Index: components/jetspeed-capability/src/test/resources/serializer.xml
===================================================================
--- components/jetspeed-capability/src/test/resources/serializer.xml	(revision 1602320)
+++ components/jetspeed-capability/src/test/resources/serializer.xml	(working copy)
@@ -17,7 +17,7 @@
 -->
 <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">
+    xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.2.xsd">
     
 	<bean id="serializer" class="org.apache.jetspeed.serializer.JetspeedSerializerImpl">
 	  <constructor-arg index="0">
Index: components/jetspeed-page-layout/src/test/resources/cache-test.xml
===================================================================
--- components/jetspeed-page-layout/src/test/resources/cache-test.xml	(revision 1602320)
+++ components/jetspeed-page-layout/src/test/resources/cache-test.xml	(working copy)
@@ -16,7 +16,7 @@
     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">
+    xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.2.xsd">
     
     <!-- Cache Manager -->
     <bean id="cacheManagerConfig" class="org.apache.jetspeed.cache.impl.EhCacheConfigResource">
Index: components/jetspeed-page-manager/src/test/resources/database-page-manager-base.xml
===================================================================
--- components/jetspeed-page-manager/src/test/resources/database-page-manager-base.xml	(revision 1602320)
+++ components/jetspeed-page-manager/src/test/resources/database-page-manager-base.xml	(working copy)
@@ -17,7 +17,7 @@
 -->
 <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">
+    xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.2.xsd">
 
     <!-- Id Generator -->
     <bean id="idGenerator" class="org.apache.jetspeed.idgenerator.JetspeedIdGenerator" init-method="start" destroy-method="stop">
Index: components/jetspeed-page-manager/src/test/resources/database-page-manager.xml
===================================================================
--- components/jetspeed-page-manager/src/test/resources/database-page-manager.xml	(revision 1602320)
+++ components/jetspeed-page-manager/src/test/resources/database-page-manager.xml	(working copy)
@@ -17,7 +17,7 @@
 -->
 <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">
+    xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.2.xsd">
 
     <import resource="database-page-manager-base.xml"/>
 
Index: components/jetspeed-page-manager/src/test/resources/interceptors.xml
===================================================================
--- components/jetspeed-page-manager/src/test/resources/interceptors.xml	(revision 1602320)
+++ components/jetspeed-page-manager/src/test/resources/interceptors.xml	(working copy)
@@ -17,7 +17,7 @@
 -->
 <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">
+    xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.2.xsd">
 
     <!--
     Examples of replay interception for failover to 
Index: components/jetspeed-portal/src/test/assembly/cache-test.xml
===================================================================
--- components/jetspeed-portal/src/test/assembly/cache-test.xml	(revision 1602320)
+++ components/jetspeed-portal/src/test/assembly/cache-test.xml	(working copy)
@@ -16,7 +16,7 @@
     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">
+    xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.2.xsd">
     
     <!-- Cache Manager -->
     <bean id="cacheManagerConfig" class="org.apache.jetspeed.cache.impl.EhCacheConfigResource">
Index: components/jetspeed-portal/src/test/assembly/jetspeed-restful-services.xml
===================================================================
--- components/jetspeed-portal/src/test/assembly/jetspeed-restful-services.xml	(revision 1602320)
+++ components/jetspeed-portal/src/test/assembly/jetspeed-restful-services.xml	(working copy)
@@ -17,7 +17,7 @@
 -->
 <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">
+       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.2.xsd">
   
   <!-- To enable log4j logging instead of the default java logging of cxf. -->
   <bean class="org.springframework.beans.factory.config.MethodInvokingFactoryBean">
Index: components/jetspeed-portal/src/test/assembly/page-manager.xml
===================================================================
--- components/jetspeed-portal/src/test/assembly/page-manager.xml	(revision 1602320)
+++ components/jetspeed-portal/src/test/assembly/page-manager.xml	(working copy)
@@ -17,7 +17,7 @@
 -->
 <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">
+    xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.2.xsd">
     
   <!-- PageManager -->
   <bean id="PsmlDocumentHandler"
Index: components/jetspeed-portal/src/test/assembly/test-layout-api.xml
===================================================================
--- components/jetspeed-portal/src/test/assembly/test-layout-api.xml	(revision 1602320)
+++ components/jetspeed-portal/src/test/assembly/test-layout-api.xml	(working copy)
@@ -17,7 +17,7 @@
 -->
 <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">
+    xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.2.xsd">
     
     <!-- AJAX Actions 
         
Index: components/jetspeed-portal/src/test/assembly/test-layout-constraints-api.xml
===================================================================
--- components/jetspeed-portal/src/test/assembly/test-layout-constraints-api.xml	(revision 1602320)
+++ components/jetspeed-portal/src/test/assembly/test-layout-constraints-api.xml	(working copy)
@@ -17,7 +17,7 @@
 -->
 <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">
