portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rwat...@apache.org
Subject svn commit: r829496 [2/2] - in /portals/jetspeed-2/portal/trunk: applications/jetspeed/src/main/webapp/WEB-INF/pages/_role/user/top-links/ applications/jetspeed/src/main/webapp/WEB-INF/pages/_user/guest/_mediatype/xhtml-basic/ components/jetspeed-page-...
Date Sun, 25 Oct 2009 05:39:20 GMT
Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/test/assembly/page-manager.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/test/assembly/page-manager.xml?rev=829496&r1=829495&r2=829496&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/test/assembly/page-manager.xml
(original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/test/assembly/page-manager.xml
Sun Oct 25 05:39:17 2009
@@ -22,38 +22,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}/src/test/testdata/pages/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}/src/test/testdata/pages/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}/src/test/testdata/pages/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}/src/test/testdata/pages/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}/src/test/testdata/pages/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}/src/test/testdata/pages/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}/src/test/testdata/pages/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}/src/test/testdata/pages/pages</value></constructor-arg>
+       <constructor-arg index="5" ><ref bean="PageFileCache"/></constructor-arg>
   </bean>
   
   <bean id="DocumentHandlerFactory"        
@@ -78,9 +82,10 @@
   
   <bean id="FolderHandler"         
        class="org.apache.jetspeed.page.document.psml.FileSystemFolderHandler" >      
  
