portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a..@apache.org
Subject svn commit: r522665 [5/29] - in /portals/jetspeed-2/branches/J2-M2-REDUX: ./ components/ components/jetspeed-cm/ components/jetspeed-cm/src/test/java/org/apache/jetspeed/cache/general/ components/jetspeed-cm/src/test/resources/ components/jetspeed-cm/s...
Date Mon, 26 Mar 2007 23:55:41 GMT
Added: portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/assembly/multiple-action.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/assembly/multiple-action.xml?view=auto&rev=522665
==============================================================================
--- portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/assembly/multiple-action.xml (added)
+++ portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/assembly/multiple-action.xml Mon Mar 26 16:53:34 2007
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+    
+    http://www.apache.org/licenses/LICENSE-2.0
+    
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<beans>
+ <!--   <bean id="AjaxMultipleActionTarget" -->
+    <bean id="AjaxMultipleAction"
+          class="org.apache.jetspeed.layout.impl.MultipleAction">
+        <constructor-arg index="0">
+            <ref bean="AjaxRequestService"/>
+        </constructor-arg>
+        <constructor-arg index="1">
+            <value>org/apache/jetspeed/layout/ajax-xml/multiaction.vm</value>
+        </constructor-arg>
+        <constructor-arg index="2">
+            <value>org/apache/jetspeed/layout/ajax-xml/multiactionerror.vm</value>
+        </constructor-arg>
+        <constructor-arg index='3'>
+            <ref bean="org.apache.jetspeed.page.PageManager"/>        
+        </constructor-arg>
+        <constructor-arg index='4'>
+            <ref bean="PortletActionSecurityBehavior"/>        
+        </constructor-arg>    		        
+        <constructor-arg index='5'>
+            <ref bean="AjaxVelocityEngine"/>        
+        </constructor-arg>    		        
+    </bean>
+    
+<!--    
+    <bean name="AjaxMultipleAction" parent="baseTransactionProxy">
+        <property name="proxyInterfaces">
+            <list>
+                <value>org.apache.jetspeed.ajax.AjaxAction</value>
+                <value>org.apache.jetspeed.ajax.AjaxBuilder</value>
+            </list>
+        </property>
+        <property name="target">
+            <ref bean="AjaxMultipleActionTarget" />
+        </property>
+        <property name="transactionAttributes">
+            <props>
+                <prop key="*">PROPAGATION_SUPPORTS,timeout_$failover{alltransactions.transactionTimeout}</prop>
+                <prop key="run">PROPAGATION_REQUIRED,timeout_$failover{alltransactions.transactionTimeout},-org.apache.jetspeed.ajax.AJAXException</prop>
+            </props>
+        </property>
+    </bean>
+-->    
+</beans>

Propchange: portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/assembly/multiple-action.xml
------------------------------------------------------------------------------
    svn:keywords = Id

Added: portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/assembly/page-manager.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/assembly/page-manager.xml?view=auto&rev=522665
==============================================================================
--- portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/assembly/page-manager.xml (added)
+++ portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/assembly/page-manager.xml Mon Mar 26 16:53:34 2007
@@ -0,0 +1,105 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
+<!--
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements.  See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to You under the Apache License, Version 2.0
+(the "License"); you may not use this file except in compliance with
+the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+<beans>
+    
+  <!-- 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>
+  </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>
+  </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>
+  </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>
+  </bean>
+  
+  <bean id="DocumentHandlerFactory"        
+       class="org.apache.jetspeed.page.document.psml.DocumentHandlerFactoryImpl" >      
+        <constructor-arg>
+        <map>
+          <entry key=".psml">
+            <ref bean="PsmlDocumentHandler" />
+          </entry>
+          <entry key=".link">
+            <ref bean="LinkDocumentHandler" />
+          </entry>  
+          <entry key="folder.metadata">
+            <ref bean="FolderMetaDataDocumentHandler" />
+          </entry>        
+          <entry key="page.security">
+            <ref bean="PageSecurityDocumentHandler" />
+          </entry>        
+        </map>
+       </constructor-arg>
+  </bean>
+  
+  <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>        
+  </bean>
+    
+  <bean id="org.apache.jetspeed.page.PageManager" 
+       name="pageManager"
+       class="org.apache.jetspeed.page.psml.CastorXmlPageManager">         
+       <constructor-arg index="0"><ref bean="IdGenerator"/></constructor-arg>
+       <constructor-arg index="1"><ref bean="DocumentHandlerFactory"/></constructor-arg>
+       <constructor-arg index="2"><ref bean="FolderHandler"/></constructor-arg>
+       <constructor-arg index="3"><ref bean="PageFileCache"/></constructor-arg>        
+       <!-- permissions security enabled flag, default=false -->
+       <constructor-arg index="4"><value>false</value></constructor-arg>
+       <!-- constraints security enabled flag, default=true -->
+       <constructor-arg index="5"><value>true</value></constructor-arg>
+  </bean>
+
+  <!-- PortalSite -->
+  <bean id="org.apache.jetspeed.portalsite.PortalSite" 
+       name="portalSite"
+       class="org.apache.jetspeed.portalsite.impl.PortalSiteImpl">         
+       <constructor-arg index="0"><ref bean="pageManager"/></constructor-arg>
+  </bean>
+
+</beans>

Propchange: portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/assembly/page-manager.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/assembly/page-manager.xml
------------------------------------------------------------------------------
    svn:keywords = Id