+    xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.2.xsd">
     
 <!-- AJAX Actions 
     
Index: components/jetspeed-portal/src/test/resources/rc2.xml
===================================================================
--- components/jetspeed-portal/src/test/resources/rc2.xml	(revision 1602320)
+++ components/jetspeed-portal/src/test/resources/rc2.xml	(working copy)
@@ -17,7 +17,7 @@
 -->
 <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">
+    xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.2.xsd">
     
   <bean id="org.apache.jetspeed.userinfo.UserInfoManager" 
   	   class="org.apache.jetspeed.userinfo.MockUserInfoManager"
Index: components/jetspeed-portal/src/test/resources/rc3.xml
===================================================================
--- components/jetspeed-portal/src/test/resources/rc3.xml	(revision 1602320)
+++ components/jetspeed-portal/src/test/resources/rc3.xml	(working copy)
@@ -17,7 +17,7 @@
 -->
 <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">
+    xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.2.xsd">
     
   <!-- Request Context -->
   <bean id="org.apache.jetspeed.request.RequestContextComponent"
Index: components/jetspeed-portal/src/test/resources/system-properties.xml
===================================================================
--- components/jetspeed-portal/src/test/resources/system-properties.xml	(revision 1602320)
+++ components/jetspeed-portal/src/test/resources/system-properties.xml	(working copy)
@@ -17,7 +17,7 @@
 -->
 <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">
+    xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.2.xsd">
     
   <bean id="placeholderConfig" class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
         
Index: components/jetspeed-portal-site/src/test/resources/cache-test.xml
===================================================================
--- components/jetspeed-portal-site/src/test/resources/cache-test.xml	(revision 1602320)
+++ components/jetspeed-portal-site/src/test/resources/cache-test.xml	(working copy)
@@ -16,7 +16,7 @@
     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">
+    xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.2.xsd">
     
     <!-- Cache Manager -->
     <bean id="cacheManagerConfig" class="org.apache.jetspeed.cache.impl.EhCacheConfigResource">
Index: components/jetspeed-profiler/src/test/resources/cache-test.xml
===================================================================
--- components/jetspeed-profiler/src/test/resources/cache-test.xml	(revision 1602320)
+++ components/jetspeed-profiler/src/test/resources/cache-test.xml	(working copy)
@@ -16,7 +16,7 @@
     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">
+    xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.2.xsd">
     
     <!-- Cache Manager -->
     <bean id="cacheManagerConfig" class="org.apache.jetspeed.cache.impl.EhCacheConfigResource">
Index: components/jetspeed-registry/src/test/resources/cache-test.xml
===================================================================
--- components/jetspeed-registry/src/test/resources/cache-test.xml	(revision 1602320)
+++ components/jetspeed-registry/src/test/resources/cache-test.xml	(working copy)
@@ -16,7 +16,7 @@
     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">
+    xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.2.xsd">
     
     <!-- Cache Manager -->
     <bean id="cacheManagerConfig" class="org.apache.jetspeed.cache.impl.EhCacheConfigResource">
Index: components/jetspeed-registry/src/test/resources/registry-test.xml
===================================================================
--- components/jetspeed-registry/src/test/resources/registry-test.xml	(revision 1602320)
+++ components/jetspeed-registry/src/test/resources/registry-test.xml	(working copy)
@@ -17,7 +17,7 @@
 -->
 <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">
+    xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.2.xsd">
     
     <!-- Portlet Factory -->
     <bean id="portletFactory" class="org.apache.jetspeed.factory.JetspeedPortletFactory">
@@ -103,8 +103,7 @@
       <property name="useEntityPreferences" ><value>true</value></property>
   </bean>
   
-  <bean id="org.apache.jetspeed.components.portletpreferences.PortletPreferencesProvider" parent="baseTransactionProxy" name="portletPreferencesProvider"
-    destroy-method="destroy">
+  <bean id="org.apache.jetspeed.components.portletpreferences.PortletPreferencesProvider" parent="baseTransactionProxy" name="portletPreferencesProvider">
     <property name="proxyInterfaces">
       <value>org.apache.jetspeed.components.portletpreferences.PortletPreferencesProvider</value>
     </property>
Index: components/jetspeed-security/src/test/resources/cache-test.xml
===================================================================
--- components/jetspeed-security/src/test/resources/cache-test.xml	(revision 1602320)
+++ components/jetspeed-security/src/test/resources/cache-test.xml	(working copy)
@@ -16,7 +16,7 @@
     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">
+    xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.2.xsd">
     
     <!-- Cache Manager -->
     <bean id="cacheManagerConfig" class="org.apache.jetspeed.cache.impl.EhCacheConfigResource">
Index: components/jetspeed-sso/src/test/resources/cache-test.xml
===================================================================
--- components/jetspeed-sso/src/test/resources/cache-test.xml	(revision 1602320)
+++ components/jetspeed-sso/src/test/resources/cache-test.xml	(working copy)
@@ -16,7 +16,7 @@
     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">
