portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rwat...@apache.org
Subject svn commit: r829497 [2/2] - in /portals/jetspeed-2/portal/branches/JETSPEED-2.1.4: 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/p...
Date Sun, 25 Oct 2009 05:40:16 GMT
Modified: portals/jetspeed-2/portal/branches/JETSPEED-2.1.4/components/portal/src/test/resources/assembly/page-manager.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JETSPEED-2.1.4/components/portal/src/test/resources/assembly/page-manager.xml?rev=829497&r1=829496&r2=829497&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JETSPEED-2.1.4/components/portal/src/test/resources/assembly/page-manager.xml (original)
+++ portals/jetspeed-2/portal/branches/JETSPEED-2.1.4/components/portal/src/test/resources/assembly/page-manager.xml Sun Oct 25 05:40:13 2009
@@ -21,38 +21,42 @@
   <!-- PageManager -->
   <bean id="PsmlDocumentHandler"      
        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.psml.PageImpl</value></constructor-arg>       
-       <constructor-arg index="3" ><value>target/test-classes/pages</value></constructor-arg>
-       <constructor-arg index="4" ><ref bean="PageFileCache"/></constructor-arg>
+       <constructor-arg index="0"><ref bean="IdGenerator"/></constructor-arg>
+       <constructor-arg index="1"><value>/JETSPEED-INF/castor/page-mapping.xml</value></constructor-arg>
+       <constructor-arg index="2"><value>.psml</value></constructor-arg>
+       <constructor-arg index="3" ><value>org.apache.jetspeed.om.page.psml.PageImpl</value></constructor-arg>       
+       <constructor-arg index="4" ><value>target/test-classes/pages</value></constructor-arg>
+       <constructor-arg index="5" ><ref bean="PageFileCache"/></constructor-arg>
   </bean>
   
   <bean id="LinkDocumentHandler"       
        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.psml.LinkImpl</value></constructor-arg>       
-       <constructor-arg index="3" ><value>target/test-classes/pages</value></constructor-arg>
-       <constructor-arg index="4" ><ref bean="PageFileCache"/></constructor-arg>
+       <constructor-arg index="0"><ref bean="IdGenerator"/></constructor-arg>
+       <constructor-arg index="1"><value>/JETSPEED-INF/castor/page-mapping.xml</value></constructor-arg>
+       <constructor-arg index="2"><value>.link</value></constructor-arg>
+       <constructor-arg index="3" ><value>org.apache.jetspeed.om.page.psml.LinkImpl</value></constructor-arg>       
+       <constructor-arg index="4" ><value>target/test-classes/pages</value></constructor-arg>
+       <constructor-arg index="5" ><ref bean="PageFileCache"/></constructor-arg>
   </bean>
   
   <bean id="FolderMetaDataDocumentHandler"         
        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.psml.FolderMetaDataImpl</value></constructor-arg>       
-       <constructor-arg index="3" ><value>target/test-classes/pages</value></constructor-arg>
-       <constructor-arg index="4" ><ref bean="PageFileCache"/></constructor-arg>
+       <constructor-arg index="0"><ref bean="IdGenerator"/></constructor-arg>
+       <constructor-arg index="1"><value>/JETSPEED-INF/castor/page-mapping.xml</value></constructor-arg>
+       <constructor-arg index="2"><value>folder.metadata</value></constructor-arg>
+       <constructor-arg index="3" ><value>org.apache.jetspeed.om.folder.psml.FolderMetaDataImpl</value></constructor-arg>       
+       <constructor-arg index="4" ><value>target/test-classes/pages</value></constructor-arg>
+       <constructor-arg index="5" ><ref bean="PageFileCache"/></constructor-arg>
   </bean>
   
   <bean id="PageSecurityDocumentHandler"       
        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.psml.PageSecurityImpl</value></constructor-arg>       
-       <constructor-arg index="3" ><value>target/test-classes/pages</value></constructor-arg>
-       <constructor-arg index="4" ><ref bean="PageFileCache"/></constructor-arg>
+       <constructor-arg index="0"><ref bean="IdGenerator"/></constructor-arg>
+       <constructor-arg index="1"><value>/JETSPEED-INF/castor/page-mapping.xml</value></constructor-arg>
+       <constructor-arg index="2"><value>page.security</value></constructor-arg>
+       <constructor-arg index="3" ><value>org.apache.jetspeed.om.page.psml.PageSecurityImpl</value></constructor-arg>       
+       <constructor-arg index="4" ><value>target/test-classes/pages</value></constructor-arg>
+       <constructor-arg index="5" ><ref bean="PageFileCache"/></constructor-arg>
   </bean>
   
   <bean id="DocumentHandlerFactory"        
@@ -77,9 +81,10 @@
   
   <bean id="FolderHandler"         
        class="org.apache.jetspeed.page.document.psml.FileSystemFolderHandler" >         
-       <constructor-arg index="0"><value>target/test-classes/pages</value></constructor-arg>
-       <constructor-arg index="1"><ref bean="DocumentHandlerFactory"/></constructor-arg>
-       <constructor-arg index="2"><ref bean="PageFileCache"/></constructor-arg>        
+       <constructor-arg index="0"><ref bean="IdGenerator"/></constructor-arg>
+       <constructor-arg index="1"><value>target/test-classes/pages</value></constructor-arg>
+       <constructor-arg index="2"><ref bean="DocumentHandlerFactory"/></constructor-arg>
+       <constructor-arg index="3"><ref bean="PageFileCache"/></constructor-arg>        
   </bean>
     
   <bean id="org.apache.jetspeed.page.PageManager" 

Modified: portals/jetspeed-2/portal/branches/JETSPEED-2.1.4/components/registry/src/test/org/apache/jetspeed/components/portletentity/ContentFragmentTestImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JETSPEED-2.1.4/components/registry/src/test/org/apache/jetspeed/components/portletentity/ContentFragmentTestImpl.java?rev=829497&r1=829496&r2=829497&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JETSPEED-2.1.4/components/registry/src/test/org/apache/jetspeed/components/portletentity/ContentFragmentTestImpl.java (original)
+++ portals/jetspeed-2/portal/branches/JETSPEED-2.1.4/components/registry/src/test/org/apache/jetspeed/components/portletentity/ContentFragmentTestImpl.java Sun Oct 25 05:40:13 2009
@@ -254,6 +254,14 @@
         f.setSecurityConstraints(constraints);
     }
 
+    /* (non-Javadoc)
+     * @see org.apache.jetspeed.om.page.Fragment#setId(java.lang.String)
+     */
+    public void setId(String fragmentId)
+    {
+        // cannot set fragment id from content fragment
+    }
+
     /**
      * @param title
      */

Modified: portals/jetspeed-2/portal/branches/JETSPEED-2.1.4/etc/build.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JETSPEED-2.1.4/etc/build.xml?rev=829497&r1=829496&r2=829497&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JETSPEED-2.1.4/etc/build.xml (original)
+++ portals/jetspeed-2/portal/branches/JETSPEED-2.1.4/etc/build.xml Sun Oct 25 05:40:13 2009
@@ -472,6 +472,7 @@
  	    <echo message="Running Jetspeed Seed Importer with -b ${temp.assembly.dir}/boot/ -c ${temp.assembly.dir}/ "/>
         <copy todir="${temp.assembly.dir}" overwrite="true" failonerror="true">
           <fileset dir="${basedir}/../src/webapp/WEB-INF/assembly">
+            <include name="jetspeed-base.xml"/>
             <include name="security*.xml"/>
             <include name="capabilities.xml"/>           
             <include name="prefs.xml"/>           