Added: portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/assembly/pipelines.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/assembly/pipelines.xml?view=auto&rev=522665
==============================================================================
--- portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/assembly/pipelines.xml (added)
+++ portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/assembly/pipelines.xml Mon Mar 26 16:53:34 2007
@@ -0,0 +1,488 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
+<!--
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements.  See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to You under the Apache License, Version 2.0
+(the "License"); you may not use this file except in compliance with
+the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+<beans>
+  <bean id="localizationValve"
+        class="org.apache.jetspeed.localization.impl.LocalizationValveImpl"
+        init-method="initialize"
+  >
+    <constructor-arg>
+      <value><!--@defaultLanguage--><!--defaultLanguage@--></value>
+    </constructor-arg>
+  </bean> 
+  
+  <bean id="capabilityValve"
+        class="org.apache.jetspeed.capabilities.impl.CapabilityValveImpl"
+        init-method="initialize"
+  >
+   <constructor-arg>
+       <ref bean="org.apache.jetspeed.capabilities.Capabilities" />
+   </constructor-arg>
+  </bean> 
+  
+  <bean id="portalURLValve"
+        class="org.apache.jetspeed.container.url.impl.PortalURLValveImpl"
+        init-method="initialize"
+   >
+   <constructor-arg>
+       <ref bean="NavigationalStateComponent" />
+   </constructor-arg>            
+  </bean>
+          
+  <bean id="securityValve"
+        class="org.apache.jetspeed.security.impl.SecurityValveImpl"
+        init-method="initialize"
+  >
+   <constructor-arg>
+       <ref bean="org.apache.jetspeed.profiler.Profiler" />
+   </constructor-arg>
+   <constructor-arg>
+       <ref bean="org.apache.jetspeed.security.UserManager" />
+   </constructor-arg>
+   <constructor-arg>
+       <ref bean="PortalStatistics" />
+   </constructor-arg>   
+  </bean> 
+  
+  <bean id="passwordCredentialValve"
+        class="org.apache.jetspeed.security.impl.PasswordCredentialValveImpl"
+        init-method="initialize"
+  />
+  
+  <bean id="loginValidationValve"
+        class="org.apache.jetspeed.security.impl.LoginValidationValveImpl"
+        init-method="initialize">
+	  <!-- remove (from the session) the following list of session attributes upon login -->
+       <constructor-arg index="0">
+            <list>
+                <value>org.apache.jetspeed.powertool.actions</value>
+            </list>		   
+	   </constructor-arg>	  
+  </bean>
+  <bean id="profilerValve"
+        class="org.apache.jetspeed.profiler.impl.ProfilerValveImpl"
+        init-method="initialize"
+  >
+   <constructor-arg index="0">
+       <ref bean="org.apache.jetspeed.profiler.Profiler" />
+   </constructor-arg>
+   <constructor-arg index="1">
+       <ref bean="org.apache.jetspeed.portalsite.PortalSite" />
+   </constructor-arg>
+   <constructor-arg index="2">
+       <ref bean="org.apache.jetspeed.page.PageManager" />
+   </constructor-arg>
+   <!--
+       request fallback to root folder/page enabled by default;
+       if set to false, requests generate HTTP 403/404 errors
+       for access errors or missing pages
+   -->
+   <constructor-arg index="3"><value>true</value></constructor-arg>    
+   <!--
+       use last visited page histories to select default page
+       for folder navigational urls; if set to false, the
+       default page specified in PSML, (or the first page in
+       the folder), is always selected
+   -->
+   <constructor-arg index="4"><value>true</value></constructor-arg>    
+  </bean>
+     
+  <!-- 
+      To create a new page when a user first logs in from their roles,
+      add this valve after each profilerValve entry in the pipeline configs 
+      below
+   -->  
+  <bean id="createPageValve"
+        class="org.apache.jetspeed.profiler.impl.CreatePageValveImpl"
+  >
+   <constructor-arg index="0">
+       <ref bean="PortletActionSecurityBehavior" />
+   </constructor-arg>
+  </bean>
+
+  <bean id="containerValve"
+        class="org.apache.jetspeed.container.ContainerValve"
+        init-method="initialize"
+  /> 
+  
+  <bean id="actionValve"
+        class="org.apache.jetspeed.pipeline.valve.impl.ActionValveImpl"
+        init-method="initialize"
+  >
+   <constructor-arg>
+       <ref bean="org.apache.pluto.PortletContainer" />
+   </constructor-arg>
+   <constructor-arg>   
+       <ref bean="PortletWindowAccessor" />    
+   </constructor-arg>
+   <constructor-arg>
+    	<ref bean="portletContentCache"/>
+   </constructor-arg>      
+    <!-- 
+         Setting to true will force Action response isCommitted to true
+         as there is a bug in Websphere 5 where request.isCommitted always returns false
+         Set this boolean to TRUE if running on Websphere 5 pre-cumulative fix 5.1.1.9  
+    <constructor-arg type="boolean">
+        <value>false</value>
+    </constructor-arg>                
+        -->          	
+  </bean> 
+
+  <bean id="desktopActionValve"
+        class="org.apache.jetspeed.pipeline.valve.impl.ActionValveImpl"
+        init-method="initialize"
+  >
+   <constructor-arg>
+       <ref bean="org.apache.pluto.DesktopPortletContainer" />
+   </constructor-arg>
+   <constructor-arg>   
+       <ref bean="PortletWindowAccessor" />    
+   </constructor-arg>   
+   <constructor-arg>
+    	<ref bean="portletContentCache"/>
+   </constructor-arg>      
+    <!-- 
+         Setting to true will force Action response isCommitted to true
+         as there is a bug in Websphere 5 where request.isCommitted always returns false
+         Set this boolean to TRUE if running on Websphere 5 pre-cumulative fix 5.1.1.9  
+    <constructor-arg type="boolean">
+        <value>false</value>
+    </constructor-arg>                
+        -->          	
+  </bean> 
+      
+  <bean id="portletValve"
+        class="org.apache.jetspeed.aggregator.PortletValve"
+        init-method="initialize"
+  >
+   <constructor-arg>
+       <ref bean="org.apache.jetspeed.aggregator.PortletAggregator"/>
+   </constructor-arg>
+  </bean> 
+
+  <bean id="portletValveTitleInHeader"
+        class="org.apache.jetspeed.aggregator.PortletValve"
+        init-method="initialize"
+  >
+   <constructor-arg>
+       <ref bean="org.apache.jetspeed.aggregator.PortletAggregatorTitleInHeader"/>
+   </constructor-arg>
+  </bean> 
+
+  <bean id="fileServerValve"
+        class="org.apache.jetspeed.aggregator.FileServerValve"
+        init-method="initialize"
+  >
+     <!-- portlet -->
+     <constructor-arg index="0"><value>demo::ContentViewer</value></constructor-arg>    
+     <!-- entity -->
+     <constructor-arg index="1"><value>public.content.21</value></constructor-arg>    
+  </bean> 
+  
+  <bean id="aggregatorValve"
+        class="org.apache.jetspeed.aggregator.AggregatorValve"
+        init-method="initialize"
+  >
+   <constructor-arg>
+       <ref bean="org.apache.jetspeed.aggregator.PageAggregator"/>
+   </constructor-arg>
+  </bean> 
+
+  <bean id="headerAggregatorValvePortal"
+        class="org.apache.jetspeed.aggregator.HeaderAggregatorValve"
+        init-method="initialize"
+  >
+   <constructor-arg>
+       <ref bean="HeaderAggregatorPortal"/>
+   </constructor-arg>
+  </bean> 
+
+  <bean id="headerAggregatorValveDesktop"
+        class="org.apache.jetspeed.aggregator.HeaderAggregatorValve"
+        init-method="initialize"
+  >
+   <constructor-arg>
+       <ref bean="HeaderAggregatorDesktop"/>
+   </constructor-arg>
+  </bean> 
+      
+  <bean id="cleanUpValve"
+        class="org.apache.jetspeed.pipeline.valve.impl.CleanupValveImpl"
+        init-method="initialize"
+  >
+  </bean> 
+
+  <bean id="AJAXValve"
+        class="org.apache.jetspeed.ajax.AJAXValve"
+        init-method="initialize"
+  >
+   <constructor-arg>
+       <ref bean="AJAXService"/>     
+   </constructor-arg>
+    <constructor-arg>
+        <ref bean="RolesSecurityBehavior"/>        
+    </constructor-arg>    	
+  </bean> 
+  
+  <bean id="DecorationValve"
+        class="org.apache.jetspeed.decoration.DecorationValve"
+        init-method="initialize">
+        <constructor-arg>
+            <ref bean="DecorationFactory" />
+        </constructor-arg>
+		<constructor-arg>			
+			 <ref bean="PortletWindowAccessor" />
+		</constructor-arg>
+  </bean>
+
+  <bean id="loginViewValve"
+        class="org.apache.jetspeed.login.impl.LoginJSPViewValve"
+        init-method="initialize"
+  >
+    <constructor-arg>
+      <value>/WEB-INF/templates/login</value>
+    </constructor-arg>
+  </bean> 
+
+  <bean id="desktopValve"
+        class="org.apache.jetspeed.desktop.impl.DesktopValveImpl"
+  > 
+    <constructor-arg>
+        <ref bean="JetspeedDesktop" />
+    </constructor-arg>      
+  </bean>
+      
+  <bean id="jetspeed-pipeline"
+        class="org.apache.jetspeed.pipeline.JetspeedPipeline"
+        init-method="initialize"
+  >
+   <constructor-arg>
+       <value>JetspeedPipeline</value>
+   </constructor-arg>
+   <constructor-arg>
+    <list>
+      <ref bean="capabilityValve"/>
+      <ref bean="portalURLValve"/>
+      <ref bean="securityValve"/>
+      <ref bean="localizationValve"/>
+      <ref bean="passwordCredentialValve"/>
+      <ref bean="loginValidationValve"/>
+      <ref bean="profilerValve"/>
+      <ref bean="containerValve"/>
+      <ref bean="actionValve"/>
+      <ref bean="DecorationValve" />
+      <ref bean="headerAggregatorValvePortal"/>  
+      <ref bean="aggregatorValve"/>
+      <ref bean="cleanUpValve"/>
+    </list>
+    </constructor-arg>
+  </bean> 
+  
+  <bean id="login-pipeline"
+        class="org.apache.jetspeed.pipeline.JetspeedPipeline"
+        init-method="initialize"
+  >
+   <constructor-arg>
+       <value>LoginPipeline</value>
+   </constructor-arg>
+   <constructor-arg>
+    <list>
+      <ref bean="capabilityValve"/>
+      <ref bean="localizationValve"/>
+      <ref bean="loginViewValve"/>
+    </list>
+    </constructor-arg>
+  </bean> 
+
+  <bean id="action-pipeline"
+        class="org.apache.jetspeed.pipeline.JetspeedPipeline"
+        init-method="initialize"
+  >
+   <constructor-arg>
+       <value>ActionPipeline</value>
+   </constructor-arg>
+   <constructor-arg>
+    <list>
+        <ref bean="localizationValve"/>
+        <ref bean="capabilityValve"/>
+        <ref bean="portalURLValve"/>
+        <ref bean="containerValve"/>
+        <ref bean="actionValve"/>
+    </list>
+    </constructor-arg>
+  </bean> 
+
+  <bean id="desktop-action-pipeline"
+        class="org.apache.jetspeed.pipeline.JetspeedPipeline"
+        init-method="initialize"
+  >
+   <constructor-arg>
+       <value>DesktopActionPipeline</value>
+   </constructor-arg>
+   <constructor-arg>
+    <list>
+        <ref bean="securityValve"/>                        
+        <ref bean="localizationValve"/>
+        <ref bean="capabilityValve"/>
+        <ref bean="portalURLValve"/>
+        <ref bean="profilerValve"/>        
+        <ref bean="containerValve"/>
+        <ref bean="desktopActionValve"/>
+    </list>
+    </constructor-arg>
+  </bean> 
+      
+  <bean id="portlet-pipeline"
+        class="org.apache.jetspeed.pipeline.JetspeedPipeline"
+        init-method="initialize"
+  >
+   <constructor-arg>
+       <value>PortletPipeline</value>
+   </constructor-arg>
+   <constructor-arg>
+    <list>
+        <ref bean="portalURLValve"/>                
+        <ref bean="capabilityValve"/>        
+        <ref bean="securityValve"/>                
+        <ref bean="localizationValve"/>
+        <ref bean="profilerValve"/>                        
+        <ref bean="containerValve"/>
+        <ref bean="portletValveTitleInHeader"/>    
+    </list>
+    </constructor-arg>
+  </bean> 
+  
+  <bean id="ajax-pipeline"
+        class="org.apache.jetspeed.pipeline.JetspeedPipeline"
+        init-method="initialize"
+  >
+   <constructor-arg>
+       <value>AjaxPipeline</value>
+   </constructor-arg>
+   <constructor-arg>
+    <list>
+        <ref bean="capabilityValve"/>
+        <ref bean="portalURLValve"/>                
+        <ref bean="securityValve"/>                
+        <ref bean="localizationValve"/>
+        <ref bean="profilerValve"/>                        
+        <ref bean="containerValve"/>
+        <!--  this is the standard Jetspeed API entry point -->
+        <ref bean="layoutValve"/>
+    </list>
+    </constructor-arg>
+  </bean> 
+
+  <bean id="ajax-direct-pipeline"
+        class="org.apache.jetspeed.pipeline.JetspeedPipeline"
+        init-method="initialize"
+  >
+   <constructor-arg>
+       <value>AjaxDirectPipeline</value>
+   </constructor-arg>
+   <constructor-arg>
+    <list>
+        <ref bean="capabilityValve"/>
+        <ref bean="portalURLValve"/>                
+        <ref bean="securityValve"/>                
+        <ref bean="localizationValve"/>
+        <ref bean="profilerValve"/>                        
+        <ref bean="containerValve"/>
+        <ref bean="AJAXValve"/>
+    </list>
+    </constructor-arg>
+  </bean> 
+
+  <bean id="fileserver-pipeline"
+        class="org.apache.jetspeed.pipeline.JetspeedPipeline"
+        init-method="initialize"
+  >
+   <constructor-arg>
+       <value>FileServerPipeline</value>
+   </constructor-arg>
+   <constructor-arg>
+    <list>
+        <ref bean="portalURLValve"/>                
+        <ref bean="securityValve"/>                
+        <ref bean="localizationValve"/>
+        <ref bean="profilerValve"/>                        
+        <ref bean="containerValve"/>
+        <ref bean="fileServerValve"/>            
+        <ref bean="portletValve"/>    
+    </list>
+    </constructor-arg>
+  </bean> 
+
+  <bean id="desktop-pipeline"
+        class="org.apache.jetspeed.pipeline.JetspeedPipeline"
+        init-method="initialize"
+  >
+   <constructor-arg>
+       <value>DesktopPipeline</value>
+   </constructor-arg>
+   <constructor-arg>
+    <list>
+        <ref bean="capabilityValve"/>
+        <ref bean="portalURLValve"/>                
+        <ref bean="securityValve"/>                
+        <ref bean="localizationValve"/>
+        <ref bean="profilerValve"/>                        
+        <ref bean="headerAggregatorValveDesktop"/>          
+        <ref bean="desktopValve"/>
+    </list>
+    </constructor-arg>
+  </bean> 
+      
+  <bean id='pipeline-map'
+        class='java.util.HashMap'>
+    <constructor-arg>
+        <map>
+            <entry key='/portlet'>
+                <value>portlet-pipeline</value>
+            </entry>            
+            <entry key='/portal'>
+                <value>jetspeed-pipeline</value>
+            </entry>
+            <entry key='/ajaxapi'>
+                <value>ajax-pipeline</value>
+            </entry>
+            <entry key='/login'>
+                <value>jetspeed-pipeline</value>
+            </entry>            
+            <entry key='/fileserver'>
+                <value>fileserver-pipeline</value>
+            </entry>                        
+            <entry key='/desktop'>                <!-- the key "/desktop" cannot be changed without editing core.js (at least) -->
+                <value>desktop-pipeline</value>   <!--    must be set in third argument in JetspeedDesktop bean initialization -->
+            </entry>                                    
+            <entry key='/action'>
+                <value>desktop-action-pipeline</value>
+            </entry>                                                
+            <entry key='/ajax'>
+                <value>ajax-direct-pipeline</value>
+            </entry>
+        </map>        
+    </constructor-arg>        
+  </bean>
+
+  <bean id="debugValve"
+        class="org.apache.jetspeed.pipeline.valve.impl.DebugValveImpl"
+  /> 
+
+          
+</beans>