+    xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.2.xsd">
     
     <!-- Cache Manager -->
     <bean id="cacheManagerConfig" class="org.apache.jetspeed.cache.impl.EhCacheConfigResource">
Index: etc/import/assembly/import-page-manager.xml
===================================================================
--- etc/import/assembly/import-page-manager.xml	(revision 1602320)
+++ etc/import/assembly/import-page-manager.xml	(working copy)
@@ -17,7 +17,7 @@
 -->
 <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">
+    xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.2.xsd">
     
   <bean id="org.apache.jetspeed.page.PageManagerImpl" 
         name="pageManagerImpl"
Index: etc/import/assembly/repository-datasource-spring.xml
===================================================================
--- etc/import/assembly/repository-datasource-spring.xml	(revision 1602320)
+++ etc/import/assembly/repository-datasource-spring.xml	(working copy)
@@ -17,7 +17,7 @@
 -->
 <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">
+    xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.2.xsd">
     
   <!-- datasource bean -->
 <!--  <bean id="JetspeedDS" class="org.apache.jetspeed.components.rdbms.ojb.ConnectionRepositoryEntry"> -->
Index: etc/registration/assembly/registry.xml
===================================================================
--- etc/registration/assembly/registry.xml	(revision 1602320)
+++ etc/registration/assembly/registry.xml	(working copy)
@@ -17,7 +17,7 @@
 -->
 <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">
+    xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.2.xsd">
     
     <!-- Portlet Factory -->
     <bean id="portletFactory" class="org.apache.jetspeed.factory.JetspeedPortletFactory"></bean>
Index: jetspeed-portal-resources/src/main/resources/assembly/administration.xml
===================================================================
--- jetspeed-portal-resources/src/main/resources/assembly/administration.xml	(revision 1602320)
+++ jetspeed-portal-resources/src/main/resources/assembly/administration.xml	(working copy)
@@ -16,7 +16,7 @@
   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">
+  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.2.xsd">
 
   <bean id="mailSender" class="org.springframework.mail.javamail.JavaMailSenderImpl">
     <meta key="j2:cat" value="default" />
Index: jetspeed-portal-resources/src/main/resources/assembly/aggregation.xml
===================================================================
--- jetspeed-portal-resources/src/main/resources/assembly/aggregation.xml	(revision 1602320)
+++ jetspeed-portal-resources/src/main/resources/assembly/aggregation.xml	(working copy)
@@ -16,7 +16,7 @@
   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">
+  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.2.xsd">
 
   <bean id="org.apache.jetspeed.aggregator.PortletTrackingManager"
     class="org.apache.jetspeed.aggregator.impl.PortletTrackingManagerImpl">
Index: jetspeed-portal-resources/src/main/resources/assembly/ajax-layout.xml
===================================================================
--- jetspeed-portal-resources/src/main/resources/assembly/ajax-layout.xml	(revision 1602320)
+++ jetspeed-portal-resources/src/main/resources/assembly/ajax-layout.xml	(working copy)
@@ -16,7 +16,7 @@
   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">
+  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.2.xsd">
 
   <!-- AJAX Actions
 
Index: jetspeed-portal-resources/src/main/resources/assembly/ajax.xml
===================================================================
--- jetspeed-portal-resources/src/main/resources/assembly/ajax.xml	(revision 1602320)
+++ jetspeed-portal-resources/src/main/resources/assembly/ajax.xml	(working copy)
@@ -16,7 +16,7 @@
   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">
+  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.2.xsd">
 
   <bean id="AJAXService" class="org.apache.jetspeed.ajax.AJAXServiceImpl">
     <meta key="j2:cat" value="default" />
Index: jetspeed-portal-resources/src/main/resources/assembly/boot/datasource.xml
===================================================================
--- jetspeed-portal-resources/src/main/resources/assembly/boot/datasource.xml	(revision 1602320)
+++ jetspeed-portal-resources/src/main/resources/assembly/boot/datasource.xml	(working copy)
@@ -16,7 +16,7 @@
   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">
+  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.2.xsd">
 
   <!--
     Simply use the JNDI data source provided via Spring
Index: jetspeed-portal-resources/src/main/resources/assembly/cache.xml
===================================================================
--- jetspeed-portal-resources/src/main/resources/assembly/cache.xml	(revision 1602320)
+++ jetspeed-portal-resources/src/main/resources/assembly/cache.xml	(working copy)
@@ -16,7 +16,7 @@
     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">
+    xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.2.xsd">
     
     <!-- Cache Manager -->
     <bean id="cacheManagerConfig" class="org.apache.jetspeed.cache.impl.EhCacheConfigResource">
Index: jetspeed-portal-resources/src/main/resources/assembly/capabilities.xml
===================================================================
--- jetspeed-portal-resources/src/main/resources/assembly/capabilities.xml	(revision 1602320)
+++ jetspeed-portal-resources/src/main/resources/assembly/capabilities.xml	(working copy)
@@ -16,7 +16,7 @@
   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">
