portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a..@apache.org
Subject svn commit: r641679 [3/5] - in /portals/jetspeed-2/portal/trunk: ./ app-servers/security/jboss/src/java/META-INF/jboss-secsvc/ components/jetspeed-capability/src/test/resources/ components/jetspeed-capability/src/test/resources/boot/ components/jetspee...
Date Thu, 27 Mar 2008 01:18:26 GMT
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=641679&r1=641678&r2=641679&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 Mar 26 18:18:18 2008
@@ -1,89 +1,91 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
-<!--
+<?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.
--->
-<beans>
-  <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>
-    <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>
-      </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>
+    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>
+  </bean>
+  
+<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.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"
@@ -99,7 +101,7 @@
     	 <constructor-arg index="1">
             <value>2</value>
         </constructor-arg>
-</bean>
+</bean>
     
 <bean id='org.apache.jetspeed.administration.PortalAuthenticationConfiguration'
 	class='org.apache.jetspeed.administration.PortalAuthenticationConfigurationImpl'>
@@ -138,5 +140,5 @@
     </list>    
     </constructor-arg>
 </bean>    
-
-</beans>
+
+</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=641679&r1=641678&r2=641679&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 Mar 26 18:18:18 2008
@@ -1,245 +1,246 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
-<!--
-    Licensed to the Apache Software Foundation (ASF) under one or more
-    contributor license agreements.  See the NOTICE file distributed with
-    this work for additional information regarding copyright ownership.
-    The ASF licenses this file to You under the Apache License, Version 2.0
-    (the "License"); you may not use this file except in compliance with
-    the License.  You may obtain a copy of the License at
-    
-    http://www.apache.org/licenses/LICENSE-2.0
-    
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
--->
-<beans>
-   
-     <bean id="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>
-
-    <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>
-    
-    <!--
-    Commonj Work Manager and Worker Monitor
-    
-    If you want to use Commonj Work Manager provided by the container, uncomment the followings
-    and replace 'org.apache.jetspeed.aggregator.WorkerMonitor' with 'org.apache.jetspeed.aggregator.CommonjWorkerMonitor' in this file.
-    
-    For the bean named 'org.apache.jetspeed.aggregator.CommonjWorkerMonitor', two flags can be added as constructor-args.
-    The second constructor-arg is a flag whether a separate timeout-monitor thread is used or not as the old WorkerMonitorImpl does.
-    By default, this flag is set to true. If it is set to false, then a new commonj work will be created for timeout-monitoring per page request.
-    The third constructor-arg is a flag whether the commonj timeout-monitor work should try to interrupt a timeout worker thread.
-    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>
-    </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>
-</beans>
+<?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.
+-->
+<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>
+
+    <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>
+    
+    <!--
+    Commonj Work Manager and Worker Monitor
+    
+    If you want to use Commonj Work Manager provided by the container, uncomment the followings
+    and replace 'org.apache.jetspeed.aggregator.WorkerMonitor' with 'org.apache.jetspeed.aggregator.CommonjWorkerMonitor' in this file.
+    
+    For the bean named 'org.apache.jetspeed.aggregator.CommonjWorkerMonitor', two flags can be added as constructor-args.
+    The second constructor-arg is a flag whether a separate timeout-monitor thread is used or not as the old WorkerMonitorImpl does.
+    By default, this flag is set to true. If it is set to false, then a new commonj work will be created for timeout-monitoring per page request.
+    The third constructor-arg is a flag whether the commonj timeout-monitor work should try to interrupt a timeout worker thread.
+    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>
+    </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>
+</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=641679&r1=641678&r2=641679&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 Mar 26 18:18:18 2008
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
 <!--
     Licensed to the Apache Software Foundation (ASF) under one or more
     contributor license agreements.  See the NOTICE file distributed with
@@ -16,8 +15,10 @@
     See the License for the specific language governing permissions and
     limitations under the License.
 -->
-<beans>
-
+<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 ==