Propchange: portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/assembly/pipelines.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/assembly/pipelines.xml
------------------------------------------------------------------------------
    svn:keywords = Id

Added: portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/assembly/pluto-factories.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/assembly/pluto-factories.xml?view=auto&rev=522665
==============================================================================
--- portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/assembly/pluto-factories.xml (added)
+++ portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/assembly/pluto-factories.xml Mon Mar 26 16:53:34 2007
@@ -0,0 +1,196 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
+
+<beans> 
+   
+  <bean id="JetspeedNamespaceMapper" class="org.apache.jetspeed.container.namespace.JetspeedNamespaceMapperImpl">
+       <constructor-arg index="0"><value>js_</value></constructor-arg>
+  </bean>
+  
+  <bean id="LocalPortletInvokerFactory"
+        class="org.apache.jetspeed.container.invoker.LocalPortletInvokerFactory" 
+  />   
+          
+  <bean id="ServletPortletInvokerFactory"
+        class="org.apache.jetspeed.container.invoker.ServletPortletInvokerFactory" 
+  /> 	
+	
+  <bean id="javax.portlet.ActionRequest"
+        class="org.apache.jetspeed.components.factorybeans.PlutoFactoryFactoryBean"
+  >             
+       <property name="className"><value>org.apache.pluto.factory.impl.ActionRequestFactoryImpl</value></property>
+       <property name="servletConfig"><ref bean="javax.servlet.ServletConfig"/></property>
+  </bean>
+  
+  <bean id="javax.portlet.RenderRequest"
+        class="org.apache.jetspeed.components.factorybeans.PlutoFactoryFactoryBean"
+  >             
+       <property name="className"><value>org.apache.pluto.factory.impl.RenderRequestFactoryImpl</value></property>
+       <property name="servletConfig"><ref bean="javax.servlet.ServletConfig"/></property>
+       <property name="props">
+       	<map>
+       	 <entry key="myproperty">
+       	 	<value>myvalue</value>
+       	 </entry>
+       	</map>       	
+       </property>
+  </bean>
+  
+  <bean id="javax.portlet.RenderResponse"
+        class="org.apache.jetspeed.components.factorybeans.PlutoFactoryFactoryBean"
+  >             
+       <property name="className"><value>org.apache.pluto.factory.impl.RenderResponseFactoryImpl</value></property>
+       <property name="servletConfig"><ref bean="javax.servlet.ServletConfig"/></property>
+  </bean>
+  
+  <bean id="javax.portlet.PortletSession"
+        class="org.apache.jetspeed.components.factorybeans.PlutoFactoryFactoryBean"
+  >             
+       <property name="className"><value>org.apache.pluto.factory.impl.PortletSessionFactoryImpl</value></property>
+       <property name="servletConfig"><ref bean="javax.servlet.ServletConfig"/></property>
+  </bean>
+  
+  <bean id="javax.portlet.PortletConfig"
+        class="org.apache.jetspeed.components.factorybeans.PlutoFactoryFactoryBean"
+  >             
+       <property name="className"><value>org.apache.pluto.factory.impl.PortletConfigFactoryImpl</value></property>
+       <property name="servletConfig"><ref bean="javax.servlet.ServletConfig"/></property>
+  </bean>
+  
+  <bean id="javax.portlet.PortletContext"
+        class="org.apache.jetspeed.components.factorybeans.PlutoFactoryFactoryBean"
+  >             
+       <property name="className"><value>org.apache.pluto.factory.impl.PortletContextFactoryImpl</value></property>
+       <property name="servletConfig"><ref bean="javax.servlet.ServletConfig"/></property>
+  </bean>
+  
+  <bean id="javax.portlet.PortalContext"
+        class="org.apache.jetspeed.components.factorybeans.PlutoFactoryFactoryBean"
+  >             
+       <property name="className"><value>org.apache.jetspeed.PortalContextFactoryImpl</value></property>
+       <property name="servletConfig"><ref bean="javax.servlet.ServletConfig"/></property>
+  </bean>
+  
+  <bean id="javax.portlet.ActionResponse"
+        class="org.apache.jetspeed.components.factorybeans.PlutoFactoryFactoryBean"
+  >             
+       <property name="className"><value>org.apache.pluto.factory.impl.ActionResponseFactoryImpl</value></property>
+       <property name="servletConfig"><ref bean="javax.servlet.ServletConfig"/></property>
+  </bean>
+  
+  <bean id="javax.portlet.PortletURL"
+        class="org.apache.jetspeed.components.factorybeans.PlutoFactoryFactoryBean"
+  >             
+       <property name="className"><value>org.apache.jetspeed.container.url.impl.PortletURLFactoryImpl</value></property>
+       <property name="servletConfig"><ref bean="javax.servlet.ServletConfig"/></property>
+  </bean>
+  
+  <bean id="javax.portlet.PortletPreferences"
+        class="org.apache.jetspeed.components.factorybeans.PlutoFactoryFactoryBean"
+  >             
+       <property name="className"><value>org.apache.pluto.factory.impl.PortletPreferencesFactoryImpl</value></property>
+       <property name="servletConfig"><ref bean="javax.servlet.ServletConfig"/></property>
+  </bean>
+  
+  <!-- Problem???
+  <bean id="javax.portlet.PreferencesValidator"
+        class="org.apache.jetspeed.components.factorybeans.PlutoFactoryFactoryBean"
+  >             
+       <property name="className"><value>org.apache.pluto.factory.impl.PreferencesValidatorFactoryImpl</value></property>
+       <property name="servletConfig"><ref bean="javax.servlet.ServletConfig"/></property>
+  </bean>
+  -->
+  
+   <bean id="org.apache.pluto.invoker.PortletInvoker"
+        class="org.apache.jetspeed.container.invoker.PortletInvokerFactoryImpl"
+  >     
+    <constructor-arg index="0">
+		<ref bean="ServletConfig" />
+	</constructor-arg>
+	<constructor-arg index="1">
+		<ref bean="PortalContext" />
+	</constructor-arg>
+    <constructor-arg index="2">
+		<ref bean="portletFactory" />
+	</constructor-arg>
+	<constructor-arg index="3">
+		<ref bean="ServletPortletInvokerFactory"/>
+	</constructor-arg>
+	<constructor-arg index="4">
+		<ref bean="LocalPortletInvokerFactory"/>
+	</constructor-arg>
+  </bean>
+  
+  <bean id="org.apache.pluto.util.NamespaceMapper"
+        class="org.apache.jetspeed.components.factorybeans.PlutoFactoryFactoryBean"
+  >             
+       <property name="className"><value>org.apache.jetspeed.container.namespace.JetspeedNamespaceMapperFactoryImpl</value></property>
+       <property name="servletConfig"><ref bean="javax.servlet.ServletConfig"/></property>
+       <property name="props">
+        <map>
+         <entry key="JetspeedNamespaceMapper">
+             <ref bean="JetspeedNamespaceMapper" />
+         </entry>
+        </map>          
+       </property>
+  </bean>
+  
+  <bean id="StaticInformationProvider" class="org.apache.jetspeed.services.information.StaticInformationProviderImpl">
+	<constructor-arg>
+		<ref bean="org.apache.jetspeed.components.portletregistry.PortletRegistry" />
+	</constructor-arg>	
+  </bean>
+  
+  <bean id="org.apache.pluto.services.information.InformationProviderService" class="org.apache.jetspeed.services.information.InformationProviderServiceImpl"
+	     name="org.apache.pluto.services.information.StaticInformationProvider,org.apache.pluto.services.information.DynamicInformationProvider,org.apache.pluto.services.information.PortletActionProvider,org.apache.pluto.services.information.PortalContextProvider">
+	<constructor-arg>
+		<ref bean="StaticInformationProvider" />
+	</constructor-arg>
+	<constructor-arg>
+		<ref bean="javax.servlet.ServletConfig"/>
+	</constructor-arg>
+  </bean>
+ 
+   
+  <bean id="ServletRequestFactory" 
+	    name="javax.servlet.http.HttpServletRequest" 
+	    class="org.apache.jetspeed.engine.servlet.ServletRequestFactoryImpl" />
+  
+   <bean id="ServletResponseFactory" 
+	    name="javax.servlet.http.HttpServletResponse" 
+	    class="org.apache.jetspeed.engine.servlet.ServletResponseFactoryImpl" />
+
+  
+  <bean id="org.apache.pluto.om.ControllerFactory"
+        class="org.apache.jetspeed.components.factorybeans.PlutoFactoryFactoryBean"
+  >             
+       <property name="className"><value>org.apache.jetspeed.om.ControllerFactoryImpl</value></property>
+       <property name="servletConfig"><ref bean="javax.servlet.ServletConfig"/></property>
+  </bean>
+  
+  <bean id="org.apache.pluto.services.log.LogService"
+        class="org.apache.jetspeed.container.services.log.PlutoLogService"
+  />  
+  
+  <bean id="org.apache.pluto.services.title.DynamicTitleService"  
+	    name="DynamicTitleService"	   
+        class="org.apache.jetspeed.services.title.DynamicTitleServiceImpl" />             
+
+	
+</beans>