+  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.2.xsd">
 
   <!-- Capabilities DAO-->
   <bean id="capabilitiesImpl" class="org.apache.jetspeed.capabilities.impl.JetspeedCapabilities" init-method="init">
Index: jetspeed-portal-resources/src/main/resources/assembly/cluster-node.xml
===================================================================
--- jetspeed-portal-resources/src/main/resources/assembly/cluster-node.xml	(revision 1602320)
+++ jetspeed-portal-resources/src/main/resources/assembly/cluster-node.xml	(working copy)
@@ -16,7 +16,7 @@
   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">
+  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.2.xsd">
 
   <!--CLUSTER NODE COMPONENT-->
   <bean id="org.apache.jetspeed.cluster.NodeManager" class="org.apache.jetspeed.cluster.NodeManagerImpl">
Index: jetspeed-portal-resources/src/main/resources/assembly/deployment.xml
===================================================================
--- jetspeed-portal-resources/src/main/resources/assembly/deployment.xml	(revision 1602320)
+++ jetspeed-portal-resources/src/main/resources/assembly/deployment.xml	(working copy)
@@ -16,7 +16,7 @@
   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">
+  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.2.xsd">
 
   <!-- Application Server Manager for Tomcat. Comment out for others like JBoss
     Provides hooks into the application server to help us deploy portlet applications
Index: jetspeed-portal-resources/src/main/resources/assembly/desktop.xml
===================================================================
--- jetspeed-portal-resources/src/main/resources/assembly/desktop.xml	(revision 1602320)
+++ jetspeed-portal-resources/src/main/resources/assembly/desktop.xml	(working copy)
@@ -16,7 +16,7 @@
   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">
+  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.2.xsd">
 
   <!-- Application Server Manager for Tomcat. Comment out for others like JBoss
     Provides hooks into the application server to help us deploy portlet applications
Index: jetspeed-portal-resources/src/main/resources/assembly/headtag.xml
===================================================================
--- jetspeed-portal-resources/src/main/resources/assembly/headtag.xml	(revision 1602320)
+++ jetspeed-portal-resources/src/main/resources/assembly/headtag.xml	(working copy)
@@ -16,7 +16,7 @@
   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">
+  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.2.xsd">
 
   <!--  header (html <head>) configuration  -->
 
Index: jetspeed-portal-resources/src/main/resources/assembly/importer-page-manager.xml
===================================================================
--- jetspeed-portal-resources/src/main/resources/assembly/importer-page-manager.xml	(revision 1602320)
+++ jetspeed-portal-resources/src/main/resources/assembly/importer-page-manager.xml	(working copy)
@@ -16,7 +16,7 @@
   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">
+  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.2.xsd">
 
   <!-- PageManager -->
   <bean id="ImportPsmlDocumentHandler" class="org.apache.jetspeed.page.document.psml.CastorFileSystemDocumentHandler">
Index: jetspeed-portal-resources/src/main/resources/assembly/jetspeed-base.xml
===================================================================
--- jetspeed-portal-resources/src/main/resources/assembly/jetspeed-base.xml	(revision 1602320)
+++ jetspeed-portal-resources/src/main/resources/assembly/jetspeed-base.xml	(working copy)
@@ -16,7 +16,7 @@
     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">
+    xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.2.xsd">
     
     <!-- ID Generator -->
     <bean id="IdGenerator" class="org.apache.jetspeed.idgenerator.JetspeedIdGenerator" init-method="start"
Index: jetspeed-portal-resources/src/main/resources/assembly/jetspeed-production.xml
===================================================================
--- jetspeed-portal-resources/src/main/resources/assembly/jetspeed-production.xml	(revision 1602320)
+++ jetspeed-portal-resources/src/main/resources/assembly/jetspeed-production.xml	(working copy)
@@ -16,7 +16,7 @@
   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">
+  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.2.xsd">
 
   <!-- Production configuration holds properties that can be configured at runtime by system administrator -->
   <!-- NOTE: you will probably want to put the property file OUTSIDE the web application -->
Index: jetspeed-portal-resources/src/main/resources/assembly/jetspeed-properties.xml
===================================================================
--- jetspeed-portal-resources/src/main/resources/assembly/jetspeed-properties.xml	(revision 1602320)
+++ jetspeed-portal-resources/src/main/resources/assembly/jetspeed-properties.xml	(working copy)
@@ -16,7 +16,7 @@
   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">
+  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.2.xsd">
 
   <!-- Commons configuration object generated from jetspeed.properties + override.properties -->
   <bean id="portal_configuration" class="org.apache.jetspeed.components.util.ConfigurationProperties">
