portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a..@apache.org
Subject svn commit: r649492 - in /portals/jetspeed-2/portal/trunk: components/jetspeed-cm/src/main/java/org/apache/jetspeed/components/test/ components/jetspeed-portal/src/test/java/org/apache/jetspeed/userinfo/ components/jetspeed-registry/src/main/java/org/a...
Date Fri, 18 Apr 2008 12:27:24 GMT
Author: ate
Date: Fri Apr 18 05:27:21 2008
New Revision: 649492

URL: http://svn.apache.org/viewvc?rev=649492&view=rev
Log:
- merging and simplifying configurations for both XML and Database PageManager in the main
assembly, filterable through new categories xmlPageManager and dbPageManager.
  the alternate assembly files db-pagemanager.xml and interceptors.xml are now no longer needed
- also adding configuration for the new PageSerializer (previously called PageImporter).
- externalizing the (XML) PSML pages root folder to a new (overridable) jetspeed.properties
definition:
    psml.pages.path = ${applicationRoot}/WEB-INF/pages
- externalizing PageManager security configuration also to jetspeed.properties:
    page.manager.permissions.security = false
    page.manager.constraints.security = true
- adding new possible spring.filter.key: "portal.dbPageManager" which can be used to switch
to use the DatabasePageManager instead of the CastorXMLPageManager
- updating and adjusting test case configurations to handle that the previously default pagemanager
now needs to be filtered using xmlPageManager
  Note: soon I'll reconfigure the test cases to make use of the spring-filter.properties file
itself instead of defining the filter categories inline.

Removed:
    portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/alternate/db-page-manager.xml
    portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/alternate/interceptors.xml
Modified:
    portals/jetspeed-2/portal/trunk/components/jetspeed-cm/src/main/java/org/apache/jetspeed/components/test/AbstractSpringTestCase.java
    portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/test/java/org/apache/jetspeed/userinfo/TestUserInfoManager.java
    portals/jetspeed-2/portal/trunk/components/jetspeed-registry/src/main/java/org/apache/jetspeed/components/util/RegistrySupportedTestCase.java
    portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/page-manager.xml
    portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/conf/jetspeed/jetspeed.properties
    portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/conf/jetspeed/spring-filter.properties

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-cm/src/main/java/org/apache/jetspeed/components/test/AbstractSpringTestCase.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-cm/src/main/java/org/apache/jetspeed/components/test/AbstractSpringTestCase.java?rev=649492&r1=649491&r2=649492&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-cm/src/main/java/org/apache/jetspeed/components/test/AbstractSpringTestCase.java
(original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-cm/src/main/java/org/apache/jetspeed/components/test/AbstractSpringTestCase.java
Fri Apr 18 05:27:21 2008
@@ -45,7 +45,7 @@
     protected void setUp() throws Exception
     {        
         super.setUp();
-        scm = new SpringComponentManager(getBeanDefinitionFilter(), getBootConfigurations(),
getConfigurations(), getBaseDir()+"target/test-classes/webapp", getPostProcessProperties(),
false);
+        scm = new SpringComponentManager(getBeanDefinitionFilter(), getBootConfigurations(),
getConfigurations(), getBaseDir()+"target/test-classes/webapp", getInitProperties(), false);
         scm.start();
     }
 
@@ -71,7 +71,7 @@
         return null;
     }
 
-    protected Properties getPostProcessProperties()
+    protected Properties getInitProperties()
     {
         return new Properties();
     }

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/test/java/org/apache/jetspeed/userinfo/TestUserInfoManager.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/test/java/org/apache/jetspeed/userinfo/TestUserInfoManager.java?rev=649492&r1=649491&r2=649492&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/test/java/org/apache/jetspeed/userinfo/TestUserInfoManager.java
(original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/test/java/org/apache/jetspeed/userinfo/TestUserInfoManager.java
Fri Apr 18 05:27:21 2008
@@ -242,6 +242,7 @@
         String[] confs = super.getConfigurations();
         List confList = new ArrayList(Arrays.asList(confs));
         confList.add("jetspeed-base.xml");
+        confList.add("jetspeed-properties.xml");
         confList.add("page-manager.xml");
         confList.add("registry.xml");
         confList.add("rc3.xml");
@@ -251,12 +252,8 @@
         return (String[]) confList.toArray(new String[1]);
     }
 