Propchange: portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/assembly/pluto-factories.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/assembly/pluto-factories.xml
------------------------------------------------------------------------------
    svn:keywords = Id

Added: portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/assembly/portal-url-generation.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/assembly/portal-url-generation.xml?view=auto&rev=522665
==============================================================================
--- portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/assembly/portal-url-generation.xml (added)
+++ portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/assembly/portal-url-generation.xml Mon Mar 26 16:53:34 2007
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
+<!--
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements.  See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to You under the Apache License, Version 2.0
+(the "License"); you may not use this file except in compliance with
+the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+<beans>
+	
+  <bean id="NavigationalStateCodec" 
+  	   class="org.apache.jetspeed.container.state.impl.JetspeedNavigationalStateCodec"
+  >  	 
+       <constructor-arg><ref bean="PortalContext"/></constructor-arg>
+	   <constructor-arg><ref bean="PortletWindowAccessor"/></constructor-arg>  
+  </bean>
+  
+  <!-- Navigation state we are currently using -->
+  <bean id="NavigationalState" 
+  	   class="org.apache.jetspeed.container.state.impl.SessionFullNavigationalState"
+	   singleton="false"
+  >  	 
+       <constructor-arg><ref bean="NavigationalStateCodec"/></constructor-arg>
+       <constructor-arg>
+        	<ref bean="portletContentCache"/>
+        </constructor-arg>       
+  </bean>
+  
+  <!-- PortalURL we are currently using -->
+  <bean id="PortalURL" 
+  	   class="org.apache.jetspeed.container.url.impl.PathInfoEncodingPortalURL"
+	   singleton="false"
+  >  	 
+       <constructor-arg><ref bean="NavigationalState"/></constructor-arg>
+	   <constructor-arg><ref bean="PortalContext"/></constructor-arg>
+	   <!-- Uncomment this to HARD CODE your portal URL -->
+	   <!-- <constructor-arg><ref bean="BasePortalURL"/></constructor-arg>  -->
+  </bean>
+
+  <!-- PortalURL we are currently using -->
+  <bean id="DesktopPortalURL" 
+  	   class="org.apache.jetspeed.container.url.impl.DesktopEncodingPortalURL"
+	   singleton="false"
+  >  	 
+       <constructor-arg index='0'><ref bean="NavigationalState"/></constructor-arg>
+	   <constructor-arg index='1'><ref bean="PortalContext"/></constructor-arg>
+      <!-- javascript function for desktop doRender -->
+       <constructor-arg index='2'><value>javascript:doRender</value></constructor-arg>
+      <!-- javascript function for desktop doAction -->      
+       <constructor-arg index='3'><value>javascript:doAction</value></constructor-arg>      
+	   <!-- Uncomment this to HARD CODE your portal URL -->
+	   <!-- <constructor-arg><ref bean="BasePortalURL"/></constructor-arg>  -->
+  </bean>
+    
+  <!-- Uncomment this to HARD CODE your portal URL -->
+   <!--
+  <bean id="BasePortalURL"
+	    class="org.apache.jetspeed.container.url.impl.BasePortalURLImpl">
+       <constructor-arg><ref bean="ProductionConfiguration"/></constructor-arg>	  
+  </bean>	
+  -->
+		
+	
+  <!--  Navigational State component -->
+  <bean id="NavigationalStateComponent" 
+  	   class="org.apache.jetspeed.container.state.impl.JetspeedNavigationalStateComponent"
+	   name="org.apache.jetspeed.container.state.NavigationalStateComponent"
+  >  	   
+       <constructor-arg index="0"><value>NavigationalState</value></constructor-arg>
+       <constructor-arg index="1"><value>PortalURL</value></constructor-arg>      
+	   <constructor-arg index='2'><ref bean="PortalContext"/></constructor-arg>
+	   <constructor-arg index='3'><value>DesktopPortalURL</value></constructor-arg>            
+  </bean>
+
+</beans>
\ No newline at end of file

