portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rwat...@apache.org
Subject svn commit: r320774 - in /portals/jetspeed-2/trunk/etc: schema/phase2-schema.xml sql/drop.sql sql/oracle/drop.sql
Date Thu, 13 Oct 2005 14:07:39 GMT
Author: rwatler
Date: Thu Oct 13 07:07:37 2005
New Revision: 320774

URL: http://svn.apache.org/viewcvs?rev=320774&view=rev
Log:
integrate Fragment properties into Fragment table

Modified:
    portals/jetspeed-2/trunk/etc/schema/phase2-schema.xml
    portals/jetspeed-2/trunk/etc/sql/drop.sql
    portals/jetspeed-2/trunk/etc/sql/oracle/drop.sql

Modified: portals/jetspeed-2/trunk/etc/schema/phase2-schema.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/etc/schema/phase2-schema.xml?rev=320774&r1=320773&r2=320774&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/etc/schema/phase2-schema.xml (original)
+++ portals/jetspeed-2/trunk/etc/schema/phase2-schema.xml Thu Oct 13 07:07:37 2005
@@ -15,7 +15,6 @@
 limitations under the License.
 -->
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database_3_2.dtd">
-<!-- Autogenerated by JDBCToXMLSchema! -->
 <database name="j2">
 
     <!--
@@ -69,6 +68,13 @@
         <column name="SKIN" size="80" type="VARCHAR"/>
         <column name="DECORATOR" size="80" type="VARCHAR"/>
         <column name="STATE" size="40" type="VARCHAR"/>
+        <column name="LAYOUT_ROW" type="INTEGER"/>
+        <column name="LAYOUT_COLUMN" type="INTEGER"/>
+        <column name="LAYOUT_WIDTH" type="INTEGER"/>
+        <column name="EXT_PROPERTY_NAME_1" size="80" type="VARCHAR"/>
+        <column name="EXT_PROPERTY_VALUE_1" size="80" type="VARCHAR"/>
+        <column name="EXT_PROPERTY_NAME_2" size="80" type="VARCHAR"/>
+        <column name="EXT_PROPERTY_VALUE_2" size="80" type="VARCHAR"/>
 		<foreign-key foreignTable="FRAGMENT" onDelete="cascade">
 			<reference foreign="FRAGMENT_ID" local="PARENT_ID"/>
 		</foreign-key>
@@ -82,26 +88,7 @@
 			<unique-column name="PAGE_ID"/>
 		</unique>
     </table>
-    
-    <table name="FRAGMENT_PROPERTY">
-        <column name="PROPERTY_ID" primaryKey="true" required="true" type="INTEGER"/>
-        <column name="FRAGMENT_ID" required="true" type="INTEGER"/>
-        <column name="LAYOUT" required="true" size="80" type="VARCHAR"/>
-        <column name="NAME" required="true" size="80" type="VARCHAR"/>
-        <column name="VALUE" required="true" size="80" type="VARCHAR"/>
-		<foreign-key foreignTable="FRAGMENT" onDelete="cascade">
-			<reference foreign="FRAGMENT_ID" local="FRAGMENT_ID"/>
-		</foreign-key>
-		<index name="IX_FRAGMENT_PROPERTY_1">
-			<index-column name="FRAGMENT_ID"/>
-		</index>        
-        <unique name="UN_FRAGMENT_PROPERTY_1">
-          <unique-column name="FRAGMENT_ID"/>
-          <unique-column name="LAYOUT"/>
-          <unique-column name="NAME"/>
-        </unique>
-    </table>
-    
+
     <!--
        Profiler
     -->

Modified: portals/jetspeed-2/trunk/etc/sql/drop.sql
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/etc/sql/drop.sql?rev=320774&r1=320773&r2=320774&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/etc/sql/drop.sql (original)
+++ portals/jetspeed-2/trunk/etc/sql/drop.sql Thu Oct 13 07:07:37 2005
@@ -15,7 +15,6 @@
 DROP TABLE CLIENT_TO_MIMETYPE;
 DROP TABLE MEDIATYPE_TO_CAPABILITY;
 DROP TABLE MEDIATYPE_TO_MIMETYPE;
-DROP TABLE FRAGMENT_PROPERTY;
 DROP TABLE FRAGMENT;
 DROP TABLE PAGE;
 DROP TABLE FOLDER;

Modified: portals/jetspeed-2/trunk/etc/sql/oracle/drop.sql
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/etc/sql/oracle/drop.sql?rev=320774&r1=320773&r2=320774&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/etc/sql/oracle/drop.sql (original)
+++ portals/jetspeed-2/trunk/etc/sql/oracle/drop.sql Thu Oct 13 07:07:37 2005
@@ -21,7 +21,6 @@
 DROP TABLE MEDIATYPE_TO_CAPABILITY;
 DROP TABLE MEDIATYPE_TO_MIMETYPE;
 
-DROP TABLE FRAGMENT_PROPERTY;
 DROP TABLE FRAGMENT;
 DROP TABLE PAGE;
 DROP TABLE FOLDER;



---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org


Mime
View raw message