Modified: portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/ajax.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/ajax.xml?rev=641679&r1=641678&r2=641679&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/ajax.xml (original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/ajax.xml Wed Mar 26 18:18:18 2008
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
 <!--
 Licensed to the Apache Software Foundation (ASF) under one or more
 contributor license agreements.  See the NOTICE file distributed with
@@ -16,8 +15,10 @@
 See the License for the specific language governing permissions and
 limitations under the License.
 -->
-
-<beans>
+<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="AJAXService"
       class="org.apache.jetspeed.ajax.AJAXServiceImpl">
     <constructor-arg>

Modified: portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/alternate/db-page-manager.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/alternate/db-page-manager.xml?rev=641679&r1=641678&r2=641679&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/alternate/db-page-manager.xml (original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/alternate/db-page-manager.xml Wed Mar 26 18:18:18 2008
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
 <!--
 Licensed to the Apache Software Foundation (ASF) under one or more
 contributor license agreements.  See the NOTICE file distributed with
@@ -16,7 +15,9 @@
 See the License for the specific language governing permissions and
 limitations under the License.
 -->
-<beans>
+<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">
     
   <!-- DB PageManager -->
   <bean id="org.apache.jetspeed.page.PageManagerImpl" 

Modified: portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/alternate/extended-pipelines.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/alternate/extended-pipelines.xml?rev=641679&r1=641678&r2=641679&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/alternate/extended-pipelines.xml (original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/alternate/extended-pipelines.xml Wed Mar 26 18:18:18 2008
@@ -1,53 +1,54 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
-<!--
+<?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.
--->
-
-<!-- the three beans below are examples only -->
-<beans>
-  <bean id="propertyLoaderValve_1"
-        class="com.fmr.portal.pipeline.impl.PropertyLoaderValve"
-        init-method="initialize"> 
-      <constructor-arg index="0"> 
-          <value>php-properties</value>
-      </constructor-arg> 
-      <constructor-arg index="1"
-       type="org.apache.commons.configuration.PropertiesConfiguration"> 
-          <ref bean="ProductionConfiguration"/> 
-      </constructor-arg> 
-  </bean>
-  
-  <bean id="propertyLoaderValve_2"
-        class="com.fmr.portal.pipeline.impl.PropertyLoaderValve"
-        init-method="initialize"> 
-      <constructor-arg index="0"> 
-          <value>php-properties</value>
-      </constructor-arg>  
-      <constructor-arg index="1">
-          <value>/apps/jetspeed/etc/jetspeed-production.properties</value>
-      </constructor-arg> 
-  </bean>
-  
-  <bean id="propertyLoaderValve_3"
-        class="com.fmr.portal.pipeline.impl.PropertyLoaderValve"
-         init-method="initialize"> 
-      <constructor-arg index="0"> 
-          <value>app.props</value>
-      </constructor-arg> 
-  </bean>
-    
-</beans>
+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">
+    
+  <!-- the three beans below are examples only -->
+  <bean id="propertyLoaderValve_1"
+        class="com.fmr.portal.pipeline.impl.PropertyLoaderValve"
+        init-method="initialize"> 
+      <constructor-arg index="0"> 
+          <value>php-properties</value>
+      </constructor-arg> 
+      <constructor-arg index="1"
+       type="org.apache.commons.configuration.PropertiesConfiguration"> 
+          <ref bean="ProductionConfiguration"/> 
+      </constructor-arg> 
+  </bean>
+  
+  <bean id="propertyLoaderValve_2"
+        class="com.fmr.portal.pipeline.impl.PropertyLoaderValve"
+        init-method="initialize"> 
+      <constructor-arg index="0"> 
+          <value>php-properties</value>
+      </constructor-arg>  
+      <constructor-arg index="1">
+          <value>/apps/jetspeed/etc/jetspeed-production.properties</value>
+      </constructor-arg> 
+  </bean>
+  
+  <bean id="propertyLoaderValve_3"
+        class="com.fmr.portal.pipeline.impl.PropertyLoaderValve"
+         init-method="initialize"> 
+      <constructor-arg index="0"> 
+          <value>app.props</value>
+      </constructor-arg> 
+  </bean>
+    
+</beans>

Modified: portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/alternate/interceptors.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/alternate/interceptors.xml?rev=641679&r1=641678&r2=641679&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/alternate/interceptors.xml (original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/alternate/interceptors.xml Wed Mar 26 18:18:18 2008
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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
@@ -15,69 +15,71 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
-<!--
-    Database PSML Manager Interception for handling Cache Rollback
-    We also have examples here of replay interception for failover to 
-    a second database on update failures
-   -->    
-<beans>
-
-    <bean id="pageManagerInterceptor" class="org.apache.jetspeed.util.interceptors.PageManagerInterceptor">
-    </bean>
-
-
-    <bean id="PageManagerTransactionProxy" class="org.springframework.transaction.interceptor.TransactionProxyFactoryBean"
-                        abstract="true">
-        <property name="transactionManager"><ref bean="transactionManager"/></property>
-        <property name="transactionAttributes">
-            <props>
-                <prop key="*">PROPAGATION_REQUIRED</prop>
-            </props>
-        </property>
-        <property name="preInterceptors"> 
-            <list>
-                <ref local="pageManagerInterceptor" />
-            </list>
-        </property>
-    </bean>
-
-    <!--    
-        Replay support:
-        
-    <bean id="replayTransactionProxy" class="org.springframework.transaction.interceptor.TransactionProxyFactoryBean"
-                        abstract="true">
-        <property name="transactionManager"><ref bean="transactionManager"/></property>
-        <property name="transactionAttributes">
-            <props>
-                <prop key="*">PROPAGATION_REQUIRED</prop>
-            </props>
-        </property>
-        <property name="preInterceptors"> 
-            <list>
-                <ref local="methodReplayInterceptor" />
-            </list>
-        </property>
-    </bean>
-        
-   <bean id="replayDecisionMakerBean"
-        class="org.apache.jetspeed.util.interceptors.TransactionalMethodReplayDecisionMaker">
-        <property name="sqlErrorCodes">
-            <value>9999, 400, -80</value> 
-             <value>9999</value>
-        </property>
-    </bean>
-
-    <bean id="methodReplayInterceptor" class="org.apache.jetspeed.util.interceptors.MethodReplayInterceptor">
-        <property name="retryCount">
-            <value>3</value>
-        </property>
-        <property name="retryInterval">
-            <value>500</value></property>  retry every 500 milliseconds 
-        <property name="replayDecisionMaker">
-            <ref bean="replayDecisionMakerBean"/>
-        </property>
-    </bean>
- -->
-            
-</beans>
+<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">
+    
+  <!--
+    Database PSML Manager Interception for handling Cache Rollback
+    We also have examples here of replay interception for failover to 
+    a second database on update failures
+   -->    
+
+    <bean id="pageManagerInterceptor" class="org.apache.jetspeed.util.interceptors.PageManagerInterceptor">
+    </bean>
+
+
+    <bean id="PageManagerTransactionProxy" class="org.springframework.transaction.interceptor.TransactionProxyFactoryBean"
+                        abstract="true">
+        <property name="transactionManager"><ref bean="transactionManager"/></property>
+        <property name="transactionAttributes">
+            <props>
+                <prop key="*">PROPAGATION_REQUIRED</prop>
+            </props>
+        </property>
+        <property name="preInterceptors"> 
+            <list>
+                <ref local="pageManagerInterceptor" />
+            </list>
+        </property>
+    </bean>
+
+    <!--    
+        Replay support:
+        
+    <bean id="replayTransactionProxy" class="org.springframework.transaction.interceptor.TransactionProxyFactoryBean"
+                        abstract="true">
+        <property name="transactionManager"><ref bean="transactionManager"/></property>
+        <property name="transactionAttributes">
+            <props>
+                <prop key="*">PROPAGATION_REQUIRED</prop>
+            </props>
+        </property>
+        <property name="preInterceptors"> 
+            <list>
+                <ref local="methodReplayInterceptor" />
+            </list>
+        </property>
+    </bean>
+        
+   <bean id="replayDecisionMakerBean"
+        class="org.apache.jetspeed.util.interceptors.TransactionalMethodReplayDecisionMaker">
+        <property name="sqlErrorCodes">
+            <value>9999, 400, -80</value> 
+             <value>9999</value>
+        </property>
+    </bean>
+
+    <bean id="methodReplayInterceptor" class="org.apache.jetspeed.util.interceptors.MethodReplayInterceptor">
+        <property name="retryCount">
+            <value>3</value>
+        </property>
+        <property name="retryInterval">
+            <value>500</value></property>  retry every 500 milliseconds 
+        <property name="replayDecisionMaker">
+            <ref bean="replayDecisionMakerBean"/>
+        </property>
+    </bean>
+ -->
+            
+</beans>

Modified: portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/alternate/jetty-override.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/alternate/jetty-override.xml?rev=641679&r1=641678&r2=641679&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/alternate/jetty-override.xml (original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/alternate/jetty-override.xml Wed Mar 26 18:18:18 2008
@@ -15,9 +15,10 @@
 See the License for the specific language governing permissions and
 limitations under the License.
 -->
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
-<beans>
-
+<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 Application and Decorator deployment event listeners -->
   <bean id="portletAppDeploymentListener" 
   	   class="org.apache.jetspeed.deployment.impl.JettyDeployPortletAppEventListener"   	   

Modified: portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/alternate/request-context.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/alternate/request-context.xml?rev=641679&r1=641678&r2=641679&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/alternate/request-context.xml (original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/alternate/request-context.xml Wed Mar 26 18:18:18 2008
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
 <!--
     Licensed to the Apache Software Foundation (ASF) under one or more
     contributor license agreements.  See the NOTICE file distributed with
@@ -16,8 +15,10 @@
     See the License for the specific language governing permissions and
     limitations under the License.
 -->
-<beans>
-
+<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 -->
     <bean id="org.apache.jetspeed.request.RequestContextComponent" class="org.apache.jetspeed.request.JetspeedRequestContextComponent">
         <constructor-arg>

Modified: portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/alternate/seed-registry.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/alternate/seed-registry.xml?rev=641679&r1=641678&r2=641679&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/alternate/seed-registry.xml (original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/alternate/seed-registry.xml Wed Mar 26 18:18:18 2008
@@ -1,145 +1,146 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
-<!--
-    Licensed to the Apache Software Foundation (ASF) under one or more
-    contributor license agreements.  See the NOTICE file distributed with
-    this work for additional information regarding copyright ownership.
-    The ASF licenses this file to You under the Apache License, Version 2.0
-    (the "License"); you may not use this file except in compliance with
-    the License.  You may obtain a copy of the License at
-    
-    http://www.apache.org/licenses/LICENSE-2.0
-    
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
--->
-<beans>
-    
-    <!-- Portlet Factory -->
-    <bean id="portletFactory" class="org.apache.jetspeed.factory.JetspeedPortletFactory">
-        <!-- 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>false</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>false</value>
-        </constructor-arg>
-        <!-- Surrogate portlet for config modes. -->
-        <property name="customConfigModePortletUniqueName">
-            <value>j2-admin::CustomConfigModePortlet</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>
-        <!--
-            <property name="preInterceptors">
-            <list>
-            <ref bean="portletEntityCachingAdvisor"/>
-            <ref bean="portletEntityRemoveFromCacheAdvisor"/>
-            </list>
-            </property>
-        -->
-        <property name="transactionAttributes">
-            <props>
-                <prop key="remove*">PROPAGATION_REQUIRED</prop>
-                <prop key="store*">PROPAGATION_REQUIRED,-org.apache.jetspeed.components.portletentity.PortletEntityNotStoredException</prop>
-                <prop key="*">PROPAGATION_SUPPORTS</prop>
-            </props>
-        </property>
-    </bean>
-    
-  <!-- Inject Portlet Entity Proxy into Portlet Entity impl -->
-  <bean id="injectEntityAccessProxy" class="org.springframework.beans.factory.config.MethodInvokingFactoryBean">
-      <property name="targetObject"><ref bean="portletEntityAccessImpl"/></property>
-      <property name="targetMethod"><value>setEntityAccessProxy</value></property>
-      <property name="arguments">
-          <list>
-              <ref bean="org.apache.jetspeed.components.portletentity.PortletEntityAccessComponent"/>
-          </list>
-      </property>
-  </bean>
-    
+<?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.
+-->
+<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>false</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>false</value>
+        </constructor-arg>
+        <!-- Surrogate portlet for config modes. -->
+        <property name="customConfigModePortletUniqueName">
+            <value>j2-admin::CustomConfigModePortlet</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>
+        <!--
+            <property name="preInterceptors">
+            <list>
+            <ref bean="portletEntityCachingAdvisor"/>
+            <ref bean="portletEntityRemoveFromCacheAdvisor"/>
+            </list>
+            </property>
+        -->
+        <property name="transactionAttributes">
+            <props>
+                <prop key="remove*">PROPAGATION_REQUIRED</prop>
+                <prop key="store*">PROPAGATION_REQUIRED,-org.apache.jetspeed.components.portletentity.PortletEntityNotStoredException</prop>
+                <prop key="*">PROPAGATION_SUPPORTS</prop>
+            </props>
+        </property>
+    </bean>
+    
+  <!-- Inject Portlet Entity Proxy into Portlet Entity impl -->
+  <bean id="injectEntityAccessProxy" class="org.springframework.beans.factory.config.MethodInvokingFactoryBean">
+      <property name="targetObject"><ref bean="portletEntityAccessImpl"/></property>
+      <property name="targetMethod"><value>setEntityAccessProxy</value></property>
+      <property name="arguments">
+          <list>
+              <ref bean="org.apache.jetspeed.components.portletentity.PortletEntityAccessComponent"/>
+          </list>
+      </property>
+  </bean>
+    
 </beans>

Modified: portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/alternate/versioned-deployment/deployment.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/alternate/versioned-deployment/deployment.xml?rev=641679&r1=641678&r2=641679&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/alternate/versioned-deployment/deployment.xml (original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/alternate/versioned-deployment/deployment.xml Wed Mar 26 18:18:18 2008
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
 <!--
 Licensed to the Apache Software Foundation (ASF) under one or more
 contributor license agreements.  See the NOTICE file distributed with
@@ -16,8 +15,10 @@
 See the License for the specific language governing permissions and
 limitations under the License.
 -->
-<beans>
-
+<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="deployFactory" class="org.apache.jetspeed.tools.deploy.JetspeedDeployFactory"/>
   <bean id="PAM" 
   	   class="org.apache.jetspeed.tools.pamanager.VersionedPortletApplicationManager" init-method="start" destroy-method="stop"

Modified: portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/alternate/versioned-deployment/jetspeed-services.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/alternate/versioned-deployment/jetspeed-services.xml?rev=641679&r1=641678&r2=641679&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/alternate/versioned-deployment/jetspeed-services.xml (original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/alternate/versioned-deployment/jetspeed-services.xml Wed Mar 26 18:18:18 2008
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
 <!--
 Licensed to the Apache Software Foundation (ASF) under one or more
 contributor license agreements.  See the NOTICE file distributed with
@@ -16,8 +15,10 @@
 See the License for the specific language governing permissions and
 limitations under the License.
 -->
-<beans>
-
+<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 Services  -->
   <bean id="PortalServices" 
   	   class="org.apache.jetspeed.services.JetspeedPortletServices" >

Modified: portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/boot/datasource.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/boot/datasource.xml?rev=641679&r1=641678&r2=641679&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/boot/datasource.xml (original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/boot/datasource.xml Wed Mar 26 18:18:18 2008
@@ -15,9 +15,11 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
-<beans>
-   <!-- 
+<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">
+    
+    <!-- 
        Simply use the JNDI data source provided via Spring
      -->           
      <bean id="JetspeedDS" class="org.springframework.jndi.JndiObjectFactoryBean">

Modified: portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/cache.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/cache.xml?rev=641679&r1=641678&r2=641679&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/cache.xml (original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/cache.xml Wed Mar 26 18:18:18 2008
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
 <!--
 	Licensed to the Apache Software Foundation (ASF) under one or more
 	contributor license agreements.  See the NOTICE file distributed with
@@ -16,8 +15,10 @@
 	See the License for the specific language governing permissions and
 	limitations under the License.
 -->
-<beans>
-
+<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="cacheManager"
 		class="org.springframework.cache.ehcache.EhCacheManagerFactoryBean">
 		<!--  get it through the class path
@@ -211,21 +212,21 @@
 		<constructor-arg index="0">
 			<ref bean="ehActiveAuthenticationCache" />
 		</constructor-arg>
-	</bean>
+	</bean>
+	
+	<bean id="ehPortletWindowCache"
+		class="org.springframework.cache.ehcache.EhCacheFactoryBean">
+		<property name="cacheManager">
+			<ref local="cacheManager" />
+		</property>
+		<property name="cacheName" value="portletWindowCache" />
+	</bean>
 	
-	<bean id="ehPortletWindowCache"
-		class="org.springframework.cache.ehcache.EhCacheFactoryBean">
-		<property name="cacheManager">
-			<ref local="cacheManager" />
-		</property>
-		<property name="cacheName" value="portletWindowCache" />
-	</bean>
-	
-    <bean id="portletWindowCache"
-		class="org.apache.jetspeed.cache.impl.EhPortletWindowCache">
-		<constructor-arg index="0">
-			<ref bean="ehPortletWindowCache" />
-		</constructor-arg>
-	</bean>
+    <bean id="portletWindowCache"
+		class="org.apache.jetspeed.cache.impl.EhPortletWindowCache">
+		<constructor-arg index="0">
+			<ref bean="ehPortletWindowCache" />
+		</constructor-arg>
+	</bean>
 
 </beans>

Modified: portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/capabilities.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/capabilities.xml?rev=641679&r1=641678&r2=641679&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/capabilities.xml (original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/capabilities.xml Wed Mar 26 18:18:18 2008
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
 <!--
     Licensed to the Apache Software Foundation (ASF) under one or more
     contributor license agreements.  See the NOTICE file distributed with
@@ -16,8 +15,10 @@
     See the License for the specific language governing permissions and
     limitations under the License.
 -->
-<beans>
-
+<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">
+    
     <!-- Capabilities DAO-->
     <bean id="capabilitiesImpl" class="org.apache.jetspeed.capabilities.impl.JetspeedCapabilities" init-method="init">
         <constructor-arg index="0">
@@ -58,15 +59,15 @@
 	<!-- Capability related content -->
 
 	<!-- Client -->
-	<bean id="Client" class="org.apache.jetspeed.capabilities.impl.ClientImpl" singleton="false"></bean>
+	<bean id="Client" class="org.apache.jetspeed.capabilities.impl.ClientImpl" scope="prototype"></bean>
 
 	<!-- MediaType -->
-	<bean id="MediaType" class="org.apache.jetspeed.capabilities.impl.MediaTypeImpl" singleton="false"></bean>
+    <bean id="MediaType" class="org.apache.jetspeed.capabilities.impl.MediaTypeImpl" scope="prototype"></bean>
 
 	<!-- MimeType -->
-	<bean id="MimeType" class="org.apache.jetspeed.capabilities.impl.MimeTypeImpl" singleton="false"></bean>
+    <bean id="MimeType" class="org.apache.jetspeed.capabilities.impl.MimeTypeImpl" scope="prototype"></bean>
 
 	<!-- Capability -->
-	<bean id="Capability" class="org.apache.jetspeed.capabilities.impl.CapabilityImpl" singleton="false"></bean>
+    <bean id="Capability" class="org.apache.jetspeed.capabilities.impl.CapabilityImpl" scope="prototype"></bean>
  
 </beans>

Modified: portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/cluster-node.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/cluster-node.xml?rev=641679&r1=641678&r2=641679&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/cluster-node.xml (original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/cluster-node.xml Wed Mar 26 18:18:18 2008
@@ -1,39 +1,40 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
-<!--
+<?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.
--->
-<beans>
-
-  <!--CLUSTER NODE COMPONENT-->
-  <bean id="org.apache.jetspeed.cluster.NodeManager"
-  	class="org.apache.jetspeed.cluster.NodeManagerImpl"
-  >
-  	<constructor-arg index="0">
-	<value>${applicationRoot}/WEB-INF/cluster_node</value> 
-<!--   				<value>target/jetspeed/WEB-INF/cluster_node</value> -->
-  		</constructor-arg>
- 	<!--  pass reference to NodeInformation -->
-		<constructor-arg index="1">
-			<value>NodeInformation</value>
-		</constructor-arg>
- 	
-  </bean>
-  
-  	<!-- Rule Criterion -->
-	<bean id="NodeInformation" class="org.apache.jetspeed.cluster.NodeInformationImpl" singleton="false"></bean>
-  
-</beans>
+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">
+    
+  <!--CLUSTER NODE COMPONENT-->
+  <bean id="org.apache.jetspeed.cluster.NodeManager"
+  	class="org.apache.jetspeed.cluster.NodeManagerImpl"
+  >
+  	<constructor-arg index="0">
+	<value>${applicationRoot}/WEB-INF/cluster_node</value> 
+<!--   				<value>target/jetspeed/WEB-INF/cluster_node</value> -->
+  		</constructor-arg>
+ 	<!--  pass reference to NodeInformation -->
+		<constructor-arg index="1">
+			<value>NodeInformation</value>
+		</constructor-arg>
+ 	
+  </bean>
+  
+  	<!-- Rule Criterion -->
+  <bean id="NodeInformation" class="org.apache.jetspeed.cluster.NodeInformationImpl" scope="prototype"></bean>
+  
+</beans>

Modified: portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/deployment.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/deployment.xml?rev=641679&r1=641678&r2=641679&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/deployment.xml (original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/deployment.xml Wed Mar 26 18:18:18 2008
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
 <!--
 Licensed to the Apache Software Foundation (ASF) under one or more
 contributor license agreements.  See the NOTICE file distributed with
@@ -16,8 +15,10 @@
 See the License for the specific language governing permissions and
 limitations under the License.
 -->
-<beans>
-
+<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">
+    
   <!-- Application Server Manager for Tomcat. Comment out for others like JBoss
   	   Provides hooks into the application server to help us deploy portlet applications
   	   as web application into that server.  This manager is for Tomcat 5

Modified: portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/desktop.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/desktop.xml?rev=641679&r1=641678&r2=641679&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/desktop.xml (original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/desktop.xml Wed Mar 26 18:18:18 2008
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
 <!--
 Licensed to the Apache Software Foundation (ASF) under one or more
 contributor license agreements.  See the NOTICE file distributed with
@@ -16,8 +15,10 @@
 See the License for the specific language governing permissions and
 limitations under the License.
 -->
-<beans>
-
+<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">
+    
   <!-- Application Server Manager for Tomcat. Comment out for others like JBoss
        Provides hooks into the application server to help us deploy portlet applications
        as web application into that server.  This manager is for Tomcat 5



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