Propchange: portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/assembly/portal-url-generation.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/assembly/portal-url-generation.xml
------------------------------------------------------------------------------
    svn:keywords = Id

Added: portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/assembly/prefs.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/assembly/prefs.xml?view=auto&rev=522665
==============================================================================
--- portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/assembly/prefs.xml (added)
+++ portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/assembly/prefs.xml Mon Mar 26 16:53:34 2007
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+    
+    http://www.apache.org/licenses/LICENSE-2.0
+    
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<beans>
+
+    <!-- Preferences Implementation -->
+    <bean id="PreferencesProviderImpl" class="org.apache.jetspeed.prefs.impl.PersistenceBrokerPreferencesProvider" name="prefsPersistenceBroker" init-method="init">
+        <constructor-arg index="0">
+            <value>JETSPEED-INF/ojb/prefs_repository.xml</value>
+        </constructor-arg>
+        <constructor-arg index="1">
+            <ref bean="preferencesCache" />
+        </constructor-arg>
+    </bean>
+
+    <bean id="org.apache.jetspeed.prefs.PreferencesProvider" parent="baseTransactionProxy" name="prefsProvider">
+        <property name="proxyInterfaces">
+            <value>org.apache.jetspeed.prefs.PreferencesProvider</value>
+        </property>
+
+        <property name="target">
+            <ref bean="PreferencesProviderImpl" />
+        </property>
+        <property name="transactionAttributes">
+            <props>
+                <prop key="createNode*">PROPAGATION_REQUIRED</prop>
+                <prop key="storeNode*">PROPAGATION_REQUIRED</prop>
+                <prop key="removeNode*">PROPAGATION_REQUIRED</prop>
+                <prop key="*">PROPAGATION_SUPPORTS</prop>
+            </props>
+        </property>
+    </bean>
+
+    <!-- PreferencesFactory implementation -->
+    <bean id="java.util.prefs.PreferencesFactory" class="org.apache.jetspeed.prefs.impl.PreferencesFactoryImpl" name="prefsFactory" init-method="init">
+        <property name="prefsProvider">
+            <ref bean="prefsProvider" />
+        </property>
+    </bean>
+
+</beans>
\ No newline at end of file

Propchange: portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/assembly/prefs.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/assembly/prefs.xml
------------------------------------------------------------------------------
    svn:keywords = Id

Added: portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/assembly/profiler.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/assembly/profiler.xml?view=auto&rev=522665
==============================================================================
--- portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/assembly/profiler.xml (added)
+++ portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/assembly/profiler.xml Mon Mar 26 16:53:34 2007
@@ -0,0 +1,179 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+    
+    http://www.apache.org/licenses/LICENSE-2.0
+    
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<beans>
+    <!-- Profiler -->
+    <bean id="profilerImpl" class="org.apache.jetspeed.profiler.impl.JetspeedProfilerImpl" init-method="init">
+        <constructor-arg index="0">
+            <value>JETSPEED-INF/ojb/profiler_repository.xml</value>
+        </constructor-arg>
+        <constructor-arg index="1">
+            <value>j2</value>
+        </constructor-arg>                
+        <constructor-arg index="2">
+            <ref bean="ProfileResolvers" />            
+        </constructor-arg>                   
+ 		<!--  pass reference to profiling rule implementations -->
+		<constructor-arg index="3">
+			<map>
+				<entry key="locator">
+					<value>ProfileLocator</value>
+				</entry>
+				<entry key="principal">
+					<value>PrincipalRule</value>
+				</entry>
+	
+				<entry key="standard">
+					<value>StandardProfilingRule</value>
+				</entry>
+				<entry key="fallback">
+					<value>RoleFallbackProfilingRule</value>
+				</entry>
+			</map>
+		</constructor-arg>
+		<!--  pass reference to rule criterion -->
+		<constructor-arg index="4">
+			<value>RuleCriterion</value>
+		</constructor-arg>
+    </bean>
+
+    <bean id="org.apache.jetspeed.profiler.Profiler" name="profiler" parent="baseTransactionProxy">
+        <property name="proxyInterfaces">
+            <value>org.apache.jetspeed.profiler.Profiler</value>
+        </property>
+        <property name="target">
+            <ref bean="profilerImpl" />
+        </property>
+        <property name="transactionAttributes">
+            <props>
+                <prop key="setRuleForPrincipal">PROPAGATION_REQUIRED,-org.apache.jetspeed.components.profiler.ProfilerException</prop>
+                <prop key="store*">PROPAGATION_REQUIRED,-org.apache.jetspeed.components.profiler.ProfilerException</prop>
+                <prop key="delete*">PROPAGATION_REQUIRED,-org.apache.jetspeed.components.profiler.ProfilerException</prop>
+                <prop key="*">PROPAGATION_SUPPORTS</prop>
+            </props>
+        </property>
+    </bean>
+               
+    <bean id="ProfileResolvers"  
+          class="org.apache.jetspeed.profiler.rules.impl.ProfileResolversImpl">
+        <constructor-arg index="0">          
+        <map>
+          <entry key="request">
+            <ref bean="StandardResolver" />
+          </entry>
+          <entry key="session">
+            <ref bean="SessionResolver" />
+          </entry>            
+          <entry key="request.session">
+            <ref bean="RequestSessionResolver" />
+          </entry>
+          <entry key="path">
+            <ref bean="PathResolver" />
+          </entry>
+          <entry key="path.session">
+            <ref bean="PathSessionResolver" />
+          </entry>
+          <entry key="hard.coded">
+            <ref bean="HardCodedResolver" />
+          </entry>
+          <entry key="user">
+            <ref bean="UserCriterionResolver" />
+          </entry>
+          <entry key="role">
+            <ref bean="RoleCriterionResolver" />
+          </entry>
+          <entry key="rolecombo">
+            <ref bean="RoleComboCriterionResolver" />
+          </entry>			
+          <entry key="group">
+            <ref bean="GroupCriterionResolver" />
+          </entry>
+          <entry key="mediatype">
+            <ref bean="MediatypeCriterionResolver" />
+          </entry>
+          <entry key="language">
+            <ref bean="LanguageCriterionResolver" />
+          </entry>
+          <entry key="country">
+            <ref bean="CountryCriterionResolver" />
+          </entry>
+          <entry key="group.role.user">
+            <ref bean="GroupRoleUserCriterionResolver" />
+          </entry>
+          <entry key="user.attribute">
+            <ref bean="UserAttributeResolver" />
+          </entry>
+          <entry key="navigation">
+            <ref bean="NavigationCriterionResolver" />
+          </entry>
+          <entry key="user.agent">
+            <ref bean="UserAgentCriterionResolver" />
+          </entry>          
+          <entry key="ip">
+            <ref bean="IPCriterionResolver" />
+          </entry>          
+          <entry key="hostname">
+            <ref bean="HostnameCriterionResolver" />
+          </entry>          
+          <entry key="domain">
+            <ref bean="DomainCriterionResolver" />
+          </entry>          
+        </map>
+        </constructor-arg>                  
+    </bean>
+    
+    <bean id='StandardResolver' class='org.apache.jetspeed.profiler.rules.impl.StandardResolver'></bean>
+    <bean id='SessionResolver' class='org.apache.jetspeed.profiler.rules.impl.SessionResolver'></bean>    
+    <bean id='RequestSessionResolver' class='org.apache.jetspeed.profiler.rules.impl.RequestSessionResolver'></bean>
+    <bean id='PathResolver' class='org.apache.jetspeed.profiler.rules.impl.PathResolver'></bean>
+    <bean id='PathSessionResolver' class='org.apache.jetspeed.profiler.rules.impl.PathSessionResolver'></bean>
+    <bean id='HardCodedResolver' class='org.apache.jetspeed.profiler.rules.impl.HardCodedResolver'></bean>
+    <bean id='UserCriterionResolver' class='org.apache.jetspeed.profiler.rules.impl.UserCriterionResolver'></bean>
+    <bean id='RoleCriterionResolver' class='org.apache.jetspeed.profiler.rules.impl.RoleCriterionResolver'></bean>
+    <bean id='RoleComboCriterionResolver' class='org.apache.jetspeed.profiler.rules.impl.RoleComboCriterionResolver'></bean>	
+    <bean id='GroupCriterionResolver' class='org.apache.jetspeed.profiler.rules.impl.GroupCriterionResolver'></bean>
+    <bean id='MediatypeCriterionResolver' class='org.apache.jetspeed.profiler.rules.impl.MediatypeCriterionResolver'></bean>
+    <bean id='LanguageCriterionResolver' class='org.apache.jetspeed.profiler.rules.impl.LanguageCriterionResolver'></bean>
+    <bean id='CountryCriterionResolver' class='org.apache.jetspeed.profiler.rules.impl.CountryCriterionResolver'></bean>
+    <bean id='GroupRoleUserCriterionResolver' class='org.apache.jetspeed.profiler.rules.impl.GroupRoleUserCriterionResolver'></bean>
+    <bean id='UserAttributeResolver' class='org.apache.jetspeed.profiler.rules.impl.UserAttributeResolver'></bean>
+    <bean id='NavigationCriterionResolver' class='org.apache.jetspeed.profiler.rules.impl.NavigationCriterionResolver'></bean>
+    <bean id='UserAgentCriterionResolver' class='org.apache.jetspeed.profiler.rules.impl.UserAgentCriterionResolver'></bean>
+    <bean id='IPCriterionResolver' class='org.apache.jetspeed.profiler.rules.impl.IPCriterionResolver'></bean>
+    <bean id='HostnameCriterionResolver' class='org.apache.jetspeed.profiler.rules.impl.HostnameCriterionResolver'></bean>    
+    <bean id='DomainCriterionResolver' class='org.apache.jetspeed.profiler.rules.impl.DomainCriterionResolver'></bean>      
+
+	<!-- Profiling Rules -->
+
+	<!-- Standard Profiler -->
+	<bean id="StandardProfilingRule" class="org.apache.jetspeed.profiler.rules.impl.StandardProfilingRule" singleton="false"></bean>
+
+	<!-- Fallback Profiler -->
+	<bean id="RoleFallbackProfilingRule" class="org.apache.jetspeed.profiler.rules.impl.RoleFallbackProfilingRule" singleton="false"></bean>
+
+	<!-- Locator -->
+	<bean id="ProfileLocator" class="org.apache.jetspeed.profiler.impl.JetspeedProfileLocator" singleton="false"></bean>
+
+	<!-- Principal Rule -->
+	<bean id="PrincipalRule" class="org.apache.jetspeed.profiler.rules.impl.PrincipalRuleImpl" singleton="false"></bean>
+
+
+	<!-- Rule Criterion -->
+	<bean id="RuleCriterion" class="org.apache.jetspeed.profiler.rules.impl.RuleCriterionImpl" singleton="false"></bean>
+    
+</beans>