@@ -553,7 +554,12 @@
             <dependency groupId="${org.apache.jetspeed.deploy.groupid}"
                         artifactId="jetspeed-portal-site"
                         version="${org.apache.jetspeed.deploy.version}"/>
-
+            <dependency groupId="${org.apache.jetspeed.deploy.groupid}"
+                        artifactId="jetspeed-id-generator"
+                        version="${org.apache.jetspeed.deploy.version}"/>
+            <dependency groupId="${org.apache.jetspeed.deploy.groupid}"
+                        artifactId="jetspeed-file-cache"
+                        version="${org.apache.jetspeed.deploy.version}"/>
         </dependencies>
 
         <!-- create sysproperty set to configure import utility -->

Modified: portals/jetspeed-2/portal/branches/JETSPEED-2.1.4/etc/import/assembly/import-page-manager.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JETSPEED-2.1.4/etc/import/assembly/import-page-manager.xml?rev=829497&r1=829496&r2=829497&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JETSPEED-2.1.4/etc/import/assembly/import-page-manager.xml (original)
+++ portals/jetspeed-2/portal/branches/JETSPEED-2.1.4/etc/import/assembly/import-page-manager.xml Sun Oct 25 05:40:13 2009
@@ -24,14 +24,16 @@
         class="org.apache.jetspeed.page.impl.DatabasePageManager">
       <!-- OJB configuration file resource path -->
       <constructor-arg index="0"><value>JETSPEED-INF/ojb/page-manager-repository.xml</value></constructor-arg>       
+      <!-- fragment id generator -->
+      <constructor-arg index="1"><ref bean="IdGenerator"/></constructor-arg>
       <!-- permissions security enabled flag, default=false -->
-      <constructor-arg index="1"><value>false</value></constructor-arg>
-      <!-- constraints security enabled flag, default=true -->
       <constructor-arg index="2"><value>false</value></constructor-arg>
+      <!-- constraints security enabled flag, default=true -->
+      <constructor-arg index="3"><value>false</value></constructor-arg>
       <!-- folder/page/link cache -->
-      <constructor-arg index="3"><ref bean="pageManagerOidCache"/></constructor-arg>
+      <constructor-arg index="4"><ref bean="pageManagerOidCache"/></constructor-arg>
       <!-- folder/page/link path cache -->
-      <constructor-arg index="4"><ref bean="pageManagerPathCache"/></constructor-arg>
+      <constructor-arg index="5"><ref bean="pageManagerPathCache"/></constructor-arg>
   </bean>
 
     <!-- Proxying -->
@@ -81,38 +83,42 @@
   <!-- PageManager -->
   <bean id="PsmlDocumentHandler"      
        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.psml.PageImpl</value></constructor-arg>       
-       <constructor-arg index="3" ><value>${org.apache.jetspeed.page.import.pages}</value></constructor-arg>
-       <constructor-arg index="4" ><ref bean="PageFileCache"/></constructor-arg>
+       <constructor-arg index="0"><ref bean="IdGenerator"/></constructor-arg>
+       <constructor-arg index="1"><value>/JETSPEED-INF/castor/page-mapping.xml</value></constructor-arg>
+       <constructor-arg index="2"><value>.psml</value></constructor-arg>
+       <constructor-arg index="3" ><value>org.apache.jetspeed.om.page.psml.PageImpl</value></constructor-arg>       
+       <constructor-arg index="4" ><value>${org.apache.jetspeed.page.import.pages}</value></constructor-arg>
+       <constructor-arg index="5" ><ref bean="PageFileCache"/></constructor-arg>
   </bean>
   
   <bean id="LinkDocumentHandler"       
        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.psml.LinkImpl</value></constructor-arg>       
-       <constructor-arg index="3" ><value>${org.apache.jetspeed.page.import.pages}</value></constructor-arg>
-       <constructor-arg index="4" ><ref bean="PageFileCache"/></constructor-arg>
+       <constructor-arg index="0"><ref bean="IdGenerator"/></constructor-arg>
+       <constructor-arg index="1"><value>/JETSPEED-INF/castor/page-mapping.xml</value></constructor-arg>
+       <constructor-arg index="2"><value>.link</value></constructor-arg>
+       <constructor-arg index="3" ><value>org.apache.jetspeed.om.page.psml.LinkImpl</value></constructor-arg>       
+       <constructor-arg index="4" ><value>${org.apache.jetspeed.page.import.pages}</value></constructor-arg>
+       <constructor-arg index="5" ><ref bean="PageFileCache"/></constructor-arg>
   </bean>
   
   <bean id="FolderMetaDataDocumentHandler"         
        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.psml.FolderMetaDataImpl</value></constructor-arg>       
-       <constructor-arg index="3" ><value>${org.apache.jetspeed.page.import.pages}</value></constructor-arg>
-       <constructor-arg index="4" ><ref bean="PageFileCache"/></constructor-arg>
+       <constructor-arg index="0"><ref bean="IdGenerator"/></constructor-arg>
+       <constructor-arg index="1"><value>/JETSPEED-INF/castor/page-mapping.xml</value></constructor-arg>
+       <constructor-arg index="2"><value>folder.metadata</value></constructor-arg>
+       <constructor-arg index="3" ><value>org.apache.jetspeed.om.folder.psml.FolderMetaDataImpl</value></constructor-arg>       
+       <constructor-arg index="4" ><value>${org.apache.jetspeed.page.import.pages}</value></constructor-arg>
+       <constructor-arg index="5" ><ref bean="PageFileCache"/></constructor-arg>
   </bean>
   
   <bean id="PageSecurityDocumentHandler"       
        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.psml.PageSecurityImpl</value></constructor-arg>       
-       <constructor-arg index="3" ><value>${org.apache.jetspeed.page.import.pages}</value></constructor-arg>
-       <constructor-arg index="4" ><ref bean="PageFileCache"/></constructor-arg>
+       <constructor-arg index="0"><ref bean="IdGenerator"/></constructor-arg>
+       <constructor-arg index="1"><value>/JETSPEED-INF/castor/page-mapping.xml</value></constructor-arg>
+       <constructor-arg index="2"><value>page.security</value></constructor-arg>
+       <constructor-arg index="3" ><value>org.apache.jetspeed.om.page.psml.PageSecurityImpl</value></constructor-arg>       
+       <constructor-arg index="4" ><value>${org.apache.jetspeed.page.import.pages}</value></constructor-arg>
+       <constructor-arg index="5" ><ref bean="PageFileCache"/></constructor-arg>
   </bean>
   
   <bean id="DocumentHandlerFactory"        
@@ -137,9 +143,10 @@
   
   <bean id="FolderHandler"         
        class="org.apache.jetspeed.page.document.psml.FileSystemFolderHandler" >         
-       <constructor-arg index="0"><value>${org.apache.jetspeed.page.import.pages}</value></constructor-arg>
-       <constructor-arg index="1"><ref bean="DocumentHandlerFactory"/></constructor-arg>
-       <constructor-arg index="2"><ref bean="PageFileCache"/></constructor-arg>        
+       <constructor-arg index="0"><ref bean="IdGenerator"/></constructor-arg>
+       <constructor-arg index="1"><value>${org.apache.jetspeed.page.import.pages}</value></constructor-arg>
+       <constructor-arg index="2"><ref bean="DocumentHandlerFactory"/></constructor-arg>
+       <constructor-arg index="3"><ref bean="PageFileCache"/></constructor-arg>        
   </bean>
     
   <bean id="org.apache.jetspeed.page.CastorPageManager" 