-    protected Properties getPostProcessProperties()
+    protected String getBeanDefinitionFilterCategories()
     {
-        Properties p = super.getPostProcessProperties();
-        p.setProperty("supported.portletmode.autoswitch.config", "false");
-        p.setProperty("supported.portletmode.autoswitch.edit_defaults", "false");
-        p.setProperty("supported.portletmode.autoswitch.config.surrogate.portlet", "j2-admin::CustomConfigModePortlet");
-        return p;
+        return super.getBeanDefinitionFilterCategories()+",xmlPageManager";
     }
 }

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-registry/src/main/java/org/apache/jetspeed/components/util/RegistrySupportedTestCase.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-registry/src/main/java/org/apache/jetspeed/components/util/RegistrySupportedTestCase.java?rev=649492&r1=649491&r2=649492&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-registry/src/main/java/org/apache/jetspeed/components/util/RegistrySupportedTestCase.java
(original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-registry/src/main/java/org/apache/jetspeed/components/util/RegistrySupportedTestCase.java
Fri Apr 18 05:27:21 2008
@@ -56,17 +56,14 @@
         String[] confs = super.getConfigurations();
         List confList = new ArrayList(Arrays.asList(confs));
         confList.add("jetspeed-base.xml");
+        confList.add("jetspeed-properties.xml");
         confList.add("page-manager.xml");
         confList.add("registry.xml");
         return (String[]) confList.toArray(new String[1]);
     }
 
-    protected Properties getPostProcessProperties()
+    protected String getBeanDefinitionFilterCategories()
     {
-        Properties p = super.getPostProcessProperties();
-        p.setProperty("supported.portletmode.autoswitch.config", "false");
-        p.setProperty("supported.portletmode.autoswitch.edit_defaults", "false");
-        p.setProperty("supported.portletmode.autoswitch.config.surrogate.portlet", "j2-admin::CustomConfigModePortlet");
-        return p;
+        return super.getBeanDefinitionFilterCategories()+",xmlPageManager";
     }
 }

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=649492&r1=649491&r2=649492&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
Fri Apr 18 05:27:21 2008
@@ -18,146 +18,255 @@
 <beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
 
-  <!-- PageManager -->
-  <bean id="PsmlDocumentHandler" 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>
-    </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>
-  </bean>
+  <!-- XML/Castor PageManager -->
 
-  <bean id="LinkDocumentHandler" 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>
-    </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>
-  </bean>
-
-  <bean id="FolderMetaDataDocumentHandler"
-    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>
-    </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>
-  </bean>
-
-  <bean id="PageSecurityDocumentHandler"
-    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>
-    </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>
-  </bean>
-
-  <bean id="DocumentHandlerFactory" class="org.apache.jetspeed.page.document.psml.DocumentHandlerFactoryImpl">
-    <meta key="j2:cat" value="default" />
+  <bean id="xmlDocumentHandlerFactory" class="org.apache.jetspeed.page.document.psml.DocumentHandlerFactoryImpl">
+    <meta key="j2:cat" value="xmlPageManager,pageSerializer" />
     <constructor-arg>
       <map>
         <entry key=".psml">
-          <ref bean="PsmlDocumentHandler" />
+          <bean 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>${psml.pages.path}</value>
+            </constructor-arg>
+            <constructor-arg index="4">
+              <ref bean="PageFileCache" />
+            </constructor-arg>
+          </bean>
         </entry>
         <entry key=".link">
-          <ref bean="LinkDocumentHandler" />
+          <bean 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>${psml.pages.path}</value>
+            </constructor-arg>
+            <constructor-arg index="4">
+              <ref bean="PageFileCache" />
+            </constructor-arg>
+          </bean>
         </entry>
         <entry key="folder.metadata">
-          <ref bean="FolderMetaDataDocumentHandler" />
+          <bean 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>${psml.pages.path}</value>
+            </constructor-arg>
+            <constructor-arg index="4">
+              <ref bean="PageFileCache" />
+            </constructor-arg>
+          </bean>
         </entry>
         <entry key="page.security">