Index: jetspeed-portal-resources/src/main/resources/assembly/jetspeed-restful-services.xml
===================================================================
--- jetspeed-portal-resources/src/main/resources/assembly/jetspeed-restful-services.xml	(revision 1602320)
+++ jetspeed-portal-resources/src/main/resources/assembly/jetspeed-restful-services.xml	(working copy)
@@ -17,7 +17,7 @@
 -->
 <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">
+       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.2.xsd">
   
   <bean id="jacksonObjectMapper" class="org.codehaus.jackson.map.ObjectMapper">
     <meta key="j2:cat" value="default" />
Index: jetspeed-portal-resources/src/main/resources/assembly/jetspeed-services.xml
===================================================================
--- jetspeed-portal-resources/src/main/resources/assembly/jetspeed-services.xml	(revision 1602320)
+++ jetspeed-portal-resources/src/main/resources/assembly/jetspeed-services.xml	(working copy)
@@ -16,7 +16,7 @@
   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">
+  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.2.xsd">
 
   <!-- Portlet Services  -->
   <bean id="PortalServices" class="org.apache.jetspeed.services.JetspeedPortletServices">
Index: jetspeed-portal-resources/src/main/resources/assembly/jetspeed-spring.xml
===================================================================
--- jetspeed-portal-resources/src/main/resources/assembly/jetspeed-spring.xml	(revision 1602320)
+++ jetspeed-portal-resources/src/main/resources/assembly/jetspeed-spring.xml	(working copy)
@@ -16,7 +16,7 @@
   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">
+  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.2.xsd">
 
   <bean id="PortalConfiguration" class="org.apache.jetspeed.administration.PortalConfigurationImpl">
     <meta key="j2:cat" value="default" />
Index: jetspeed-portal-resources/src/main/resources/assembly/multiple-action.xml
===================================================================
--- jetspeed-portal-resources/src/main/resources/assembly/multiple-action.xml	(revision 1602320)
+++ jetspeed-portal-resources/src/main/resources/assembly/multiple-action.xml	(working copy)
@@ -16,7 +16,7 @@
   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">
+  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.2.xsd">
 
   <!--   <bean id="AjaxMultipleActionTarget" -->
   <bean id="AjaxMultipleAction" class="org.apache.jetspeed.layout.impl.MultipleAction">
Index: jetspeed-portal-resources/src/main/resources/assembly/page-manager.xml
===================================================================
--- jetspeed-portal-resources/src/main/resources/assembly/page-manager.xml	(revision 1602320)
+++ jetspeed-portal-resources/src/main/resources/assembly/page-manager.xml	(working copy)
@@ -16,7 +16,7 @@
   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">
+  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.2.xsd">
 
   <!-- XML/Castor PageManager -->
 
Index: jetspeed-portal-resources/src/main/resources/assembly/pipelines.xml
===================================================================
--- jetspeed-portal-resources/src/main/resources/assembly/pipelines.xml	(revision 1602320)
+++ jetspeed-portal-resources/src/main/resources/assembly/pipelines.xml	(working copy)
@@ -16,7 +16,7 @@
   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">
+  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.2.xsd">
 
   <bean id="localizationValve" class="org.apache.jetspeed.localization.impl.LocalizationValveImpl"
     init-method="initialize">
Index: jetspeed-portal-resources/src/main/resources/assembly/pluto-services.xml
===================================================================
--- jetspeed-portal-resources/src/main/resources/assembly/pluto-services.xml	(revision 1602320)
+++ jetspeed-portal-resources/src/main/resources/assembly/pluto-services.xml	(working copy)
@@ -18,7 +18,7 @@
 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">
+  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.2.xsd">
 
     <!-- ====================================================== -->
     <!-- Declare Pluto Service Accessors                        -->
Index: jetspeed-portal-resources/src/main/resources/assembly/portal-url-generation.xml
===================================================================
--- jetspeed-portal-resources/src/main/resources/assembly/portal-url-generation.xml	(revision 1602320)
+++ jetspeed-portal-resources/src/main/resources/assembly/portal-url-generation.xml	(working copy)
@@ -16,7 +16,7 @@
   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">
+  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.2.xsd">
 
   <bean id="NavigationalStateCodec" class="org.apache.jetspeed.container.state.impl.JetspeedNavigationalStateCodec">
     <meta key="j2:cat" value="default" />
Index: jetspeed-portal-resources/src/main/resources/assembly/profiler.xml
===================================================================
--- jetspeed-portal-resources/src/main/resources/assembly/profiler.xml	(revision 1602320)
+++ jetspeed-portal-resources/src/main/resources/assembly/profiler.xml	(working copy)
@@ -16,7 +16,7 @@
   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">
+  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.2.xsd">
 
   <!-- Profiler -->
   <bean id="profilerImpl" class="org.apache.jetspeed.profiler.impl.JetspeedProfilerImpl" init-method="init">