Modified: portals/jetspeed-2/portal/branches/JETSPEED-2.1.4/etc/schema/phase2-schema.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JETSPEED-2.1.4/etc/schema/phase2-schema.xml?rev=829497&r1=829496&r2=829497&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JETSPEED-2.1.4/etc/schema/phase2-schema.xml (original)
+++ portals/jetspeed-2/portal/branches/JETSPEED-2.1.4/etc/schema/phase2-schema.xml Sun Oct 25 05:40:13 2009
@@ -327,6 +327,7 @@
         <column name="FRAGMENT_ID" primaryKey="true" required="true" type="INTEGER"/>
         <column name="PARENT_ID" type="INTEGER"/>
         <column name="PAGE_ID" type="INTEGER"/>
+        <column name="FRAGMENT_STRING_ID" size="80" type="VARCHAR"/>
         <column name="NAME" size="100" type="VARCHAR"/>
         <column name="TITLE" size="100" type="VARCHAR"/>
         <column name="SHORT_TITLE" size="40" type="VARCHAR"/>
@@ -360,6 +361,9 @@
         <index name="UN_FRAGMENT_1">
             <index-column name="PAGE_ID"/>
         </index>
+        <unique name="UN_FRAGMENT_2">
+            <unique-column name="FRAGMENT_STRING_ID"/>
+        </unique>
     </table>
 
     <table name="FRAGMENT_CONSTRAINT">

Modified: portals/jetspeed-2/portal/branches/JETSPEED-2.1.4/installer/etc/database/build.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JETSPEED-2.1.4/installer/etc/database/build.xml?rev=829497&r1=829496&r2=829497&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JETSPEED-2.1.4/installer/etc/database/build.xml (original)
+++ portals/jetspeed-2/portal/branches/JETSPEED-2.1.4/installer/etc/database/build.xml Sun Oct 25 05:40:13 2009
@@ -378,6 +378,7 @@
 
     <copy todir="${basedir}/assembly" overwrite="true" failonerror="true">
       <fileset dir="${basedir}/../webapps/${portalName}/WEB-INF/assembly">
+        <include name="jetspeed-base.xml"/>
         <include name="security*.xml" />
         <include name="capabilities.xml" />
         <include name="prefs.xml" />

Modified: portals/jetspeed-2/portal/branches/JETSPEED-2.1.4/installer/etc/database/import/assembly/import-page-manager.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JETSPEED-2.1.4/installer/etc/database/import/assembly/import-page-manager.xml?rev=829497&r1=829496&r2=829497&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JETSPEED-2.1.4/installer/etc/database/import/assembly/import-page-manager.xml (original)
+++ portals/jetspeed-2/portal/branches/JETSPEED-2.1.4/installer/etc/database/import/assembly/import-page-manager.xml Sun Oct 25 05:40:13 2009
@@ -24,14 +24,16 @@
         class="org.apache.jetspeed.page.impl.DatabasePageManager">
       <!-- OJB configuration file resource path -->
       <constructor-arg index="0"><value>JETSPEED-INF/ojb/page-manager-repository.xml</value></constructor-arg>       
+      <!-- fragment id generator -->
+      <constructor-arg index="1"><ref bean="IdGenerator"/></constructor-arg>
       <!-- permissions security enabled flag, default=false -->
-      <constructor-arg index="1"><value>false</value></constructor-arg>
-      <!-- constraints security enabled flag, default=true -->
       <constructor-arg index="2"><value>false</value></constructor-arg>
+      <!-- constraints security enabled flag, default=true -->
+      <constructor-arg index="3"><value>false</value></constructor-arg>
       <!-- folder/page/link cache -->
-      <constructor-arg index="3"><ref bean="pageManagerOidCache"/></constructor-arg>
+      <constructor-arg index="4"><ref bean="pageManagerOidCache"/></constructor-arg>
       <!-- folder/page/link path cache -->
-      <constructor-arg index="4"><ref bean="pageManagerPathCache"/></constructor-arg>
+      <constructor-arg index="5"><ref bean="pageManagerPathCache"/></constructor-arg>
   </bean>
 
     <!-- Proxying -->
@@ -81,38 +83,42 @@
   <!-- PageManager -->
   <bean id="PsmlDocumentHandler"      
        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.psml.PageImpl</value></constructor-arg>       
-       <constructor-arg index="3" ><value>${org.apache.jetspeed.page.import.pages}</value></constructor-arg>
-       <constructor-arg index="4" ><ref bean="PageFileCache"/></constructor-arg>
+       <constructor-arg index="0"><ref bean="IdGenerator"/></constructor-arg>
+       <constructor-arg index="1"><value>/JETSPEED-INF/castor/page-mapping.xml</value></constructor-arg>
+       <constructor-arg index="2"><value>.psml</value></constructor-arg>
+       <constructor-arg index="3" ><value>org.apache.jetspeed.om.page.psml.PageImpl</value></constructor-arg>       
+       <constructor-arg index="4" ><value>${org.apache.jetspeed.page.import.pages}</value></constructor-arg>
+       <constructor-arg index="5" ><ref bean="PageFileCache"/></constructor-arg>
   </bean>
   
   <bean id="LinkDocumentHandler"       
        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.psml.LinkImpl</value></constructor-arg>       
-       <constructor-arg index="3" ><value>${org.apache.jetspeed.page.import.pages}</value></constructor-arg>
-       <constructor-arg index="4" ><ref bean="PageFileCache"/></constructor-arg>
+       <constructor-arg index="0"><ref bean="IdGenerator"/></constructor-arg>
+       <constructor-arg index="1"><value>/JETSPEED-INF/castor/page-mapping.xml</value></constructor-arg>
+       <constructor-arg index="2"><value>.link</value></constructor-arg>
+       <constructor-arg index="3" ><value>org.apache.jetspeed.om.page.psml.LinkImpl</value></constructor-arg>       
+       <constructor-arg index="4" ><value>${org.apache.jetspeed.page.import.pages}</value></constructor-arg>
+       <constructor-arg index="5" ><ref bean="PageFileCache"/></constructor-arg>
   </bean>
   
   <bean id="FolderMetaDataDocumentHandler"         
        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.psml.FolderMetaDataImpl</value></constructor-arg>       
-       <constructor-arg index="3" ><value>${org.apache.jetspeed.page.import.pages}</value></constructor-arg>
-       <constructor-arg index="4" ><ref bean="PageFileCache"/></constructor-arg>
+       <constructor-arg index="0"><ref bean="IdGenerator"/></constructor-arg>
+       <constructor-arg index="1"><value>/JETSPEED-INF/castor/page-mapping.xml</value></constructor-arg>
+       <constructor-arg index="2"><value>folder.metadata</value></constructor-arg>
+       <constructor-arg index="3" ><value>org.apache.jetspeed.om.folder.psml.FolderMetaDataImpl</value></constructor-arg>       
+       <constructor-arg index="4" ><value>${org.apache.jetspeed.page.import.pages}</value></constructor-arg>
+       <constructor-arg index="5" ><ref bean="PageFileCache"/></constructor-arg>
   </bean>
   
   <bean id="PageSecurityDocumentHandler"       
        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.psml.PageSecurityImpl</value></constructor-arg>       
-       <constructor-arg index="3" ><value>${org.apache.jetspeed.page.import.pages}</value></constructor-arg>
-       <constructor-arg index="4" ><ref bean="PageFileCache"/></constructor-arg>
+       <constructor-arg index="0"><ref bean="IdGenerator"/></constructor-arg>
+       <constructor-arg index="1"><value>/JETSPEED-INF/castor/page-mapping.xml</value></constructor-arg>
+       <constructor-arg index="2"><value>page.security</value></constructor-arg>
+       <constructor-arg index="3" ><value>org.apache.jetspeed.om.page.psml.PageSecurityImpl</value></constructor-arg>       
+       <constructor-arg index="4" ><value>${org.apache.jetspeed.page.import.pages}</value></constructor-arg>
+       <constructor-arg index="5" ><ref bean="PageFileCache"/></constructor-arg>
   </bean>
   
   <bean id="DocumentHandlerFactory"        