-          <ref bean="PageSecurityDocumentHandler" />
+          <bean 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>${psml.pages.path}</value>
+            </constructor-arg>
+            <constructor-arg index="4">
+              <ref bean="PageFileCache" />
+            </constructor-arg>
+          </bean>
         </entry>
       </map>
     </constructor-arg>
   </bean>
 
-  <bean id="FolderHandler" class="org.apache.jetspeed.page.document.psml.FileSystemFolderHandler">
-    <meta key="j2:cat" value="default" />
+  <bean id="xmlFolderHandler" class="org.apache.jetspeed.page.document.psml.FileSystemFolderHandler">
+    <meta key="j2:cat" value="xmlPageManager,pageSerializer" />
     <constructor-arg index="0">
-      <value>${applicationRoot}/WEB-INF/pages</value>
+      <value>${psml.pages.path}</value>
     </constructor-arg>
     <constructor-arg index="1">
-      <ref bean="DocumentHandlerFactory" />
+      <ref bean="xmlDocumentHandlerFactory" />
     </constructor-arg>
     <constructor-arg index="2">
       <ref bean="PageFileCache" />
     </constructor-arg>
   </bean>
 
-  <bean id="org.apache.jetspeed.page.PageManager" name="pageManager"
-    class="org.apache.jetspeed.page.psml.CastorXmlPageManager">
-    <meta key="j2:cat" value="default" />
+  <bean name="xmlPageManager" class="org.apache.jetspeed.page.psml.CastorXmlPageManager">
+    <meta key="j2:cat" value="xmlPageManager,pageSerializer" />
     <constructor-arg index="0">
       <ref bean="IdGenerator" />
     </constructor-arg>
     <constructor-arg index="1">
-      <ref bean="DocumentHandlerFactory" />
+      <ref bean="xmlDocumentHandlerFactory" />
     </constructor-arg>
     <constructor-arg index="2">
-      <ref bean="FolderHandler" />
+      <ref bean="xmlFolderHandler" />
     </constructor-arg>
     <constructor-arg index="3">
       <ref bean="PageFileCache" />
     </constructor-arg>
     <!-- permissions security enabled flag, default=false -->
     <constructor-arg index="4">
-      <value>false</value>
+      <value>${page.manager.permissions.security}</value>
     </constructor-arg>
     <!-- constraints security enabled flag, default=true -->
     <constructor-arg index="5">
-      <value>true</value>
+      <value>${page.manager.constraints.security}</value>
+    </constructor-arg>
+  </bean>
+
+  <!-- End XML/Castor PageManager -->
+
+  <!-- Database PageManager -->
+
+  <bean id="dbPageManagerImpl" class="org.apache.jetspeed.page.impl.DatabasePageManager"
init-method="init">
+    <meta key="j2:cat" value="dbPageManager,pageSerializer" />
+    <!-- OJB configuration file resource path -->
+    <constructor-arg index="0">
+      <value>JETSPEED-INF/ojb/page-manager-repository.xml</value>
+    </constructor-arg>
+    <!-- folder/page/link cache size, default=128, min=128 -->
+    <constructor-arg index="1">
+      <value>128</value>
+    </constructor-arg>
+    <!-- folder/page/link cache expires seconds, default=-1, infinite=0, min=30 -->
+    <!--                                         (default is 150 seconds) -->
+    <constructor-arg index="2">
+      <value>-1</value>
+    </constructor-arg>
+    <!-- permissions security enabled flag, default=false -->
+    <constructor-arg index="3">
+      <value>${page.manager.permissions.security}</value>
     </constructor-arg>