Propchange: portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/assembly/profiler.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/assembly/profiler.xml
------------------------------------------------------------------------------
    svn:keywords = Id

Added: portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/assembly/registry.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/assembly/registry.xml?view=auto&rev=522665
==============================================================================
--- portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/assembly/registry.xml (added)
+++ portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/assembly/registry.xml Mon Mar 26 16:53:34 2007
@@ -0,0 +1,127 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+    
+    http://www.apache.org/licenses/LICENSE-2.0
+    
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<beans>
+
+    <!-- Portlet Factory -->
+    <bean id="portletFactory" class="org.apache.jetspeed.factory.JetspeedPortletFactory"></bean>
+
+    <!-- Portlet Registry DAO-->
+    <bean id="portletRegistryImpl" class="org.apache.jetspeed.components.portletregistry.PersistenceBrokerPortletRegistry" init-method="init">
+
+        <constructor-arg index="0">
+            <value>JETSPEED-INF/ojb/registry_repository.xml</value>
+        </constructor-arg>
+        <constructor-arg index="1">
+            <ref bean="portletFactory" />
+        </constructor-arg>
+        <constructor-arg index="2">
+            <ref bean="portletApplicationOidCache" />
+        </constructor-arg>
+        <constructor-arg index="3">
+            <ref bean="portletDefinitionOidCache" />
+        </constructor-arg>
+        <constructor-arg index="4">
+            <ref bean="portletApplicationNameCache" />
+        </constructor-arg>
+        <constructor-arg index="5">
+            <ref bean="portletDefinitionNameCache" />
+        </constructor-arg>        
+    </bean>
+
+    <bean id="org.apache.jetspeed.components.portletregistry.PortletRegistry" name="portletRegistry" parent="baseTransactionProxy">
+        <property name="proxyInterfaces">
+            <value>org.apache.jetspeed.components.portletregistry.PortletRegistry</value>
+        </property>
+
+        <property name="target">
+            <ref bean="portletRegistryImpl" />
+        </property>
+        <property name="transactionAttributes">
+            <props>
+                <prop key="register*">PROPAGATION_REQUIRED,-org.apache.jetspeed.components.portletregistry.RegistryException</prop>
+                <prop key="remove*">PROPAGATION_REQUIRED,-org.apache.jetspeed.components.portletregistry.RegistryException</prop>
+                <prop key="update*">PROPAGATION_REQUIRED,-org.apache.jetspeed.components.portletregistry.RegistryException</prop>
+                <prop key="save*">PROPAGATION_REQUIRED,-org.apache.jetspeed.components.portletregistry.RegistryException</prop>
+                <prop key="*">PROPAGATION_SUPPORTS</prop>
+            </props>
+        </property>
+    </bean>
+
+    <!--
+        - PortletEntity business object: OJB implementation, as an inner bean wrapped
+        - by an outer transactional proxy. The two bean definitions could have been separate,
+        - but this is cleaner as there is no need to ever access the unwrapped object.
+    -->
+
+    <bean id="portletEntityAccessImpl" class="org.apache.jetspeed.components.portletentity.PersistenceBrokerPortletEntityAccess">
+        <constructor-arg>
+            <ref bean="portletRegistry" />
+        </constructor-arg>
+        <constructor-arg>
+            <ref bean="org.apache.jetspeed.request.RequestContextComponent" />
+        </constructor-arg>    
+        <!-- 
+            All preferences were shared. With JS2-449, preferences are now
+            stored 'per user'. The username is stored in the preferences FULL_PATH
+            To turn on mergeSharedPreferences configure this property to true 
+            This will NOT turn off per user prefs, 
+             but instead merge with them, where user prefs override.
+            boolean
+          -->    
+        <constructor-arg type="boolean">
+            <value>false</value>
+        </constructor-arg>        
+    </bean>
+
+    <bean id="org.apache.jetspeed.components.portletentity.PortletEntityAccessComponent" parent="baseTransactionProxy" name="portletEntityAccess">
+        <property name="proxyInterfaces">
+            <value>org.apache.jetspeed.components.portletentity.PortletEntityAccessComponent</value>
+        </property>
+        <property name="target">
+            <ref bean="portletEntityAccessImpl" />
+        </property>
+        <!--
+            <property name="preInterceptors">
+            <list>
+            <ref bean="portletEntityCachingAdvisor"/>
+            <ref bean="portletEntityRemoveFromCacheAdvisor"/>
+            </list>
+            </property>
+        -->
+        <property name="transactionAttributes">
+            <props>
+                <prop key="remove*">PROPAGATION_REQUIRED</prop>
+                <prop key="store*">PROPAGATION_REQUIRED,-org.apache.jetspeed.components.portletentity.PortletEntityNotStoredException</prop>
+                <prop key="*">PROPAGATION_SUPPORTS</prop>
+            </props>
+        </property>
+    </bean>
+    
+  <!-- Inject Portlet Entity Proxy into Portlet Entity impl -->
+  <bean id="injectEntityAccessProxy" class="org.springframework.beans.factory.config.MethodInvokingFactoryBean">
+      <property name="targetObject"><ref bean="portletEntityAccessImpl"/></property>
+      <property name="targetMethod"><value>setEntityAccessProxy</value></property>
+      <property name="arguments">
+          <list>
+              <ref bean="org.apache.jetspeed.components.portletentity.PortletEntityAccessComponent"/>
+          </list>
+      </property>
+  </bean>
+    
+</beans>
\ No newline at end of file