Index: jetspeed-portal-resources/src/main/resources/assembly/registry.xml
===================================================================
--- jetspeed-portal-resources/src/main/resources/assembly/registry.xml	(revision 1602320)
+++ jetspeed-portal-resources/src/main/resources/assembly/registry.xml	(working copy)
@@ -16,7 +16,7 @@
   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">
+  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.2.xsd">
 
   <!-- Portlet Factory -->
   <bean id="portletFactory" class="org.apache.jetspeed.factory.JetspeedPortletFactory">
@@ -118,7 +118,7 @@
 
   <bean id="org.apache.pluto.services.PreferencesService" name="PortletPreferencesProviderImpl"
         class="org.apache.jetspeed.components.portletpreferences.PortletPreferencesServiceImpl"
-        init-method="init" destroy-method="destroy">
+        init-method="init">
     <meta key="j2:cat" value="default or registry" />          
     <constructor-arg index="0">
       <ref bean="portletFactory" />
@@ -130,7 +130,7 @@
   </bean>
 
   <bean id="org.apache.jetspeed.components.portletpreferences.PortletPreferencesProvider" parent="baseTransactionProxy"
-    name="portletPreferencesProvider" destroy-method="destroy">
+    name="portletPreferencesProvider">
     <meta key="j2:cat" value="default or registry" />
     <property name="proxyInterfaces">
       <value>org.apache.jetspeed.components.portletpreferences.PortletPreferencesProvider</value>
Index: jetspeed-portal-resources/src/main/resources/assembly/request-context-objects.xml
===================================================================
--- jetspeed-portal-resources/src/main/resources/assembly/request-context-objects.xml	(revision 1602320)
+++ jetspeed-portal-resources/src/main/resources/assembly/request-context-objects.xml	(working copy)
@@ -16,7 +16,7 @@
   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">
+  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.2.xsd">
 
   <!--  Request Context Objects will be populated into the Jetspeed Request Context
     and are accessible in the vm context of templates in the "rco" variable, example:
Index: jetspeed-portal-resources/src/main/resources/assembly/search.xml
===================================================================
--- jetspeed-portal-resources/src/main/resources/assembly/search.xml	(revision 1602320)
+++ jetspeed-portal-resources/src/main/resources/assembly/search.xml	(working copy)
@@ -16,7 +16,7 @@
   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">
+  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.2.xsd">
 
   <!--SEARCH COMPONENT-->
   <bean id="org.apache.jetspeed.search.HandlerFactory" class="org.apache.jetspeed.search.handlers.HandlerFactoryImpl">
Index: jetspeed-portal-resources/src/main/resources/assembly/security-atn.xml
===================================================================
--- jetspeed-portal-resources/src/main/resources/assembly/security-atn.xml	(revision 1602320)
+++ jetspeed-portal-resources/src/main/resources/assembly/security-atn.xml	(working copy)
@@ -16,7 +16,7 @@
   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">
+  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.2.xsd">
 
   <!-- ************** Login Module ************** -->
   <!-- Security: Login Module Proxy -->
Index: jetspeed-portal-resources/src/main/resources/assembly/security-atz.xml
===================================================================
--- jetspeed-portal-resources/src/main/resources/assembly/security-atz.xml	(revision 1602320)
+++ jetspeed-portal-resources/src/main/resources/assembly/security-atz.xml	(working copy)
@@ -16,7 +16,7 @@
   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">
+  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.2.xsd">
 
   <!-- Security: RDBMS Policy implementation for JAAS -->
   <bean id="org.apache.jetspeed.security.impl.RdbmsPolicy" class="org.apache.jetspeed.security.impl.RdbmsPolicy">
Index: jetspeed-portal-resources/src/main/resources/assembly/security-ldap.xml
===================================================================
--- jetspeed-portal-resources/src/main/resources/assembly/security-ldap.xml	(revision 1602320)
+++ jetspeed-portal-resources/src/main/resources/assembly/security-ldap.xml	(working copy)
@@ -16,7 +16,7 @@
   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">
+  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.2.xsd">
 
   <bean id="org.apache.jetspeed.security.spi.impl.JetspeedPrincipalLdapStorageManager" class="org.apache.jetspeed.security.spi.impl.JetspeedPrincipalLdapStorageManager">
     <meta key="j2:cat" value="ldapSecurity" />
Index: jetspeed-portal-resources/src/main/resources/assembly/security-managers.xml
===================================================================
--- jetspeed-portal-resources/src/main/resources/assembly/security-managers.xml	(revision 1602320)
+++ jetspeed-portal-resources/src/main/resources/assembly/security-managers.xml	(working copy)
@@ -16,7 +16,7 @@
   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">
+  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.2.xsd">
 
   <bean id="org.apache.jetspeed.security.JetspeedPrincipalType.user"
     class="org.apache.jetspeed.security.impl.JetspeedPrincipalTypeImpl">