+    <!-- constraints security enabled flag, default=true -->
+    <constructor-arg index="4">
+      <value>${page.manager.constraints.security}</value>
+    </constructor-arg>
+  </bean>
+
+  <bean id="dbPageManager" class="org.springframework.transaction.interceptor.TransactionProxyFactoryBean">
+    <meta key="j2:cat" value="dbPageManager,pageSerializer" />
+    <meta key="j2:alias" value="org.apache.jetspeed.page.PageManager" />
+    <property name="transactionManager">
+      <ref bean="transactionManager" />
+    </property>
+    <property name="proxyInterfaces">
+      <value>org.apache.jetspeed.page.PageManager</value>
+    </property>
+    <property name="target">
+      <ref bean="dbPageManagerImpl" />
+    </property>
+    <property name="transactionAttributes">
+      <props>
+        <prop key="*">PROPAGATION_REQUIRED</prop>
+        <prop key="getPage*">PROPAGATION_SUPPORTS</prop>
+        <prop key="getLink*">PROPAGATION_SUPPORTS</prop>
+        <prop key="getFolder*">PROPAGATION_SUPPORTS</prop>
+        <prop key="getContentPage">PROPAGATION_SUPPORTS</prop>
+        <prop key="getAll">PROPAGATION_SUPPORTS</prop>
+        <prop key="getUserFolder">PROPAGATION_SUPPORTS</prop>
+        <prop key="update*">PROPAGATION_REQUIRED,-org.apache.jetspeed.page.document.NodeException</prop>
+        <prop key="removePage">PROPAGATION_REQUIRED,-org.apache.jetspeed.page.document.NodeException</prop>
+        <prop key="removeFolder">PROPAGATION_REQUIRED,-org.apache.jetspeed.page.document.NodeException</prop>
+        <prop key="removeLink">PROPAGATION_REQUIRED,-org.apache.jetspeed.page.document.NodeException</prop>
+        <prop key="removePageSecurity">PROPAGATION_REQUIRED,-org.apache.jetspeed.page.document.NodeException</prop>
+        <prop key="createUserHomePagesFromRoles">
+          PROPAGATION_REQUIRED,-org.apache.jetspeed.page.document.NodeException
+        </prop>
+        <prop key="deepCopy*">PROPAGATION_REQUIRED,-org.apache.jetspeed.page.document.NodeException</prop>
+        <prop key="addPages">PROPAGATION_REQUIRED,-org.apache.jetspeed.page.document.NodeException</prop>
+        <prop key="folderExists">PROPAGATION_SUPPORTS</prop>
+        <prop key="pageExists">PROPAGATION_SUPPORTS</prop>
+        <prop key="linkExists">PROPAGATION_SUPPORTS</prop>
+        <prop key="userFolderExists">PROPAGATION_SUPPORTS</prop>
+        <prop key="userPageExists">PROPAGATION_SUPPORTS</prop>
+      </props>
+    </property>
+    <property name="preInterceptors">
+      <list>
+        <bean class="org.apache.jetspeed.util.interceptors.PageManagerInterceptor" />
+      </list>
+    </property>
+    <!--  Replace support:
+      <property name="preInterceptors"> 
+      <list>
+      <bean id="methodReplayInterceptor" class="org.apache.jetspeed.util.interceptors.MethodReplayInterceptor">
+      <property name="retryCount" value="3"/>
+      <property name="retryInterval" value="500"/>
+      <property name="replayDecisionMaker">
+      <bean class="org.apache.jetspeed.util.interceptors.TransactionalMethodReplayDecisionMaker">
+      <property name="sqlErrorCodes">
+      <value>9999, 400, -80</value>
+      </property>
+      </bean>
+      </property>
+      </bean>
+      </list>
+      </property>
+    -->
+  </bean>
+
+  <!-- Inject Page Manager Proxy into Page Manager -->
+  <bean class="org.springframework.beans.factory.config.MethodInvokingFactoryBean">
+    <meta key="j2:cat" value="dbPageManager,pageSerializer" />
+    <property name="targetObject">
+      <ref bean="dbPageManagerImpl" />
+    </property>
+    <property name="targetMethod">
+      <value>setPageManagerProxy</value>
+    </property>
+    <property name="arguments">
+      <list>
+        <ref bean="dbPageManager" />
+      </list>
+    </property>
+  </bean>
+
+  <!-- End Database PageManager -->
+
+  <!-- FactoryBean selecting which PageManager to use -->
+
+  <bean class="org.springframework.beans.factory.config.BeanReferenceFactoryBean">
+    <meta key="j2:cat" value="xmlPageManager" />
+    <meta key="j2:alias" value="org.apache.jetspeed.page.PageManager" />
+    <property name="targetBeanName" value="xmlPageManager" />
+  </bean>
+
+  <bean class="org.springframework.beans.factory.config.BeanReferenceFactoryBean">
+    <meta key="j2:cat" value="dbPageManager" />
+    <meta key="j2:alias" value="org.apache.jetspeed.page.PageManager" />
+    <property name="targetBeanName" value="dbPageManager" />
   </bean>
 
   <bean class="org.apache.jetspeed.components.factorybeans.NullReferenceFactoryBean">
     <meta key="j2:cat" value="noPageManager" />