-       <constructor-arg index="0"><value>${applicationRoot}/src/test/testdata/pages/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}/src/test/testdata/pages/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/trunk/components/jetspeed-portal/src/test/java/org/apache/jetspeed/container/state/MockContentFragment.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/test/java/org/apache/jetspeed/container/state/MockContentFragment.java?rev=829496&r1=829495&r2=829496&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/test/java/org/apache/jetspeed/container/state/MockContentFragment.java
(original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/test/java/org/apache/jetspeed/container/state/MockContentFragment.java
Sun Oct 25 05:39:17 2009
@@ -436,6 +436,13 @@
     }
 
     /* (non-Javadoc)
+     * @see org.apache.jetspeed.om.page.Fragment#setId(java.lang.String)
+     */
+    public void setId(String fragmentId)
+    {
+    }
+    
+    /* (non-Javadoc)
      * @see org.apache.jetspeed.om.page.BaseElement#getShortTitle()
      */
     public String getShortTitle()

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-registry/src/test/java/org/apache/jetspeed/components/portletentity/ContentFragmentTestImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-registry/src/test/java/org/apache/jetspeed/components/portletentity/ContentFragmentTestImpl.java?rev=829496&r1=829495&r2=829496&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-registry/src/test/java/org/apache/jetspeed/components/portletentity/ContentFragmentTestImpl.java
(original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-registry/src/test/java/org/apache/jetspeed/components/portletentity/ContentFragmentTestImpl.java
Sun Oct 25 05:39:17 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/trunk/etc/import/assembly/import-page-manager.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/etc/import/assembly/import-page-manager.xml?rev=829496&r1=829495&r2=829496&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/etc/import/assembly/import-page-manager.xml (original)
+++ portals/jetspeed-2/portal/trunk/etc/import/assembly/import-page-manager.xml Sun Oct 25
05:39:17 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>
-      <!-- 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 -->

Modified: portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/om/page/Fragment.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/om/page/Fragment.java?rev=829496&r1=829495&r2=829496&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/om/page/Fragment.java
(original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/om/page/Fragment.java
Sun Oct 25 05:39:17 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/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/page/PageManager.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/page/PageManager.java?rev=829496&r1=829495&r2=829496&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/page/PageManager.java
(original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/page/PageManager.java
Sun Oct 25 05:39:17 2009
@@ -560,6 +560,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 
@@ -570,13 +582,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;
@@ -593,6 +604,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.
@@ -617,6 +640,19 @@
         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.
@@ -629,6 +665,19 @@
         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/trunk/jetspeed-portal-resources/src/main/ddl-schema/phase2-schema.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/ddl-schema/phase2-schema.xml?rev=829496&r1=829495&r2=829496&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/ddl-schema/phase2-schema.xml
(original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/ddl-schema/phase2-schema.xml
Sun Oct 25 05:39:17 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/trunk/jetspeed-portal-resources/src/main/resources/assembly/importer-page-manager.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/importer-page-manager.xml?rev=829496&r1=829495&r2=829496&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/importer-page-manager.xml
(original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/importer-page-manager.xml
Sun Oct 25 05:39:17 2009
@@ -22,18 +22,21 @@
   <bean id="ImportPsmlDocumentHandler" class="org.apache.jetspeed.page.document.psml.CastorFileSystemDocumentHandler">
     <meta key="j2:cat" value="default" />
     <constructor-arg index="0">
-      <value>/JETSPEED-INF/castor/page-mapping.xml</value>
+      <ref bean="ImportIdGenerator" />
     </constructor-arg>
     <constructor-arg index="1">
-      <value>.psml</value>
+      <value>/JETSPEED-INF/castor/page-mapping.xml</value>
     </constructor-arg>
     <constructor-arg index="2">
-      <value>org.apache.jetspeed.om.page.psml.PageImpl</value>
+      <value>.psml</value>
     </constructor-arg>
     <constructor-arg index="3">
-      <value>${java.io.tmpdir}</value>
+      <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>
@@ -41,18 +44,21 @@
   <bean id="ImportLinkDocumentHandler" class="org.apache.jetspeed.page.document.psml.CastorFileSystemDocumentHandler">
     <meta key="j2:cat" value="default" />
     <constructor-arg index="0">
-      <value>/JETSPEED-INF/castor/page-mapping.xml</value>
+      <ref bean="ImportIdGenerator" />
     </constructor-arg>
     <constructor-arg index="1">
-      <value>.link</value>
+      <value>/JETSPEED-INF/castor/page-mapping.xml</value>
     </constructor-arg>
     <constructor-arg index="2">
-      <value>org.apache.jetspeed.om.page.psml.LinkImpl</value>
+      <value>.link</value>
     </constructor-arg>
     <constructor-arg index="3">
-      <value>${java.io.tmpdir}</value>
+      <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>
@@ -61,18 +67,21 @@
     class="org.apache.jetspeed.page.document.psml.CastorFileSystemDocumentHandler">
     <meta key="j2:cat" value="default" />
     <constructor-arg index="0">
-      <value>/JETSPEED-INF/castor/page-mapping.xml</value>
+      <ref bean="ImportIdGenerator" />
     </constructor-arg>
     <constructor-arg index="1">
-      <value>folder.metadata</value>
+      <value>/JETSPEED-INF/castor/page-mapping.xml</value>
     </constructor-arg>
     <constructor-arg index="2">
-      <value>org.apache.jetspeed.om.folder.psml.FolderMetaDataImpl</value>
+      <value>folder.metadata</value>
     </constructor-arg>
     <constructor-arg index="3">
-      <value>${java.io.tmpdir}</value>
+      <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>
@@ -81,18 +90,21 @@
     class="org.apache.jetspeed.page.document.psml.CastorFileSystemDocumentHandler">
     <meta key="j2:cat" value="default" />
     <constructor-arg index="0">
-      <value>/JETSPEED-INF/castor/page-mapping.xml</value>
+      <ref bean="ImportIdGenerator" />
     </constructor-arg>
     <constructor-arg index="1">
-      <value>page.security</value>
+      <value>/JETSPEED-INF/castor/page-mapping.xml</value>
     </constructor-arg>
     <constructor-arg index="2">
-      <value>org.apache.jetspeed.om.page.psml.PageSecurityImpl</value>
+      <value>page.security</value>
     </constructor-arg>
     <constructor-arg index="3">
-      <value>${java.io.tmpdir}</value>
+      <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>
@@ -120,12 +132,15 @@
   <bean id="ImportFolderHandler" class="org.apache.jetspeed.page.document.psml.FileSystemFolderHandler">
     <meta key="j2:cat" value="default" />
     <constructor-arg index="0">
-      <value>${java.io.tmpdir}</value>
+      <ref bean="ImportIdGenerator" />
     </constructor-arg>
     <constructor-arg index="1">
-      <ref bean="ImportDocumentHandlerFactory" />
+      <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>

Modified: portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/page-manager.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/page-manager.xml?rev=829496&r1=829495&r2=829496&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/page-manager.xml
(original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/page-manager.xml
Sun Oct 25 05:39:17 2009
@@ -27,18 +27,21 @@
         <entry key=".psml">
           <bean class="org.apache.jetspeed.page.document.psml.CastorFileSystemDocumentHandler">
             <constructor-arg index="0">
-              <value>/JETSPEED-INF/castor/page-mapping.xml</value>
+              <ref bean="IdGenerator" />
             </constructor-arg>
             <constructor-arg index="1">
-              <value>.psml</value>
+              <value>/JETSPEED-INF/castor/page-mapping.xml</value>
             </constructor-arg>
             <constructor-arg index="2">
-              <value>org.apache.jetspeed.om.page.psml.PageImpl</value>
+              <value>.psml</value>
             </constructor-arg>
             <constructor-arg index="3">
-              <value>${psml.pages.path}</value>
+              <value>org.apache.jetspeed.om.page.psml.PageImpl</value>
             </constructor-arg>
             <constructor-arg index="4">
+              <value>${psml.pages.path}</value>
+            </constructor-arg>
+            <constructor-arg index="5">
               <ref bean="PageFileCache" />
             </constructor-arg>
           </bean>
@@ -46,18 +49,21 @@
         <entry key=".link">
           <bean class="org.apache.jetspeed.page.document.psml.CastorFileSystemDocumentHandler">
             <constructor-arg index="0">
-              <value>/JETSPEED-INF/castor/page-mapping.xml</value>
+              <ref bean="IdGenerator" />
             </constructor-arg>
             <constructor-arg index="1">
-              <value>.link</value>
+              <value>/JETSPEED-INF/castor/page-mapping.xml</value>
             </constructor-arg>
             <constructor-arg index="2">
-              <value>org.apache.jetspeed.om.page.psml.LinkImpl</value>
+              <value>.link</value>
             </constructor-arg>
             <constructor-arg index="3">
-              <value>${psml.pages.path}</value>
+              <value>org.apache.jetspeed.om.page.psml.LinkImpl</value>
             </constructor-arg>
             <constructor-arg index="4">
+              <value>${psml.pages.path}</value>
+            </constructor-arg>
+            <constructor-arg index="5">
               <ref bean="PageFileCache" />
             </constructor-arg>
           </bean>
@@ -65,18 +71,21 @@
         <entry key="folder.metadata">
           <bean class="org.apache.jetspeed.page.document.psml.CastorFileSystemDocumentHandler">
             <constructor-arg index="0">
-              <value>/JETSPEED-INF/castor/page-mapping.xml</value>
+              <ref bean="IdGenerator" />
             </constructor-arg>
             <constructor-arg index="1">
-              <value>folder.metadata</value>
+              <value>/JETSPEED-INF/castor/page-mapping.xml</value>
             </constructor-arg>
             <constructor-arg index="2">
-              <value>org.apache.jetspeed.om.folder.psml.FolderMetaDataImpl</value>
+              <value>folder.metadata</value>
             </constructor-arg>
             <constructor-arg index="3">
-              <value>${psml.pages.path}</value>
+              <value>org.apache.jetspeed.om.folder.psml.FolderMetaDataImpl</value>
             </constructor-arg>
             <constructor-arg index="4">
+              <value>${psml.pages.path}</value>
+            </constructor-arg>
+            <constructor-arg index="5">
               <ref bean="PageFileCache" />
             </constructor-arg>
           </bean>
@@ -84,18 +93,21 @@
         <entry key="page.security">
           <bean class="org.apache.jetspeed.page.document.psml.CastorFileSystemDocumentHandler">
             <constructor-arg index="0">
-              <value>/JETSPEED-INF/castor/page-mapping.xml</value>
+              <ref bean="IdGenerator" />
             </constructor-arg>
             <constructor-arg index="1">
-              <value>page.security</value>
+              <value>/JETSPEED-INF/castor/page-mapping.xml</value>
             </constructor-arg>
             <constructor-arg index="2">
-              <value>org.apache.jetspeed.om.page.psml.PageSecurityImpl</value>
+              <value>page.security</value>
             </constructor-arg>
             <constructor-arg index="3">
-              <value>${psml.pages.path}</value>
+              <value>org.apache.jetspeed.om.page.psml.PageSecurityImpl</value>
             </constructor-arg>
             <constructor-arg index="4">
+              <value>${psml.pages.path}</value>
+            </constructor-arg>
+            <constructor-arg index="5">
               <ref bean="PageFileCache" />
             </constructor-arg>
           </bean>
@@ -107,12 +119,15 @@
   <bean id="xmlFolderHandler" class="org.apache.jetspeed.page.document.psml.FileSystemFolderHandler">
     <meta key="j2:cat" value="xmlPageManager or pageSerializer" />
     <constructor-arg index="0">
-      <value>${psml.pages.path}</value>
+      <ref bean="IdGenerator" />
     </constructor-arg>
     <constructor-arg index="1">
-      <ref bean="xmlDocumentHandlerFactory" />
+      <value>${psml.pages.path}</value>
     </constructor-arg>
     <constructor-arg index="2">
+      <ref bean="xmlDocumentHandlerFactory" />
+    </constructor-arg>
+    <constructor-arg index="3">
       <ref bean="PageFileCache" />
     </constructor-arg>
   </bean>
@@ -151,20 +166,24 @@
     <constructor-arg index="0">
       <value>JETSPEED-INF/ojb/page-manager-repository.xml</value>
     </constructor-arg>
-    <!-- permissions security enabled flag, default=false -->
+    <!-- fragment id generator -->
     <constructor-arg index="1">
+      <ref bean="IdGenerator" />
+    </constructor-arg>
+    <!-- permissions security enabled flag, default=false -->
+    <constructor-arg index="2">
       <value>${page.manager.permissions.security}</value>
     </constructor-arg>
     <!-- constraints security enabled flag, default=true -->
-    <constructor-arg index="2">
+    <constructor-arg index="3">
       <value>${page.manager.constraints.security}</value>
     </constructor-arg>
     <!-- folder/page/link cache -->
-    <constructor-arg index="3">
+    <constructor-arg index="4">
       <ref bean="pageManagerOidCache"/>
     </constructor-arg>
     <!-- folder/page/link path cache -->
-    <constructor-arg index="4">
+    <constructor-arg index="5">
       <ref bean="pageManagerPathCache"/>
     </constructor-arg>
   </bean>



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