@@ -137,9 +143,10 @@
   
   <bean id="FolderHandler"         
        class="org.apache.jetspeed.page.document.psml.FileSystemFolderHandler" >         
-       <constructor-arg index="0"><value>${org.apache.jetspeed.page.import.pages}</value></constructor-arg>
-       <constructor-arg index="1"><ref bean="DocumentHandlerFactory"/></constructor-arg>
-       <constructor-arg index="2"><ref bean="PageFileCache"/></constructor-arg>        
+       <constructor-arg index="0"><ref bean="IdGenerator"/></constructor-arg>
+       <constructor-arg index="1"><value>${org.apache.jetspeed.page.import.pages}</value></constructor-arg>
+       <constructor-arg index="2"><ref bean="DocumentHandlerFactory"/></constructor-arg>
+       <constructor-arg index="3"><ref bean="PageFileCache"/></constructor-arg>        
   </bean>
     
   <bean id="org.apache.jetspeed.page.CastorPageManager" 

Modified: portals/jetspeed-2/portal/branches/JETSPEED-2.1.4/jetspeed-api/src/java/org/apache/jetspeed/om/page/Fragment.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JETSPEED-2.1.4/jetspeed-api/src/java/org/apache/jetspeed/om/page/Fragment.java?rev=829497&r1=829496&r2=829497&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JETSPEED-2.1.4/jetspeed-api/src/java/org/apache/jetspeed/om/page/Fragment.java (original)
+++ portals/jetspeed-2/portal/branches/JETSPEED-2.1.4/jetspeed-api/src/java/org/apache/jetspeed/om/page/Fragment.java Sun Oct 25 05:40:13 2009
@@ -99,6 +99,14 @@
      public String HEIGHT_PROPERTY_NAME = "height";
 
     /**
+     * Sets the unique Id of this fragment. This id must be unique from the
+     * complete portal and must be suitable as a unique key.
+     *
+     * @param fragmentId the unique id of this fragment.
+     */
+    public void setId(String fragmentId);
+
+    /**
      * Returns the administrative name of this fragment. This name should map
      * to a component name in the component repository defined by the type
      * attribute.

Modified: portals/jetspeed-2/portal/branches/JETSPEED-2.1.4/jetspeed-api/src/java/org/apache/jetspeed/page/PageManager.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JETSPEED-2.1.4/jetspeed-api/src/java/org/apache/jetspeed/page/PageManager.java?rev=829497&r1=829496&r2=829497&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JETSPEED-2.1.4/jetspeed-api/src/java/org/apache/jetspeed/page/PageManager.java (original)
+++ portals/jetspeed-2/portal/branches/JETSPEED-2.1.4/jetspeed-api/src/java/org/apache/jetspeed/page/PageManager.java Sun Oct 25 05:40:13 2009
@@ -556,6 +556,18 @@
         throws NodeException;
 
     /** 
+     * Copy the source page creating and returning a new copy of the page  
+     * with the same portlet and fragment collection as the source.
+     * 
+     * @param source The source Page object to be copied 
+     * @param path a PSML normalized path to the new page to be created
+     * @param copyIds flag indicating whether to use new or copied ids
+     * @return a new Page object copied from the source
+     */
+    public Page copyPage(Page source, String path, boolean copyIds)
+        throws NodeException;
+
+    /** 
      * Copy the source link creating and returning a new copy of the link  
      * 
      * @param source The source Link object to be copied 
@@ -566,13 +578,12 @@
         throws NodeException;
 
     /** 
-     * Copy the source folder creating and returning a new copy of the folder  
-     * with the same content as the source
-     * All subobjects are created with new ids
+     * Copy the source folder creating and returning a new copy of the folder
+     * without copying any content from within the folder
      * 
      * @param source The source Folder object to be copied 
      * @param path a PSML normalized path to the new folder to be created
-     * @return a new Folder object copied from the source, with new subobject ids
+     * @return a new empty Folder object copied from the source
      */
     public Folder copyFolder(Folder source, String path) 
         throws NodeException;
@@ -589,6 +600,18 @@
     public Fragment copyFragment(Fragment source, String name) 
         throws NodeException;
 
