Index: components/statistics/src/java/org/apache/jetspeed/statistics/impl/PortalStatisticsImpl.java
===================================================================
--- components/statistics/src/java/org/apache/jetspeed/statistics/impl/PortalStatisticsImpl.java	(revisión: 486498)
+++ components/statistics/src/java/org/apache/jetspeed/statistics/impl/PortalStatisticsImpl.java	(copia de trabajo)
@@ -46,7 +46,7 @@
 import org.apache.jetspeed.statistics.PortalStatistics;
 import org.apache.jetspeed.statistics.StatisticsQueryCriteria;
 import org.apache.jetspeed.statistics.UserStats;
-import org.springframework.orm.ojb.support.PersistenceBrokerDaoSupport;
+import org.springmodules.orm.ojb.support.PersistenceBrokerDaoSupport;
 
 /**
  * <p>
Index: components/cm/src/java/org/apache/jetspeed/testhelpers/OJBHelper.java
===================================================================
--- components/cm/src/java/org/apache/jetspeed/testhelpers/OJBHelper.java	(revisión: 486498)
+++ components/cm/src/java/org/apache/jetspeed/testhelpers/OJBHelper.java	(copia de trabajo)
@@ -5,9 +5,9 @@
 
 import org.springframework.beans.factory.support.DefaultListableBeanFactory;
 import org.springframework.context.support.GenericApplicationContext;
-import org.springframework.orm.ojb.PersistenceBrokerTransactionManager;
-import org.springframework.orm.ojb.support.LocalOjbConfigurer;
 import org.springframework.transaction.interceptor.TransactionProxyFactoryBean;
+import org.springmodules.orm.ojb.PersistenceBrokerTransactionManager;
+import org.springmodules.orm.ojb.support.LocalOjbConfigurer;
 
 public class OJBHelper extends DatasourceHelper
 {
@@ -55,13 +55,18 @@
      */
     public Object getTxProxiedObject(Object object, String[] interfacesToProxyAs) throws Exception
     {
+        Class[] ifaces = new Class[interfacesToProxyAs.length];
+        for(int i = 0; i < interfacesToProxyAs.length; i++) {
+                ifaces[i] = Class.forName(interfacesToProxyAs[i]);
+        }
+
         TransactionProxyFactoryBean txfb = new TransactionProxyFactoryBean();
         txfb.setTransactionManager(new PersistenceBrokerTransactionManager());
         Properties txProps = new Properties();
         txProps.setProperty("*", "PROPAGATION_REQUIRED");
         txfb.setTransactionAttributes(txProps);
         txfb.setTarget(object);
-        txfb.setProxyInterfaces(interfacesToProxyAs);
+        txfb.setProxyInterfaces(ifaces);
         txfb.afterPropertiesSet();
         return txfb.getObject();
     }
Index: components/cm/pom.xml
===================================================================
--- components/cm/pom.xml	(revisión: 486498)
+++ components/cm/pom.xml	(copia de trabajo)
@@ -50,6 +50,10 @@
             <artifactId>spring</artifactId>
         </dependency>
         <dependency>
+            <groupId>org.springmodules</groupId>
+            <artifactId>spring-modules-ojb</artifactId>
+        </dependency>
+        <dependency>
             <groupId>aopalliance</groupId>
             <artifactId>aopalliance</artifactId>
         </dependency>
Index: components/rdbms/src/java/org/apache/jetspeed/components/dao/InitablePersistenceBrokerDaoSupport.java
===================================================================
--- components/rdbms/src/java/org/apache/jetspeed/components/dao/InitablePersistenceBrokerDaoSupport.java	(revisión: 486498)
+++ components/rdbms/src/java/org/apache/jetspeed/components/dao/InitablePersistenceBrokerDaoSupport.java	(copia de trabajo)
@@ -20,7 +20,7 @@
 import org.apache.ojb.broker.metadata.DescriptorRepository;
 import org.apache.ojb.broker.metadata.MetadataManager;
 import org.apache.ojb.broker.metadata.RepositoryPersistor;