Propchange: portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/assembly/registry.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/assembly/registry.xml
------------------------------------------------------------------------------
    svn:keywords = Id

Added: portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/assembly/search.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/assembly/search.xml?view=auto&rev=522665
==============================================================================
--- portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/assembly/search.xml (added)
+++ portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/assembly/search.xml Mon Mar 26 16:53:34 2007
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
+<!--
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements.  See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to You under the Apache License, Version 2.0
+(the "License"); you may not use this file except in compliance with
+the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+<beans>
+
+  <!--SEARCH COMPONENT-->
+  <bean id="org.apache.jetspeed.search.HandlerFactory"
+  	class="org.apache.jetspeed.search.handlers.HandlerFactoryImpl"
+  >
+  	<constructor-arg>
+  		<map>
+  			<entry key="java.net.URL"><value>org.apache.jetspeed.search.handlers.URLToDocHandler</value></entry>
+  			<entry key="org.apache.jetspeed.om.portlet.impl.PortletApplicationDefinitionImpl"><value>org.apache.jetspeed.search.handlers.pam.PortletApplicationHandler</value></entry>
+  			<entry key="org.apache.jetspeed.om.portlet.impl.PortletDefinitionImpl"><value>org.apache.jetspeed.search.handlers.pam.PortletDefinitionHandler</value></entry>
+  		</map>
+	</constructor-arg>
+  </bean>
+  
+  
+  <bean id="org.apache.jetspeed.search.SearchEngine"
+  	class="org.apache.jetspeed.search.lucene.SearchEngineImpl"
+  >
+  	<constructor-arg index="0"><value>${applicationRoot}/WEB-INF/search_index</value></constructor-arg>
+  	<constructor-arg index="1"><null /></constructor-arg>
+  	<constructor-arg type="boolean"><value>true</value></constructor-arg>
+  	<constructor-arg><ref bean="org.apache.jetspeed.search.HandlerFactory"/></constructor-arg>
+  	
+  </bean>
+</beans>
\ No newline at end of file

Propchange: portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/assembly/search.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/assembly/search.xml
------------------------------------------------------------------------------
    svn:keywords = Id

Added: portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/assembly/security-atn.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/assembly/security-atn.xml?view=auto&rev=522665
==============================================================================
--- portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/assembly/security-atn.xml (added)
+++ portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/assembly/security-atn.xml Mon Mar 26 16:53:34 2007
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
+<!--
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements.  See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to You under the Apache License, Version 2.0
+(the "License"); you may not use this file except in compliance with
+the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+<beans>
+  
+  <!-- ************** Login Module ************** -->
+  <!-- Security: Login Module Proxy -->
+  <bean id="org.apache.jetspeed.security.LoginModuleProxy" 
+  	   class="org.apache.jetspeed.security.impl.LoginModuleProxyImpl"
+  >
+       <!-- User Manager to construct JAAS subject/principals returned to container -->
+  	   <constructor-arg index="0"><ref bean="org.apache.jetspeed.security.UserManager"/></constructor-arg>  	   
+       <!-- Portal user role name used to identify authenticated users in web.xml security constraints -->
+  	   <constructor-arg index="1"><value>portal-user</value></constructor-arg>  	   
+  </bean>
+
+</beans>

Propchange: portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/assembly/security-atn.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/assembly/security-atn.xml
------------------------------------------------------------------------------
    svn:keywords = Id

Added: portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/assembly/security-atz.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/assembly/security-atz.xml?view=auto&rev=522665
==============================================================================
--- portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/assembly/security-atz.xml (added)
+++ portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/assembly/security-atz.xml Mon Mar 26 16:53:34 2007
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
+<!--
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements.  See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to You under the Apache License, Version 2.0
+(the "License"); you may not use this file except in compliance with
+the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+<beans>
+
+  <!-- Security: RDBMS Policy implementation for JAAS -->
+  <bean id="org.apache.jetspeed.security.impl.RdbmsPolicy" 
+  	   class="org.apache.jetspeed.security.impl.RdbmsPolicy"
+  >  	   
+  	   <constructor-arg ><ref bean="org.apache.jetspeed.security.PermissionManager"/></constructor-arg>  	   
+  </bean>
+
+</beans>

Propchange: portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/assembly/security-atz.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/assembly/security-atz.xml
------------------------------------------------------------------------------
    svn:keywords = Id

Added: portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/assembly/security-managers.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/assembly/security-managers.xml?view=auto&rev=522665
==============================================================================
--- portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/assembly/security-managers.xml (added)
+++ portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/assembly/security-managers.xml Mon Mar 26 16:53:34 2007
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
+<!--
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements.  See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to You under the Apache License, Version 2.0
+(the "License"); you may not use this file except in compliance with
+the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+<beans>
+  
+  <!-- Security: User Manager -->
+  <bean id="org.apache.jetspeed.security.UserManager" 
+  	   class="org.apache.jetspeed.security.impl.UserManagerImpl"
+  >  	   
+  	   <constructor-arg ><ref bean="org.apache.jetspeed.security.SecurityProvider"/></constructor-arg>
+  </bean>
+  
+   <!-- Security: Group Manager -->
+  <bean id="org.apache.jetspeed.security.GroupManager" 
+  	   class="org.apache.jetspeed.security.impl.GroupManagerImpl"
+  >  	   
+  	   <constructor-arg ><ref bean="org.apache.jetspeed.security.SecurityProvider"/></constructor-arg>   
+  </bean>
+  
+  <!-- Security: Role Manager -->
+  <bean id="org.apache.jetspeed.security.RoleManager" 
+  	   class="org.apache.jetspeed.security.impl.RoleManagerImpl"
+  >  	   
+  	   <constructor-arg ><ref bean="org.apache.jetspeed.security.SecurityProvider"/></constructor-arg>   
+  </bean>
+  
+  <!-- Security: Permission Manager -->
+  <bean id="org.apache.jetspeed.security.impl.PermissionManagerImpl" 
+  	   class="org.apache.jetspeed.security.impl.PermissionManagerImpl"  />
+  
+  <bean id="org.apache.jetspeed.security.PermissionManager" parent="baseTransactionProxy" 
+		name="permissionManager" >
+		<property name="proxyInterfaces">
+			<value>org.apache.jetspeed.security.PermissionManager</value>
+		</property>
+		<property name="target">
+			<ref bean="org.apache.jetspeed.security.impl.PermissionManagerImpl"/>
+		</property>
+		<property name="transactionAttributes">
+			<props>				
+				<prop key="remove*">PROPAGATION_REQUIRED</prop>
+				<prop key="grant*">PROPAGATION_REQUIRED</prop>
+				<prop key="revoke*">PROPAGATION_REQUIRED</prop>
+				<prop key="grant*">PROPAGATION_REQUIRED</prop>
+				<prop key="add*">PROPAGATION_REQUIRED</prop>
+				<prop key="update*">PROPAGATION_REQUIRED</prop>
+				<prop key="*">PROPAGATION_SUPPORTS</prop>
+			</props>
+		</property>
+   </bean>
+
+</beans>

Propchange: portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/assembly/security-managers.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/assembly/security-managers.xml
------------------------------------------------------------------------------
    svn:keywords = Id