+    /** 
+     * Copy the source fragment creating and returning a new copy of the fragment  
+     * with the parameter collection as the source
+     * 
+     * @param source The source Fragment object to be copied 
+     * @param the new fragment name, can be the same as source fragment name
+     * @param copyIds flag indicating whether to use new or copied ids
+     * @return a new Fragment object copied from the source
+     */
+    public Fragment copyFragment(Fragment source, String name, boolean copyIds) 
+        throws NodeException;
+
     /**
      * Copy the source page security (both global constraints and constraint references)
      * creating and returning a new copy of the page security definition.
@@ -612,6 +635,44 @@
         throws NodeException;
 
     /**
+     * Deep copy a folder. Copies a folder and all subcontents including
+     * other folders, subpages, links, menus, security, fragments. 
+     *  
+     * @param source source folder
+     * @param dest destination folder
+     * @param owner set owner of the new folder(s), or null for no owner
+     * @param copyIds flag indicating whether to use new or copied ids
+     * @throws NodeException if the root folder already exists
+     */
+    public void deepCopyFolder(Folder srcFolder, String destinationPath, String owner, boolean copyIds)
+        throws NodeException;
+
+    /**
+     * Deep merges a source folder into a destination folder. Copies a folder and all subcontents including
+     * other folders, subpages, links, menus, security, fragments. If a destination resource already exists,
+     * it is skipped over without error.
+     *  
+     * @param source source folder
+     * @param dest destination folder
+     * @param owner set owner of the new folder(s), or null for no owner
+     */
+    public void deepMergeFolder(Folder srcFolder, String destinationPath, String owner)
+        throws NodeException;
+    
+    /**
+     * Deep merges a source folder into a destination folder. Copies a folder and all subcontents including
+     * other folders, subpages, links, menus, security, fragments. If a destination resource already exists,
+     * it is skipped over without error.
+     *  
+     * @param source source folder
+     * @param dest destination folder
+     * @param owner set owner of the new folder(s), or null for no owner
+     * @param copyIds flag indicating whether to use new or copied ids
+     */
+    public void deepMergeFolder(Folder srcFolder, String destinationPath, String owner, boolean copyIds)
+        throws NodeException;
+    
+    /**
      * Retrieve a page for the given user name and page name
      * 
      * @param userName

Modified: portals/jetspeed-2/portal/branches/JETSPEED-2.1.4/maven-archetypes/portal/build.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JETSPEED-2.1.4/maven-archetypes/portal/build.xml?rev=829497&r1=829496&r2=829497&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JETSPEED-2.1.4/maven-archetypes/portal/build.xml (original)
+++ portals/jetspeed-2/portal/branches/JETSPEED-2.1.4/maven-archetypes/portal/build.xml Sun Oct 25 05:40:13 2009
@@ -117,6 +117,7 @@
     	<mkdir dir="${basedir}/target/classes/archetype-resources/etc/serializer/assembly"/>
             <copy todir="${basedir}/target/classes/archetype-resources/etc/serializer/assembly">
           <fileset dir="${basedir}/../../src/webapp/WEB-INF/assembly">
+            <include name="jetspeed-base.xml"/>
             <include name="security*.xml"/>
             <include name="capabilities.xml"/>           
             <include name="prefs.xml"/>           

Modified: portals/jetspeed-2/portal/branches/JETSPEED-2.1.4/maven-archetypes/portal/src/archetype/archetype-resources/etc/build.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JETSPEED-2.1.4/maven-archetypes/portal/src/archetype/archetype-resources/etc/build.xml?rev=829497&r1=829496&r2=829497&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JETSPEED-2.1.4/maven-archetypes/portal/src/archetype/archetype-resources/etc/build.xml (original)
+++ portals/jetspeed-2/portal/branches/JETSPEED-2.1.4/maven-archetypes/portal/src/archetype/archetype-resources/etc/build.xml Sun Oct 25 05:40:13 2009
@@ -473,6 +473,7 @@
  	    <echo message="Running Jetspeed Seed Importer with -b ${temp.assembly.dir}/boot/ -c ${temp.assembly.dir}/ "/>
 <!--        <copy todir="${temp.assembly.dir}" overwrite="true" failonerror="true">
           <fileset dir="\${basedir}/../src/webapp/WEB-INF/assembly">
+            <include name="jetspeed-base.xml"/>
             <include name="security*.xml"/>
             <include name="capabilities.xml"/>           
             <include name="prefs.xml"/>           
@@ -556,6 +557,12 @@
             <dependency groupId="${org.apache.jetspeed.deploy.groupid}"
                         artifactId="jetspeed-portal-site"
                         version="${org.apache.jetspeed.deploy.version}"/>        	
+            <dependency groupId="${org.apache.jetspeed.deploy.groupid}"
+                        artifactId="jetspeed-id-generator"
+                        version="${org.apache.jetspeed.deploy.version}"/>
+            <dependency groupId="${org.apache.jetspeed.deploy.groupid}"
+                        artifactId="jetspeed-file-cache"
+                        version="${org.apache.jetspeed.deploy.version}"/>
         </dependencies>
 
         <!-- create sysproperty set to configure import utility -->

Modified: portals/jetspeed-2/portal/branches/JETSPEED-2.1.4/maven-archetypes/portal/src/archetype/archetype-resources/etc/dbpsml/assembly/alternate/db-page-manager.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JETSPEED-2.1.4/maven-archetypes/portal/src/archetype/archetype-resources/etc/dbpsml/assembly/alternate/db-page-manager.xml?rev=829497&r1=829496&r2=829497&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JETSPEED-2.1.4/maven-archetypes/portal/src/archetype/archetype-resources/etc/dbpsml/assembly/alternate/db-page-manager.xml (original)
+++ portals/jetspeed-2/portal/branches/JETSPEED-2.1.4/maven-archetypes/portal/src/archetype/archetype-resources/etc/dbpsml/assembly/alternate/db-page-manager.xml Sun Oct 25 05:40:13 2009
@@ -25,14 +25,16 @@
         class="org.apache.jetspeed.page.impl.DatabasePageManager">
       <!-- OJB configuration file resource path -->
       <constructor-arg index="0"><value>JETSPEED-INF/ojb/page-manager-repository.xml</value></constructor-arg>       
+      <!-- fragment id generator -->
+      <constructor-arg index="1"><ref bean="IdGenerator"/></constructor-arg>
       <!-- permissions security enabled flag, default=false -->
-      <constructor-arg index="1"><value>false</value></constructor-arg>
+      <constructor-arg index="2"><value>false</value></constructor-arg>
       <!-- constraints security enabled flag, default=true -->
-      <constructor-arg index="2"><value>true</value></constructor-arg>
+      <constructor-arg index="3"><value>true</value></constructor-arg>
       <!-- folder/page/link cache -->
-      <constructor-arg index="3"><ref bean="pageManagerOidCache"/></constructor-arg>
+      <constructor-arg index="4"><ref bean="pageManagerOidCache"/></constructor-arg>
       <!-- folder/page/link path cache -->
-      <constructor-arg index="4"><ref bean="pageManagerPathCache"/></constructor-arg>
+      <constructor-arg index="5"><ref bean="pageManagerPathCache"/></constructor-arg>
   </bean>
 
   <!-- Transaction Proxying -->

Modified: portals/jetspeed-2/portal/branches/JETSPEED-2.1.4/maven-archetypes/portal/src/archetype/archetype-resources/etc/dbpsml/assembly/import-page-manager.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JETSPEED-2.1.4/maven-archetypes/portal/src/archetype/archetype-resources/etc/dbpsml/assembly/import-page-manager.xml?rev=829497&r1=829496&r2=829497&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JETSPEED-2.1.4/maven-archetypes/portal/src/archetype/archetype-resources/etc/dbpsml/assembly/import-page-manager.xml (original)
+++ portals/jetspeed-2/portal/branches/JETSPEED-2.1.4/maven-archetypes/portal/src/archetype/archetype-resources/etc/dbpsml/assembly/import-page-manager.xml Sun Oct 25 05:40:13 2009
@@ -24,14 +24,16 @@
         class="org.apache.jetspeed.page.impl.DatabasePageManager">
       <!-- OJB configuration file resource path -->
       <constructor-arg index="0"><value>JETSPEED-INF/ojb/page-manager-repository.xml</value></constructor-arg>       
+      <!-- fragment id generator -->
+      <constructor-arg index="1"><ref bean="IdGenerator"/></constructor-arg>
       <!-- folder/page/link cache size, default=128, min=128 -->
-      <constructor-arg index="1"><value>128</value></constructor-arg>
+      <constructor-arg index="2"><value>128</value></constructor-arg>
       <!-- folder/page/link cache expires seconds, default=150, infinite=0, min=30 -->
-      <constructor-arg index="2"><value>0</value></constructor-arg>
+      <constructor-arg index="3"><value>0</value></constructor-arg>
       <!-- permissions security enabled flag, default=false -->
-      <constructor-arg index="3"><value>false</value></constructor-arg>
-      <!-- constraints security enabled flag, default=true -->
       <constructor-arg index="4"><value>false</value></constructor-arg>
+      <!-- constraints security enabled flag, default=true -->
+      <constructor-arg index="5"><value>false</value></constructor-arg>
   </bean>
 
     <!-- Proxying -->
@@ -86,38 +88,42 @@
   <!-- PageManager -->
   <bean id="PsmlDocumentHandler"      
        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.psml.PageImpl</value></constructor-arg>       
-       <constructor-arg index="3" ><value>${org.apache.jetspeed.page.import.pages}</value></constructor-arg>
-       <constructor-arg index="4" ><ref bean="PageFileCache"/></constructor-arg>
+       <constructor-arg index="0"><ref bean="IdGenerator"/></constructor-arg>
+       <constructor-arg index="1"><value>/JETSPEED-INF/castor/page-mapping.xml</value></constructor-arg>
+       <constructor-arg index="2"><value>.psml</value></constructor-arg>
+       <constructor-arg index="3" ><value>org.apache.jetspeed.om.page.psml.PageImpl</value></constructor-arg>       
+       <constructor-arg index="4" ><value>${org.apache.jetspeed.page.import.pages}</value></constructor-arg>
+       <constructor-arg index="5" ><ref bean="PageFileCache"/></constructor-arg>
   </bean>
   
   <bean id="LinkDocumentHandler"       
        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.psml.LinkImpl</value></constructor-arg>       
-       <constructor-arg index="3" ><value>${org.apache.jetspeed.page.import.pages}</value></constructor-arg>
-       <constructor-arg index="4" ><ref bean="PageFileCache"/></constructor-arg>
+       <constructor-arg index="0"><ref bean="IdGenerator"/></constructor-arg>
+       <constructor-arg index="1"><value>/JETSPEED-INF/castor/page-mapping.xml</value></constructor-arg>
+       <constructor-arg index="2"><value>.link</value></constructor-arg>
+       <constructor-arg index="3" ><value>org.apache.jetspeed.om.page.psml.LinkImpl</value></constructor-arg>       
+       <constructor-arg index="4" ><value>${org.apache.jetspeed.page.import.pages}</value></constructor-arg>
+       <constructor-arg index="5" ><ref bean="PageFileCache"/></constructor-arg>
   </bean>
   
   <bean id="FolderMetaDataDocumentHandler"         
        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.psml.FolderMetaDataImpl</value></constructor-arg>       
-       <constructor-arg index="3" ><value>${org.apache.jetspeed.page.import.pages}</value></constructor-arg>
-       <constructor-arg index="4" ><ref bean="PageFileCache"/></constructor-arg>
+       <constructor-arg index="0"><ref bean="IdGenerator"/></constructor-arg>
+       <constructor-arg index="1"><value>/JETSPEED-INF/castor/page-mapping.xml</value></constructor-arg>
+       <constructor-arg index="2"><value>folder.metadata</value></constructor-arg>
+       <constructor-arg index="3" ><value>org.apache.jetspeed.om.folder.psml.FolderMetaDataImpl</value></constructor-arg>       
+       <constructor-arg index="4" ><value>${org.apache.jetspeed.page.import.pages}</value></constructor-arg>
+       <constructor-arg index="5" ><ref bean="PageFileCache"/></constructor-arg>
   </bean>
   
   <bean id="PageSecurityDocumentHandler"       
        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.psml.PageSecurityImpl</value></constructor-arg>       
-       <constructor-arg index="3" ><value>${org.apache.jetspeed.page.import.pages}</value></constructor-arg>
-       <constructor-arg index="4" ><ref bean="PageFileCache"/></constructor-arg>
+       <constructor-arg index="0"><ref bean="IdGenerator"/></constructor-arg>
+       <constructor-arg index="1"><value>/JETSPEED-INF/castor/page-mapping.xml</value></constructor-arg>
+       <constructor-arg index="2"><value>page.security</value></constructor-arg>
+       <constructor-arg index="3" ><value>org.apache.jetspeed.om.page.psml.PageSecurityImpl</value></constructor-arg>       
+       <constructor-arg index="4" ><value>${org.apache.jetspeed.page.import.pages}</value></constructor-arg>
+       <constructor-arg index="5" ><ref bean="PageFileCache"/></constructor-arg>
   </bean>
   
   <bean id="DocumentHandlerFactory"        
@@ -142,9 +148,10 @@
   
   <bean id="FolderHandler"         
        class="org.apache.jetspeed.page.document.psml.FileSystemFolderHandler" >         
-       <constructor-arg index="0"><value>${org.apache.jetspeed.page.import.pages}</value></constructor-arg>
-       <constructor-arg index="1"><ref bean="DocumentHandlerFactory"/></constructor-arg>
-       <constructor-arg index="2"><ref bean="PageFileCache"/></constructor-arg>        
+       <constructor-arg index="0"><ref bean="IdGenerator"/></constructor-arg>
+       <constructor-arg index="1"><value>${org.apache.jetspeed.page.import.pages}</value></constructor-arg>
+       <constructor-arg index="2"><ref bean="DocumentHandlerFactory"/></constructor-arg>
+       <constructor-arg index="3"><ref bean="PageFileCache"/></constructor-arg>        
   </bean>
     
   <bean id="org.apache.jetspeed.page.CastorPageManager" 

Modified: portals/jetspeed-2/portal/branches/JETSPEED-2.1.4/maven-plugin/plugin.jelly
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JETSPEED-2.1.4/maven-plugin/plugin.jelly?rev=829497&r1=829496&r2=829497&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JETSPEED-2.1.4/maven-plugin/plugin.jelly (original)
+++ portals/jetspeed-2/portal/branches/JETSPEED-2.1.4/maven-plugin/plugin.jelly Sun Oct 25 05:40:13 2009
@@ -1104,6 +1104,7 @@
 
 	<copy todir="${temp.assembly.dir}" overwrite="true" failonerror="true">
       <fileset dir="${portal.webapp.dir.assembly}">
+        <include name="jetspeed-base.xml"/>
         <include name="security*.xml"/>
 		<include name="capabilities.xml"/>           
 		<include name="prefs.xml"/>           

Modified: portals/jetspeed-2/portal/branches/JETSPEED-2.1.4/src/webapp/WEB-INF/assembly/alternate/db-page-manager.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JETSPEED-2.1.4/src/webapp/WEB-INF/assembly/alternate/db-page-manager.xml?rev=829497&r1=829496&r2=829497&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JETSPEED-2.1.4/src/webapp/WEB-INF/assembly/alternate/db-page-manager.xml (original)
+++ portals/jetspeed-2/portal/branches/JETSPEED-2.1.4/src/webapp/WEB-INF/assembly/alternate/db-page-manager.xml Sun Oct 25 05:40:13 2009
@@ -25,14 +25,16 @@
         class="org.apache.jetspeed.page.impl.DatabasePageManager">
       <!-- OJB configuration file resource path -->
       <constructor-arg index="0"><value>JETSPEED-INF/ojb/page-manager-repository.xml</value></constructor-arg>       
+      <!-- fragment id generator -->
+      <constructor-arg index="1"><ref bean="IdGenerator"/></constructor-arg>
       <!-- permissions security enabled flag, default=false -->
-      <constructor-arg index="1"><value>false</value></constructor-arg>
+      <constructor-arg index="2"><value>false</value></constructor-arg>
       <!-- constraints security enabled flag, default=true -->
-      <constructor-arg index="2"><value>true</value></constructor-arg>
+      <constructor-arg index="3"><value>true</value></constructor-arg>
       <!-- folder/page/link cache -->
-      <constructor-arg index="3"><ref bean="pageManagerOidCache"/></constructor-arg>
+      <constructor-arg index="4"><ref bean="pageManagerOidCache"/></constructor-arg>
       <!-- folder/page/link path cache -->
-      <constructor-arg index="4"><ref bean="pageManagerPathCache"/></constructor-arg>
+      <constructor-arg index="5"><ref bean="pageManagerPathCache"/></constructor-arg>
   </bean>
 
   <!-- Transaction Proxying -->

Modified: portals/jetspeed-2/portal/branches/JETSPEED-2.1.4/src/webapp/WEB-INF/assembly/importer-page-manager.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JETSPEED-2.1.4/src/webapp/WEB-INF/assembly/importer-page-manager.xml?rev=829497&r1=829496&r2=829497&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JETSPEED-2.1.4/src/webapp/WEB-INF/assembly/importer-page-manager.xml (original)
+++ portals/jetspeed-2/portal/branches/JETSPEED-2.1.4/src/webapp/WEB-INF/assembly/importer-page-manager.xml Sun Oct 25 05:40:13 2009
@@ -20,38 +20,42 @@
   <!-- PageManager -->
   <bean id="ImportPsmlDocumentHandler"      
        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.psml.PageImpl</value></constructor-arg>       
-       <constructor-arg index="3" ><value>${java.io.tmpdir}</value></constructor-arg>
-       <constructor-arg index="4" ><ref bean="ImportPageFileCache"/></constructor-arg>
+       <constructor-arg index="0"><ref bean="ImportIdGenerator"/></constructor-arg>
+       <constructor-arg index="1"><value>/JETSPEED-INF/castor/page-mapping.xml</value></constructor-arg>
+       <constructor-arg index="2"><value>.psml</value></constructor-arg>
+       <constructor-arg index="3" ><value>org.apache.jetspeed.om.page.psml.PageImpl</value></constructor-arg>       
+       <constructor-arg index="4" ><value>${java.io.tmpdir}</value></constructor-arg>
+       <constructor-arg index="5" ><ref bean="ImportPageFileCache"/></constructor-arg>
   </bean>
   
   <bean id="ImportLinkDocumentHandler"       
        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.psml.LinkImpl</value></constructor-arg>       
-       <constructor-arg index="3" ><value>${java.io.tmpdir}</value></constructor-arg>
-       <constructor-arg index="4" ><ref bean="ImportPageFileCache"/></constructor-arg>
+       <constructor-arg index="0"><ref bean="ImportIdGenerator"/></constructor-arg>
+       <constructor-arg index="1"><value>/JETSPEED-INF/castor/page-mapping.xml</value></constructor-arg>
+       <constructor-arg index="2"><value>.link</value></constructor-arg>
+       <constructor-arg index="3" ><value>org.apache.jetspeed.om.page.psml.LinkImpl</value></constructor-arg>       
+       <constructor-arg index="4" ><value>${java.io.tmpdir}</value></constructor-arg>
+       <constructor-arg index="5" ><ref bean="ImportPageFileCache"/></constructor-arg>
   </bean>
   
   <bean id="ImportFolderMetaDataDocumentHandler"         
        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.psml.FolderMetaDataImpl</value></constructor-arg>       
-       <constructor-arg index="3" ><value>${java.io.tmpdir}</value></constructor-arg>
-       <constructor-arg index="4" ><ref bean="ImportPageFileCache"/></constructor-arg>
+       <constructor-arg index="0"><ref bean="ImportIdGenerator"/></constructor-arg>
+       <constructor-arg index="1"><value>/JETSPEED-INF/castor/page-mapping.xml</value></constructor-arg>
+       <constructor-arg index="2"><value>folder.metadata</value></constructor-arg>
+       <constructor-arg index="3" ><value>org.apache.jetspeed.om.folder.psml.FolderMetaDataImpl</value></constructor-arg>       
+       <constructor-arg index="4" ><value>${java.io.tmpdir}</value></constructor-arg>
+       <constructor-arg index="5" ><ref bean="ImportPageFileCache"/></constructor-arg>
   </bean>
   
   <bean id="ImportPageSecurityDocumentHandler"       
        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.psml.PageSecurityImpl</value></constructor-arg>       
-       <constructor-arg index="3" ><value>${java.io.tmpdir}</value></constructor-arg>
-       <constructor-arg index="4" ><ref bean="ImportPageFileCache"/></constructor-arg>
+       <constructor-arg index="0"><ref bean="ImportIdGenerator"/></constructor-arg>
+       <constructor-arg index="1"><value>/JETSPEED-INF/castor/page-mapping.xml</value></constructor-arg>
+       <constructor-arg index="2"><value>page.security</value></constructor-arg>
+       <constructor-arg index="3" ><value>org.apache.jetspeed.om.page.psml.PageSecurityImpl</value></constructor-arg>       
+       <constructor-arg index="4" ><value>${java.io.tmpdir}</value></constructor-arg>
+       <constructor-arg index="5" ><ref bean="ImportPageFileCache"/></constructor-arg>
   </bean>
   
   <bean id="ImportDocumentHandlerFactory"        
@@ -76,9 +80,10 @@
   
   <bean id="ImportFolderHandler"         
        class="org.apache.jetspeed.page.document.psml.FileSystemFolderHandler" >         
-       <constructor-arg index="0"><value>${java.io.tmpdir}</value></constructor-arg>
-       <constructor-arg index="1"><ref bean="ImportDocumentHandlerFactory"/></constructor-arg>
-       <constructor-arg index="2"><ref bean="ImportPageFileCache"/></constructor-arg>        
+       <constructor-arg index="0"><ref bean="ImportIdGenerator"/></constructor-arg>
+       <constructor-arg index="1"><value>${java.io.tmpdir}</value></constructor-arg>
+       <constructor-arg index="2"><ref bean="ImportDocumentHandlerFactory"/></constructor-arg>
+       <constructor-arg index="3"><ref bean="ImportPageFileCache"/></constructor-arg>        
   </bean>
     
   <bean id="org.apache.jetspeed.page.CastorPageManager" 

Modified: portals/jetspeed-2/portal/branches/JETSPEED-2.1.4/src/webapp/WEB-INF/assembly/page-manager.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JETSPEED-2.1.4/src/webapp/WEB-INF/assembly/page-manager.xml?rev=829497&r1=829496&r2=829497&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JETSPEED-2.1.4/src/webapp/WEB-INF/assembly/page-manager.xml (original)
+++ portals/jetspeed-2/portal/branches/JETSPEED-2.1.4/src/webapp/WEB-INF/assembly/page-manager.xml Sun Oct 25 05:40:13 2009
@@ -21,38 +21,42 @@
   <!-- PageManager -->
   <bean id="PsmlDocumentHandler"      
        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.psml.PageImpl</value></constructor-arg>       
-       <constructor-arg index="3" ><value>${applicationRoot}/WEB-INF/pages</value></constructor-arg>
-       <constructor-arg index="4" ><ref bean="PageFileCache"/></constructor-arg>
+       <constructor-arg index="0"><ref bean="IdGenerator"/></constructor-arg>
+       <constructor-arg index="1"><value>/JETSPEED-INF/castor/page-mapping.xml</value></constructor-arg>
+       <constructor-arg index="2"><value>.psml</value></constructor-arg>
+       <constructor-arg index="3" ><value>org.apache.jetspeed.om.page.psml.PageImpl</value></constructor-arg>       
+       <constructor-arg index="4" ><value>${applicationRoot}/WEB-INF/pages</value></constructor-arg>
+       <constructor-arg index="5" ><ref bean="PageFileCache"/></constructor-arg>
   </bean>
   
   <bean id="LinkDocumentHandler"       
        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.psml.LinkImpl</value></constructor-arg>       
-       <constructor-arg index="3" ><value>${applicationRoot}/WEB-INF/pages</value></constructor-arg>
-       <constructor-arg index="4" ><ref bean="PageFileCache"/></constructor-arg>
+       <constructor-arg index="0"><ref bean="IdGenerator"/></constructor-arg>
+       <constructor-arg index="1"><value>/JETSPEED-INF/castor/page-mapping.xml</value></constructor-arg>
+       <constructor-arg index="2"><value>.link</value></constructor-arg>
+       <constructor-arg index="3" ><value>org.apache.jetspeed.om.page.psml.LinkImpl</value></constructor-arg>       
+       <constructor-arg index="4" ><value>${applicationRoot}/WEB-INF/pages</value></constructor-arg>
+       <constructor-arg index="5" ><ref bean="PageFileCache"/></constructor-arg>
   </bean>
   
   <bean id="FolderMetaDataDocumentHandler"         
        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.psml.FolderMetaDataImpl</value></constructor-arg>       
-       <constructor-arg index="3" ><value>${applicationRoot}/WEB-INF/pages</value></constructor-arg>
-       <constructor-arg index="4" ><ref bean="PageFileCache"/></constructor-arg>
+       <constructor-arg index="0"><ref bean="IdGenerator"/></constructor-arg>
+       <constructor-arg index="1"><value>/JETSPEED-INF/castor/page-mapping.xml</value></constructor-arg>
+       <constructor-arg index="2"><value>folder.metadata</value></constructor-arg>
+       <constructor-arg index="3" ><value>org.apache.jetspeed.om.folder.psml.FolderMetaDataImpl</value></constructor-arg>       
+       <constructor-arg index="4" ><value>${applicationRoot}/WEB-INF/pages</value></constructor-arg>
+       <constructor-arg index="5" ><ref bean="PageFileCache"/></constructor-arg>
   </bean>
   
   <bean id="PageSecurityDocumentHandler"       
        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.psml.PageSecurityImpl</value></constructor-arg>       
-       <constructor-arg index="3" ><value>${applicationRoot}/WEB-INF/pages</value></constructor-arg>
-       <constructor-arg index="4" ><ref bean="PageFileCache"/></constructor-arg>
+       <constructor-arg index="0"><ref bean="IdGenerator"/></constructor-arg>
+       <constructor-arg index="1"><value>/JETSPEED-INF/castor/page-mapping.xml</value></constructor-arg>
+       <constructor-arg index="2"><value>page.security</value></constructor-arg>
+       <constructor-arg index="3" ><value>org.apache.jetspeed.om.page.psml.PageSecurityImpl</value></constructor-arg>       
+       <constructor-arg index="4" ><value>${applicationRoot}/WEB-INF/pages</value></constructor-arg>
+       <constructor-arg index="5" ><ref bean="PageFileCache"/></constructor-arg>
   </bean>
   
   <bean id="DocumentHandlerFactory"        
@@ -77,9 +81,10 @@
   
   <bean id="FolderHandler"         
        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>        
+       <constructor-arg index="0"><ref bean="IdGenerator"/></constructor-arg>
+       <constructor-arg index="1"><value>${applicationRoot}/WEB-INF/pages</value></constructor-arg>
+       <constructor-arg index="2"><ref bean="DocumentHandlerFactory"/></constructor-arg>
+       <constructor-arg index="3"><ref bean="PageFileCache"/></constructor-arg>        
   </bean>
     
   <bean id="org.apache.jetspeed.page.PageManager" 

Modified: portals/jetspeed-2/portal/branches/JETSPEED-2.1.4/src/webapp/WEB-INF/pages/__subsite-root/_role/subsite/system/customizer/portlet-selector.psml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JETSPEED-2.1.4/src/webapp/WEB-INF/pages/__subsite-root/_role/subsite/system/customizer/portlet-selector.psml?rev=829497&r1=829496&r2=829497&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JETSPEED-2.1.4/src/webapp/WEB-INF/pages/__subsite-root/_role/subsite/system/customizer/portlet-selector.psml (original)
+++ portals/jetspeed-2/portal/branches/JETSPEED-2.1.4/src/webapp/WEB-INF/pages/__subsite-root/_role/subsite/system/customizer/portlet-selector.psml Sun Oct 25 05:40:13 2009
@@ -15,7 +15,7 @@
 See the License for the specific language governing permissions and
 limitations under the License.
 -->
-<page id="j2-portlet-selector" hidden='true'
+<page id="role-j2-portlet-selector" hidden='true'
     xmlns="http://portals.apache.org/jetspeed"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
     xsi:schemaLocation="http://portals.apache.org/jetspeed http://portals.apache.org/jetspeed-2/2.1/schemas/psml.xsd">
@@ -29,8 +29,8 @@
   <metadata name="title" xml:lang="zh">Portlet选择器</metadata>
   <metadata name="title" xml:lang="zh-TW">Portlet選擇器</metadata>
 
-  <fragment id="ss-portlet-selector" type="layout" name="jetspeed-layouts::VelocityOneColumnNoActions">
-    <fragment id="ss-portlet-selector-1" type="portlet" name="j2-admin::PortletSelector" >
+  <fragment id="role-ss-portlet-selector" type="layout" name="jetspeed-layouts::VelocityOneColumnNoActions">
+    <fragment id="role-ss-portlet-selector-1" type="portlet" name="j2-admin::PortletSelector" >
     </fragment>
   </fragment>
 </page>

Modified: portals/jetspeed-2/portal/branches/JETSPEED-2.1.4/src/webapp/WEB-INF/pages/_role/user/top-links/top-page.psml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JETSPEED-2.1.4/src/webapp/WEB-INF/pages/_role/user/top-links/top-page.psml?rev=829497&r1=829496&r2=829497&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JETSPEED-2.1.4/src/webapp/WEB-INF/pages/_role/user/top-links/top-page.psml (original)
+++ portals/jetspeed-2/portal/branches/JETSPEED-2.1.4/src/webapp/WEB-INF/pages/_role/user/top-links/top-page.psml Sun Oct 25 05:40:13 2009
@@ -28,20 +28,20 @@
   <metadata name="title" xml:lang="zh-TW">[用戶] 頂層頁</metadata>
   <metadata name="title" xml:lang="ko">[사용자] 최상위 페이지</metadata>
 
-  <fragment id="utp-1" type="layout" name="jetspeed-layouts::VelocityTwoColumns">
-    <fragment id="utp-2" type="portlet" name="j2-admin::LoginPortlet">
+  <fragment id="utp2-1" type="layout" name="jetspeed-layouts::VelocityTwoColumns">
+    <fragment id="utp2-2" type="portlet" name="j2-admin::LoginPortlet">
       <property layout="TwoColumns" name="row" value="0" />
       <property layout="TwoColumns" name="column" value="0" />
     </fragment>                                
-    <fragment id="utp-3" type="portlet" name="demo::UserInfoTest">
+    <fragment id="utp2-3" type="portlet" name="demo::UserInfoTest">
       <property layout="TwoColumns" name="row" value="0" />
       <property layout="TwoColumns" name="column" value="1" />
     </fragment>    
-    <fragment id="utp-4" type="portlet" name="demo::BookmarkPortlet">
+    <fragment id="utp2-4" type="portlet" name="demo::BookmarkPortlet">
       <property layout="TwoColumns" name="row" value="0" />
       <property layout="TwoColumns" name="column" value="1" />
     </fragment>    	
-    <fragment id="utp-5" type="portlet" name="jsf-demo::CalendarPortlet">
+    <fragment id="utp2-5" type="portlet" name="jsf-demo::CalendarPortlet">
       <property layout="TwoColumns" name="row" value="0" />
       <property layout="TwoColumns" name="column" value="1" />
     </fragment>    		

Modified: portals/jetspeed-2/portal/branches/JETSPEED-2.1.4/src/webapp/WEB-INF/pages/_user/guest/_mediatype/xhtml-basic/default-page.psml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JETSPEED-2.1.4/src/webapp/WEB-INF/pages/_user/guest/_mediatype/xhtml-basic/default-page.psml?rev=829497&r1=829496&r2=829497&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JETSPEED-2.1.4/src/webapp/WEB-INF/pages/_user/guest/_mediatype/xhtml-basic/default-page.psml (original)
+++ portals/jetspeed-2/portal/branches/JETSPEED-2.1.4/src/webapp/WEB-INF/pages/_user/guest/_mediatype/xhtml-basic/default-page.psml Sun Oct 25 05:40:13 2009
@@ -30,11 +30,11 @@
   <metadata name="title" xml:lang="zh-TW">歡迎來到Jetspeed 2</metadata>
   <metadata name="title" xml:lang="ko">Jetspeed 2 에 오신 것을 환영합니다</metadata>
 
-  <fragment id="dp-xhtml-basic-1" type="layout" name="jetspeed-layouts::VelocityOneColumn">
-    <fragment id="dp-xhtml-basic-11" type="portlet" name="j2-admin::LoginPortletForXHTMLBasic">
+  <fragment id="guest-dp-xhtml-basic-1" type="layout" name="jetspeed-layouts::VelocityOneColumn">
+    <fragment id="guest-dp-xhtml-basic-11" type="portlet" name="j2-admin::LoginPortletForXHTMLBasic">
       <property layout="OneColumn" name="row" value="0" />
     </fragment>                                
-    <fragment id="dp-xhtml-basic-12" type="portlet" name="demo::BookmarkPortletForXHTMLBasic">
+    <fragment id="guest-dp-xhtml-basic-12" type="portlet" name="demo::BookmarkPortletForXHTMLBasic">
       <property layout="OneColumn" name="row" value="1" />
     </fragment>
   </fragment>



---------------------------------------------------------------------
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