Index: jetspeed-portal-resources/src/main/resources/assembly/security-providers.xml
===================================================================
--- jetspeed-portal-resources/src/main/resources/assembly/security-providers.xml	(revision 1602320)
+++ jetspeed-portal-resources/src/main/resources/assembly/security-providers.xml	(working copy)
@@ -16,7 +16,7 @@
   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">
+  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.2.xsd">
 
   <!-- ************** Security Providers ************** -->
   <!-- Security: Default Authentication Provider -->
Index: jetspeed-portal-resources/src/main/resources/assembly/security-spi-atn.xml
===================================================================
--- jetspeed-portal-resources/src/main/resources/assembly/security-spi-atn.xml	(revision 1602320)
+++ jetspeed-portal-resources/src/main/resources/assembly/security-spi-atn.xml	(working copy)
@@ -16,7 +16,7 @@
   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">
+  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.2.xsd">
 
   <!-- ************** Security SPI Handlers ************** -->
 
Index: jetspeed-portal-resources/src/main/resources/assembly/security-spi.xml
===================================================================
--- jetspeed-portal-resources/src/main/resources/assembly/security-spi.xml	(revision 1602320)
+++ jetspeed-portal-resources/src/main/resources/assembly/security-spi.xml	(working copy)
@@ -16,7 +16,7 @@
   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">
+  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.2.xsd">
 
   <!-- ************** Security SPI Handlers ************** -->
   <!-- Security SPI: CommonQueries -->
Index: jetspeed-portal-resources/src/main/resources/assembly/serializer.xml
===================================================================
--- jetspeed-portal-resources/src/main/resources/assembly/serializer.xml	(revision 1602320)
+++ jetspeed-portal-resources/src/main/resources/assembly/serializer.xml	(working copy)
@@ -16,7 +16,7 @@
 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">
+  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.2.xsd">
 
   <bean id="org.apache.jetspeed.serializer.JetspeedSerializer" name="JetspeedSerializer"
     class="org.apache.jetspeed.serializer.JetspeedSerializerImpl">
Index: jetspeed-portal-resources/src/main/resources/assembly/servlet-api.xml
===================================================================
--- jetspeed-portal-resources/src/main/resources/assembly/servlet-api.xml	(revision 1602320)
+++ jetspeed-portal-resources/src/main/resources/assembly/servlet-api.xml	(working copy)
@@ -16,7 +16,7 @@
   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">
+  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.2.xsd">
 
   <!-- ServletConfig -->
   <bean id="javax.servlet.ServletConfig" name="ServletConfig"
Index: jetspeed-portal-resources/src/main/resources/assembly/spaces.xml
===================================================================
--- jetspeed-portal-resources/src/main/resources/assembly/spaces.xml	(revision 1602320)
+++ jetspeed-portal-resources/src/main/resources/assembly/spaces.xml	(working copy)
@@ -16,7 +16,7 @@
   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">
+  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.2.xsd">
 
   <bean id="org.apache.jetspeed.services.Spaces" class="org.apache.jetspeed.spaces.SpacesServiceImpl">
     <meta key="j2:cat" value="default" />
Index: jetspeed-portal-resources/src/main/resources/assembly/sso.xml
===================================================================
--- jetspeed-portal-resources/src/main/resources/assembly/sso.xml	(revision 1602320)
+++ jetspeed-portal-resources/src/main/resources/assembly/sso.xml	(working copy)
@@ -17,7 +17,7 @@
 -->
 <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">
+  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.2.xsd">
 
   <!-- SSO Implementation -->
 
Index: jetspeed-portal-resources/src/main/resources/assembly/static-bean-references.xml
===================================================================
--- jetspeed-portal-resources/src/main/resources/assembly/static-bean-references.xml	(revision 1602320)
+++ jetspeed-portal-resources/src/main/resources/assembly/static-bean-references.xml	(working copy)
@@ -16,7 +16,7 @@
   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">
+  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.2.xsd">
 
   <bean id="_portletDefinitionImplPortletPreferencesProviderInitializer"
     class="org.apache.jetspeed.components.LifecycleAwareStaticClassInitializer">
Index: jetspeed-portal-resources/src/main/resources/assembly/statistics.xml
===================================================================
--- jetspeed-portal-resources/src/main/resources/assembly/statistics.xml	(revision 1602320)
+++ jetspeed-portal-resources/src/main/resources/assembly/statistics.xml	(working copy)
@@ -16,7 +16,7 @@
   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">
+  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.2.xsd">
 
   <!-- Statistics Implementation -->
   <bean id="PortalStatistics" class="org.apache.jetspeed.statistics.impl.PortalStatisticsImpl" init-method="springInit"
Index: jetspeed-portal-resources/src/main/resources/assembly/theme-engine.xml
===================================================================
--- jetspeed-portal-resources/src/main/resources/assembly/theme-engine.xml	(revision 1602320)
+++ jetspeed-portal-resources/src/main/resources/assembly/theme-engine.xml	(working copy)
@@ -16,7 +16,7 @@
   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">
