portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tay...@apache.org
Subject svn commit: r489500 - in /portals/jetspeed-2/trunk: ./ app-servers/security/jboss/src/java/META-INF/jboss-secsvc/ applications/j2-admin/ applications/rss/src/java/org/apache/portals/applications/rss/servlets/ components/cm/ components/cm/src/java/org/a...
Date Thu, 21 Dec 2006 23:32:09 GMT
Author: taylor
Date: Thu Dec 21 15:32:04 2006
New Revision: 489500

URL: http://svn.apache.org/viewvc?view=rev&rev=489500
Log:
http://issues.apache.org/jira/browse/JS2-618
Migration from Spring 1.1.x to Spring 2.0

patch applied
everything built with Maven-1, and Maven-2
everything tested with Maven-1, and Maven-2, all passing
deployed with Maven-1, Maven-2, seems to work (ahem)
uncovered a lot of issues when deploying and testing
fixed broken tests in Maven-2

Added:
    portals/jetspeed-2/trunk/xdocs/guide-federated-security.xml
Modified:
    portals/jetspeed-2/trunk/.classpath
    portals/jetspeed-2/trunk/app-servers/security/jboss/src/java/META-INF/jboss-secsvc/transaction.xml
    portals/jetspeed-2/trunk/applications/j2-admin/project.xml
    portals/jetspeed-2/trunk/applications/rss/src/java/org/apache/portals/applications/rss/servlets/SpringInitServlet.java
    portals/jetspeed-2/trunk/components/cm/pom.xml
    portals/jetspeed-2/trunk/components/cm/src/java/org/apache/jetspeed/testhelpers/OJBHelper.java
    portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/page/psml/PageImpl.java
    portals/jetspeed-2/trunk/components/page-manager/src/test/org/apache/jetspeed/page/PageManagerTestShared.java
    portals/jetspeed-2/trunk/components/portal/pom.xml
    portals/jetspeed-2/trunk/components/rdbms/pom.xml
    portals/jetspeed-2/trunk/components/rdbms/src/java/org/apache/jetspeed/components/dao/InitablePersistenceBrokerDaoSupport.java
    portals/jetspeed-2/trunk/components/registry/etc/assembly/registry-test.xml
    portals/jetspeed-2/trunk/components/registry/pom.xml
    portals/jetspeed-2/trunk/components/registry/src/java/org/apache/jetspeed/components/portletentity/PersistenceBrokerPortletEntityAccess.java
    portals/jetspeed-2/trunk/components/security/src/java/org/apache/jetspeed/security/impl/PermissionManagerImpl.java
    portals/jetspeed-2/trunk/components/statistics/src/java/org/apache/jetspeed/statistics/impl/PortalStatisticsImpl.java
    portals/jetspeed-2/trunk/core-build.xml
    portals/jetspeed-2/trunk/etc/db-ojb/OJB.properties
    portals/jetspeed-2/trunk/etc/import/assembly/repository-datasource-spring.xml
    portals/jetspeed-2/trunk/etc/registration/assembly/registry.xml
    portals/jetspeed-2/trunk/pom.xml
    portals/jetspeed-2/trunk/project.properties
    portals/jetspeed-2/trunk/src/webapp/WEB-INF/assembly/administration.xml
    portals/jetspeed-2/trunk/src/webapp/WEB-INF/assembly/boot/datasource.xml
    portals/jetspeed-2/trunk/src/webapp/WEB-INF/assembly/desktop.xml
    portals/jetspeed-2/trunk/src/webapp/WEB-INF/assembly/profiler.xml
    portals/jetspeed-2/trunk/src/webapp/WEB-INF/assembly/registry.xml
    portals/jetspeed-2/trunk/src/webapp/WEB-INF/assembly/transaction.xml

Modified: portals/jetspeed-2/trunk/.classpath
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/.classpath?view=diff&rev=489500&r1=489499&r2=489500
==============================================================================
--- portals/jetspeed-2/trunk/.classpath (original)
+++ portals/jetspeed-2/trunk/.classpath Thu Dec 21 15:32:04 2006
@@ -99,13 +99,11 @@
 	<classpathentry kind="var" path="MAVEN_REPO/myfaces/jars/myfaces-impl-1.1.0.jar"/>
 	<classpathentry kind="var" path="MAVEN_REPO/myfaces/jars/tomahawk-1.1.0.jar"/>
 	<classpathentry kind="var" path="MAVEN_REPO/cglib/jars/cglib-full-2.0.2.jar"/>
-	<classpathentry kind="var" path="MAVEN_REPO/springframework/jars/spring-1.1.5.jar"/>
-	<classpathentry kind="var" path="MAVEN_REPO/org.springframework/jars/spring-beans-2.0.jar"/>
-	<classpathentry kind="var" path="MAVEN_REPO/org.springframework/jars/spring-context-2.0.jar"/>
+	<classpathentry kind="var" path="MAVEN_REPO/springframework/jars/spring-2.0.jar"/>
 	<classpathentry kind="var" path="MAVEN_REPO/org.springframework/jars/spring-mock-2.0.jar"/>
 	<classpathentry kind="var" path="MAVEN_REPO/org.springframework/jars/spring-portlet-2.0.jar"/>
-	<classpathentry kind="var" path="MAVEN_REPO/org.springframework/jars/spring-web-2.0.jar"/>
 	<classpathentry kind="var" path="MAVEN_REPO/org.springframework/jars/spring-webmvc-2.0.jar"/>
+	<classpathentry kind="var" path="MAVEN_REPO/springframeworkmodules/jars/spring-modules-ojb-0.6.jar"/>	
 	<classpathentry kind="var" path="MAVEN_REPO/commons-fileupload/jars/commons-fileupload-1.0.jar"/>
 	<classpathentry kind="var" path="MAVEN_REPO/org.apache.portals.bridges/jars/portals-bridges-common-1.0.1-dev.jar"/>
 	<classpathentry kind="var" path="MAVEN_REPO/org.apache.portals.bridges/jars/portals-bridges-frameworks-1.0.1-dev.jar"/>