-import org.springframework.orm.ojb.support.PersistenceBrokerDaoSupport;
+import org.springmodules.orm.ojb.support.PersistenceBrokerDaoSupport;
 
 /**
  * <p>
Index: components/rdbms/pom.xml
===================================================================
--- components/rdbms/pom.xml	(revisión: 486498)
+++ components/rdbms/pom.xml	(copia de trabajo)
@@ -46,6 +46,14 @@
 
         <!-- Build Dependencies -->
         <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springmodules</groupId>
+            <artifactId>spring-modules-ojb</artifactId>
+        </dependency>
+        <dependency>
             <groupId>${pom.groupId}</groupId>
             <artifactId>jetspeed-cm</artifactId>
         </dependency>
Index: components/security/src/java/org/apache/jetspeed/security/impl/PermissionManagerImpl.java
===================================================================
--- components/security/src/java/org/apache/jetspeed/security/impl/PermissionManagerImpl.java	(revisión: 486498)
+++ components/security/src/java/org/apache/jetspeed/security/impl/PermissionManagerImpl.java	(copia de trabajo)
@@ -47,7 +47,7 @@
 import org.apache.ojb.broker.query.Query;
 import org.apache.ojb.broker.query.QueryByCriteria;
 import org.apache.ojb.broker.query.QueryFactory;
-import org.springframework.orm.ojb.support.PersistenceBrokerDaoSupport;
+import org.springmodules.orm.ojb.support.PersistenceBrokerDaoSupport;
 
 /**
  * <p>
Index: components/registry/src/java/org/apache/jetspeed/components/portletentity/PersistenceBrokerPortletEntityAccess.java
===================================================================
--- components/registry/src/java/org/apache/jetspeed/components/portletentity/PersistenceBrokerPortletEntityAccess.java	(revisión: 486498)
+++ components/registry/src/java/org/apache/jetspeed/components/portletentity/PersistenceBrokerPortletEntityAccess.java	(copia de trabajo)
@@ -38,7 +38,7 @@
 import org.apache.pluto.om.entity.PortletEntity;
 import org.apache.pluto.om.entity.PortletEntityCtrl;
 import org.apache.pluto.om.portlet.PortletDefinition;
-import org.springframework.orm.ojb.support.PersistenceBrokerDaoSupport;
+import org.springmodules.orm.ojb.support.PersistenceBrokerDaoSupport;
 
 /**
  * <p>
Index: applications/rss/src/java/org/apache/portals/applications/rss/servlets/SpringInitServlet.java
===================================================================
--- applications/rss/src/java/org/apache/portals/applications/rss/servlets/SpringInitServlet.java	(revisión: 486498)
+++ applications/rss/src/java/org/apache/portals/applications/rss/servlets/SpringInitServlet.java	(copia de trabajo)
@@ -23,8 +23,8 @@
 
 import org.springframework.beans.factory.BeanFactory;
 import org.springframework.beans.factory.xml.XmlBeanFactory;
+import org.springframework.web.context.support.ServletContextResourceLoader;
 
-
 /**
  * SpringInitServlet
  * 
@@ -61,9 +61,8 @@
             {
                 if (null == springFactory)
                 {
-                    InputStream is = this.getServletContext().getResourceAsStream(springConfig);                    
-                    springFactory = new XmlBeanFactory(is);
-                    is.close();
+                    ServletContextResourceLoader resourceLoader = new ServletContextResourceLoader(this.getServletContext());
+                    springFactory = new XmlBeanFactory(resourceLoader.getResource(springConfig));
                 }
             }
          } 
Index: pom.xml
===================================================================
--- pom.xml	(revisión: 486498)
+++ pom.xml	(copia de trabajo)
@@ -195,6 +195,7 @@
         <rome.version>0.4</rome.version>
         <saxpath.version>1.0-FCS</saxpath.version>
         <spring2.version>2.0</spring2.version>
+        <spring.modules.version>0.6.0</spring.modules.version>
         <taglibs-random.version>1.0.2</taglibs-random.version>
         <taglibs-request.version>1.0.1</taglibs-request.version>
         <taglibs-standard.version>1.0.6</taglibs-standard.version>
@@ -525,7 +526,7 @@
             <dependency>
                 <groupId>org.springframework</groupId>
                 <artifactId>spring</artifactId>
-                <version>${org.springframework.version}</version>
+                <version>${spring2.version}</version>
             </dependency>
             <dependency>
                 <groupId>cglib</groupId>
@@ -578,6 +579,13 @@
                 <version>${spring2.version}</version>
             </dependency>
 
+            <!-- Spring Framework Modules -->
+            <dependency>
+                <groupId>org.springmodules</groupId>
+                <artifactId>spring-modules-ojb</artifactId>
+                <version>${spring.modules.version}</version>
+            </dependency>
+
             <!-- Jakarta -->
             <dependency>
                 <groupId>lucene</groupId>
Index: project.properties
===================================================================
--- project.properties	(revisión: 486498)
+++ project.properties	(copia de trabajo)
@@ -32,6 +32,7 @@
 portals.bridges.velocity.version=1.0.1-dev
 commons.logging.version=1.0.3
 spring2.version=2.0
+spring.modules.version=0.6.0
 derby.version=10.1.1.0
 hsql.version=1.8.0.2
 
Index: core-build.xml
===================================================================
--- core-build.xml	(revisión: 486498)
+++ core-build.xml	(copia de trabajo)
@@ -76,12 +76,19 @@
         <!-- Spring Framework and dependencies -->
 	    <dependency>
 	      <id>springframework:spring</id>
-	      <version>${spring.version}</version>
+	      <version>${spring2.version}</version>
 	      <properties>
 	        <war.bundle>true</war.bundle>
 	      </properties>
 	    </dependency>   
 	    <dependency>
+	      <id>springmodules:spring-modules-ojb</id>
+	      <version>${spring.modules.version}</version>
+	      <properties>
+	        <war.bundle>true</war.bundle>
+	      </properties>
+	    </dependency>   
+	    <dependency>
 	      <id>cglib</id>
 	      <version>full-2.0.2</version>
 	      <properties>
@@ -358,6 +365,7 @@
 	         <war.bundle>true</war.bundle>
 	      </properties>          
 	    </dependency>	
+<!--
 	    <dependency>
 	      <id>DdlUtils</id>
 	      <version>1.0-RC1-PATCHED</version>
@@ -365,5 +373,6 @@
 	         <war.bundle>true</war.bundle>
 	      </properties>          
 	    </dependency>
+-->
 	  </dependencies>     
 </project>