-    <meta key="j2:alias" value="org.apache.jetspeed.page.PageManager"/>
+    <meta key="j2:alias" value="org.apache.jetspeed.page.PageManager" />
     <property name="objectType" value="org.apache.jetspeed.page.PageManager"></property>
   </bean>
 
@@ -166,8 +275,19 @@
     class="org.apache.jetspeed.portalsite.impl.PortalSiteImpl">
     <meta key="j2:cat" value="default" />
     <constructor-arg index="0">
-      <ref bean="pageManager" />
+      <ref bean="org.apache.jetspeed.page.PageManager" />
     </constructor-arg>
   </bean>
-
+  
+  <!-- PageSerializer, source: xmlPageManager, dest: dbPageMmanager -->
+  <bean id="org.apache.jetspeed.page.PageSerializer" class="org.apache.jetspeed.page.PageSerializerImpl">
+    <meta key="j2:cat" value="pageSerializer" />
+    <constructor-arg index="0">
+      <ref bean="xmlPageManager"/>
+    </constructor-arg>
+    <constructor-arg index="1">
+      <ref bean="dbPageManager"/>
+    </constructor-arg>    
+  </bean>
+  
 </beans>

Modified: portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/conf/jetspeed/jetspeed.properties
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/conf/jetspeed/jetspeed.properties?rev=649492&r1=649491&r2=649492&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/conf/jetspeed/jetspeed.properties
(original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/conf/jetspeed/jetspeed.properties
Fri Apr 18 05:27:21 2008
@@ -114,17 +114,14 @@
 container.impl = org.apache.pluto.PortletContainerImpl
 container.wrapper = org.apache.jetspeed.container.JetspeedPortletContainerWrapper
 
-
 # -------------------------------------------------------------------
 #  P I P E L I N E
 # -------------------------------------------------------------------
 pipeline.default = jetspeed-pipeline
 
-
 # -------------------------------------------------------------------
 #  F A C T O R Y
 # -------------------------------------------------------------------
-
 factory.container.response = org.apache.jetspeed.container.ContainerResponse
 factory.container.request = org.apache.jetspeed.container.ContainerRequest
 
@@ -203,6 +200,15 @@
 psml.page.default = default-page.psml    
 # PSML Folder Template to copy during new user creation and registration
 psml.template.folder = /_user/template/
+# default path to (XML) PSML pages root folder
+psml.pages.path = ${applicationRoot}/WEB-INF/pages
+
+#-------------------------------------------------------------------------
+# P A G E M A N A G E R
+#-------------------------------------------------------------------------
+# defaults for page manager security
+page.manager.permissions.security = false
+page.manager.constraints.security = true
 
 #-------------------------------------------------------------------------
 # P R O F I L E R

Modified: portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/conf/jetspeed/spring-filter.properties
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/conf/jetspeed/spring-filter.properties?rev=649492&r1=649491&r2=649492&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/conf/jetspeed/spring-filter.properties
(original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/conf/jetspeed/spring-filter.properties
Fri Apr 18 05:27:21 2008
@@ -27,5 +27,7 @@
 # default filter 
 default=default
 
-portal=${default},jndiDS
+portal=${default},jndiDS,xmlPageManager
+portal.dbPageManager=${default},jndiDS,dbPageManager
 serializer=jdbcDS,serializer,capabilities,security,profiler,registry,search,transaction,cache,prefs,springProperties,noRequestContext,noPageManager
+pageSerializer=jdbcDS,base,pageSerializer,transaction,springProperties



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