portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a..@apache.org
Subject svn commit: r646449 [6/7] - in /portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly: ./ alternate/ alternate/versioned-deployment/ boot/
Date Wed, 09 Apr 2008 17:55:05 GMT
Modified: portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/pluto-factories.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/pluto-factories.xml?rev=646449&r1=646448&r2=646449&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/pluto-factories.xml (original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/pluto-factories.xml Wed Apr  9 10:54:56 2008
@@ -6,202 +6,223 @@
   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
-
+  
+  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 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">
-    
+<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">
+
   <bean id="JetspeedNamespaceMapper" class="org.apache.jetspeed.container.namespace.JetspeedNamespaceMapperImpl">
-       <constructor-arg index="0"><value>js_</value></constructor-arg>
+    <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="LocalPortletInvokerFactory" class="org.apache.jetspeed.container.invoker.LocalPortletInvokerFactory" />
+
+  <bean id="ServletPortletInvokerFactory" class="org.apache.jetspeed.container.invoker.ServletPortletInvokerFactory">
     <constructor-arg index="0">
-        <ref bean="PortletRequestResponseUnwrapper" />
+      <ref bean="PortletRequestResponseUnwrapper" />
     </constructor-arg>
   </bean>
-  
+
   <!--  
-  PortletRequestResponseUnwrapper finds servlet request or servlet response from portlet request or portlet response by unwrapping.
-  Third-party module can provide an implementation to decorate the real request or response object of a servlet container.
-  For example, the real request object of a servlet container can be decorated because it is not thread-safe under Jetspeed parallel rendering mode.
+    PortletRequestResponseUnwrapper finds servlet request or servlet response from portlet request or portlet response by unwrapping.
+    Third-party module can provide an implementation to decorate the real request or response object of a servlet container.
+    For example, the real request object of a servlet container can be decorated because it is not thread-safe under Jetspeed parallel rendering mode.
   -->
   <bean id="PortletRequestResponseUnwrapper"
-        class="org.apache.jetspeed.container.invoker.DefaultPortletRequestResponseUnwrapper" />
-  
-  <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>
+    class="org.apache.jetspeed.container.invoker.DefaultPortletRequestResponseUnwrapper" />
+
+  <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 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 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 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 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 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 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 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 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>
+    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="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"
-  >     
+
+  <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>
+      <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>
+      <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>
+    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>	
+    <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.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>
+    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" />             
+    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>

Modified: portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/portal-url-generation.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/portal-url-generation.xml?rev=646449&r1=646448&r2=646449&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/portal-url-generation.xml (original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/portal-url-generation.xml Wed Apr  9 10:54:56 2008
@@ -1,99 +1,114 @@
 <?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.
+  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 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">
-    
-  <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>  
+<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">
+
+  <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.SessionFullExtendedNavigationalState"
-       scope="prototype"
-  >  	 
-       <constructor-arg index='0'><ref bean="NavigationalStateCodec"/></constructor-arg>
-       <constructor-arg index='1'>
-        	<ref bean="portletContentCache"/>
-       </constructor-arg>       
-       <constructor-arg index='2'>
-        	<ref bean="decorationContentCache"/>
-       </constructor-arg>
-       <!--
-        JS2-806 
-           - set this to true along with PageHistoryValve will enable clearing the mode and window state of
-            all portlets in the current page request.
-           - setting this to false effectively disables this, and reverts to the default 
-             SessionFullNavigationalState object behaviour
-        -->
-       <constructor-arg index='3'>
-            <value>false</value>
-       </constructor-arg>
+  <bean id="NavigationalState" class="org.apache.jetspeed.container.state.impl.SessionFullExtendedNavigationalState"
+    scope="prototype">
+    <constructor-arg index='0'>
+      <ref bean="NavigationalStateCodec" />
+    </constructor-arg>
+    <constructor-arg index='1'>
+      <ref bean="portletContentCache" />
+    </constructor-arg>
+    <constructor-arg index='2'>
+      <ref bean="decorationContentCache" />
+    </constructor-arg>
+    <!--
+      JS2-806 
+      - set this to true along with PageHistoryValve will enable clearing the mode and window state of
+      all portlets in the current page request.
+      - setting this to false effectively disables this, and reverts to the default 
+      SessionFullNavigationalState object behaviour
+    -->
+    <constructor-arg index='3'>
+      <value>false</value>
+    </constructor-arg>
   </bean>
-  
+
   <!-- PortalURL we are currently using -->
-  <bean id="PortalURL" 
-  	   class="org.apache.jetspeed.container.url.impl.PathInfoEncodingPortalURL"
-       scope="prototype"
-  >  	 
-       <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 id="PortalURL" class="org.apache.jetspeed.container.url.impl.PathInfoEncodingPortalURL" scope="prototype">
+    <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"
-       scope="prototype"
-  >  	 
-       <constructor-arg index='0'><ref bean="NavigationalState"/></constructor-arg>
-	   <constructor-arg index='1'><ref bean="PortalContext"/></constructor-arg>
-      <!-- jetspeed pipeline for desktop render -->
-       <constructor-arg index='2'><value>/render</value></constructor-arg>
-      <!-- jetspeed pipeline for desktop action -->      
-       <constructor-arg index='3'><value>/action</value></constructor-arg>      
-	   <!-- Uncomment this to HARD CODE your portal URL -->
-	   <!-- <constructor-arg><ref bean="BasePortalURL"/></constructor-arg>  -->
+  <bean id="DesktopPortalURL" class="org.apache.jetspeed.container.url.impl.DesktopEncodingPortalURL"
+    scope="prototype">
+    <constructor-arg index='0'>
+      <ref bean="NavigationalState" />
+    </constructor-arg>
+    <constructor-arg index='1'>
+      <ref bean="PortalContext" />
+    </constructor-arg>
+    <!-- jetspeed pipeline for desktop render -->
+    <constructor-arg index='2'>
+      <value>/render</value>
+    </constructor-arg>
+    <!-- jetspeed pipeline for desktop action -->
+    <constructor-arg index='3'>
+      <value>/action</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>	
+    <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 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>

Modified: portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/prefs.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/prefs.xml?rev=646449&r1=646448&r2=646449&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/prefs.xml (original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/prefs.xml Wed Apr  9 10:54:56 2008
@@ -1,67 +1,73 @@
 <?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.
+  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 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">
-    
-    <!-- Preferences Implementation -->
-    <bean id="PreferencesProviderImpl" class="org.apache.jetspeed.prefs.impl.PersistenceBrokerPreferencesProvider" name="prefsPersistenceBroker" init-method="init" destroy-method="destroy">
-        <constructor-arg index="0">
-            <value>JETSPEED-INF/ojb/prefs_repository.xml</value>
-        </constructor-arg>
-        <constructor-arg index="1">
-            <ref bean="preferencesCache" />
-        </constructor-arg>
-        <!-- list of portlet applications default preferences to preload, leave list empty to not preload -->
-        <constructor-arg index='2'>
-	    <list>
-    		<value>j2-admin</value>
-        </list>
-        </constructor-arg>
-        <!--  preload ALL Entities: warning this can chew up lots of memory -->
-        <constructor-arg index='3'><value type="boolean">false</value></constructor-arg>        
-    </bean>
+<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">
 
-    <bean id="org.apache.jetspeed.prefs.PreferencesProvider" parent="baseTransactionProxy" name="prefsProvider" destroy-method="destroy">
-        <property name="proxyInterfaces">
-            <value>org.apache.jetspeed.prefs.PreferencesProvider</value>
-        </property>
+  <!-- Preferences Implementation -->
+  <bean id="PreferencesProviderImpl" class="org.apache.jetspeed.prefs.impl.PersistenceBrokerPreferencesProvider"
+    name="prefsPersistenceBroker" init-method="init" destroy-method="destroy">
+    <constructor-arg index="0">
+      <value>JETSPEED-INF/ojb/prefs_repository.xml</value>
+    </constructor-arg>
+    <constructor-arg index="1">
+      <ref bean="preferencesCache" />
+    </constructor-arg>
+    <!-- list of portlet applications default preferences to preload, leave list empty to not preload -->
+    <constructor-arg index='2'>
+      <list>
+        <value>j2-admin</value>
+      </list>
+    </constructor-arg>
+    <!--  preload ALL Entities: warning this can chew up lots of memory -->
+    <constructor-arg index='3'>
+      <value type="boolean">false</value>
+    </constructor-arg>
+  </bean>
 
-        <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>
+  <bean id="org.apache.jetspeed.prefs.PreferencesProvider" parent="baseTransactionProxy" name="prefsProvider"
+    destroy-method="destroy">
+    <property name="proxyInterfaces">
+      <value>org.apache.jetspeed.prefs.PreferencesProvider</value>
+    </property>
 
-    <!-- PreferencesFactory implementation -->
-    <bean id="java.util.prefs.PreferencesFactory" class="org.apache.jetspeed.prefs.impl.PreferencesFactoryImpl" name="prefsFactory" init-method="init" destroy-method="destroy">
-        <!-- dummy constructor argument to distinguish it from the default constructor invoked by the Java Preferences itself --> 
-        <constructor-arg><value>1</value></constructor-arg>
-        <property name="prefsProvider">
-            <ref bean="prefsProvider" />
-        </property>
-    </bean>
+    <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" destroy-method="destroy">
+    <!-- dummy constructor argument to distinguish it from the default constructor invoked by the Java Preferences itself -->
+    <constructor-arg>
+      <value>1</value>
+    </constructor-arg>
+    <property name="prefsProvider">
+      <ref bean="prefsProvider" />
+    </property>
+  </bean>
 
 </beans>

Modified: portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/profiler.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/profiler.xml?rev=646449&r1=646448&r2=646449&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/profiler.xml (original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/profiler.xml Wed Apr  9 10:54:56 2008
@@ -1,186 +1,192 @@
 <?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.
+  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 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">
-    
-    <!-- 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'>
-      <!--  use the dot prefix, for ex: "accounting.xyz.com" returns "accounting" -->
-      <constructor-arg type="boolean" index="0">
-            <value>false</value> 
-        </constructor-arg>    	
-    </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" scope="prototype"></bean>
-
-	<!-- Fallback Profiler -->
-    <bean id="RoleFallbackProfilingRule" class="org.apache.jetspeed.profiler.rules.impl.RoleFallbackProfilingRule" scope="prototype"></bean>
-
-	<!-- Locator -->
-    <bean id="ProfileLocator" class="org.apache.jetspeed.profiler.impl.JetspeedProfileLocator" scope="prototype"></bean>
-
-	<!-- Principal Rule -->
-    <bean id="PrincipalRule" class="org.apache.jetspeed.profiler.rules.impl.PrincipalRuleImpl" scope="prototype"></bean>
-
-
-	<!-- Rule Criterion -->
-    <bean id="RuleCriterion" class="org.apache.jetspeed.profiler.rules.impl.RuleCriterionImpl" scope="prototype"></bean>
-    
+<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">
+
+  <!-- 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'>
+    <!--  use the dot prefix, for ex: "accounting.xyz.com" returns "accounting" -->
+    <constructor-arg type="boolean" index="0">
+      <value>false</value>
+    </constructor-arg>
+  </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"
+    scope="prototype">
+  </bean>
+
+  <!-- Fallback Profiler -->
+  <bean id="RoleFallbackProfilingRule" class="org.apache.jetspeed.profiler.rules.impl.RoleFallbackProfilingRule"
+    scope="prototype">
+  </bean>
+
+  <!-- Locator -->
+  <bean id="ProfileLocator" class="org.apache.jetspeed.profiler.impl.JetspeedProfileLocator" scope="prototype"></bean>
+
+  <!-- Principal Rule -->
+  <bean id="PrincipalRule" class="org.apache.jetspeed.profiler.rules.impl.PrincipalRuleImpl" scope="prototype"></bean>
+
+
+  <!-- Rule Criterion -->
+  <bean id="RuleCriterion" class="org.apache.jetspeed.profiler.rules.impl.RuleCriterionImpl" scope="prototype"></bean>
+
 </beans>

Modified: portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/registry.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/registry.xml?rev=646449&r1=646448&r2=646449&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/registry.xml (original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/registry.xml Wed Apr  9 10:54:56 2008
@@ -1,146 +1,161 @@
 <?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.
+  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 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">
-    
-    <!-- Portlet Factory -->
-    <bean id="portletFactory" class="org.apache.jetspeed.factory.JetspeedPortletFactory">
-        <!-- If the following constructor-arg is set to true, 
-        proxy instances will switch config mode to built-in custom config mode portlet. -->
-        <constructor-arg index="0">
-            <value>${supported.portletmode.autoswitch.config}</value>
-        </constructor-arg>
-        <!-- If the following constructor-arg is set to true, 
-        proxy instances will switch edit_defaults mode to edit mode automatically for portlets not supporting edit_defaults mode. -->
-        <constructor-arg index="1">
-            <value>${supported.portletmode.autoswitch.edit_defaults}</value>
-        </constructor-arg>
-        <!-- Surrogate portlet for config modes. -->
-        <property name="customConfigModePortletUniqueName">
-            <value>${supported.portletmode.autoswitch.config.surrogate.portlet}</value>
-        </property>
-    </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>
+<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">
 
+  <!-- Portlet Factory -->
+  <bean id="portletFactory" class="org.apache.jetspeed.factory.JetspeedPortletFactory">
+    <!-- If the following constructor-arg is set to true, 
+      proxy instances will switch config mode to built-in custom config mode portlet. -->
+    <constructor-arg index="0">
+      <value>${supported.portletmode.autoswitch.config}</value>
+    </constructor-arg>
+    <!-- If the following constructor-arg is set to true, 
+      proxy instances will switch edit_defaults mode to edit mode automatically for portlets not supporting edit_defaults mode. -->
+    <constructor-arg index="1">
+      <value>${supported.portletmode.autoswitch.edit_defaults}</value>
+    </constructor-arg>
+    <!-- Surrogate portlet for config modes. -->
+    <property name="customConfigModePortletUniqueName">
+      <value>${supported.portletmode.autoswitch.config.surrogate.portlet}</value>
+    </property>
+  </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>
+      <ref bean="org.apache.jetspeed.page.PageManager" />
+    </constructor-arg>
+    <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>
     <!--
-        - 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.
+      <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>
 
-    <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>
-            <ref bean="org.apache.jetspeed.page.PageManager" />
-        </constructor-arg>
-        <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>
+    <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>

Modified: portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/request-context-objects.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/request-context-objects.xml?rev=646449&r1=646448&r2=646449&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/request-context-objects.xml (original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/request-context-objects.xml Wed Apr  9 10:54:56 2008
@@ -1,37 +1,36 @@
 <?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.
+  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 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">
-    
-    <!--  Request Context Objects will be populated into the Jetspeed Request Context
-          and are accessible in the vm context of templates in the "rco" variable, example:
-          $rco.get("myObject") 
-      -->
-    <bean id="RequestContextObjects" class="java.util.HashMap">
-        <constructor-arg index="0">
-            <map>
-            <!-- 
-                <entry key="myObject">
-                    <ref bean="org.me.MyObject" />
-                </entry>
-               -->  
-            </map>
-        </constructor-arg>
-    </bean>
+<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">
+
+  <!--  Request Context Objects will be populated into the Jetspeed Request Context
+    and are accessible in the vm context of templates in the "rco" variable, example:
+    $rco.get("myObject") 
+  -->
+  <bean id="RequestContextObjects" class="java.util.HashMap">
+    <constructor-arg index="0">
+      <map>
+        <!-- 
+          <entry key="myObject">
+          <ref bean="org.me.MyObject" />
+          </entry>
+        -->
+      </map>
+    </constructor-arg>
+  </bean>
 </beans>

Modified: portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/search.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/search.xml?rev=646449&r1=646448&r2=646449&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/search.xml (original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/search.xml Wed Apr  9 10:54:56 2008
@@ -1,45 +1,54 @@
 <?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.
+  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 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">
-    
+<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">
+
   <!--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 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 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>

Modified: portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/security-atn.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/security-atn.xml?rev=646449&r1=646448&r2=646449&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/security-atn.xml (original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/security-atn.xml Wed Apr  9 10:54:56 2008
@@ -1,33 +1,35 @@
 <?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.
+  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 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">
-    
+<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">
+
   <!-- ************** 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 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>

Modified: portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/security-atz.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/security-atz.xml?rev=646449&r1=646448&r2=646449&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/security-atz.xml (original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/security-atz.xml Wed Apr  9 10:54:56 2008
@@ -1,29 +1,28 @@
 <?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.
+  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 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">
-    
+<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">
+
   <!-- 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 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>

Modified: portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/security-managers.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/security-managers.xml?rev=646449&r1=646448&r2=646449&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/security-managers.xml (original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/security-managers.xml Wed Apr  9 10:54:56 2008
@@ -1,68 +1,66 @@
 <?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.
+  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 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">
-    
+<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">
+
   <!-- 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 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>   
+
+  <!-- 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 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>
+  <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>



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