Modified: portals/jetspeed-2/trunk/app-servers/security/jboss/src/java/META-INF/jboss-secsvc/transaction.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/app-servers/security/jboss/src/java/META-INF/jboss-secsvc/transaction.xml?view=diff&rev=489500&r1=489499&r2=489500
==============================================================================
--- portals/jetspeed-2/trunk/app-servers/security/jboss/src/java/META-INF/jboss-secsvc/transaction.xml (original)
+++ portals/jetspeed-2/trunk/app-servers/security/jboss/src/java/META-INF/jboss-secsvc/transaction.xml Thu Dec 21 15:32:04 2006
@@ -7,7 +7,7 @@
 <beans>
   
 	<!-- Transaction manager for a single OJB PersistenceBroker (alternative to JTA) -->
-	<bean id="transactionManager" class="org.springframework.orm.ojb.PersistenceBrokerTransactionManager">
+	<bean id="transactionManager" class="org.springmodules.orm.ojb.PersistenceBrokerTransactionManager">
           <property name="jcdAlias"><value>JetspeedSecurityServiceDS</value></property>
     </bean>
 

Modified: portals/jetspeed-2/trunk/applications/j2-admin/project.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/applications/j2-admin/project.xml?view=diff&rev=489500&r1=489499&r2=489500
==============================================================================
--- portals/jetspeed-2/trunk/applications/j2-admin/project.xml (original)
+++ portals/jetspeed-2/trunk/applications/j2-admin/project.xml Thu Dec 21 15:32:04 2006
@@ -327,7 +327,7 @@
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-beans</artifactId>
-            <version>${spring2.version}</version>
+            <version>${spring.version}</version>
             <properties>
                 <war.bundle>true</war.bundle>
             </properties>        
@@ -335,7 +335,7 @@
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-context</artifactId>
-            <version>${spring2.version}</version>
+            <version>${spring.version}</version>
             <properties>
                 <war.bundle>true</war.bundle>
             </properties>        
@@ -343,7 +343,7 @@
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-core</artifactId>
-            <version>${spring2.version}</version>
+            <version>${spring.version}</version>
             <properties>
                 <war.bundle>true</war.bundle>
             </properties>        
@@ -351,7 +351,7 @@
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-portlet</artifactId>
-            <version>${spring2.version}</version>
+            <version>${spring.version}</version>
             <properties>
                 <war.bundle>true</war.bundle>
             </properties>        
@@ -359,7 +359,7 @@
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-web</artifactId>
-            <version>${spring2.version}</version>
+            <version>${spring.version}</version>
             <properties>
                 <war.bundle>true</war.bundle>
             </properties>        
@@ -367,7 +367,7 @@
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-webmvc</artifactId>
-            <version>${spring2.version}</version>
+            <version>${spring.version}</version>
             <properties>
                 <war.bundle>true</war.bundle>
             </properties>        
@@ -375,7 +375,7 @@
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-mock</artifactId>
-            <version>${spring2.version}</version>
+            <version>${spring.version}</version>
             <properties>
                 <war.bundle>true</war.bundle>
             </properties>        
@@ -383,7 +383,7 @@
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-support</artifactId>
-            <version>${spring2.version}</version>
+            <version>${spring.version}</version>
             <properties>
                 <war.bundle>true</war.bundle>
             </properties>        

Modified: portals/jetspeed-2/trunk/applications/rss/src/java/org/apache/portals/applications/rss/servlets/SpringInitServlet.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/applications/rss/src/java/org/apache/portals/applications/rss/servlets/SpringInitServlet.java?view=diff&rev=489500&r1=489499&r2=489500
==============================================================================
--- portals/jetspeed-2/trunk/applications/rss/src/java/org/apache/portals/applications/rss/servlets/SpringInitServlet.java (original)
+++ portals/jetspeed-2/trunk/applications/rss/src/java/org/apache/portals/applications/rss/servlets/SpringInitServlet.java Thu Dec 21 15:32:04 2006
@@ -23,7 +23,7 @@
 
 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));
                 }
             }
          } 

Modified: portals/jetspeed-2/trunk/components/cm/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/cm/pom.xml?view=diff&rev=489500&r1=489499&r2=489500
==============================================================================
--- portals/jetspeed-2/trunk/components/cm/pom.xml (original)
+++ portals/jetspeed-2/trunk/components/cm/pom.xml Thu Dec 21 15:32:04 2006
@@ -49,6 +49,10 @@
             <groupId>org.springframework</groupId>
             <artifactId>spring</artifactId>
         </dependency>
+         <dependency>
+            <groupId>org.springmodules</groupId>
+            <artifactId>spring-modules-ojb</artifactId>
+        </dependency>        
         <dependency>
             <groupId>aopalliance</groupId>
             <artifactId>aopalliance</artifactId>

Modified: portals/jetspeed-2/trunk/components/cm/src/java/org/apache/jetspeed/testhelpers/OJBHelper.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/cm/src/java/org/apache/jetspeed/testhelpers/OJBHelper.java?view=diff&rev=489500&r1=489499&r2=489500
==============================================================================
--- portals/jetspeed-2/trunk/components/cm/src/java/org/apache/jetspeed/testhelpers/OJBHelper.java (original)
+++ portals/jetspeed-2/trunk/components/cm/src/java/org/apache/jetspeed/testhelpers/OJBHelper.java Thu Dec 21 15:32:04 2006
@@ -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();
     }

Modified: portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/page/psml/PageImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/page/psml/PageImpl.java?view=diff&rev=489500&r1=489499&r2=489500
==============================================================================
--- portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/page/psml/PageImpl.java (original)
+++ portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/page/psml/PageImpl.java Thu Dec 21 15:32:04 2006
@@ -23,7 +23,6 @@
 import java.util.Map;
 import java.util.Stack;
 
-import org.apache.jetspeed.om.folder.psml.MenuDefinitionImpl;
 import org.apache.jetspeed.om.folder.Folder;
 import org.apache.jetspeed.om.folder.MenuDefinition;
 import org.apache.jetspeed.om.folder.MenuExcludeDefinition;
@@ -37,6 +36,7 @@
 import org.apache.jetspeed.om.folder.psml.MenuSeparatorDefinitionImpl;
 import org.apache.jetspeed.om.page.Fragment;
 import org.apache.jetspeed.om.page.Page;
