You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jetspeed-dev@portals.apache.org by rw...@apache.org on 2005/10/12 08:35:51 UTC
svn commit: r314803 [2/2] - in /portals/jetspeed-2/trunk:
components/page-manager/src/java/JETSPEED-INF/castor/
components/page-manager/src/java/JETSPEED-INF/ojb/
components/page-manager/src/java/org/apache/jetspeed/om/folder/impl/
components/page-mana...
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=314803&r1=314802&r2=314803&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/etc/schema/phase2-schema.xml (original)
+++ portals/jetspeed-2/trunk/etc/schema/phase2-schema.xml Tue Oct 11 23:35:19 2005
@@ -18,119 +18,84 @@
<!-- Autogenerated by JDBCToXMLSchema! -->
<database name="j2">
+ <!--
+ Folder Definition
+ -->
<table name="FOLDER">
- <column name="FOLDER_ID" primaryKey="true" required="true"
- size="80" type="VARCHAR"/>
- <column name="PARENT_ID" type="VARCHAR" size="80"/>
+ <column name="FOLDER_ID" primaryKey="true" required="true" size="255" type="VARCHAR"/>
+ <column name="PARENT_ID" type="VARCHAR" size="255"/>
+ <column name="NAME" size="80" type="VARCHAR"/>
<column name="TITLE" size="100" type="VARCHAR"/>
<foreign-key foreignTable="FOLDER" onDelete="cascade">
<reference foreign="FOLDER_ID" local="PARENT_ID"/>
</foreign-key>
- <index name="FOLDER_IDX1">
- <index-column name="PARENT_ID" />
- </index >
- </table>
-
- <!-- associates a page with its sub group pages -->
- <table name="SUB_PAGES">
- <column name="FOLDER_ID" required="true" size="80" type="VARCHAR"/>
- <column name="SUB_PAGE_ID" required="true" size="80" type="VARCHAR"/>
- <index name="IX_SUB_PAGES_1">
- <index-column name="FOLDER_ID" />
- <index-column name="SUB_PAGE_ID" />
- </index>
- </table>
-
- <table name="SUB_FOLDERS">
- <column name="FOLDER_ID" required="true" size="80" type="VARCHAR"/>
- <column name="SUB_FOLDER_ID" required="true" size="80" type="VARCHAR"/>
- <index name="IX_SUB_FOLDER_1">
- <index-column name="FOLDER_ID" />
- <index-column name="SUB_FOLDER_ID" />
- </index>
+ <index name="IX_FOLDER_1">
+ <index-column name="PARENT_ID"/>
+ </index>
</table>
<!--
- Page Definitions
+ Page Definition
-->
<table name="PAGE">
- <column name="PAGE_ID" primaryKey="true" required="true"
- size="80" type="VARCHAR"/>
- <column name="PARENT_ID" type="VARCHAR" size="80"/>
+ <column name="PAGE_ID" primaryKey="true" required="true" size="255" type="VARCHAR"/>
+ <column name="PARENT_ID" type="VARCHAR" size="255"/>
+ <column name="NAME" size="80" type="VARCHAR"/>
<column name="TITLE" size="100" type="VARCHAR"/>
- <column name="DEFAULT_DECORATOR" size="100" type="VARCHAR"/>
- <column name="DEFAULT_PORTLET_DECORATOR" size="100" type="VARCHAR"/>
- <column name="ACL" size="80" type="VARCHAR"/>
+ <column name="SKIN" size="80" type="VARCHAR"/>
<foreign-key foreignTable="FOLDER" onDelete="cascade">
<reference foreign="FOLDER_ID" local="PARENT_ID"/>
</foreign-key>
- <index name="PAGE_IDX1">
- <index-column name="PARENT_ID" />
- </index >
-
+ <index name="IX_PAGE_1">
+ <index-column name="PARENT_ID"/>
+ </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>
<!--
- Fragments (portlets, layouts)
+ Fragment Definitions (portlets, layouts)
-->
<table name="FRAGMENT">
- <column name="FRAGMENT_ID" primaryKey="true" required="true"
- size="80" type="VARCHAR"/>
- <column name="COMPONENT_NAME" size="100" type="VARCHAR"/>
- <column name="ACL" size="80" type="VARCHAR"/>
+ <column name="FRAGMENT_ID" primaryKey="true" required="true" type="INTEGER"/>
+ <column name="PARENT_ID" type="INTEGER"/>
+ <column name="PAGE_ID" type="VARCHAR" size="255"/>
+ <column name="NAME" size="100" type="VARCHAR"/>
<column name="TITLE" size="100" type="VARCHAR"/>
<column name="TYPE" size="40" type="VARCHAR"/>
<column name="SKIN" size="80" type="VARCHAR"/>
<column name="DECORATOR" size="80" type="VARCHAR"/>
<column name="STATE" size="40" type="VARCHAR"/>
- </table>
-
- <!-- associates a page with its top level fragments -->
- <table name="PAGE_FRAGMENTS">
- <column name="PAGE_ID" required="true" size="80" type="VARCHAR"/>
- <column name="FRAGMENT_ID" required="true" size="80" type="VARCHAR"/>
- <index name="IX_PAGE_FRAGMENTS_1">
- <index-column name="PAGE_ID" />
- <index-column name="FRAGMENT_ID" />
- </index>
- </table>
-
- <!-- associates a fragment with its top level fragments -->
- <table name="SUB_FRAGMENTS">
- <column name="FRAGMENT_ID" required="true" size="80" type="VARCHAR"/>
- <column name="SUB_FRAGMENT_ID" required="true" size="80" type="VARCHAR"/>
- <index name="IX_SUB_FRAGMENTS_1">
- <index-column name="FRAGMENT_ID" />
- <index-column name="SUB_FRAGMENT_ID" />
- </index>
- </table>
-
- <table name="FRAGMENT_PARAMETER">
- <column name="PARAMETER_ID" primaryKey="true" required="true" type="INTEGER"/>
- <column name="FRAGMENT_ID" required="true" type="INTEGER"/>
- <column name="NAME" required="true" size="80" type="VARCHAR"/>
- <column name="COLUMN_VALUE" required="true" type="LONGVARCHAR"/>
- <unique name="UN_FRAGMENT_PARAMETER_1">
- <unique-column name="FRAGMENT_ID" />
- <unique-column name="PARAMETER_ID" />
- </unique>
- </table>
-
- <!-- names a reference to a fragment subtree -->
- <table name="FRAGMENT_REF">
- <column name="FRAGMENT_REF_ID" primaryKey="true" required="true"
- size="80" type="VARCHAR"/>
- <column name="FRAGMENT_ID" required="true" size="80" type="VARCHAR"/>
- <column name="NAME" required="true" size="80" type="VARCHAR"/>
- <column name="TITLE" size="100" type="VARCHAR"/>
- </table>
-
- <table name="FRAGMENT_REFS">
- <column name="FRAGMENT_REF_ID" required="true" size="80" type="VARCHAR"/>
- <column name="FRAGMENT_ID" required="true" size="80" type="VARCHAR"/>
+ <foreign-key foreignTable="FRAGMENT" onDelete="cascade">
+ <reference foreign="FRAGMENT_ID" local="PARENT_ID"/>
+ </foreign-key>
+ <foreign-key foreignTable="PAGE" onDelete="cascade">
+ <reference foreign="PAGE_ID" local="PAGE_ID"/>
+ </foreign-key>
+ <index name="IX_FRAGMENT_1">
+ <index-column name="PARENT_ID"/>
+ </index>
+ <unique name="UN_FRAGMENT_1">
+ <unique-column name="PAGE_ID"/>
+ </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=314803&r1=314802&r2=314803&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/etc/sql/drop.sql (original)
+++ portals/jetspeed-2/trunk/etc/sql/drop.sql Tue Oct 11 23:35:19 2005
@@ -16,14 +16,8 @@
DROP TABLE MEDIATYPE_TO_CAPABILITY;
DROP TABLE MEDIATYPE_TO_MIMETYPE;
DROP TABLE FRAGMENT;
-DROP TABLE PAGE_FRAGMENTS;
-DROP TABLE SUB_FRAGMENTS;
-DROP TABLE FRAGMENT_PARAMETER;
-DROP TABLE FRAGMENT_REF;
-DROP TABLE FRAGMENT_REFS;
-DROP TABLE SUB_PAGES;
+DROP TABLE PAGE_DECORATOR;
DROP TABLE PAGE;
-DROP TABLE SUB_FOLDERS;
DROP TABLE FOLDER;
DROP TABLE RULE_CRITERION;
DROP TABLE PRINCIPAL_RULE_ASSOC;
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=314803&r1=314802&r2=314803&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/etc/sql/oracle/drop.sql (original)
+++ portals/jetspeed-2/trunk/etc/sql/oracle/drop.sql Tue Oct 11 23:35:19 2005
@@ -22,16 +22,8 @@
DROP TABLE MEDIATYPE_TO_MIMETYPE;
DROP TABLE FRAGMENT;
-DROP TABLE PAGE_FRAGMENTS;
-DROP TABLE SUB_FRAGMENTS;
-DROP TABLE FRAGMENT_PARAMETER;
-DROP TABLE FRAGMENT_REF;
-DROP TABLE FRAGMENT_REFS;
-
-DROP TABLE SUB_PAGES;
+DROP TABLE PAGE_DECORATOR;
DROP TABLE PAGE;
-
-DROP TABLE SUB_FOLDERS;
DROP TABLE FOLDER;
DROP TABLE RULE_CRITERION;
Modified: portals/jetspeed-2/trunk/src/webapp/WEB-INF/assembly/page-manager.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/src/webapp/WEB-INF/assembly/page-manager.xml?rev=314803&r1=314802&r2=314803&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/src/webapp/WEB-INF/assembly/page-manager.xml (original)
+++ portals/jetspeed-2/trunk/src/webapp/WEB-INF/assembly/page-manager.xml Tue Oct 11 23:35:19 2005
@@ -19,7 +19,7 @@
<!-- PageManager -->
<bean id="PsmlDocumentHandler"
- class="org.apache.jetspeed.page.document.CastorFileSystemDocumentHandler" >
+ class="org.apache.jetspeed.page.document.psml.CastorFileSystemDocumentHandler" >
<constructor-arg index="0"><value>/JETSPEED-INF/castor/page-mapping.xml</value></constructor-arg>
<constructor-arg index="1"><value>.psml</value></constructor-arg>
<constructor-arg index="2" ><value>org.apache.jetspeed.om.page.Page</value></constructor-arg>
@@ -28,7 +28,7 @@
</bean>
<bean id="LinkDocumentHandler"
- class="org.apache.jetspeed.page.document.CastorFileSystemDocumentHandler" >
+ class="org.apache.jetspeed.page.document.psml.CastorFileSystemDocumentHandler" >
<constructor-arg index="0"><value>/JETSPEED-INF/castor/page-mapping.xml</value></constructor-arg>
<constructor-arg index="1"><value>.link</value></constructor-arg>
<constructor-arg index="2" ><value>org.apache.jetspeed.om.page.Link</value></constructor-arg>
@@ -37,7 +37,7 @@
</bean>
<bean id="FolderMetaDataDocumentHandler"
- class="org.apache.jetspeed.page.document.CastorFileSystemDocumentHandler" >
+ class="org.apache.jetspeed.page.document.psml.CastorFileSystemDocumentHandler" >
<constructor-arg index="0"><value>/JETSPEED-INF/castor/page-mapping.xml</value></constructor-arg>
<constructor-arg index="1"><value>folder.metadata</value></constructor-arg>
<constructor-arg index="2" ><value>org.apache.jetspeed.om.folder.FolderMetaData</value></constructor-arg>
@@ -46,7 +46,7 @@
</bean>
<bean id="PageSecurityDocumentHandler"
- class="org.apache.jetspeed.page.document.CastorFileSystemDocumentHandler" >
+ class="org.apache.jetspeed.page.document.psml.CastorFileSystemDocumentHandler" >
<constructor-arg index="0"><value>/JETSPEED-INF/castor/page-mapping.xml</value></constructor-arg>
<constructor-arg index="1"><value>page.security</value></constructor-arg>
<constructor-arg index="2" ><value>org.apache.jetspeed.om.page.PageSecurity</value></constructor-arg>
@@ -55,7 +55,7 @@
</bean>
<bean id="DocumentHandlerFactory"
- class="org.apache.jetspeed.page.document.DocumentHandlerFactoryImpl" >
+ class="org.apache.jetspeed.page.document.psml.DocumentHandlerFactoryImpl" >
<constructor-arg>
<map>
<entry key=".psml">
@@ -75,7 +75,7 @@
</bean>
<bean id="FolderHandler"
- class="org.apache.jetspeed.page.document.FileSystemFolderHandler" >
+ class="org.apache.jetspeed.page.document.psml.FileSystemFolderHandler" >
<constructor-arg index="0"><value>${applicationRoot}/WEB-INF/pages</value></constructor-arg>
<constructor-arg index="1"><ref bean="DocumentHandlerFactory"/></constructor-arg>
<constructor-arg index="2"><ref bean="PageFileCache"/></constructor-arg>
@@ -83,7 +83,7 @@
<bean id="org.apache.jetspeed.page.PageManager"
name="pageManager"
- class="org.apache.jetspeed.page.impl.CastorXmlPageManager">
+ class="org.apache.jetspeed.page.psml.CastorXmlPageManager">
<constructor-arg index="0"><ref bean="IdGenerator"/></constructor-arg>
<constructor-arg index="1"><ref bean="DocumentHandlerFactory"/></constructor-arg>
<constructor-arg index="2"><ref bean="FolderHandler"/></constructor-arg>
---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org