Added: portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/assembly/security-providers.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/assembly/security-providers.xml?view=auto&rev=522665
==============================================================================
--- portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/assembly/security-providers.xml (added)
+++ portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/assembly/security-providers.xml Mon Mar 26 16:53:34 2007
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
+<!--
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements.  See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to You under the Apache License, Version 2.0
+(the "License"); you may not use this file except in compliance with
+the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+<beans>
+
+  <!-- ************** Security Providers ************** -->
+  <!-- Security: Default Authentication Provider -->
+  <bean id="org.apache.jetspeed.security.AuthenticationProvider" 
+  	   class="org.apache.jetspeed.security.impl.AuthenticationProviderImpl"
+  >  	   
+  	   <constructor-arg index="0"><value>DefaultAuthenticator</value></constructor-arg>
+  	   <constructor-arg index="1"><value>The default authenticator</value></constructor-arg>
+  	   <constructor-arg index="2"><value>login.conf</value></constructor-arg>
+  	   <constructor-arg index="3"><ref bean="org.apache.jetspeed.security.spi.CredentialHandler"/></constructor-arg>
+  	   <constructor-arg index="4"><ref bean="org.apache.jetspeed.security.spi.UserSecurityHandler"/></constructor-arg>
+  </bean>
+  
+  <!-- Security: Authentication Provider Proxy -->
+  <bean id="org.apache.jetspeed.security.AuthenticationProviderProxy" 
+  	   class="org.apache.jetspeed.security.impl.AuthenticationProviderProxyImpl"
+  >  	   
+  	   <constructor-arg >
+  	   		<list>
+  	   			<ref bean="org.apache.jetspeed.security.AuthenticationProvider"/>
+  	   		</list>
+  	   </constructor-arg>
+  	   <constructor-arg ><value>DefaultAuthenticator</value></constructor-arg>
+  </bean>
+  
+  <!-- Security: Security Provider -->
+  <bean id="org.apache.jetspeed.security.SecurityProvider" 
+  	   class="org.apache.jetspeed.security.impl.SecurityProviderImpl"
+  >  	   
+  	   <constructor-arg ><ref bean="org.apache.jetspeed.security.AuthenticationProviderProxy"/></constructor-arg>
+  	   <constructor-arg ><ref bean="org.apache.jetspeed.security.spi.RoleSecurityHandler"/></constructor-arg>
+  	   <constructor-arg ><ref bean="org.apache.jetspeed.security.spi.GroupSecurityHandler"/></constructor-arg>
+  	   <constructor-arg ><ref bean="org.apache.jetspeed.security.spi.SecurityMappingHandler"/></constructor-arg>
+  </bean>
+  
+  <!-- Security: Authorization Provider -->
+  <bean id="org.apache.jetspeed.security.AuthorizationProvider" 
+  	   class="org.apache.jetspeed.security.impl.AuthorizationProviderImpl"
+  >  	   
+  	   <constructor-arg index="0"><ref bean="org.apache.jetspeed.security.impl.RdbmsPolicy"/></constructor-arg>
+  	   <!-- Does not use the default policy as a default behavior -->
+  	   <constructor-arg index="1"><value>false</value></constructor-arg>   
+  </bean>
+
+</beans>

Propchange: portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/assembly/security-providers.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/assembly/security-providers.xml
------------------------------------------------------------------------------
    svn:keywords = Id

Added: portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/assembly/security-spi-atn.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/assembly/security-spi-atn.xml?view=auto&rev=522665
==============================================================================
--- portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/assembly/security-spi-atn.xml (added)
+++ portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/assembly/security-spi-atn.xml Mon Mar 26 16:53:34 2007
@@ -0,0 +1,124 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
+<!--
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements.  See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to You under the Apache License, Version 2.0
+(the "License"); you may not use this file except in compliance with
+the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+<beans>
+
+  <!-- ************** Security SPI Handlers ************** -->
+
+  <!-- require a non-empty password -->
+  <bean id="org.apache.jetspeed.security.spi.CredentialPasswordValidator" 
+       class="org.apache.jetspeed.security.spi.impl.DefaultCredentialPasswordValidator"/>
+
+  <!-- MessageDigest encode passwords using SHA-1 -->
+  <bean id="org.apache.jetspeed.security.spi.CredentialPasswordEncoder" 
+       class="org.apache.jetspeed.security.spi.impl.MessageDigestCredentialPasswordEncoder">
+       <constructor-arg index="0"><value>SHA-1</value></constructor-arg>       
+  </bean>       
+
+  <bean id="org.apache.jetspeed.security.spi.PasswordCredentialProvider" 
+       class="org.apache.jetspeed.security.spi.impl.DefaultPasswordCredentialProvider">
+       <constructor-arg index="0"><ref bean="org.apache.jetspeed.security.spi.CredentialPasswordValidator"/></constructor-arg>       
+       <constructor-arg index="1"><ref bean="org.apache.jetspeed.security.spi.CredentialPasswordEncoder"/></constructor-arg>       
+  </bean>       
+
+  <!-- A Two-way encoding password service which also implements CredentialPasswordEncoder
+         this Service can be used instead of for example the default provided MessageDigestCredentialPasswordEncoder
+  <bean id="org.apache.jetspeed.security.PasswordEncodingService"
+        name="org.apache.jetspeed.security.spi.CredentialPasswordEncoder"
+        class="org.apache.jetspeed.security.spi.impl.PBEPasswordService">
+    <constructor-arg index="0">
+      <!- secret PBE key password ->
+      <value>********</value>
+    </constructor-arg>       
+  </bean>       
+-->
+
+ <!-- A Two-way encoding password service which also implements CredentialPasswordEncoder
+       Furthermore, this extension of the PBEPasswordService supports lazy upgrading from an old CredentialPasswordEncoder
+       like the default provided MessageDigestCredentialPasswordEncoder
+  ->
+  <bean id="org.apache.jetspeed.security.PasswordEncodingService"
+        name="org.apache.jetspeed.security.spi.CredentialPasswordEncoder"
+        class="org.apache.jetspeed.security.spi.impl.AlgorithmUpgradePBEPasswordService">
+    <constructor-arg index="0">
+      <!- secret PBE key password ->
+      <value>********</value>
+    </constructor-arg>
+    <constructor-arg index="1">
+      <!- old MessageDigestCredentialPasswordEncoder to be upgrading from, using SHA-1 ->
+      <bean class="org.apache.jetspeed.security.spi.impl.MessageDigestCredentialPasswordEncoder">
+       <constructor-arg index="0"><value>SHA-1</value></constructor-arg>       
+      </bean>       
+    </constructor-arg>
+    <constructor-arg index="2">
+      <!- startPBEPasswordEncodingService: date before which old encoded passwords need to be recoded (on authentication)
+           (SimpleDateFormat) format: yyyy-MM-dd HH:mm:ss
+      ->
+      <value>2006-07-02 15:00:00</value>
+    </constructor-arg>
+  </bean>
+-->
+
+  <!-- allow multiple InternalPasswordCredentialInterceptors to be used for DefaultCredentialHandler --> 
+  <bean id="org.apache.jetspeed.security.spi.InternalPasswordCredentialInterceptor"
+       class="org.apache.jetspeed.security.spi.impl.InternalPasswordCredentialInterceptorsProxy">
+       <constructor-arg index="0">
+         <list>
+           <!-- enforce an invalid preset password value in the persisent store is required to be changed -->
+           <bean class="org.apache.jetspeed.security.spi.impl.ValidatePasswordOnLoadInterceptor"/>
+
+           <!-- ensure preset cleartext passwords in the persistent store  will be encoded on first use -->
+           <bean class="org.apache.jetspeed.security.spi.impl.EncodePasswordOnFirstLoadInterceptor"/>
+         </list>
+       </constructor-arg>
+  </bean>
+
+  <!-- Security SPI: CredentialHandler -->
+  <bean id="org.apache.jetspeed.security.spi.CredentialHandler" 
+       class="org.apache.jetspeed.security.spi.impl.DefaultCredentialHandler"
+  >       
+       <constructor-arg index="0"><ref bean="org.apache.jetspeed.security.spi.SecurityAccess"/></constructor-arg>       
+       <constructor-arg index="1"><ref bean="org.apache.jetspeed.security.spi.PasswordCredentialProvider"/></constructor-arg>       
+       <constructor-arg index="2"><ref bean="org.apache.jetspeed.security.spi.InternalPasswordCredentialInterceptor"/></constructor-arg>       
+  </bean>
+  
+  <!-- Security SPI: UserSecurityHandler -->
+  <!-- The DefaultUSerSecurityHandler uses the raw SecurityAccessImpl so that it
+  	   may demarcate its own transactions -->
+  <bean id="org.apache.jetspeed.security.spi.UserSecurityHandlerImpl" 
+  	   class="org.apache.jetspeed.security.spi.impl.DefaultUserSecurityHandler"
+  >  	   
+  	   <constructor-arg ><ref bean="org.apache.jetspeed.security.spi.SecurityAccess"/></constructor-arg>  	   
+  </bean>
+  
+  <bean id="org.apache.jetspeed.security.spi.UserSecurityHandler" parent="baseTransactionProxy" 
+		name="userSecurityHandler" >
+		<property name="proxyInterfaces">
+			<value>org.apache.jetspeed.security.spi.UserSecurityHandler</value>
+		</property>
+		<property name="target">
+			<ref bean="org.apache.jetspeed.security.spi.UserSecurityHandlerImpl"/>
+		</property>
+		<property name="transactionAttributes">
+			<props>				
+				<prop key="*">PROPAGATION_REQUIRED</prop>
+			</props>
+		</property>
+   </bean>
+
+</beans>

Propchange: portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/assembly/security-spi-atn.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/assembly/security-spi-atn.xml
------------------------------------------------------------------------------
    svn:keywords = Id



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