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 [1/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
Author: ate
Date: Wed Apr  9 10:54:56 2008
New Revision: 646449

URL: http://svn.apache.org/viewvc?rev=646449&view=rev
Log:
Formatted all Spring xml configuration files using default indent=2
*no* configuration changes

Modified:
    portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/administration.xml
    portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/aggregation.xml
    portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/ajax-layout.xml
    portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/ajax.xml
    portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/alternate/db-page-manager.xml
    portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/alternate/extended-pipelines.xml
    portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/alternate/interceptors.xml
    portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/alternate/jetty-override.xml
    portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/alternate/request-context.xml
    portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/alternate/seed-registry.xml
    portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/alternate/versioned-deployment/deployment.xml
    portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/alternate/versioned-deployment/jetspeed-services.xml
    portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/boot/datasource.xml
    portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/cache.xml
    portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/capabilities.xml
    portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/cluster-node.xml
    portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/deployment.xml
    portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/desktop.xml
    portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/headtag.xml
    portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/hierarchical-principal-names.xml
    portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/importer-page-manager.xml
    portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/jetspeed-base.xml
    portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/jetspeed-production.xml
    portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/jetspeed-services.xml
    portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/jetspeed-spring.xml
    portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/multiple-action.xml
    portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/page-manager.xml
    portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/pipelines.xml
    portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/pluto-factories.xml
    portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/portal-url-generation.xml
    portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/prefs.xml
    portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/profiler.xml
    portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/registry.xml
    portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/request-context-objects.xml
    portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/search.xml
    portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/security-atn.xml
    portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/security-atz.xml
    portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/security-managers.xml
    portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/security-providers.xml
    portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/security-spi-atn.xml
    portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/security-spi-atz.xml
    portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/security-spi.xml
    portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/serializer.xml
    portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/sso.xml
    portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/statistics.xml
    portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/theme-engine.xml
    portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/transaction.xml
    portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/userinfo.xml
    portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/wps.xml

Modified: portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/administration.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/administration.xml?rev=646449&r1=646448&r2=646449&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/administration.xml (original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/administration.xml Wed Apr  9 10:54:56 2008
@@ -1,144 +1,155 @@
 <?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="mailSender" class="org.springframework.mail.javamail.JavaMailSenderImpl">
-    <property name="host"><value>localhost</value></property>
-    <property name="username"><value></value></property>
-    <property name="password"><value></value></property>
-      <property name="javaMailProperties">
-          <props>
-              <prop key="mail.smtp.auth">false</prop>
-          </props>
-      </property>
+<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="mailSender" class="org.springframework.mail.javamail.JavaMailSenderImpl">
+    <property name="host">
+      <value>localhost</value>
+    </property>
+    <property name="username">
+      <value></value>
+    </property>
+    <property name="password">
+      <value></value>
+    </property>
+    <property name="javaMailProperties">
+      <props>
+        <prop key="mail.smtp.auth">false</prop>
+      </props>
+    </property>
   </bean>
-  
-<bean id="adminVelocityEngine" class="org.springframework.ui.velocity.VelocityEngineFactoryBean">
-    <property name="resourceLoaderPath"><value>/WEB-INF/templates/</value></property>
+
+  <bean id="adminVelocityEngine" class="org.springframework.ui.velocity.VelocityEngineFactoryBean">
+    <property name="resourceLoaderPath">
+      <value>/WEB-INF/templates/</value>
+    </property>
     <property name="velocityProperties">
       <props>
         <!-- use webapp-logging CommonsLoggingLog4JLogSystem for logging through IsolatedLog4JLogger -->
-        <prop key="runtime.log.logsystem.class">org.apache.jetspeed.webapp.logging.velocity.CommonsLoggingLog4JLogSystem</prop>
+        <prop key="runtime.log.logsystem.class">
+          org.apache.jetspeed.webapp.logging.velocity.CommonsLoggingLog4JLogSystem
+        </prop>
         <prop key="runtime.log.logsystem.log4j.category">velocity</prop>
         <!-- clear out default global VM_global_library.vm leading to ERROR logging because its not available -->
         <prop key="velocimacro.library"></prop>
       </props>
     </property>
     <!--  use our own CommonsLoggingLog4JLogSystem specified above, not the default one provided by Spring -->
-    <property name="overrideLogging"><value>false</value></property>
-</bean>
-  
-<bean id='PortalAdministrationImpl' init-method="start"
-      class='org.apache.jetspeed.administration.PortalAdministrationImpl'>
-    	<constructor-arg index='0'>
-    		<ref bean="org.apache.jetspeed.security.UserManager"/>
-    	</constructor-arg>
-        <constructor-arg index='1'>
-    		<ref bean="org.apache.jetspeed.security.RoleManager"/>
-    	</constructor-arg>
-        <constructor-arg index='2'>
-    		<ref bean="org.apache.jetspeed.security.GroupManager"/>
-    	</constructor-arg>
-        <constructor-arg index='3'>
-    		<ref bean="org.apache.jetspeed.page.PageManager"/>
-    	</constructor-arg>
-        <constructor-arg index='4'>
-    		<ref bean="org.apache.jetspeed.prefs.PreferencesProvider"/>
-    	</constructor-arg>        
-        <constructor-arg index='5'>
-    		<ref bean="org.apache.jetspeed.profiler.Profiler"/>
-    	</constructor-arg>
-        <constructor-arg index='6'>
-    		<ref bean="mailSender"/>
-    	</constructor-arg>
-        <constructor-arg index='7'>
-    		<ref bean="adminVelocityEngine"/>
-    	</constructor-arg>                                                            
-</bean>
-    
-<bean id="PortalAdministration" parent="baseTransactionProxy">
-        <property name="proxyInterfaces">
-            <value>org.apache.jetspeed.administration.PortalAdministration</value>
-        </property>
-
-        <property name="target">
-            <ref bean="PortalAdministrationImpl" />
-        </property>
-        <property name="transactionAttributes">
-            <props>
-                <prop key="register*">PROPAGATION_REQUIRED,-org.apache.jetspeed.administration.RegistrationException</prop>
-            </props>
-        </property>
-</bean>
-
-<bean id="org.apache.jetspeed.security.SecurityAccessController"
-      class='org.apache.jetspeed.security.impl.SecurityAccessControllerImpl'>
-    	<constructor-arg index='0'>
-    		<ref bean="org.apache.jetspeed.page.PageManager"/> 
-    	</constructor-arg>
-    	<!--
-    	   Security Mode:
-    	      1 = Permissions = use Jetspeed Java Security Policy
-    	      2 = Constraints = use Jetspeed (PageManager) Constraint-based Security  
-    	 -->
-    	 <constructor-arg index="1">
-            <value>2</value>
-        </constructor-arg>
-</bean>
-    
-<bean id='org.apache.jetspeed.administration.PortalAuthenticationConfiguration'
-	class='org.apache.jetspeed.administration.PortalAuthenticationConfigurationImpl'>
-
-   <!--  create new session upon authentication -->   
-   <constructor-arg index='0'>
-   		<value>false</value>
-   </constructor-arg>	
-   <!--  hard session timeout limit in seconds, regardless of (in)activity, setting to 0 turns off this feature 
-   		 note:this feature should be used with 'create new session upon authentication' feature 
-   -->   
-   <constructor-arg index='1'>
-   		<value>0</value>
-   </constructor-arg>
-   <!--  redirect location for hard session expiration -->   
-   <constructor-arg index='2'>
-   		<value>/login/logout</value>
-   </constructor-arg>
-</bean>    
+    <property name="overrideLogging">
+      <value>false</value>
+    </property>
+  </bean>
+
+  <bean id='PortalAdministrationImpl' init-method="start"
+    class='org.apache.jetspeed.administration.PortalAdministrationImpl'>
+    <constructor-arg index='0'>
+      <ref bean="org.apache.jetspeed.security.UserManager" />
+    </constructor-arg>
+    <constructor-arg index='1'>
+      <ref bean="org.apache.jetspeed.security.RoleManager" />
+    </constructor-arg>
+    <constructor-arg index='2'>
+      <ref bean="org.apache.jetspeed.security.GroupManager" />
+    </constructor-arg>
+    <constructor-arg index='3'>
+      <ref bean="org.apache.jetspeed.page.PageManager" />
+    </constructor-arg>
+    <constructor-arg index='4'>
+      <ref bean="org.apache.jetspeed.prefs.PreferencesProvider" />
+    </constructor-arg>
+    <constructor-arg index='5'>
+      <ref bean="org.apache.jetspeed.profiler.Profiler" />
+    </constructor-arg>
+    <constructor-arg index='6'>
+      <ref bean="mailSender" />
+    </constructor-arg>
+    <constructor-arg index='7'>
+      <ref bean="adminVelocityEngine" />
+    </constructor-arg>
+  </bean>
+
+  <bean id="PortalAdministration" parent="baseTransactionProxy">
+    <property name="proxyInterfaces">
+      <value>org.apache.jetspeed.administration.PortalAdministration</value>
+    </property>
+
+    <property name="target">
+      <ref bean="PortalAdministrationImpl" />
+    </property>
+    <property name="transactionAttributes">
+      <props>
+        <prop key="register*">PROPAGATION_REQUIRED,-org.apache.jetspeed.administration.RegistrationException</prop>
+      </props>
+    </property>
+  </bean>
 
-<bean id='org.apache.jetspeed.security.activeauthentication.ActiveAuthenticationIdentityProvider'
-	class='org.apache.jetspeed.security.activeauthentication.ActiveAuthenticationIdentityProviderImpl'>
+  <bean id="org.apache.jetspeed.security.SecurityAccessController"
+    class='org.apache.jetspeed.security.impl.SecurityAccessControllerImpl'>
+    <constructor-arg index='0'>
+      <ref bean="org.apache.jetspeed.page.PageManager" />
+    </constructor-arg>
+    <!--
+      Security Mode:
+      1 = Permissions = use Jetspeed Java Security Policy
+      2 = Constraints = use Jetspeed (PageManager) Constraint-based Security  
+    -->
+    <constructor-arg index="1">
+      <value>2</value>
+    </constructor-arg>
+  </bean>
+
+  <bean id='org.apache.jetspeed.administration.PortalAuthenticationConfiguration'
+    class='org.apache.jetspeed.administration.PortalAuthenticationConfigurationImpl'>
+
+    <!--  create new session upon authentication -->
+    <constructor-arg index='0'>
+      <value>false</value>
+    </constructor-arg>
+    <!--  hard session timeout limit in seconds, regardless of (in)activity, setting to 0 turns off this feature 
+      note:this feature should be used with 'create new session upon authentication' feature 
+    -->
+    <constructor-arg index='1'>
+      <value>0</value>
+    </constructor-arg>
+    <!--  redirect location for hard session expiration -->
+    <constructor-arg index='2'>
+      <value>/login/logout</value>
+    </constructor-arg>
+  </bean>
+
+  <bean id='org.apache.jetspeed.security.activeauthentication.ActiveAuthenticationIdentityProvider'
+    class='org.apache.jetspeed.security.activeauthentication.ActiveAuthenticationIdentityProviderImpl'>
     <constructor-arg index="0">
-        <ref bean="activeAuthenticationCache" />
+      <ref bean="activeAuthenticationCache" />
     </constructor-arg>
     <!--  list of session attribute names that should be saved and restored upon authentication events -->
-    <constructor-arg>    
-    <list>
-    	<value>org.apache.jetspeed.login.username</value>
-    	<value>org.apache.jetspeed.login.password</value>
-    	<value>org.apache.jetspeed.login.destination</value>
-    	<value>org.apache.jetspeed.login.retrycount</value>
-    	<value>org.apache.jetspeed.login.errorcode</value>
-    	<value>org.apache.jetspeed.login.check</value>    
-    	<value>org.apache.jetspeed.theme.override</value>	
-    </list>    
+    <constructor-arg>
+      <list>
+        <value>org.apache.jetspeed.login.username</value>
+        <value>org.apache.jetspeed.login.password</value>
+        <value>org.apache.jetspeed.login.destination</value>
+        <value>org.apache.jetspeed.login.retrycount</value>
+        <value>org.apache.jetspeed.login.errorcode</value>
+        <value>org.apache.jetspeed.login.check</value>
+        <value>org.apache.jetspeed.theme.override</value>
+      </list>
     </constructor-arg>
-</bean>    
+  </bean>
 
 </beans>

Modified: portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/aggregation.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/aggregation.xml?rev=646449&r1=646448&r2=646449&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/aggregation.xml (original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/aggregation.xml Wed Apr  9 10:54:56 2008
@@ -1,165 +1,167 @@
 <?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="org.apache.jetspeed.aggregator.PortletTrackingManager" class="org.apache.jetspeed.aggregator.impl.PortletTrackingManagerImpl">          
-        <constructor-arg index='0'>
-           <ref bean="PortletWindowAccessor"/>
- 	    </constructor-arg>
-       <!-- Default portlet timeout in milliseconds:
-        Zero means no portlet timeout option by default.
-        -->        
-        <constructor-arg index='1'>
-            <value>0</value>
-        </constructor-arg>        
-        <!--  Out of service limit, if a portlet entity times out past its limit (or default limit) n consecutive times, it is taken out of service -->
-       <constructor-arg index="2">
-           <value>3</value>
-       </constructor-arg>
-     </bean>
-       
-   
-  <!-- Aggregation: Portlet -->
-    <bean id="org.apache.jetspeed.aggregator.PortletAggregator" class="org.apache.jetspeed.aggregator.impl.PortletAggregatorImpl">
-        <constructor-arg>
-            <ref bean="org.apache.jetspeed.aggregator.PortletRenderer" />
-        </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.aggregator.PortletAggregatorTitleInHeader" class="org.apache.jetspeed.aggregator.impl.PortletAggregatorImpl">
-        <constructor-arg>
-            <ref bean="org.apache.jetspeed.aggregator.PortletRendererWithTitleHeader" />
-        </constructor-arg>
-    </bean>
+  <bean id="org.apache.jetspeed.aggregator.PortletTrackingManager"
+    class="org.apache.jetspeed.aggregator.impl.PortletTrackingManagerImpl">
+    <constructor-arg index='0'>
+      <ref bean="PortletWindowAccessor" />
+    </constructor-arg>
+    <!-- Default portlet timeout in milliseconds:
+      Zero means no portlet timeout option by default.
+    -->
+    <constructor-arg index='1'>
+      <value>0</value>
+    </constructor-arg>
+    <!--  Out of service limit, if a portlet entity times out past its limit (or default limit) n consecutive times, it is taken out of service -->
+    <constructor-arg index="2">
+      <value>3</value>
+    </constructor-arg>
+  </bean>
 
-    <!-- Portlet Renderer -->
-    <bean id="org.apache.jetspeed.aggregator.PortletRenderer" class="org.apache.jetspeed.aggregator.impl.PortletRendererImpl" init-method="start"
-        destroy-method="stop">
-        <constructor-arg>
-            <ref bean="org.apache.pluto.PortletContainer" />
-        </constructor-arg>
-        <constructor-arg>
-            <ref bean="org.apache.jetspeed.container.window.PortletWindowAccessor" />
-        </constructor-arg>
-        <constructor-arg>
-            <ref bean="org.apache.jetspeed.aggregator.WorkerMonitor" />
-        </constructor-arg>        
-        <constructor-arg>
-            <ref bean="PortalStatistics" />
-        </constructor-arg>                        
-        <constructor-arg>
-            <ref bean="org.apache.pluto.services.title.DynamicTitleService" />
-        </constructor-arg>
-        <constructor-arg>
-            <ref bean="org.apache.jetspeed.aggregator.PortletTrackingManager" />
-        </constructor-arg>
-        <!-- flag indicating whether to check jetspeed-portlet.xml security constraints
-             before rendering a portlet. If security check fails, do not display portlet content
-          -->
-        <constructor-arg type="boolean">
-            <value>false</value>
-        </constructor-arg>           
-        <constructor-arg>
-            <ref bean="org.apache.jetspeed.security.SecurityAccessController" />
-        </constructor-arg>             
-        <constructor-arg>
-        	<ref bean="portletContentCache"/>
-        </constructor-arg>
-    </bean>
 
-    <!-- Portlet Renderer w/title in http response header -->
-    <bean id="org.apache.jetspeed.aggregator.PortletRendererWithTitleHeader" class="org.apache.jetspeed.aggregator.impl.PortletRendererImpl" init-method="start"
-        destroy-method="stop">
-        <constructor-arg>
-            <ref bean="org.apache.pluto.PortletContainer" />
-        </constructor-arg>
-        <constructor-arg>
-            <ref bean="org.apache.jetspeed.container.window.PortletWindowAccessor" />
-        </constructor-arg>
-        <constructor-arg>
-            <ref bean="org.apache.jetspeed.aggregator.WorkerMonitor" />
-        </constructor-arg>        
-        <constructor-arg>
-            <ref bean="PortalStatistics" />
-        </constructor-arg>
-        <constructor-arg>
-            <ref bean="org.apache.pluto.services.title.DynamicTitleService" />
-        </constructor-arg>
-        <constructor-arg>
-            <ref bean="org.apache.jetspeed.aggregator.PortletTrackingManager" />
-        </constructor-arg>
-        <!-- flag indicating whether to check jetspeed-portlet.xml security constraints
-             before rendering a portlet. If security check fails, do not display portlet content
-          -->
-        <constructor-arg type="boolean">
-            <value>true</value>
-        </constructor-arg>           
-        <constructor-arg>
-            <ref bean="org.apache.jetspeed.security.SecurityAccessController" />
-        </constructor-arg>             
-        <constructor-arg>
-        	<ref bean="portletContentCache"/>
-        </constructor-arg>
-        <constructor-arg type="boolean">
-            <value>true</value>   
-        </constructor-arg>       
-    </bean>
+  <!-- Aggregation: Portlet -->
+  <bean id="org.apache.jetspeed.aggregator.PortletAggregator"
+    class="org.apache.jetspeed.aggregator.impl.PortletAggregatorImpl">
+    <constructor-arg>
+      <ref bean="org.apache.jetspeed.aggregator.PortletRenderer" />
+    </constructor-arg>
+  </bean>
+
+  <bean id="org.apache.jetspeed.aggregator.PortletAggregatorTitleInHeader"
+    class="org.apache.jetspeed.aggregator.impl.PortletAggregatorImpl">
+    <constructor-arg>
+      <ref bean="org.apache.jetspeed.aggregator.PortletRendererWithTitleHeader" />
+    </constructor-arg>
+  </bean>
+
+  <!-- Portlet Renderer -->
+  <bean id="org.apache.jetspeed.aggregator.PortletRenderer"
+    class="org.apache.jetspeed.aggregator.impl.PortletRendererImpl" init-method="start" destroy-method="stop">
+    <constructor-arg>
+      <ref bean="org.apache.pluto.PortletContainer" />
+    </constructor-arg>
+    <constructor-arg>
+      <ref bean="org.apache.jetspeed.container.window.PortletWindowAccessor" />
+    </constructor-arg>
+    <constructor-arg>
+      <ref bean="org.apache.jetspeed.aggregator.WorkerMonitor" />
+    </constructor-arg>
+    <constructor-arg>
+      <ref bean="PortalStatistics" />
+    </constructor-arg>
+    <constructor-arg>
+      <ref bean="org.apache.pluto.services.title.DynamicTitleService" />
+    </constructor-arg>
+    <constructor-arg>
+      <ref bean="org.apache.jetspeed.aggregator.PortletTrackingManager" />
+    </constructor-arg>
+    <!-- flag indicating whether to check jetspeed-portlet.xml security constraints
+      before rendering a portlet. If security check fails, do not display portlet content
+    -->
+    <constructor-arg type="boolean">
+      <value>false</value>
+    </constructor-arg>
+    <constructor-arg>
+      <ref bean="org.apache.jetspeed.security.SecurityAccessController" />
+    </constructor-arg>
+    <constructor-arg>
+      <ref bean="portletContentCache" />
+    </constructor-arg>
+  </bean>
+
+  <!-- Portlet Renderer w/title in http response header -->
+  <bean id="org.apache.jetspeed.aggregator.PortletRendererWithTitleHeader"
+    class="org.apache.jetspeed.aggregator.impl.PortletRendererImpl" init-method="start" destroy-method="stop">
+    <constructor-arg>
+      <ref bean="org.apache.pluto.PortletContainer" />
+    </constructor-arg>
+    <constructor-arg>
+      <ref bean="org.apache.jetspeed.container.window.PortletWindowAccessor" />
+    </constructor-arg>
+    <constructor-arg>
+      <ref bean="org.apache.jetspeed.aggregator.WorkerMonitor" />
+    </constructor-arg>
+    <constructor-arg>
+      <ref bean="PortalStatistics" />
+    </constructor-arg>
+    <constructor-arg>
+      <ref bean="org.apache.pluto.services.title.DynamicTitleService" />
+    </constructor-arg>
+    <constructor-arg>
+      <ref bean="org.apache.jetspeed.aggregator.PortletTrackingManager" />
+    </constructor-arg>
+    <!-- flag indicating whether to check jetspeed-portlet.xml security constraints
+      before rendering a portlet. If security check fails, do not display portlet content
+    -->
+    <constructor-arg type="boolean">
+      <value>true</value>
+    </constructor-arg>
+    <constructor-arg>
+      <ref bean="org.apache.jetspeed.security.SecurityAccessController" />
+    </constructor-arg>
+    <constructor-arg>
+      <ref bean="portletContentCache" />
+    </constructor-arg>
+    <constructor-arg type="boolean">
+      <value>true</value>
+    </constructor-arg>
+  </bean>
+
+  <bean id="org.apache.jetspeed.aggregator.PageAggregator"
+    class="org.apache.jetspeed.aggregator.impl.PageAggregatorImpl">
+    <constructor-arg index="0">
+      <ref bean="org.apache.jetspeed.aggregator.PortletRenderer" />
+    </constructor-arg>
+  </bean>
+
+  <bean id="org.apache.jetspeed.aggregator.AsyncPageAggregator"
+    class="org.apache.jetspeed.aggregator.impl.AsyncPageAggregatorImpl">
+    <constructor-arg index='0'>
+      <ref bean="org.apache.jetspeed.aggregator.PortletRenderer" />
+    </constructor-arg>
+  </bean>
+
+  <!-- The default Worker Monitor -->
+  <bean id="org.apache.jetspeed.aggregator.WorkerMonitor" class="org.apache.jetspeed.aggregator.impl.WorkerMonitorImpl"
+    init-method="start" destroy-method="stop">
+
+    <constructor-arg index="0">
+      <!-- Minimum number of workers to create -->
+      <value>5</value>
+    </constructor-arg>
+    <constructor-arg index="1">
+      <!-- Maximum number of workers to create -->
+      <value>50</value>
+    </constructor-arg>
+    <constructor-arg index="2">
+      <!-- Spare number of workers to create -->
+      <value>3</value>
+    </constructor-arg>
+    <constructor-arg index="3">
+      <!-- Maximum number of jobs processed by a worker before being released -->
+      <value>3</value>
+    </constructor-arg>
 
-    <bean id="org.apache.jetspeed.aggregator.PageAggregator" class="org.apache.jetspeed.aggregator.impl.PageAggregatorImpl">
-        <constructor-arg index="0">
-            <ref bean="org.apache.jetspeed.aggregator.PortletRenderer" />
-        </constructor-arg>
-    </bean>
+  </bean>
 
-    <bean id="org.apache.jetspeed.aggregator.AsyncPageAggregator" 
-          class="org.apache.jetspeed.aggregator.impl.AsyncPageAggregatorImpl">
-        <constructor-arg index='0'>
-            <ref bean="org.apache.jetspeed.aggregator.PortletRenderer" />
-        </constructor-arg>
-    </bean>
-    
-    <!-- The default Worker Monitor -->
-    <bean id="org.apache.jetspeed.aggregator.WorkerMonitor"
-          class="org.apache.jetspeed.aggregator.impl.WorkerMonitorImpl"
-          init-method="start"  destroy-method="stop" >
-
-        <constructor-arg index="0">
-            <!-- Minimum number of workers to create -->
-            <value>5</value>            
-        </constructor-arg>          
-        <constructor-arg index="1">
-            <!-- Maximum number of workers to create -->
-            <value>50</value>            
-        </constructor-arg>          
-        <constructor-arg index="2">
-            <!-- Spare number of workers to create -->
-            <value>3</value>            
-        </constructor-arg>          
-        <constructor-arg index="3">
-            <!-- Maximum number of jobs processed by a worker before being released -->
-            <value>3</value>            
-        </constructor-arg>          
-          
-    </bean>
-    
-    <!--
+  <!--
     Commonj Work Manager and Worker Monitor
     
     If you want to use Commonj Work Manager provided by the container, uncomment the followings
@@ -172,75 +174,75 @@
     This flag is meaningful only when the second constructor-arg is set to false, and by default this flag is set to true. 
     If it is set to false, then it does not wait for the timeout rendering works without interruption.
     On most platforms such as WebSphere or WebLogic, the default flag options (true, true) will be fine.
-    -->
-    
-    <!--
+  -->
+
+  <!--
     <bean id="JetspeedWorkManager" class="org.springframework.jndi.JndiObjectFactoryBean">
-        <property name="resourceRef"><value>false</value></property> 
-        <property name="jndiName">
-            <value>java:comp/env/wm/jetspeed</value>
-        </property>
+    <property name="resourceRef"><value>false</value></property> 
+    <property name="jndiName">
+    <value>java:comp/env/wm/jetspeed</value>
+    </property>
     </bean>
     <bean id="org.apache.jetspeed.aggregator.CommonjWorkerMonitor"
-          class="org.apache.jetspeed.aggregator.impl.CommonjWorkerMonitorImpl"
-          init-method="start"  destroy-method="stop" >
-        <constructor-arg index="0">
-            <ref bean="JetspeedWorkManager" />           
-        </constructor-arg>
-    </bean>
-    -->
-
-    <bean id="HeaderAggregatorPortal" class="org.apache.jetspeed.aggregator.impl.HeaderAggregatorImpl">
-        <constructor-arg index="0">
-            <ref bean="portletFactory" />
-        </constructor-arg>
-        <constructor-arg index="1">
-            <ref bean="PortletWindowAccessor"/>
-        </constructor-arg>
-        <constructor-arg index="2">
-            <ref bean="org.apache.jetspeed.headerresource.HeaderResourceFactory" />
-        </constructor-arg>
-        <constructor-arg index="3" type="boolean">
-            <value>false</value>   <!-- isDesktop == false -->
-        </constructor-arg>
-        <constructor-arg index="4">
-            <ref bean="HeaderResourceConfigurationPortal"/>
-        </constructor-arg>
-        <constructor-arg index="5">
-            <ref bean="HeaderResourceRegistry"/>
-        </constructor-arg>
-        <constructor-arg index="6">
-            <ref bean="DecorationFactory"/>
-        </constructor-arg>
-        
-        <!-- Uncomment this to HARD CODE your portal URL -->
-        <!-- <constructor-arg><ref bean="BasePortalURL"/></constructor-arg>  -->
-    </bean>
-           
-    <bean id="HeaderAggregatorDesktop" class="org.apache.jetspeed.aggregator.impl.HeaderAggregatorImpl">
-        <constructor-arg index="0">
-            <ref bean="portletFactory" />
-        </constructor-arg>
-        <constructor-arg index="1">
-            <ref bean="PortletWindowAccessor"/>
-        </constructor-arg>
-        <constructor-arg index="2">
-            <ref bean="org.apache.jetspeed.headerresource.HeaderResourceFactory" />
-        </constructor-arg>
-        <constructor-arg index="3" type="boolean">
-            <value>true</value>   <!-- isDesktop == true -->
-        </constructor-arg>
-        <constructor-arg index="4">
-            <ref bean="HeaderResourceConfigurationDesktop"/>
-        </constructor-arg>
-        <constructor-arg index="5">
-            <ref bean="HeaderResourceRegistry"/>
-        </constructor-arg>
-        <constructor-arg index="6">
-            <ref bean="DecorationFactory"/>
-        </constructor-arg>
-        
-        <!-- Uncomment this to HARD CODE your portal URL -->
-        <!-- <constructor-arg><ref bean="BasePortalURL"/></constructor-arg>  -->
-    </bean>
+    class="org.apache.jetspeed.aggregator.impl.CommonjWorkerMonitorImpl"
+    init-method="start"  destroy-method="stop" >
+    <constructor-arg index="0">
+    <ref bean="JetspeedWorkManager" />           
+    </constructor-arg>
+    </bean>
+  -->
+
+  <bean id="HeaderAggregatorPortal" class="org.apache.jetspeed.aggregator.impl.HeaderAggregatorImpl">
+    <constructor-arg index="0">
+      <ref bean="portletFactory" />
+    </constructor-arg>
+    <constructor-arg index="1">
+      <ref bean="PortletWindowAccessor" />
+    </constructor-arg>
+    <constructor-arg index="2">
+      <ref bean="org.apache.jetspeed.headerresource.HeaderResourceFactory" />
+    </constructor-arg>
+    <constructor-arg index="3" type="boolean">
+      <value>false</value><!-- isDesktop == false -->
+    </constructor-arg>
+    <constructor-arg index="4">
+      <ref bean="HeaderResourceConfigurationPortal" />
+    </constructor-arg>
+    <constructor-arg index="5">
+      <ref bean="HeaderResourceRegistry" />
+    </constructor-arg>
+    <constructor-arg index="6">
+      <ref bean="DecorationFactory" />
+    </constructor-arg>
+
+    <!-- Uncomment this to HARD CODE your portal URL -->
+    <!-- <constructor-arg><ref bean="BasePortalURL"/></constructor-arg>  -->
+  </bean>
+
+  <bean id="HeaderAggregatorDesktop" class="org.apache.jetspeed.aggregator.impl.HeaderAggregatorImpl">
+    <constructor-arg index="0">
+      <ref bean="portletFactory" />
+    </constructor-arg>
+    <constructor-arg index="1">
+      <ref bean="PortletWindowAccessor" />
+    </constructor-arg>
+    <constructor-arg index="2">
+      <ref bean="org.apache.jetspeed.headerresource.HeaderResourceFactory" />
+    </constructor-arg>
+    <constructor-arg index="3" type="boolean">
+      <value>true</value><!-- isDesktop == true -->
+    </constructor-arg>
+    <constructor-arg index="4">
+      <ref bean="HeaderResourceConfigurationDesktop" />
+    </constructor-arg>
+    <constructor-arg index="5">
+      <ref bean="HeaderResourceRegistry" />
+    </constructor-arg>
+    <constructor-arg index="6">
+      <ref bean="DecorationFactory" />
+    </constructor-arg>
+
+    <!-- Uncomment this to HARD CODE your portal URL -->
+    <!-- <constructor-arg><ref bean="BasePortalURL"/></constructor-arg>  -->
+  </bean>
 </beans>

Modified: portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/ajax-layout.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/ajax-layout.xml?rev=646449&r1=646448&r2=646449&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/ajax-layout.xml (original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/ajax-layout.xml Wed Apr  9 10:54:56 2008
@@ -1,25 +1,24 @@
 <?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">
-    
-<!-- AJAX Actions 
+<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">
+
+  <!-- AJAX Actions 
     
     == Constructor Arguments ==
     index 0 = render response VM template, generates XML NORMAL response
@@ -27,537 +26,510 @@
     index 2 = action name from AJAX Request
     index 3 = Page Manager
     index 4 = Registry (getPortlets)
-    -->
+  -->
 
-<bean id="EnableCreateUserPagesFromRolesOnEdit" class="java.lang.Boolean">
+  <bean id="EnableCreateUserPagesFromRolesOnEdit" class="java.lang.Boolean">
     <constructor-arg index="0">
-        <value>true</value>
+      <value>true</value>
     </constructor-arg>
-</bean>
+  </bean>
 
-<bean id="PortletActionSecurityBehavior"
-	  class="org.apache.jetspeed.layout.impl.PortletActionSecurityConstraintsBehavior">
+  <bean id="PortletActionSecurityBehavior"
+    class="org.apache.jetspeed.layout.impl.PortletActionSecurityConstraintsBehavior">
     <constructor-arg index='0'>
-        <ref bean="org.apache.jetspeed.page.PageManager"/>        
+      <ref bean="org.apache.jetspeed.page.PageManager" />
     </constructor-arg>
     <constructor-arg index='1'>
-        <ref bean="EnableCreateUserPagesFromRolesOnEdit"/>
+      <ref bean="EnableCreateUserPagesFromRolesOnEdit" />
     </constructor-arg>
-</bean>	
+  </bean>
 
-<bean id="RolesSecurityBehavior"
-	  class="org.apache.jetspeed.layout.impl.RolesSecurityBehavior">
-       <!-- List of required roles (comma-separated) 
-            Only need to match one of the listed  roles to pass security requirements
-           -->
-        <constructor-arg>
-            <list>
-                <value>admin</value>
-            </list>
-        </constructor-arg>
-</bean>	
-    
-<bean id="AjaxMove"
-    class="org.apache.jetspeed.layout.impl.MovePortletAction">
+  <bean id="RolesSecurityBehavior" class="org.apache.jetspeed.layout.impl.RolesSecurityBehavior">
+    <!-- List of required roles (comma-separated) 
+      Only need to match one of the listed  roles to pass security requirements
+    -->
+    <constructor-arg>
+      <list>
+        <value>admin</value>
+      </list>
+    </constructor-arg>
+  </bean>
+
+  <bean id="AjaxMove" class="org.apache.jetspeed.layout.impl.MovePortletAction">
     <constructor-arg index="0">
-        <value>org/apache/jetspeed/layout/ajax-xml/xmove.vm</value>
+      <value>org/apache/jetspeed/layout/ajax-xml/xmove.vm</value>
     </constructor-arg>
     <constructor-arg index="1">
-        <value>org/apache/jetspeed/layout/ajax-xml/error.vm</value>
+      <value>org/apache/jetspeed/layout/ajax-xml/error.vm</value>
     </constructor-arg>
     <constructor-arg index='2'>
-        <ref bean="org.apache.jetspeed.components.portletregistry.PortletRegistry"/>        
+      <ref bean="org.apache.jetspeed.components.portletregistry.PortletRegistry" />
     </constructor-arg>
     <constructor-arg index="3">
-        <value>move</value>
+      <value>move</value>
     </constructor-arg>
     <constructor-arg index='4'>
-        <ref bean="org.apache.jetspeed.page.PageManager"/>        
-    </constructor-arg>    
+      <ref bean="org.apache.jetspeed.page.PageManager" />
+    </constructor-arg>
     <constructor-arg index='5'>
-        <ref bean="PortletActionSecurityBehavior"/>        
-    </constructor-arg>    	
-</bean>
-    	
-<bean id="AjaxMovePortletAbsolute"
-    class="org.apache.jetspeed.layout.impl.MovePortletAction">
+      <ref bean="PortletActionSecurityBehavior" />
+    </constructor-arg>
+  </bean>
+
+  <bean id="AjaxMovePortletAbsolute" class="org.apache.jetspeed.layout.impl.MovePortletAction">
     <constructor-arg index="0">
-        <value>org/apache/jetspeed/layout/ajax-xml/move.vm</value>
+      <value>org/apache/jetspeed/layout/ajax-xml/move.vm</value>
     </constructor-arg>
     <constructor-arg index="1">
-        <value>org/apache/jetspeed/layout/ajax-xml/error.vm</value>
+      <value>org/apache/jetspeed/layout/ajax-xml/error.vm</value>
     </constructor-arg>
     <constructor-arg index='2'>
-        <ref bean="org.apache.jetspeed.components.portletregistry.PortletRegistry"/>        
+      <ref bean="org.apache.jetspeed.components.portletregistry.PortletRegistry" />
     </constructor-arg>
     <constructor-arg index="3">
-        <value>moveabs</value>
+      <value>moveabs</value>
     </constructor-arg>
     <constructor-arg index='4'>
-        <ref bean="org.apache.jetspeed.page.PageManager"/>        
-    </constructor-arg>    
+      <ref bean="org.apache.jetspeed.page.PageManager" />
+    </constructor-arg>
     <constructor-arg index='5'>
-        <ref bean="PortletActionSecurityBehavior"/>        
-    </constructor-arg>    	
-</bean>
+      <ref bean="PortletActionSecurityBehavior" />
+    </constructor-arg>
+  </bean>
 
-<bean id="AjaxMovePortletLeft"
-    class="org.apache.jetspeed.layout.impl.MovePortletAction">
+  <bean id="AjaxMovePortletLeft" class="org.apache.jetspeed.layout.impl.MovePortletAction">
     <constructor-arg index="0">
-        <value>org/apache/jetspeed/layout/ajax-xml/move.vm</value>
+      <value>org/apache/jetspeed/layout/ajax-xml/move.vm</value>
     </constructor-arg>
     <constructor-arg index="1">
-        <value>org/apache/jetspeed/layout/ajax-xml/error.vm</value>
+      <value>org/apache/jetspeed/layout/ajax-xml/error.vm</value>
     </constructor-arg>
     <constructor-arg index='2'>
-        <ref bean="org.apache.jetspeed.components.portletregistry.PortletRegistry"/>        
+      <ref bean="org.apache.jetspeed.components.portletregistry.PortletRegistry" />
     </constructor-arg>
     <constructor-arg index="3">
-        <value>moveleft</value>
+      <value>moveleft</value>
     </constructor-arg>
     <constructor-arg index='4'>
-        <ref bean="org.apache.jetspeed.page.PageManager"/>        
-    </constructor-arg>        
+      <ref bean="org.apache.jetspeed.page.PageManager" />
+    </constructor-arg>
     <constructor-arg index='5'>
-        <ref bean="PortletActionSecurityBehavior"/>        
-    </constructor-arg>    		
-</bean>
+      <ref bean="PortletActionSecurityBehavior" />
+    </constructor-arg>
+  </bean>
 
-<bean id="AjaxMovePortletRight"
-    class="org.apache.jetspeed.layout.impl.MovePortletAction">
+  <bean id="AjaxMovePortletRight" class="org.apache.jetspeed.layout.impl.MovePortletAction">
     <constructor-arg index="0">
-        <value>org/apache/jetspeed/layout/ajax-xml/move.vm</value>
+      <value>org/apache/jetspeed/layout/ajax-xml/move.vm</value>
     </constructor-arg>
     <constructor-arg index="1">
-        <value>org/apache/jetspeed/layout/ajax-xml/error.vm</value>
+      <value>org/apache/jetspeed/layout/ajax-xml/error.vm</value>
     </constructor-arg>
     <constructor-arg index='2'>
-        <ref bean="org.apache.jetspeed.components.portletregistry.PortletRegistry"/>        
+      <ref bean="org.apache.jetspeed.components.portletregistry.PortletRegistry" />
     </constructor-arg>
     <constructor-arg index="3">
-        <value>moveright</value>
+      <value>moveright</value>
     </constructor-arg>
     <constructor-arg index='4'>
-        <ref bean="org.apache.jetspeed.page.PageManager"/>        
-    </constructor-arg>      
+      <ref bean="org.apache.jetspeed.page.PageManager" />
+    </constructor-arg>
     <constructor-arg index='5'>
-        <ref bean="PortletActionSecurityBehavior"/>        
-    </constructor-arg>    		  
-</bean>
+      <ref bean="PortletActionSecurityBehavior" />
+    </constructor-arg>
+  </bean>
 
-<bean id="AjaxMovePortletUp"
-    class="org.apache.jetspeed.layout.impl.MovePortletAction">
+  <bean id="AjaxMovePortletUp" class="org.apache.jetspeed.layout.impl.MovePortletAction">
     <constructor-arg index="0">
-        <value>org/apache/jetspeed/layout/ajax-xml/move.vm</value>
+      <value>org/apache/jetspeed/layout/ajax-xml/move.vm</value>
     </constructor-arg>
     <constructor-arg index="1">
-        <value>org/apache/jetspeed/layout/ajax-xml/error.vm</value>
+      <value>org/apache/jetspeed/layout/ajax-xml/error.vm</value>
     </constructor-arg>
     <constructor-arg index='2'>
-        <ref bean="org.apache.jetspeed.components.portletregistry.PortletRegistry"/>        
+      <ref bean="org.apache.jetspeed.components.portletregistry.PortletRegistry" />
     </constructor-arg>
     <constructor-arg index="3">
-        <value>moveup</value>
+      <value>moveup</value>
     </constructor-arg>
     <constructor-arg index='4'>
-        <ref bean="org.apache.jetspeed.page.PageManager"/>        
-    </constructor-arg>      
+      <ref bean="org.apache.jetspeed.page.PageManager" />
+    </constructor-arg>
     <constructor-arg index='5'>
-        <ref bean="PortletActionSecurityBehavior"/>        
-    </constructor-arg>    		  
-</bean>
+      <ref bean="PortletActionSecurityBehavior" />
+    </constructor-arg>
+  </bean>
 
-<bean id="AjaxMovePortletDown"
-    class="org.apache.jetspeed.layout.impl.MovePortletAction">
+  <bean id="AjaxMovePortletDown" class="org.apache.jetspeed.layout.impl.MovePortletAction">
     <constructor-arg index="0">
-        <value>org/apache/jetspeed/layout/ajax-xml/move.vm</value>
+      <value>org/apache/jetspeed/layout/ajax-xml/move.vm</value>
     </constructor-arg>
     <constructor-arg index="1">
-        <value>org/apache/jetspeed/layout/ajax-xml/error.vm</value>
+      <value>org/apache/jetspeed/layout/ajax-xml/error.vm</value>
     </constructor-arg>
     <constructor-arg index='2'>
-        <ref bean="org.apache.jetspeed.components.portletregistry.PortletRegistry"/>        
+      <ref bean="org.apache.jetspeed.components.portletregistry.PortletRegistry" />
     </constructor-arg>
     <constructor-arg index="3">
-        <value>movedown</value>
+      <value>movedown</value>
     </constructor-arg>
     <constructor-arg index='4'>
-        <ref bean="org.apache.jetspeed.page.PageManager"/>        
-    </constructor-arg>      
+      <ref bean="org.apache.jetspeed.page.PageManager" />
+    </constructor-arg>
     <constructor-arg index='5'>
-        <ref bean="PortletActionSecurityBehavior"/>        
-    </constructor-arg>    		  
-</bean>
+      <ref bean="PortletActionSecurityBehavior" />
+    </constructor-arg>
+  </bean>
 
-<bean id="AjaxAddPortlet"
-    class="org.apache.jetspeed.layout.impl.AddPortletAction">
+  <bean id="AjaxAddPortlet" class="org.apache.jetspeed.layout.impl.AddPortletAction">
     <constructor-arg index="0">
-        <value>org/apache/jetspeed/layout/ajax-xml/add.vm</value>
+      <value>org/apache/jetspeed/layout/ajax-xml/add.vm</value>
     </constructor-arg>
     <constructor-arg index="1">
-        <value>org/apache/jetspeed/layout/ajax-xml/error.vm</value>
+      <value>org/apache/jetspeed/layout/ajax-xml/error.vm</value>
     </constructor-arg>
     <constructor-arg index='2'>
-        <ref bean="org.apache.jetspeed.components.portletregistry.PortletRegistry"/>        
+      <ref bean="org.apache.jetspeed.components.portletregistry.PortletRegistry" />
     </constructor-arg>
     <constructor-arg index='3'>
-        <ref bean="org.apache.jetspeed.page.PageManager"/>        
-    </constructor-arg>      
+      <ref bean="org.apache.jetspeed.page.PageManager" />
+    </constructor-arg>
     <constructor-arg index='4'>
-        <ref bean="PortletActionSecurityBehavior"/>        
-    </constructor-arg>    		  
+      <ref bean="PortletActionSecurityBehavior" />
+    </constructor-arg>
     <constructor-arg index='5'>
-        <ref bean="AjaxGetPortlets"/>        
-    </constructor-arg>     	    
-</bean>
+      <ref bean="AjaxGetPortlets" />
+    </constructor-arg>
+  </bean>
 
-<bean id="AjaxRemovePortlet"
-    class="org.apache.jetspeed.layout.impl.RemovePortletAction">
+  <bean id="AjaxRemovePortlet" class="org.apache.jetspeed.layout.impl.RemovePortletAction">
     <constructor-arg index="0">
-        <value>org/apache/jetspeed/layout/ajax-xml/remove.vm</value>
+      <value>org/apache/jetspeed/layout/ajax-xml/remove.vm</value>
     </constructor-arg>
     <constructor-arg index="1">
-        <value>org/apache/jetspeed/layout/ajax-xml/error.vm</value>
+      <value>org/apache/jetspeed/layout/ajax-xml/error.vm</value>
     </constructor-arg>
     <constructor-arg index='2'>
-        <ref bean="org.apache.jetspeed.components.portletregistry.PortletRegistry"/>        
+      <ref bean="org.apache.jetspeed.components.portletregistry.PortletRegistry" />
     </constructor-arg>
     <constructor-arg index='3'>
-        <ref bean="org.apache.jetspeed.page.PageManager"/>        
-    </constructor-arg>        
+      <ref bean="org.apache.jetspeed.page.PageManager" />
+    </constructor-arg>
     <constructor-arg index='4'>
-        <ref bean="PortletActionSecurityBehavior"/>        
-    </constructor-arg>    		
-</bean>
+      <ref bean="PortletActionSecurityBehavior" />
+    </constructor-arg>
+  </bean>
 
-<bean id="AjaxGetPortlets"
-    class="org.apache.jetspeed.layout.impl.GetPortletsAction">
+  <bean id="AjaxGetPortlets" class="org.apache.jetspeed.layout.impl.GetPortletsAction">
     <constructor-arg index="0">
-        <value>org/apache/jetspeed/layout/ajax-xml/getportlets.vm</value>
+      <value>org/apache/jetspeed/layout/ajax-xml/getportlets.vm</value>
     </constructor-arg>
     <constructor-arg index="1">
-        <value>org/apache/jetspeed/layout/ajax-xml/error.vm</value>
+      <value>org/apache/jetspeed/layout/ajax-xml/error.vm</value>
     </constructor-arg>
     <constructor-arg index='2'>
-        <ref bean="org.apache.jetspeed.page.PageManager"/>        
-    </constructor-arg>        
+      <ref bean="org.apache.jetspeed.page.PageManager" />
+    </constructor-arg>
     <constructor-arg index='3'>
-        <ref bean="org.apache.jetspeed.components.portletregistry.PortletRegistry"/>        
+      <ref bean="org.apache.jetspeed.components.portletregistry.PortletRegistry" />
     </constructor-arg>
     <constructor-arg index='4'>
-        <ref bean="org.apache.jetspeed.search.SearchEngine"/>        
-    </constructor-arg>              
+      <ref bean="org.apache.jetspeed.search.SearchEngine" />
+    </constructor-arg>
     <constructor-arg index='5'>
-        <ref bean="org.apache.jetspeed.security.SecurityAccessController"/>        
-    </constructor-arg>       
+      <ref bean="org.apache.jetspeed.security.SecurityAccessController" />
+    </constructor-arg>
     <constructor-arg index='6'>
-        <ref bean="PortletActionSecurityBehavior"/>        
-    </constructor-arg>    		       
-</bean>
+      <ref bean="PortletActionSecurityBehavior" />
+    </constructor-arg>
+  </bean>
 
-<bean id="AjaxGetPage"
-    class="org.apache.jetspeed.layout.impl.GetPageAction">
+  <bean id="AjaxGetPage" class="org.apache.jetspeed.layout.impl.GetPageAction">
     <constructor-arg index="0">
-        <value>org/apache/jetspeed/layout/ajax-xml/psml.vm</value>
+      <value>org/apache/jetspeed/layout/ajax-xml/psml.vm</value>
     </constructor-arg>
     <constructor-arg index="1">
-        <value>org/apache/jetspeed/layout/ajax-xml/error.vm</value>
+      <value>org/apache/jetspeed/layout/ajax-xml/error.vm</value>
     </constructor-arg>
     <constructor-arg index='2'>
-        <ref bean="org.apache.jetspeed.page.PageManager"/>        
+      <ref bean="org.apache.jetspeed.page.PageManager" />
     </constructor-arg>
     <constructor-arg index='3'>
-        <ref bean="PortletActionSecurityBehavior"/>        
+      <ref bean="PortletActionSecurityBehavior" />
     </constructor-arg>
     <constructor-arg index='4'>
-        <ref bean="org.apache.jetspeed.components.portletregistry.PortletRegistry"/>        
-    </constructor-arg>              
+      <ref bean="org.apache.jetspeed.components.portletregistry.PortletRegistry" />
+    </constructor-arg>
     <constructor-arg index='5'>
-        <ref bean="DecorationValve"/>
+      <ref bean="DecorationValve" />
     </constructor-arg>
-</bean>
+  </bean>
 
-<bean id="AjaxGetPages"
-    class="org.apache.jetspeed.layout.impl.GetPagesAction">
+  <bean id="AjaxGetPages" class="org.apache.jetspeed.layout.impl.GetPagesAction">
     <constructor-arg index="0">
-        <value>org/apache/jetspeed/layout/ajax-xml/getpages.vm</value>
+      <value>org/apache/jetspeed/layout/ajax-xml/getpages.vm</value>
     </constructor-arg>
     <constructor-arg index="1">
-        <value>org/apache/jetspeed/layout/ajax-xml/error.vm</value>
+      <value>org/apache/jetspeed/layout/ajax-xml/error.vm</value>
     </constructor-arg>
     <constructor-arg index='2'>
-        <ref bean="org.apache.jetspeed.page.PageManager"/>        
+      <ref bean="org.apache.jetspeed.page.PageManager" />
     </constructor-arg>
     <constructor-arg index='3'>
-        <ref bean="PortletActionSecurityBehavior"/>        
-    </constructor-arg>    		        
-</bean>
+      <ref bean="PortletActionSecurityBehavior" />
+    </constructor-arg>
+  </bean>
 
-<bean id="AjaxGetFolder"
-    class="org.apache.jetspeed.layout.impl.GetFolderAction">
+  <bean id="AjaxGetFolder" class="org.apache.jetspeed.layout.impl.GetFolderAction">
     <constructor-arg index="0">
-        <value>org/apache/jetspeed/layout/ajax-xml/getfolder.vm</value>
+      <value>org/apache/jetspeed/layout/ajax-xml/getfolder.vm</value>
     </constructor-arg>
     <constructor-arg index="1">
-        <value>org/apache/jetspeed/layout/ajax-xml/error.vm</value>
+      <value>org/apache/jetspeed/layout/ajax-xml/error.vm</value>
     </constructor-arg>
     <constructor-arg index='2'>
-        <ref bean="org.apache.jetspeed.page.PageManager"/>        
+      <ref bean="org.apache.jetspeed.page.PageManager" />
     </constructor-arg>
     <constructor-arg index='3'>
-        <ref bean="PortletActionSecurityBehavior"/>        
-    </constructor-arg>    		        
-</bean>
+      <ref bean="PortletActionSecurityBehavior" />
+    </constructor-arg>
+  </bean>
 
-<bean id="AjaxGetLink"
-    class="org.apache.jetspeed.layout.impl.GetLinkAction">
+  <bean id="AjaxGetLink" class="org.apache.jetspeed.layout.impl.GetLinkAction">
     <constructor-arg index="0">
-        <value>org/apache/jetspeed/layout/ajax-xml/getlink.vm</value>
+      <value>org/apache/jetspeed/layout/ajax-xml/getlink.vm</value>
     </constructor-arg>
     <constructor-arg index="1">
-        <value>org/apache/jetspeed/layout/ajax-xml/error.vm</value>
+      <value>org/apache/jetspeed/layout/ajax-xml/error.vm</value>
     </constructor-arg>
     <constructor-arg index='2'>
-        <ref bean="org.apache.jetspeed.page.PageManager"/>        
+      <ref bean="org.apache.jetspeed.page.PageManager" />
     </constructor-arg>
     <constructor-arg index='3'>
-        <ref bean="PortletActionSecurityBehavior"/>        
-    </constructor-arg>    		        
-</bean>
+      <ref bean="PortletActionSecurityBehavior" />
+    </constructor-arg>
+  </bean>
 
-<bean id="AjaxGetFolderList"
-    class="org.apache.jetspeed.layout.impl.GetFolderListAction">
+  <bean id="AjaxGetFolderList" class="org.apache.jetspeed.layout.impl.GetFolderListAction">
     <constructor-arg index="0">
-        <value>org/apache/jetspeed/layout/ajax-xml/getfolderlist.vm</value>
+      <value>org/apache/jetspeed/layout/ajax-xml/getfolderlist.vm</value>
     </constructor-arg>
     <constructor-arg index="1">
-        <value>org/apache/jetspeed/layout/ajax-xml/error.vm</value>
+      <value>org/apache/jetspeed/layout/ajax-xml/error.vm</value>
     </constructor-arg>
     <constructor-arg index='2'>
-        <ref bean="org.apache.jetspeed.page.PageManager"/>        
+      <ref bean="org.apache.jetspeed.page.PageManager" />
     </constructor-arg>
     <constructor-arg index='3'>
-        <ref bean="PortletActionSecurityBehavior"/>        
-    </constructor-arg>    		        
-</bean>
-<bean id="AjaxGetFoldersList"
-    class="org.apache.jetspeed.layout.impl.GetFoldersListAction">
+      <ref bean="PortletActionSecurityBehavior" />
+    </constructor-arg>
+  </bean>
+  <bean id="AjaxGetFoldersList" class="org.apache.jetspeed.layout.impl.GetFoldersListAction">
     <constructor-arg index="0">
-        <value>org/apache/jetspeed/layout/ajax-xml/getfolders.vm</value>
+      <value>org/apache/jetspeed/layout/ajax-xml/getfolders.vm</value>
     </constructor-arg>
     <constructor-arg index="1">
-        <value>org/apache/jetspeed/layout/ajax-xml/error.vm</value>
+      <value>org/apache/jetspeed/layout/ajax-xml/error.vm</value>
     </constructor-arg>
     <constructor-arg index='2'>
-        <ref bean="org.apache.jetspeed.page.PageManager"/>        
+      <ref bean="org.apache.jetspeed.page.PageManager" />
     </constructor-arg>
     <constructor-arg index='3'>
-        <ref bean="PortletActionSecurityBehavior"/>        
-    </constructor-arg>    		        
-</bean>
-        
-<bean id="AjaxGetThemes"
-    class="org.apache.jetspeed.layout.impl.GetThemesAction">
+      <ref bean="PortletActionSecurityBehavior" />
+    </constructor-arg>
+  </bean>
+
+  <bean id="AjaxGetThemes" class="org.apache.jetspeed.layout.impl.GetThemesAction">
     <constructor-arg index="0">
-        <value>org/apache/jetspeed/layout/ajax-xml/getthemes.vm</value>
+      <value>org/apache/jetspeed/layout/ajax-xml/getthemes.vm</value>
     </constructor-arg>
     <constructor-arg index="1">
-        <value>org/apache/jetspeed/layout/ajax-xml/error.vm</value>
+      <value>org/apache/jetspeed/layout/ajax-xml/error.vm</value>
     </constructor-arg>
     <constructor-arg index='2'>
-        <ref bean="DecorationFactory"/>        
+      <ref bean="DecorationFactory" />
     </constructor-arg>
     <constructor-arg index='3'>
-        <ref bean="PortletActionSecurityBehavior"/>        
-    </constructor-arg>    		        
-</bean>
-        
-<bean id="AjaxChangeWindow"
-    class="org.apache.jetspeed.layout.impl.ChangePortletAction">
+      <ref bean="PortletActionSecurityBehavior" />
+    </constructor-arg>
+  </bean>
+
+  <bean id="AjaxChangeWindow" class="org.apache.jetspeed.layout.impl.ChangePortletAction">
     <constructor-arg index="0">
-        <value>org/apache/jetspeed/layout/ajax-xml/window.vm</value>
+      <value>org/apache/jetspeed/layout/ajax-xml/window.vm</value>
     </constructor-arg>
     <constructor-arg index="1">
-        <value>org/apache/jetspeed/layout/ajax-xml/error.vm</value>
+      <value>org/apache/jetspeed/layout/ajax-xml/error.vm</value>
     </constructor-arg>
     <constructor-arg index="2">
-        <value>window</value>
+      <value>window</value>
     </constructor-arg>
     <constructor-arg index='3'>
-        <ref bean="org.apache.jetspeed.page.PageManager"/>
-    </constructor-arg>    
+      <ref bean="org.apache.jetspeed.page.PageManager" />
+    </constructor-arg>
     <constructor-arg index='4'>
-        <ref bean="org.apache.jetspeed.container.window.PortletWindowAccessor"/>
+      <ref bean="org.apache.jetspeed.container.window.PortletWindowAccessor" />
     </constructor-arg>
     <constructor-arg index='5'>
-        <ref bean="PortletActionSecurityBehavior"/>
+      <ref bean="PortletActionSecurityBehavior" />
     </constructor-arg>
-</bean>
+  </bean>
 
-<bean id="AjaxGetActions"
-    class="org.apache.jetspeed.layout.impl.GetPortletActionsAction">
+  <bean id="AjaxGetActions" class="org.apache.jetspeed.layout.impl.GetPortletActionsAction">
     <constructor-arg index="0">
-        <value>org/apache/jetspeed/layout/ajax-xml/getactions.vm</value>
+      <value>org/apache/jetspeed/layout/ajax-xml/getactions.vm</value>
     </constructor-arg>
     <constructor-arg index="1">
-        <value>org/apache/jetspeed/layout/ajax-xml/error.vm</value>
+      <value>org/apache/jetspeed/layout/ajax-xml/error.vm</value>
     </constructor-arg>
     <constructor-arg index="2">
-        <value>getactions</value>
+      <value>getactions</value>
     </constructor-arg>
     <constructor-arg index='3'>
-        <ref bean="DecorationValve"/>
-    </constructor-arg>    
+      <ref bean="DecorationValve" />
+    </constructor-arg>
     <constructor-arg index='4'>
-        <ref bean="org.apache.jetspeed.page.PageManager"/>
-    </constructor-arg>        
+      <ref bean="org.apache.jetspeed.page.PageManager" />
+    </constructor-arg>
     <constructor-arg index='5'>
-        <ref bean="PortletActionSecurityBehavior"/>        
-    </constructor-arg>    	
-</bean>
+      <ref bean="PortletActionSecurityBehavior" />
+    </constructor-arg>
+  </bean>
 
-<bean id="AjaxGetMenus"
-    class="org.apache.jetspeed.layout.impl.GetMenusAction">
+  <bean id="AjaxGetMenus" class="org.apache.jetspeed.layout.impl.GetMenusAction">
     <constructor-arg index="0">
-        <value>org/apache/jetspeed/layout/ajax-xml/menu.vm</value>
+      <value>org/apache/jetspeed/layout/ajax-xml/menu.vm</value>
     </constructor-arg>
     <constructor-arg index="1">
-        <value>org/apache/jetspeed/layout/ajax-xml/error.vm</value>
+      <value>org/apache/jetspeed/layout/ajax-xml/error.vm</value>
     </constructor-arg>
     <constructor-arg index='2'>
-        <ref bean="PortletActionSecurityBehavior"/>        
-    </constructor-arg>    	
-</bean>
+      <ref bean="PortletActionSecurityBehavior" />
+    </constructor-arg>
+  </bean>
 
-<bean id="AjaxGetMenu"
-    class="org.apache.jetspeed.layout.impl.GetMenuAction">
+  <bean id="AjaxGetMenu" class="org.apache.jetspeed.layout.impl.GetMenuAction">
     <constructor-arg index="0">
-        <value>org/apache/jetspeed/layout/ajax-xml/menu.vm</value>
+      <value>org/apache/jetspeed/layout/ajax-xml/menu.vm</value>
     </constructor-arg>
     <constructor-arg index="1">
-        <value>org/apache/jetspeed/layout/ajax-xml/error.vm</value>
+      <value>org/apache/jetspeed/layout/ajax-xml/error.vm</value>
     </constructor-arg>
     <constructor-arg index='2'>
-        <ref bean="PortletActionSecurityBehavior"/>        
-    </constructor-arg>    	
-</bean>
+      <ref bean="PortletActionSecurityBehavior" />
+    </constructor-arg>
+  </bean>
 
-<bean id="AjaxSecurityPermissions"
-    class="org.apache.jetspeed.layout.impl.SecurityPermissionAction">
+  <bean id="AjaxSecurityPermissions" class="org.apache.jetspeed.layout.impl.SecurityPermissionAction">
     <constructor-arg index="0">
-        <value>org/apache/jetspeed/layout/ajax-xml/permissions.vm</value>
+      <value>org/apache/jetspeed/layout/ajax-xml/permissions.vm</value>
     </constructor-arg>
     <constructor-arg index="1">
-        <value>org/apache/jetspeed/layout/ajax-xml/error.vm</value>
+      <value>org/apache/jetspeed/layout/ajax-xml/error.vm</value>
+    </constructor-arg>
+    <constructor-arg index='2'>
+      <ref bean="org.apache.jetspeed.security.PermissionManager" />
     </constructor-arg>
-    <constructor-arg index='2'>    
-        <ref bean="org.apache.jetspeed.security.PermissionManager"/>        
-    </constructor-arg>    
     <constructor-arg index='3'>
-        <ref bean="RolesSecurityBehavior"/>        
-    </constructor-arg>    	
-    <constructor-arg index='4'>    
-        <map>
-            <entry key="portlet">
-                <value>org.apache.jetspeed.security.PortletPermission</value>
-            </entry>                        
-            <entry key="page">
-                <value>org.apache.jetspeed.security.PagePermission</value>
-            </entry>                                    
-            <entry key="folder">
-                <value>org.apache.jetspeed.security.FolderPermission</value>
-            </entry>                                    
-        </map>
+      <ref bean="RolesSecurityBehavior" />
+    </constructor-arg>
+    <constructor-arg index='4'>
+      <map>
+        <entry key="portlet">
+          <value>org.apache.jetspeed.security.PortletPermission</value>
+        </entry>
+        <entry key="page">
+          <value>org.apache.jetspeed.security.PagePermission</value>
+        </entry>
+        <entry key="folder">
+          <value>org.apache.jetspeed.security.FolderPermission</value>
+        </entry>
+      </map>
     </constructor-arg>
-</bean>
+  </bean>
 
-<bean id="AjaxSecurityConstraints"
-    class="org.apache.jetspeed.layout.impl.SecurityConstraintsAction">
+  <bean id="AjaxSecurityConstraints" class="org.apache.jetspeed.layout.impl.SecurityConstraintsAction">
     <constructor-arg index="0">
-        <value>org/apache/jetspeed/layout/ajax-xml/constraints.vm</value>
+      <value>org/apache/jetspeed/layout/ajax-xml/constraints.vm</value>
     </constructor-arg>
     <constructor-arg index="1">
-        <value>org/apache/jetspeed/layout/ajax-xml/error.vm</value>
+      <value>org/apache/jetspeed/layout/ajax-xml/error.vm</value>
+    </constructor-arg>
+    <constructor-arg index='2'>
+      <ref bean="org.apache.jetspeed.page.PageManager" />
     </constructor-arg>
-    <constructor-arg index='2'>    
-        <ref bean="org.apache.jetspeed.page.PageManager"/>        
-    </constructor-arg>    
     <constructor-arg index='3'>
-        <ref bean="PortletActionSecurityBehavior"/>        
-    </constructor-arg>    	        
-</bean>
+      <ref bean="PortletActionSecurityBehavior" />
+    </constructor-arg>
+  </bean>
 
-<bean id="AjaxUpdateFolder"
-    class="org.apache.jetspeed.layout.impl.UpdateFolderAction">
+  <bean id="AjaxUpdateFolder" class="org.apache.jetspeed.layout.impl.UpdateFolderAction">
     <constructor-arg index="0">
-        <value>org/apache/jetspeed/layout/ajax-xml/update.vm</value>
+      <value>org/apache/jetspeed/layout/ajax-xml/update.vm</value>
     </constructor-arg>
     <constructor-arg index="1">
-        <value>org/apache/jetspeed/layout/ajax-xml/error.vm</value>
+      <value>org/apache/jetspeed/layout/ajax-xml/error.vm</value>
+    </constructor-arg>
+    <constructor-arg index='2'>
+      <ref bean="org.apache.jetspeed.page.PageManager" />
     </constructor-arg>
-    <constructor-arg index='2'>    
-        <ref bean="org.apache.jetspeed.page.PageManager"/>        
-    </constructor-arg>    
     <constructor-arg index='3'>
-        <ref bean="PortletActionSecurityBehavior"/>        
-    </constructor-arg>    	    
-</bean>
+      <ref bean="PortletActionSecurityBehavior" />
+    </constructor-arg>
+  </bean>
 
-<bean id="AjaxUpdatePage"
-    class="org.apache.jetspeed.layout.impl.UpdatePageAction">
+  <bean id="AjaxUpdatePage" class="org.apache.jetspeed.layout.impl.UpdatePageAction">
     <constructor-arg index="0">
-        <value>org/apache/jetspeed/layout/ajax-xml/update.vm</value>
+      <value>org/apache/jetspeed/layout/ajax-xml/update.vm</value>
     </constructor-arg>
     <constructor-arg index="1">
-        <value>org/apache/jetspeed/layout/ajax-xml/error.vm</value>
+      <value>org/apache/jetspeed/layout/ajax-xml/error.vm</value>
+    </constructor-arg>
+    <constructor-arg index='2'>
+      <ref bean="org.apache.jetspeed.page.PageManager" />
     </constructor-arg>
-    <constructor-arg index='2'>    
-        <ref bean="org.apache.jetspeed.page.PageManager"/>        
-    </constructor-arg>    
     <constructor-arg index='3'>
-        <ref bean="org.apache.jetspeed.container.window.PortletWindowAccessor"/>
-    </constructor-arg>  
+      <ref bean="org.apache.jetspeed.container.window.PortletWindowAccessor" />
+    </constructor-arg>
     <constructor-arg index='4'>
-        <ref bean="org.apache.jetspeed.components.portletentity.PortletEntityAccessComponent" />
-    </constructor-arg>      
+      <ref bean="org.apache.jetspeed.components.portletentity.PortletEntityAccessComponent" />
+    </constructor-arg>
     <constructor-arg index='5'>
-        <ref bean="PortletActionSecurityBehavior"/>        
-    </constructor-arg>    	            
-</bean>
-                
-<bean id="AjaxUpdateLink"
-    class="org.apache.jetspeed.layout.impl.UpdateLinkAction">
+      <ref bean="PortletActionSecurityBehavior" />
+    </constructor-arg>
+  </bean>
+
+  <bean id="AjaxUpdateLink" class="org.apache.jetspeed.layout.impl.UpdateLinkAction">
     <constructor-arg index="0">
-        <value>org/apache/jetspeed/layout/ajax-xml/update.vm</value>
+      <value>org/apache/jetspeed/layout/ajax-xml/update.vm</value>
     </constructor-arg>
     <constructor-arg index="1">
-        <value>org/apache/jetspeed/layout/ajax-xml/error.vm</value>
+      <value>org/apache/jetspeed/layout/ajax-xml/error.vm</value>
+    </constructor-arg>
+    <constructor-arg index='2'>
+      <ref bean="org.apache.jetspeed.page.PageManager" />
     </constructor-arg>
-    <constructor-arg index='2'>    
-        <ref bean="org.apache.jetspeed.page.PageManager"/>        
-    </constructor-arg>    
     <constructor-arg index='3'>
-        <ref bean="PortletActionSecurityBehavior"/>        
-    </constructor-arg>    	                
-</bean>
+      <ref bean="PortletActionSecurityBehavior" />
+    </constructor-arg>
+  </bean>
 
-<bean id="AjaxGetUserInformation"
-    class="org.apache.jetspeed.layout.impl.GetUserInformationAction">
+  <bean id="AjaxGetUserInformation" class="org.apache.jetspeed.layout.impl.GetUserInformationAction">
     <constructor-arg index="0">
-        <value>org/apache/jetspeed/layout/ajax-xml/userinfo.vm</value>
+      <value>org/apache/jetspeed/layout/ajax-xml/userinfo.vm</value>
     </constructor-arg>
     <constructor-arg index="1">
-        <value>org/apache/jetspeed/layout/ajax-xml/error.vm</value>
+      <value>org/apache/jetspeed/layout/ajax-xml/error.vm</value>
     </constructor-arg>
-    <constructor-arg index='2'>    
-        <ref bean="org.apache.jetspeed.security.UserManager"/>        
+    <constructor-arg index='2'>
+      <ref bean="org.apache.jetspeed.security.UserManager" />
     </constructor-arg>
-	<constructor-arg index='3'>
-        <ref bean="RolesSecurityBehavior"/>
+    <constructor-arg index='3'>
+      <ref bean="RolesSecurityBehavior" />
     </constructor-arg>
-</bean>
+  </bean>
 
-<!-- 
+  <!-- 
     == AjaxGetUserList Constructor Arguments ==
     index 0 = render response VM template, generates XML NORMAL response
     index 1 = render response VM template, generates XML ERROR response
@@ -566,202 +538,201 @@
     index 4 = Portal session manager
     index 5 = Security behavior
     index 6 = Protection scope
-    -->
+  -->
 
-<bean id="AjaxGetUserList"
-    class="org.apache.jetspeed.layout.impl.GetUserListAction">
+  <bean id="AjaxGetUserList" class="org.apache.jetspeed.layout.impl.GetUserListAction">
     <constructor-arg index="0">
-        <value>org/apache/jetspeed/layout/ajax-xml/userlist.vm</value>
+      <value>org/apache/jetspeed/layout/ajax-xml/userlist.vm</value>
     </constructor-arg>
     <constructor-arg index="1">
-        <value>org/apache/jetspeed/layout/ajax-xml/error.vm</value>
+      <value>org/apache/jetspeed/layout/ajax-xml/error.vm</value>
     </constructor-arg>
-    <constructor-arg index='2'>    
-        <ref bean="org.apache.jetspeed.security.UserManager"/>        
+    <constructor-arg index='2'>
+      <ref bean="org.apache.jetspeed.security.UserManager" />
     </constructor-arg>
     <constructor-arg index='3'>
-        <ref bean="PortalStatistics"/>
+      <ref bean="PortalStatistics" />
     </constructor-arg>
     <constructor-arg index='4'>
-        <ref bean="org.apache.jetspeed.container.session.PortalSessionsManager"/>
+      <ref bean="org.apache.jetspeed.container.session.PortalSessionsManager" />
     </constructor-arg>
-	<constructor-arg index='5'>
-        <ref bean="RolesSecurityBehavior"/>
+    <constructor-arg index='5'>
+      <ref bean="RolesSecurityBehavior" />
     </constructor-arg>
     <constructor-arg index='6'>
-        <value>private</value>
+      <value>private</value>
     </constructor-arg>
-</bean>
-<bean id="AjaxJetspeedSchemaExportObject"
-    class="org.apache.jetspeed.layout.impl.ExportJetspeedSchema">
+  </bean>
+  <bean id="AjaxJetspeedSchemaExportObject" class="org.apache.jetspeed.layout.impl.ExportJetspeedSchema">
     <constructor-arg index="0">
-        <value>org/apache/jetspeed/layout/ajax-xml/jetspeedSchema.vm</value>
+      <value>org/apache/jetspeed/layout/ajax-xml/jetspeedSchema.vm</value>
     </constructor-arg>
     <constructor-arg index="1">
-        <value>org/apache/jetspeed/layout/ajax-xml/error.vm</value>
+      <value>org/apache/jetspeed/layout/ajax-xml/error.vm</value>
     </constructor-arg>
-    <constructor-arg index='2'>    
-        <ref bean="org.apache.jetspeed.page.PageManager"/>        
+    <constructor-arg index='2'>
+      <ref bean="org.apache.jetspeed.page.PageManager" />
     </constructor-arg>
     <constructor-arg index='3'>
-        <ref bean="PortletActionSecurityBehavior"/>
+      <ref bean="PortletActionSecurityBehavior" />
     </constructor-arg>
     <constructor-arg index='4'>
-        <ref bean="JetspeedSerializer"/>
+      <ref bean="JetspeedSerializer" />
     </constructor-arg>
-	<constructor-arg index='5'>
-		<value>${java.io.tmpdir}</value>
+    <constructor-arg index='5'>
+      <value>${java.io.tmpdir}</value>
     </constructor-arg>
-</bean>
-    
-<bean id="AjaxExportObject"
-    class="org.apache.jetspeed.layout.impl.ExportObject">
+  </bean>
+
+  <bean id="AjaxExportObject" class="org.apache.jetspeed.layout.impl.ExportObject">
     <constructor-arg index="0">
-        <value>org/apache/jetspeed/layout/ajax-xml/export.vm</value>
+      <value>org/apache/jetspeed/layout/ajax-xml/export.vm</value>
     </constructor-arg>
     <constructor-arg index="1">
-        <value>org/apache/jetspeed/layout/ajax-xml/error.vm</value>
+      <value>org/apache/jetspeed/layout/ajax-xml/error.vm</value>
+    </constructor-arg>
+    <constructor-arg index='2'>
+      <ref bean="org.apache.jetspeed.page.PageManager" />
     </constructor-arg>
-    <constructor-arg index='2'>    
-        <ref bean="org.apache.jetspeed.page.PageManager"/>        
-    </constructor-arg>
-    <constructor-arg index='3'>
-        <ref bean="PortletActionSecurityBehavior"/>
-    </constructor-arg>
-    <constructor-arg index='4'>
-        <ref bean="importerCastorPageManager"/>
-    </constructor-arg>
-	<constructor-arg index='5'>
-		<value>${java.io.tmpdir}</value>
-    </constructor-arg>
-</bean>
-<bean id="AjaxActionMap" class="java.util.HashMap">
-    <constructor-arg index="0">
-        <map>
-            <entry key="move">
-                <ref bean="AjaxMove"/>
-            </entry>            
-            <entry key="moveabs">
-                <ref bean="AjaxMovePortletAbsolute"/>
-            </entry>
-            <entry key="moveleft">
-                <ref bean="AjaxMovePortletLeft"/>
-            </entry>
-            <entry key="moveright">
-                <ref bean="AjaxMovePortletRight"/>
-            </entry>
-            <entry key="moveup">
-                <ref bean="AjaxMovePortletUp"/>
-            </entry>
-            <entry key="movedown">
-                <ref bean="AjaxMovePortletDown"/>
-            </entry>
-            <entry key="add">
-                <ref bean="AjaxAddPortlet"/>
-            </entry>
-            <entry key="remove">
-                <ref bean="AjaxRemovePortlet"/>
-            </entry>
-            <entry key="getportlets">
-                <ref bean="AjaxGetPortlets"/>
-            </entry>
-            <entry key="getpage">
-                <ref bean="AjaxGetPage"/>
-            </entry>
-            <entry key="getpages">
-                <ref bean="AjaxGetPages"/>
-            </entry>			
-            <entry key="getfolder">
-                <ref bean="AjaxGetFolder"/>
-            </entry>			            
-            <entry key="getlink">
-                <ref bean="AjaxGetLink"/>
-            </entry>			                        
-            <entry key="getfolderlist">
-                <ref bean="AjaxGetFolderList"/>
-            </entry>			                        
-            <entry key="getfolders">
-                <ref bean="AjaxGetFoldersList"/>
-            </entry>			      						
-            <entry key="getthemes">
-                <ref bean="AjaxGetThemes"/>
-            </entry>
-            <entry key="getactions">
-                <ref bean="AjaxGetActions"/>
-            </entry>
-            <entry key="window">
-                <ref bean="AjaxChangeWindow"/>
-            </entry>
-            <entry key="getmenus">
-                <ref bean="AjaxGetMenus"/>
-            </entry>			            
-            <entry key="getmenu">
-                <ref bean="AjaxGetMenu"/>
-            </entry>			            
-            <entry key="permissions">
-                <ref bean="AjaxSecurityPermissions"/>
-            </entry>			                        
-            <entry key="constraints">
-                <ref bean="AjaxSecurityConstraints"/>
-            </entry>			          
-            <entry key="updatefolder">
-                <ref bean="AjaxUpdateFolder"/>                
-            </entry>                          
-            <entry key="updatepage">
-                <ref bean="AjaxUpdatePage"/>                
-            </entry>              
-            <entry key="updatelink">
-                <ref bean="AjaxUpdateLink"/>                
-            </entry>                                                              
-            <entry key="getuserinfo">
-                <ref bean="AjaxGetUserInformation"/>                
-            </entry>
-            <entry key="getuserlist">
-                <ref bean="AjaxGetUserList"/>                
-            </entry>
-            <entry key="export">
-                <ref bean="AjaxExportObject"/>                
-            </entry>                        
-            <entry key="jetspeedexport">
-                <ref bean="AjaxJetspeedSchemaExportObject"/>                
-            </entry>      			
-        </map>
-    </constructor-arg>    
-</bean>    
-
-<bean id="AjaxRequestService" class="org.apache.jetspeed.ajax.AjaxRequestServiceImpl">
-    <constructor-arg index="0">
-        <ref bean="AjaxActionMap"/>
-    </constructor-arg>   
-    <constructor-arg index="1">
-        <ref bean="AjaxVelocityEngine"/>
-    </constructor-arg>
-</bean>
-        
-<bean id="AjaxVelocityEngine" class="org.springframework.ui.velocity.VelocityEngineFactoryBean">
+    <constructor-arg index='3'>
+      <ref bean="PortletActionSecurityBehavior" />
+    </constructor-arg>
+    <constructor-arg index='4'>
+      <ref bean="importerCastorPageManager" />
+    </constructor-arg>
+    <constructor-arg index='5'>
+      <value>${java.io.tmpdir}</value>
+    </constructor-arg>
+  </bean>
+  <bean id="AjaxActionMap" class="java.util.HashMap">
+    <constructor-arg index="0">
+      <map>
+        <entry key="move">
+          <ref bean="AjaxMove" />
+        </entry>
+        <entry key="moveabs">
+          <ref bean="AjaxMovePortletAbsolute" />
+        </entry>
+        <entry key="moveleft">
+          <ref bean="AjaxMovePortletLeft" />
+        </entry>
+        <entry key="moveright">
+          <ref bean="AjaxMovePortletRight" />
+        </entry>
+        <entry key="moveup">
+          <ref bean="AjaxMovePortletUp" />
+        </entry>
+        <entry key="movedown">
+          <ref bean="AjaxMovePortletDown" />
+        </entry>
+        <entry key="add">
+          <ref bean="AjaxAddPortlet" />
+        </entry>
+        <entry key="remove">
+          <ref bean="AjaxRemovePortlet" />
+        </entry>
+        <entry key="getportlets">
+          <ref bean="AjaxGetPortlets" />
+        </entry>
+        <entry key="getpage">
+          <ref bean="AjaxGetPage" />
+        </entry>
+        <entry key="getpages">
+          <ref bean="AjaxGetPages" />
+        </entry>
+        <entry key="getfolder">
+          <ref bean="AjaxGetFolder" />
+        </entry>
+        <entry key="getlink">
+          <ref bean="AjaxGetLink" />
+        </entry>
+        <entry key="getfolderlist">
+          <ref bean="AjaxGetFolderList" />
+        </entry>
+        <entry key="getfolders">
+          <ref bean="AjaxGetFoldersList" />
+        </entry>
+        <entry key="getthemes">
+          <ref bean="AjaxGetThemes" />
+        </entry>
+        <entry key="getactions">
+          <ref bean="AjaxGetActions" />
+        </entry>
+        <entry key="window">
+          <ref bean="AjaxChangeWindow" />
+        </entry>
+        <entry key="getmenus">
+          <ref bean="AjaxGetMenus" />
+        </entry>
+        <entry key="getmenu">
+          <ref bean="AjaxGetMenu" />
+        </entry>
+        <entry key="permissions">
+          <ref bean="AjaxSecurityPermissions" />
+        </entry>
+        <entry key="constraints">
+          <ref bean="AjaxSecurityConstraints" />
+        </entry>
+        <entry key="updatefolder">
+          <ref bean="AjaxUpdateFolder" />
+        </entry>
+        <entry key="updatepage">
+          <ref bean="AjaxUpdatePage" />
+        </entry>
+        <entry key="updatelink">
+          <ref bean="AjaxUpdateLink" />
+        </entry>
+        <entry key="getuserinfo">
+          <ref bean="AjaxGetUserInformation" />
+        </entry>
+        <entry key="getuserlist">
+          <ref bean="AjaxGetUserList" />
+        </entry>
+        <entry key="export">
+          <ref bean="AjaxExportObject" />
+        </entry>
+        <entry key="jetspeedexport">
+          <ref bean="AjaxJetspeedSchemaExportObject" />
+        </entry>
+      </map>
+    </constructor-arg>
+  </bean>
+
+  <bean id="AjaxRequestService" class="org.apache.jetspeed.ajax.AjaxRequestServiceImpl">
+    <constructor-arg index="0">
+      <ref bean="AjaxActionMap" />
+    </constructor-arg>
+    <constructor-arg index="1">
+      <ref bean="AjaxVelocityEngine" />
+    </constructor-arg>
+  </bean>
+
+  <bean id="AjaxVelocityEngine" class="org.springframework.ui.velocity.VelocityEngineFactoryBean">
     <property name="velocityProperties">
-        <props>
-           <!-- use webapp-logging CommonsLoggingLog4JLogSystem for logging through IsolatedLog4JLogger -->
-           <prop key="runtime.log.logsystem.class">org.apache.jetspeed.webapp.logging.velocity.CommonsLoggingLog4JLogSystem</prop>
-           <prop key="runtime.log.logsystem.log4j.category">velocity</prop>
-            <!-- clear out default global VM_global_library.vm leading to ERROR logging because its not available -->
-            <prop key="velocimacro.library"></prop>
-            <prop key="resource.loader">class</prop>
-            <prop key="class.resource.loader.class">
-                org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader
-            </prop>
-        </props>
+      <props>
+        <!-- use webapp-logging CommonsLoggingLog4JLogSystem for logging through IsolatedLog4JLogger -->
+        <prop key="runtime.log.logsystem.class">
+          org.apache.jetspeed.webapp.logging.velocity.CommonsLoggingLog4JLogSystem
+        </prop>
+        <prop key="runtime.log.logsystem.log4j.category">velocity</prop>
+        <!-- clear out default global VM_global_library.vm leading to ERROR logging because its not available -->
+        <prop key="velocimacro.library"></prop>
+        <prop key="resource.loader">class</prop>
+        <prop key="class.resource.loader.class">
+          org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader
+        </prop>
+      </props>
     </property>
     <!--  use our own CommonsLoggingLog4JLogSystem specified above, not the default one provided by Spring -->
-    <property name="overrideLogging"><value>false</value></property>
+    <property name="overrideLogging">
+      <value>false</value>
+    </property>
   </bean>
-  
-	<bean id="layoutValve"
-		class="org.apache.jetspeed.layout.impl.LayoutValve"
-		init-method="initialize">
-		<constructor-arg index="0">
-			<ref bean="AjaxRequestService"/>
-		</constructor-arg>
-	</bean>
-      
+
+  <bean id="layoutValve" class="org.apache.jetspeed.layout.impl.LayoutValve" init-method="initialize">
+    <constructor-arg index="0">
+      <ref bean="AjaxRequestService" />
+    </constructor-arg>
+  </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