Author: rwatler
Date: Wed Oct 12 10:08:40 2005
New Revision: 314970
URL: http://svn.apache.org/viewcvs?rev=314970&view=rev
Log:
add fragment properties; decrement page decorators
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=314970&r1=314969&r2=314970&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/etc/schema/phase2-schema.xml (original)
+++ portals/jetspeed-2/trunk/etc/schema/phase2-schema.xml Wed Oct 12 10:08:40
2005
@@ -45,6 +45,8 @@
<column name="NAME" size="80" type="VARCHAR"/>
<column name="TITLE" size="100" type="VARCHAR"/>
<column name="SKIN" size="80" type="VARCHAR"/>
+ <column name="DECORATOR" size="80" type="VARCHAR"/>
+ <column name="DEFAULT_FRAGMENT_DECORATOR" size="80" type="VARCHAR"/>
<foreign-key foreignTable="FOLDER" onDelete="cascade">
<reference foreign="FOLDER_ID" local="PARENT_ID"/>
</foreign-key>
@@ -53,23 +55,6 @@
</index>
</table>
- <table name="PAGE_DECORATOR">
- <column name="DECORATOR_ID" primaryKey="true" required="true"
type="INTEGER"/>
- <column name="PAGE_ID" type="VARCHAR" size="255"
required="true"/>
- <column name="NAME" size="80" type="VARCHAR"/>
- <column name="DECORATOR" size="80" type="VARCHAR"/>
- <foreign-key foreignTable="PAGE" onDelete="cascade">
- <reference foreign="PAGE_ID" local="PAGE_ID"/>
- </foreign-key>
- <index name="IX_PAGE_DECORATOR_1">
- <index-column name="PAGE_ID"/>
- </index>
- <unique name="UN_PAGE_DECORATOR_1">
- <unique-column name="PAGE_ID"/>
- <unique-column name="NAME"/>
- </unique>
- </table>
-
<!--
Fragment Definitions (portlets, layouts)
-->
@@ -96,6 +81,25 @@
<unique name="UN_FRAGMENT_1">
<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>
<!--
Modified: portals/jetspeed-2/trunk/etc/sql/drop.sql
URL:
http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/etc/sql/drop.sql?rev=314970&r1=314969&r2=314970&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/etc/sql/drop.sql (original)
+++ portals/jetspeed-2/trunk/etc/sql/drop.sql Wed Oct 12 10:08:40 2005
@@ -15,8 +15,8 @@
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_DECORATOR;
DROP TABLE PAGE;
DROP TABLE FOLDER;
DROP TABLE RULE_CRITERION;
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=314970&r1=314969&r2=314970&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/etc/sql/oracle/drop.sql (original)
+++ portals/jetspeed-2/trunk/etc/sql/oracle/drop.sql Wed Oct 12 10:08:40 2005
@@ -21,8 +21,8 @@
DROP TABLE MEDIATYPE_TO_CAPABILITY;
DROP TABLE MEDIATYPE_TO_MIMETYPE;
+DROP TABLE FRAGMENT_PROPERTY;
DROP TABLE FRAGMENT;
-DROP TABLE PAGE_DECORATOR;
DROP TABLE PAGE;
DROP TABLE FOLDER;
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