+import org.apache.jetspeed.page.impl.DatabasePageManagerUtils;
 
 /**
  * @version $Id$
@@ -252,7 +252,7 @@
 
     public List getFragmentsByName( String name )
     {
-        List fragments = null;
+        List fragments = DatabasePageManagerUtils.createList();
 
         Stack stack = new Stack();
         if (getRootFragment() != null)
@@ -266,10 +266,6 @@
         {
             if ((f.getName() != null) && f.getName().equals(name))
             {
-                if (fragments == null)
-                {
-                    fragments = new ArrayList(1);
-                }
                 fragments.add(f);
             }
 

Modified: portals/jetspeed-2/trunk/components/page-manager/src/test/org/apache/jetspeed/page/PageManagerTestShared.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/page-manager/src/test/org/apache/jetspeed/page/PageManagerTestShared.java?view=diff&rev=489500&r1=489499&r2=489500
==============================================================================
--- portals/jetspeed-2/trunk/components/page-manager/src/test/org/apache/jetspeed/page/PageManagerTestShared.java (original)
+++ portals/jetspeed-2/trunk/components/page-manager/src/test/org/apache/jetspeed/page/PageManagerTestShared.java Thu Dec 21 15:32:04 2006
@@ -297,11 +297,11 @@
                             portlet.setSecurityConstraints(fragmentConstraints);
                             root.getFragments().add(portlet);
                             pageManager.updatePage(page);
-                            test.assertNotNull(page.getRootFragment());
-                            test.assertNotNull(page.getRootFragment().getFragments());
-                            test.assertEquals(2, page.getRootFragment().getFragments().size());
-                            test.assertEquals("some-app::SomePortlet", ((Fragment)page.getRootFragment().getFragments().get(1)).getName());
-                            test.assertFalse("0".equals(((Fragment)page.getRootFragment().getFragments().get(1)).getId()));
+                            TestCase.assertNotNull(page.getRootFragment());
+                            TestCase.assertNotNull(page.getRootFragment().getFragments());
+                            TestCase.assertEquals(2, page.getRootFragment().getFragments().size());
+                            TestCase.assertEquals("some-app::SomePortlet", ((Fragment)page.getRootFragment().getFragments().get(1)).getName());
+                            TestCase.assertFalse("0".equals(((Fragment)page.getRootFragment().getFragments().get(1)).getId()));
                             somePortletId[0] = ((Fragment)page.getRootFragment().getFragments().get(1)).getId();
                         
                             page = pageManager.newPage("/user-page.psml");
@@ -353,19 +353,19 @@
                         {
                             // test view access
                             Folder folder = pageManager.getFolder("/");
-                            test.assertNotNull(folder.getPageSecurity());
-                            test.assertNotNull(folder.getPages());
-                            test.assertEquals(2, folder.getPages().size());
-                            test.assertNotNull(pageManager.getPages(folder));
-                            test.assertEquals(2, pageManager.getPages(folder).size());
+                            TestCase.assertNotNull(folder.getPageSecurity());
+                            TestCase.assertNotNull(folder.getPages());
+                            TestCase.assertEquals(2, folder.getPages().size());
+                            TestCase.assertNotNull(pageManager.getPages(folder));
+                            TestCase.assertEquals(2, pageManager.getPages(folder).size());
                             PageSecurity pageSecurity = pageManager.getPageSecurity();
                             Page page0 = pageManager.getPage("/default-page.psml");
-                            test.assertNotNull(page0.getRootFragment());
-                            test.assertNotNull(page0.getRootFragment().getFragments());
-                            test.assertEquals(2, page0.getRootFragment().getFragments().size());
-                            test.assertNotNull(page0.getFragmentById(somePortletId[0]));
-                            test.assertNotNull(page0.getFragmentsByName("some-app::SomePortlet"));
-                            test.assertEquals(1, page0.getFragmentsByName("some-app::SomePortlet").size());
+                            TestCase.assertNotNull(page0.getRootFragment());
+                            TestCase.assertNotNull(page0.getRootFragment().getFragments());
+                            TestCase.assertEquals(2, page0.getRootFragment().getFragments().size());
+                            TestCase.assertNotNull(page0.getFragmentById(somePortletId[0]));
+                            TestCase.assertNotNull(page0.getFragmentsByName("some-app::SomePortlet"));
+                            TestCase.assertEquals(1, page0.getFragmentsByName("some-app::SomePortlet").size());
                             Page page1 = pageManager.getPage("/user-page.psml");
                             Link link = pageManager.getLink("/default.link");
                             // test edit access
@@ -396,24 +396,24 @@
                         {
                             // test view access
                             Folder folder = pageManager.getFolder("/");
-                            test.assertNotNull(folder.getPageSecurity());
-                            test.assertNotNull(folder.getPages());
-                            test.assertEquals(2, folder.getPages().size());
+                            TestCase.assertNotNull(folder.getPageSecurity());
+                            TestCase.assertNotNull(folder.getPages());
+                            TestCase.assertEquals(2, folder.getPages().size());
                             PageSecurity pageSecurity = pageManager.getPageSecurity();
                             Page page0 = pageManager.getPage("/default-page.psml");
-                            test.assertNotNull(page0.getRootFragment());
-                            test.assertNotNull(page0.getRootFragment().getFragments());
-                            test.assertEquals(2, page0.getRootFragment().getFragments().size());
-                            test.assertNotNull(page0.getFragmentById(somePortletId[0]));
-                            test.assertNotNull(page0.getFragmentsByName("some-app::SomePortlet"));
-                            test.assertEquals(1, page0.getFragmentsByName("some-app::SomePortlet").size());
+                            TestCase.assertNotNull(page0.getRootFragment());
+                            TestCase.assertNotNull(page0.getRootFragment().getFragments());
+                            TestCase.assertEquals(2, page0.getRootFragment().getFragments().size());
+                            TestCase.assertNotNull(page0.getFragmentById(somePortletId[0]));
+                            TestCase.assertNotNull(page0.getFragmentsByName("some-app::SomePortlet"));
+                            TestCase.assertEquals(1, page0.getFragmentsByName("some-app::SomePortlet").size());
                             Page page1 = pageManager.getPage("/user-page.psml");
                             Link link = pageManager.getLink("/default.link");
                             // test edit access
                             try
                             {
                                 pageManager.updateFolder(folder);
-                                test.assertTrue("Folder / not editable for user", false);
+                                TestCase.assertTrue("Folder / not editable for user", false);
                             }
                             catch (SecurityException se)
                             {
@@ -421,7 +421,7 @@
                             try
                             {
                                 pageManager.updatePageSecurity(pageSecurity);
-                                test.assertTrue("PageSecurity not editable for user", false);
+                                TestCase.assertTrue("PageSecurity not editable for user", false);
                             }
                             catch (SecurityException se)
                             {
@@ -429,7 +429,7 @@
                             try
                             {
                                 pageManager.updatePage(page0);
-                                test.assertTrue("Page /default-page.psml not editable for user", false);
+                                TestCase.assertTrue("Page /default-page.psml not editable for user", false);
                             }
                             catch (SecurityException se)
                             {
@@ -438,7 +438,7 @@
                             try
                             {
                                 pageManager.updateLink(link);
-                                test.assertTrue("Page /default.link not editable for user", false);
+                                TestCase.assertTrue("Page /default.link not editable for user", false);
                             }
                             catch (SecurityException se)
                             {
@@ -465,21 +465,21 @@
                         {
                             // test view access
                             Folder folder = pageManager.getFolder("/");
-                            test.assertNotNull(folder.getPageSecurity());
-                            test.assertNotNull(folder.getPages());
-                            test.assertEquals(1, folder.getPages().size());
+                            TestCase.assertNotNull(folder.getPageSecurity());
+                            TestCase.assertNotNull(folder.getPages());
+                            TestCase.assertEquals(1, folder.getPages().size());
                             PageSecurity pageSecurity = pageManager.getPageSecurity();
                             Page page0 = pageManager.getPage("/default-page.psml");
-                            test.assertNotNull(page0.getRootFragment());
-                            test.assertNotNull(page0.getRootFragment().getFragments());
-                            test.assertEquals(1, page0.getRootFragment().getFragments().size());
-                            test.assertNull(page0.getFragmentById(somePortletId[0]));
-                            test.assertNull(page0.getFragmentsByName("some-app::SomePortlet"));
+                            TestCase.assertNotNull(page0.getRootFragment());
+                            TestCase.assertNotNull(page0.getRootFragment().getFragments());
+                            TestCase.assertEquals(1, page0.getRootFragment().getFragments().size());
+                            TestCase.assertNull(page0.getFragmentById(somePortletId[0]));
+                            TestCase.assertTrue(page0.getFragmentsByName("some-app::SomePortlet").isEmpty());
                             Link link = pageManager.getLink("/default.link");
                             try
                             {
                                 Page page1 = pageManager.getPage("/user-page.psml");
-                                test.assertTrue("Page /user-page.psml not viewable for manager", false);
+                                TestCase.assertTrue("Page /user-page.psml not viewable for manager", false);
                             }
                             catch (SecurityException se)
                             {
@@ -488,7 +488,7 @@
                             try
                             {
                                 pageManager.updateFolder(folder);
-                                test.assertTrue("Folder / not editable for manager", false);
+                                TestCase.assertTrue("Folder / not editable for manager", false);
                             }
                             catch (SecurityException se)
                             {
@@ -496,7 +496,7 @@
                             try
                             {
                                 pageManager.updatePageSecurity(pageSecurity);
-                                test.assertTrue("PageSecurity not editable for manager", false);
+                                TestCase.assertTrue("PageSecurity not editable for manager", false);
                             }
                             catch (SecurityException se)
                             {
@@ -525,21 +525,21 @@
                         {
                             // test view access
                             Folder folder = pageManager.getFolder("/");
-                            test.assertNotNull(folder.getPageSecurity());
-                            test.assertNotNull(folder.getPages());
-                            test.assertEquals(1, folder.getPages().size());
+                            TestCase.assertNotNull(folder.getPageSecurity());
+                            TestCase.assertNotNull(folder.getPages());
+                            TestCase.assertEquals(1, folder.getPages().size());
                             PageSecurity pageSecurity = pageManager.getPageSecurity();
                             Page page0 = pageManager.getPage("/default-page.psml");
-                            test.assertNotNull(page0.getRootFragment());
-                            test.assertNotNull(page0.getRootFragment().getFragments());
-                            test.assertEquals(1, page0.getRootFragment().getFragments().size());
-                            test.assertNull(page0.getFragmentById(somePortletId[0]));
-                            test.assertNull(page0.getFragmentsByName("some-app::SomePortlet"));
+                            TestCase.assertNotNull(page0.getRootFragment());
+                            TestCase.assertNotNull(page0.getRootFragment().getFragments());
+                            TestCase.assertEquals(1, page0.getRootFragment().getFragments().size());
+                            TestCase.assertNull(page0.getFragmentById(somePortletId[0]));
+                            TestCase.assertTrue(page0.getFragmentsByName("some-app::SomePortlet").isEmpty());
                             Link link = pageManager.getLink("/default.link");
                             try
                             {
                                 Page page1 = pageManager.getPage("/user-page.psml");
-                                test.assertTrue("Page /user-page.psml not viewable for guest", false);
+                                TestCase.assertTrue("Page /user-page.psml not viewable for guest", false);
                             }
                             catch (SecurityException se)
                             {
@@ -548,7 +548,7 @@
                             try
                             {
                                 pageManager.updateFolder(folder);
-                                test.assertTrue("Folder / not editable for guest", false);
+                                TestCase.assertTrue("Folder / not editable for guest", false);
                             }
                             catch (SecurityException se)
                             {
@@ -556,7 +556,7 @@
                             try
                             {
                                 pageManager.updatePageSecurity(pageSecurity);
-                                test.assertTrue("PageSecurity not editable for guest", false);
+                                TestCase.assertTrue("PageSecurity not editable for guest", false);
                             }
                             catch (SecurityException se)
                             {
@@ -564,7 +564,7 @@
                             try
                             {
                                 pageManager.updatePage(page0);
-                                test.assertTrue("Page /default-page.psml not editable for guest", false);
+                                TestCase.assertTrue("Page /default-page.psml not editable for guest", false);
                             }
                             catch (SecurityException se)
                             {
@@ -572,7 +572,7 @@
                             try
                             {
                                 pageManager.updateLink(link);
-                                test.assertTrue("Page /default.link not editable for guest", false);
+                                TestCase.assertTrue("Page /default.link not editable for guest", false);
                             }
                             catch (SecurityException se)
                             {
@@ -604,12 +604,12 @@
                             try
                             {
                                 Folder remove = pageManager.getFolder("/");
-                                test.assertEquals("/", remove.getPath());
+                                TestCase.assertEquals("/", remove.getPath());
                                 pageManager.removeFolder(remove);
                             }
                             catch (FolderNotFoundException e)
                             {
-                                test.assertTrue("Folder / NOT FOUND", false);
+                                TestCase.assertTrue("Folder / NOT FOUND", false);
                             }
 
                             return null;

Modified: portals/jetspeed-2/trunk/components/portal/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/portal/pom.xml?view=diff&rev=489500&r1=489499&r2=489500
==============================================================================
--- portals/jetspeed-2/trunk/components/portal/pom.xml (original)
+++ portals/jetspeed-2/trunk/components/portal/pom.xml Thu Dec 21 15:32:04 2006
@@ -223,6 +223,9 @@
             <testResource>
                 <directory>test/assembly</directory>
             </testResource>                                            
+            <testResource>
+                <directory>test/testdata/pages</directory>
+            </testResource>                                                        
         </testResources>
 
         <plugins>

Modified: portals/jetspeed-2/trunk/components/rdbms/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/rdbms/pom.xml?view=diff&rev=489500&r1=489499&r2=489500
==============================================================================
--- portals/jetspeed-2/trunk/components/rdbms/pom.xml (original)
+++ portals/jetspeed-2/trunk/components/rdbms/pom.xml Thu Dec 21 15:32:04 2006
@@ -1,122 +1,130 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Copyright 2006 The Apache Software Foundation
-
-Licensed 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.
-
-  $Id:$
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
-    <modelVersion>4.0.0</modelVersion>
-    <prerequisites>
-        <maven>2.0.4</maven>
-    </prerequisites>
-
-    <!-- POM Identification -->
-
-    <artifactId>jetspeed-rdbms</artifactId>
-    <parent>
-        <groupId>org.apache.portals.jetspeed-2</groupId>
-        <artifactId>components</artifactId>
-        <version>2.1-dev</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <packaging>jar</packaging>
-    <name>Jetspeed-2 RDBMS Components</name>
-    <description>
-        RDBMS Components
-    </description>
-
-    <!-- Dependencies -->
-
-    <dependencies>
-
-        <!-- Build Dependencies -->
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>jetspeed-cm</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>ojb</groupId>
-            <artifactId>db-ojb</artifactId>
-        </dependency>
-        <!--
-            Note: tyrex and junit are normally required only for test, but 
-            in this case, abstract test cases are included in the component
-            build... this should probably be fixed... for now, assume that
-            tyrex and/or junit will be provided if these test classes are
-            used.
-        -->
-        <dependency>
-            <groupId>tyrex</groupId>
-            <artifactId>tyrex</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <scope>provided</scope>
-        </dependency>
-
-    </dependencies>
-
-    <!-- Build Configuration -->
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-antrun-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>hot-deploy-component</id>
-                        <phase>install</phase>
-                        <configuration>
-                            <tasks>
-                                <ant target="hot-deploy-jar" antfile="build.xml" dir="${basedir}/../../app-servers" inheritall="off">
-                                    <property name="org.apache.jetspeed.deploy.enable"
-                                              value="${org.apache.jetspeed.env.hotdeploy}"/>
-                                    <property name="org.apache.jetspeed.deploy.target"
-                                              value="${org.apache.jetspeed.env.deploy.target}"/>
-                                    <property name="org.apache.jetspeed.server.home"
-                                              value="${org.apache.jetspeed.server.home}"/>
-                                    <property name="org.apache.jetspeed.deploy.groupid"
-                                              value="${pom.groupId}"/>
-                                    <property name="org.apache.jetspeed.deploy.artifactid"
-                                              value="${pom.artifactId}"/>
-                                    <property name="org.apache.jetspeed.deploy.version"
-                                              value="${pom.version}"/>
-                                </ant>
-                            </tasks>
-                        </configuration>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-
-    <!-- Project Information -->
-
-    <scm>
-        <connection>scm:svn:http://svn.apache.org/repos/asf/portals/jetspeed-2/trunk/components/rdbms</connection>
-        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/portals/jetspeed-2/trunk/components/rdbms</developerConnection>
-        <url>http://svn.apache.org/viewcvs.cgi/portals/jetspeed-2/trunk/components/rdbms/</url>
-    </scm>
-
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright 2006 The Apache Software Foundation
+
+Licensed 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.
+
+  $Id:$
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+    <modelVersion>4.0.0</modelVersion>
+    <prerequisites>
+        <maven>2.0.4</maven>
+    </prerequisites>
+
+    <!-- POM Identification -->
+
+    <artifactId>jetspeed-rdbms</artifactId>
+    <parent>
+        <groupId>org.apache.portals.jetspeed-2</groupId>
+        <artifactId>components</artifactId>
+        <version>2.1-dev</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+    <packaging>jar</packaging>
+    <name>Jetspeed-2 RDBMS Components</name>
+    <description>
+        RDBMS Components
+    </description>
+
+    <!-- Dependencies -->
+
+    <dependencies>
+
+        <!-- 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>
+        <dependency>
+            <groupId>ojb</groupId>
+            <artifactId>db-ojb</artifactId>
+        </dependency>
+        <!--
+            Note: tyrex and junit are normally required only for test, but 
+            in this case, abstract test cases are included in the component
+            build... this should probably be fixed... for now, assume that
+            tyrex and/or junit will be provided if these test classes are
+            used.
+        -->
+        <dependency>
+            <groupId>tyrex</groupId>
+            <artifactId>tyrex</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <scope>provided</scope>
+        </dependency>
+
+    </dependencies>
+
+    <!-- Build Configuration -->
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-antrun-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>hot-deploy-component</id>
+                        <phase>install</phase>
+                        <configuration>
+                            <tasks>
+                                <ant target="hot-deploy-jar" antfile="build.xml" dir="${basedir}/../../app-servers" inheritall="off">
+                                    <property name="org.apache.jetspeed.deploy.enable"
+                                              value="${org.apache.jetspeed.env.hotdeploy}"/>
+                                    <property name="org.apache.jetspeed.deploy.target"
+                                              value="${org.apache.jetspeed.env.deploy.target}"/>
+                                    <property name="org.apache.jetspeed.server.home"
+                                              value="${org.apache.jetspeed.server.home}"/>
+                                    <property name="org.apache.jetspeed.deploy.groupid"
+                                              value="${pom.groupId}"/>
+                                    <property name="org.apache.jetspeed.deploy.artifactid"
+                                              value="${pom.artifactId}"/>
+                                    <property name="org.apache.jetspeed.deploy.version"
+                                              value="${pom.version}"/>
+                                </ant>
+                            </tasks>
+                        </configuration>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
+    <!-- Project Information -->
+
+    <scm>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/portals/jetspeed-2/trunk/components/rdbms</connection>
+        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/portals/jetspeed-2/trunk/components/rdbms</developerConnection>
+        <url>http://svn.apache.org/viewcvs.cgi/portals/jetspeed-2/trunk/components/rdbms/</url>
+    </scm>
+
+</project>

Modified: portals/jetspeed-2/trunk/components/rdbms/src/java/org/apache/jetspeed/components/dao/InitablePersistenceBrokerDaoSupport.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/rdbms/src/java/org/apache/jetspeed/components/dao/InitablePersistenceBrokerDaoSupport.java?view=diff&rev=489500&r1=489499&r2=489500
==============================================================================
--- portals/jetspeed-2/trunk/components/rdbms/src/java/org/apache/jetspeed/components/dao/InitablePersistenceBrokerDaoSupport.java (original)
+++ portals/jetspeed-2/trunk/components/rdbms/src/java/org/apache/jetspeed/components/dao/InitablePersistenceBrokerDaoSupport.java Thu Dec 21 15:32:04 2006
@@ -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>

Modified: portals/jetspeed-2/trunk/components/registry/etc/assembly/registry-test.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/registry/etc/assembly/registry-test.xml?view=diff&rev=489500&r1=489499&r2=489500
==============================================================================
--- portals/jetspeed-2/trunk/components/registry/etc/assembly/registry-test.xml (original)
+++ portals/jetspeed-2/trunk/components/registry/etc/assembly/registry-test.xml Thu Dec 21 15:32:04 2006
@@ -95,8 +95,7 @@
         - 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"
-        name="portletEntityAccessImpl">
+    <bean id="portletEntityAccessImpl" class="org.apache.jetspeed.components.portletentity.PersistenceBrokerPortletEntityAccess">
         <constructor-arg>
             <ref bean="portletRegistry" />
         </constructor-arg>

Modified: portals/jetspeed-2/trunk/components/registry/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/registry/pom.xml?view=diff&rev=489500&r1=489499&r2=489500
==============================================================================
--- portals/jetspeed-2/trunk/components/registry/pom.xml (original)
+++ portals/jetspeed-2/trunk/components/registry/pom.xml Thu Dec 21 15:32:04 2006
@@ -145,6 +145,12 @@
                 </executions>
             </plugin>
         </plugins>
+
+        <testResources>
+            <testResource>
+                <directory>etc/assembly</directory>                
+             </testResource>
+        </testResources>
     </build>
 
     <!-- Project Information -->

Modified: portals/jetspeed-2/trunk/components/registry/src/java/org/apache/jetspeed/components/portletentity/PersistenceBrokerPortletEntityAccess.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/registry/src/java/org/apache/jetspeed/components/portletentity/PersistenceBrokerPortletEntityAccess.java?view=diff&rev=489500&r1=489499&r2=489500
==============================================================================
--- portals/jetspeed-2/trunk/components/registry/src/java/org/apache/jetspeed/components/portletentity/PersistenceBrokerPortletEntityAccess.java (original)
+++ portals/jetspeed-2/trunk/components/registry/src/java/org/apache/jetspeed/components/portletentity/PersistenceBrokerPortletEntityAccess.java Thu Dec 21 15:32:04 2006
@@ -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>

Modified: portals/jetspeed-2/trunk/components/security/src/java/org/apache/jetspeed/security/impl/PermissionManagerImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/security/src/java/org/apache/jetspeed/security/impl/PermissionManagerImpl.java?view=diff&rev=489500&r1=489499&r2=489500
==============================================================================
--- portals/jetspeed-2/trunk/components/security/src/java/org/apache/jetspeed/security/impl/PermissionManagerImpl.java (original)
+++ portals/jetspeed-2/trunk/components/security/src/java/org/apache/jetspeed/security/impl/PermissionManagerImpl.java Thu Dec 21 15:32:04 2006
@@ -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>

Modified: portals/jetspeed-2/trunk/components/statistics/src/java/org/apache/jetspeed/statistics/impl/PortalStatisticsImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/statistics/src/java/org/apache/jetspeed/statistics/impl/PortalStatisticsImpl.java?view=diff&rev=489500&r1=489499&r2=489500
==============================================================================
--- portals/jetspeed-2/trunk/components/statistics/src/java/org/apache/jetspeed/statistics/impl/PortalStatisticsImpl.java (original)
+++ portals/jetspeed-2/trunk/components/statistics/src/java/org/apache/jetspeed/statistics/impl/PortalStatisticsImpl.java Thu Dec 21 15:32:04 2006
@@ -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>

Modified: portals/jetspeed-2/trunk/core-build.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/core-build.xml?view=diff&rev=489500&r1=489499&r2=489500
==============================================================================
--- portals/jetspeed-2/trunk/core-build.xml (original)
+++ portals/jetspeed-2/trunk/core-build.xml Thu Dec 21 15:32:04 2006
@@ -75,12 +75,19 @@
 
         <!-- Spring Framework and dependencies -->
 	    <dependency>
-	      <id>springframework:spring</id>
+          <id>springframework:spring</id>
 	      <version>${spring.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>

Modified: portals/jetspeed-2/trunk/etc/db-ojb/OJB.properties
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/etc/db-ojb/OJB.properties?view=diff&rev=489500&r1=489499&r2=489500
==============================================================================
--- portals/jetspeed-2/trunk/etc/db-ojb/OJB.properties (original)
+++ portals/jetspeed-2/trunk/etc/db-ojb/OJB.properties Thu Dec 21 15:32:04 2006
@@ -140,7 +140,7 @@
 #ConnectionFactoryClass=org.apache.ojb.broker.accesslayer.ConnectionFactoryNotPooledImpl
 ### ConnectionFactoryClass=org.apache.ojb.broker.accesslayer.ConnectionFactoryManagedImpl
 ### ConnectionFactoryClass=org.springframework.orm.ojb.support.LocalDataSourceConnectionFactory
-ConnectionFactoryClass=org.springframework.orm.ojb.support.TransactionAwareDataSourceConnectionFactory
+ConnectionFactoryClass=org.springmodules.orm.ojb.support.TransactionAwareDataSourceConnectionFactory
 
 #ConnectionFactoryClass=org.springframework.orm.ojb.support.LocalDataSourceConnectionFactory
 #ConnectionFactoryClass=org.apache.ojb.broker.accesslayer.ConnectionFactoryDBCPImpl

Modified: portals/jetspeed-2/trunk/etc/import/assembly/repository-datasource-spring.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/etc/import/assembly/repository-datasource-spring.xml?view=diff&rev=489500&r1=489499&r2=489500
==============================================================================
--- portals/jetspeed-2/trunk/etc/import/assembly/repository-datasource-spring.xml (original)
+++ portals/jetspeed-2/trunk/etc/import/assembly/repository-datasource-spring.xml Thu Dec 21 15:32:04 2006
@@ -19,7 +19,7 @@
     </property>
   </bean>     
     
-  <bean id="ojbConfigurer" class="org.springframework.orm.ojb.support.LocalOjbConfigurer"/> 
+  <bean id="ojbConfigurer" class="org.springmodules.orm.ojb.support.LocalOjbConfigurer"/> 
      
     <!-- 
          Dynamically configures Database Platform for OJB by looking at the connection string

Modified: portals/jetspeed-2/trunk/etc/registration/assembly/registry.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/etc/registration/assembly/registry.xml?view=diff&rev=489500&r1=489499&r2=489500
==============================================================================
--- portals/jetspeed-2/trunk/etc/registration/assembly/registry.xml (original)
+++ portals/jetspeed-2/trunk/etc/registration/assembly/registry.xml Thu Dec 21 15:32:04 2006
@@ -50,8 +50,7 @@
         </property>
     </bean>
 
-    <bean id="portletEntityAccessImpl" class="org.apache.jetspeed.components.portletentity.PersistenceBrokerPortletEntityAccess"
-        name="portletEntityAccessImpl">
+    <bean id="portletEntityAccessImpl" class="org.apache.jetspeed.components.portletentity.PersistenceBrokerPortletEntityAccess">
         <constructor-arg>
             <ref bean="portletRegistry" />
         </constructor-arg>

Modified: portals/jetspeed-2/trunk/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/pom.xml?view=diff&rev=489500&r1=489499&r2=489500
==============================================================================
--- portals/jetspeed-2/trunk/pom.xml (original)
+++ portals/jetspeed-2/trunk/pom.xml Thu Dec 21 15:32:04 2006
@@ -188,13 +188,13 @@
         <org.apache.portals.bridges.perl.version>1.0</org.apache.portals.bridges.perl.version>
         <org.apache.portals.bridges.php.version>1.0</org.apache.portals.bridges.php.version>
         <org.apache.portals.bridges.velocity.version>1.0.1-dev</org.apache.portals.bridges.velocity.version>
-        <org.springframework.version>1.1.5</org.springframework.version>
         <oro.version>2.0.7</oro.version>
         <portlet-api.version>1.0</portlet-api.version>
         <regexp.version>1.2</regexp.version>
         <rome.version>0.8</rome.version>
         <saxpath.version>1.0-FCS</saxpath.version>
-        <spring2.version>2.0</spring2.version>
+        <spring.version>2.0</spring.version>
+        <spring.modules.version>0.6</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>
@@ -523,11 +523,6 @@
 
             <!-- Spring Framework -->
             <dependency>
-                <groupId>org.springframework</groupId>
-                <artifactId>spring</artifactId>
-                <version>${org.springframework.version}</version>
-            </dependency>
-            <dependency>
                 <groupId>cglib</groupId>
                 <artifactId>cglib-full</artifactId>
                 <version>${cglib.version}</version>
@@ -539,45 +534,56 @@
             </dependency>
             <dependency>
                 <groupId>org.springframework</groupId>
+                <artifactId>spring</artifactId>
+                <version>${spring.version}</version>
+            </dependency>            
+            <dependency>
+                <groupId>org.springframework</groupId>
                 <artifactId>spring-portlet</artifactId>
-                <version>${spring2.version}</version>
+                <version>${spring.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.springframework</groupId>
                 <artifactId>spring-beans</artifactId>
-                <version>${spring2.version}</version>
+                <version>${spring.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.springframework</groupId>
                 <artifactId>spring-context</artifactId>
-                <version>${spring2.version}</version>
+                <version>${spring.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.springframework</groupId>
                 <artifactId>spring-core</artifactId>
-                <version>${spring2.version}</version>
+                <version>${spring.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.springframework</groupId>
                 <artifactId>spring-web</artifactId>
-                <version>${spring2.version}</version>
+                <version>${spring.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.springframework</groupId>
                 <artifactId>spring-webmvc</artifactId>
-                <version>${spring2.version}</version>
+                <version>${spring.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.springframework</groupId>
                 <artifactId>spring-mock</artifactId>
-                <version>${spring2.version}</version>
+                <version>${spring.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.springframework</groupId>
                 <artifactId>spring-support</artifactId>
-                <version>${spring2.version}</version>
+                <version>${spring.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>

Modified: portals/jetspeed-2/trunk/project.properties
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/project.properties?view=diff&rev=489500&r1=489499&r2=489500
==============================================================================
--- portals/jetspeed-2/trunk/project.properties (original)
+++ portals/jetspeed-2/trunk/project.properties Thu Dec 21 15:32:04 2006
@@ -19,7 +19,6 @@
 portlet.api.version=1.0
 servlet.api.version=2.3
 myfaces.version=1.1.0
-spring.version=1.1.5
 bridges.groupId=org.apache.portals.bridges
 portals.bridges.version=1.0
 portals.bridges.common.version=1.0.1-dev
@@ -31,7 +30,8 @@
 portals.bridges.jpetstore.version=1.0
 portals.bridges.velocity.version=1.0.1-dev
 commons.logging.version=1.0.3
-spring2.version=2.0
+spring.version=2.0
+spring.modules.version=0.6
 derby.version=10.1.1.0
 hsql.version=1.8.0.2
 

Modified: portals/jetspeed-2/trunk/src/webapp/WEB-INF/assembly/administration.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/src/webapp/WEB-INF/assembly/administration.xml?view=diff&rev=489500&r1=489499&r2=489500
==============================================================================
--- portals/jetspeed-2/trunk/src/webapp/WEB-INF/assembly/administration.xml (original)
+++ portals/jetspeed-2/trunk/src/webapp/WEB-INF/assembly/administration.xml Thu Dec 21 15:32:04 2006
@@ -70,7 +70,7 @@
     	</constructor-arg>                                                            
 </bean>
     
-<bean id="PortalAdministration" name="PortalAdministration" parent="baseTransactionProxy">
+<bean id="PortalAdministration" parent="baseTransactionProxy">
         <property name="proxyInterfaces">
             <value>org.apache.jetspeed.administration.PortalAdministration</value>
         </property>

Modified: portals/jetspeed-2/trunk/src/webapp/WEB-INF/assembly/boot/datasource.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/src/webapp/WEB-INF/assembly/boot/datasource.xml?view=diff&rev=489500&r1=489499&r2=489500
==============================================================================
--- portals/jetspeed-2/trunk/src/webapp/WEB-INF/assembly/boot/datasource.xml (original)
+++ portals/jetspeed-2/trunk/src/webapp/WEB-INF/assembly/boot/datasource.xml Thu Dec 21 15:32:04 2006
@@ -11,7 +11,7 @@
         </property>
     </bean>
     		
-    <bean id="ojbConfigurer" class="org.springframework.orm.ojb.support.LocalOjbConfigurer"/> 
+    <bean id="ojbConfigurer" class="org.springmodules.orm.ojb.support.LocalOjbConfigurer"/> 
 
     <!-- 
          Dynamically configures Database Platform for OJB by looking at the connection string

Modified: portals/jetspeed-2/trunk/src/webapp/WEB-INF/assembly/desktop.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/src/webapp/WEB-INF/assembly/desktop.xml?view=diff&rev=489500&r1=489499&r2=489500
==============================================================================
--- portals/jetspeed-2/trunk/src/webapp/WEB-INF/assembly/desktop.xml (original)
+++ portals/jetspeed-2/trunk/src/webapp/WEB-INF/assembly/desktop.xml Thu Dec 21 15:32:04 2006
@@ -22,8 +22,7 @@
   	   as web application into that server.  This manager is for Tomcat 5
   	-->
 
-    <bean id="JetspeedDesktop" class="org.apache.jetspeed.desktop.impl.JetspeedDesktopImpl" 
-         name="JetspeedDesktop">
+    <bean id="JetspeedDesktop" class="org.apache.jetspeed.desktop.impl.JetspeedDesktopImpl">
         <!-- Location of the desktop themes -->
         <constructor-arg index="0">
             <value>/desktop-themes/</value>

Modified: portals/jetspeed-2/trunk/src/webapp/WEB-INF/assembly/profiler.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/src/webapp/WEB-INF/assembly/profiler.xml?view=diff&rev=489500&r1=489499&r2=489500
==============================================================================
--- portals/jetspeed-2/trunk/src/webapp/WEB-INF/assembly/profiler.xml (original)
+++ portals/jetspeed-2/trunk/src/webapp/WEB-INF/assembly/profiler.xml Thu Dec 21 15:32:04 2006
@@ -17,7 +17,7 @@
 -->
 <beans>
     <!-- Profiler -->
-    <bean id="profilerImpl" class="org.apache.jetspeed.profiler.impl.JetspeedProfilerImpl" name="profilerImpl" init-method="init">
+    <bean id="profilerImpl" class="org.apache.jetspeed.profiler.impl.JetspeedProfilerImpl" init-method="init">
         <constructor-arg index="0">
             <value>JETSPEED-INF/ojb/profiler_repository.xml</value>
         </constructor-arg>

Modified: portals/jetspeed-2/trunk/src/webapp/WEB-INF/assembly/registry.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/src/webapp/WEB-INF/assembly/registry.xml?view=diff&rev=489500&r1=489499&r2=489500
==============================================================================
--- portals/jetspeed-2/trunk/src/webapp/WEB-INF/assembly/registry.xml (original)
+++ portals/jetspeed-2/trunk/src/webapp/WEB-INF/assembly/registry.xml Thu Dec 21 15:32:04 2006
@@ -95,8 +95,7 @@
         - 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"
-        name="portletEntityAccessImpl">
+    <bean id="portletEntityAccessImpl" class="org.apache.jetspeed.components.portletentity.PersistenceBrokerPortletEntityAccess">
         <constructor-arg>
             <ref bean="portletRegistry" />
         </constructor-arg>

Modified: portals/jetspeed-2/trunk/src/webapp/WEB-INF/assembly/transaction.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/src/webapp/WEB-INF/assembly/transaction.xml?view=diff&rev=489500&r1=489499&r2=489500
==============================================================================
--- portals/jetspeed-2/trunk/src/webapp/WEB-INF/assembly/transaction.xml (original)
+++ portals/jetspeed-2/trunk/src/webapp/WEB-INF/assembly/transaction.xml Thu Dec 21 15:32:04 2006
@@ -7,7 +7,7 @@
 <beans>
   
 	<!-- Transaction manager for a single OJB PersistenceBroker (alternative to JTA) -->
-	<bean id="transactionManager" class="org.springframework.orm.ojb.PersistenceBrokerTransactionManager"/>
+	<bean id="transactionManager" class="org.springmodules.orm.ojb.PersistenceBrokerTransactionManager"/>
 
 	<!-- Transaction manager that delegates to JTA (for a transactional JNDI DataSource) -->
 	<!--

Added: portals/jetspeed-2/trunk/xdocs/guide-federated-security.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/xdocs/guide-federated-security.xml?view=auto&rev=489500
==============================================================================
--- portals/jetspeed-2/trunk/xdocs/guide-federated-security.xml (added)
+++ portals/jetspeed-2/trunk/xdocs/guide-federated-security.xml Thu Dec 21 15:32:04 2006
@@ -0,0 +1,36 @@
+<?xml version="1.0"?>
+<!--
+	Copyright 2004 The Apache Software Foundation
+	
+	Licensed 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.
+-->
+<document>
+<properties>
+    <title>Guide to Federated Security</title>
+    <subtitle>Federated Security Configuration Overview</subtitle>
+    <authors>
+        <person name="David Sean Taylor" email="taylor@apache.org" />
+    </authors>
+</properties>
+<body>
+<section name="Configuring Jetspeed-2 Federated Security">
+<p>
+1. override web.xml in custom build
+2. edit web.xml
+	* remove security-constraints "Login"
+	* remove LoginProxy, LoginServlet, LoginError, LoginRedirector, ...
+	* remove servlet-mapping for above servlets
+</p>
+</section>
+</body>
+</document>
\ No newline at end of file



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