+  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.2.xsd">
 
   <bean id="ResourceValidator" class="org.apache.jetspeed.decoration.validators.WebApplicationResourceValidator">
     <meta key="j2:cat" value="default" />
Index: jetspeed-portal-resources/src/main/resources/assembly/transaction.xml
===================================================================
--- jetspeed-portal-resources/src/main/resources/assembly/transaction.xml	(revision 1602320)
+++ jetspeed-portal-resources/src/main/resources/assembly/transaction.xml	(working copy)
@@ -16,7 +16,7 @@
   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">
+  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.2.xsd">
 
   <!--
     - Application context definition for PortletRegistry using Apache OJB.
Index: jetspeed-portal-resources/src/main/resources/assembly/userinfo.xml
===================================================================
--- jetspeed-portal-resources/src/main/resources/assembly/userinfo.xml	(revision 1602320)
+++ jetspeed-portal-resources/src/main/resources/assembly/userinfo.xml	(working copy)
@@ -16,7 +16,7 @@
   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">
+  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.2.xsd">
 
   <!-- Single Source User Info -->
   <bean id="org.apache.jetspeed.userinfo.UserInfoManager"
Index: jetspeed-portal-resources/src/main/resources/assembly/wps.xml
===================================================================
--- jetspeed-portal-resources/src/main/resources/assembly/wps.xml	(revision 1602320)
+++ jetspeed-portal-resources/src/main/resources/assembly/wps.xml	(working copy)
@@ -16,7 +16,7 @@
   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">
+  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.2.xsd">
 
   <!-- required for websphere, uncomment if running under websphere
     see:  http://issues.apache.org/jira/browse/JS2-355
Index: pom.xml
===================================================================
--- pom.xml	(revision 1602320)
+++ pom.xml	(working copy)
@@ -228,21 +228,22 @@
     <aopalliance.version>1.0</aopalliance.version>
     <castor.version>1.1.1</castor.version>
     <cglib.version>2.1_3</cglib.version>
-    <commons-beanutils.version>1.8.0</commons-beanutils.version>
+    <commons-beanutils.version>1.9.2</commons-beanutils.version>
     <commons-betwixt.version>0.8</commons-betwixt.version>
-    <commons-codec.version>1.3</commons-codec.version>
-    <commons-collections.version>3.2</commons-collections.version>
-    <commons-configuration.version>1.9</commons-configuration.version>
-    <commons-dbcp.version>1.2.2</commons-dbcp.version>
-    <commons-digester.version>1.8</commons-digester.version>
-    <commons-fileupload.version>1.2</commons-fileupload.version>
-    <commons-httpclient.version>3.0.1</commons-httpclient.version>
-    <commons-io.version>1.4</commons-io.version>
+    <commons-codec.version>1.9</commons-codec.version>
+    <commons-collections.version>3.2.1</commons-collections.version>
+    <commons-configuration.version>1.10</commons-configuration.version>
+    <commons-dbcp.version>1.4</commons-dbcp.version>
+    <commons-digester.version>2.1</commons-digester.version>
+    <commons-fileupload.version>1.3.1</commons-fileupload.version>
+    <commons-httpclient.version>3.1</commons-httpclient.version>
+    <commons-io.version>2.4</commons-io.version>
     <commons-jexl.version>1.1</commons-jexl.version>
-    <commons-lang.version>2.4</commons-lang.version>
-    <commons-logging.version>1.1</commons-logging.version>
+    <commons-lang.version>2.6</commons-lang.version>
+    <commons-logging.version>1.1.3</commons-logging.version>
+    <commons-pool.version>1.6</commons-pool.version>
     <slf4j.version>1.5.6</slf4j.version>
-    <commons-pool.version>1.5.6</commons-pool.version>
+    
     <ddlutils.version>1.0</ddlutils.version>
     <directory.version>1.5.5</directory.version>
     <dom4j.version>1.6.1</dom4j.version>
@@ -265,7 +266,7 @@
     <geronimo-activation_1.1_spec.version>1.0.2</geronimo-activation_1.1_spec.version>
     
     <jdom.version>1.1</jdom.version>
-    <log4j.version>1.2.14</log4j.version>
+    <log4j.version>1.2.17</log4j.version>
     <lucene.version>3.1.0</lucene.version>
     <solr.version>3.1.0</solr.version>
     <myfaces.version>1.1.5</myfaces.version>
@@ -289,7 +290,7 @@
     <regexp.version>1.2</regexp.version>
     <rome.version>0.8</rome.version>
     <saxpath.version>1.0-FCS</saxpath.version>
-    <spring.version>2.5.6</spring.version>
+    <spring.version>3.2.9.RELEASE</spring.version>
     <spring.ldap.version>1.3.0.RELEASE</spring.ldap.version>
     <spring.ojb.version>2.0-rc2</spring.ojb.version>    
     <step2.version>${project.version}</step2.version>