portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dlest...@apache.org
Subject svn commit: r226654 - in /portals/jetspeed-2/trunk: ./ components/portal/src/test/org/apache/jetspeed/userinfo/ components/sso/ components/sso/src/test/org/apache/jetspeed/sso/ etc/db-ojb/ maven-plugin/ portal-webapp/
Date Sun, 31 Jul 2005 15:45:36 GMT
Author: dlestrat
Date: Sun Jul 31 08:45:28 2005
New Revision: 226654

URL: http://svn.apache.org/viewcvs?rev=226654&view=rev
Log:
Upgrading to Torque 3.2-rc1 and to OJB 1.0.3

http://issues.apache.org/jira/browse/JS2-318

Modified:
    portals/jetspeed-2/trunk/.classpath
    portals/jetspeed-2/trunk/components/portal/src/test/org/apache/jetspeed/userinfo/TestUserInfoManager.java
    portals/jetspeed-2/trunk/components/sso/project.xml
    portals/jetspeed-2/trunk/components/sso/src/test/org/apache/jetspeed/sso/TestSSOComponent.java
    portals/jetspeed-2/trunk/core-build.xml
    portals/jetspeed-2/trunk/etc/db-ojb/OJB-logging.properties
    portals/jetspeed-2/trunk/etc/db-ojb/OJB.properties
    portals/jetspeed-2/trunk/etc/db-ojb/repository.dtd
    portals/jetspeed-2/trunk/etc/db-ojb/repository.xml
    portals/jetspeed-2/trunk/etc/db-ojb/repository_database.xml
    portals/jetspeed-2/trunk/etc/db-ojb/repository_internal.xml
    portals/jetspeed-2/trunk/maven-plugin/project.xml
    portals/jetspeed-2/trunk/portal-webapp/portal-project.xml
    portals/jetspeed-2/trunk/project.xml

Modified: portals/jetspeed-2/trunk/.classpath
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/.classpath?rev=226654&r1=226653&r2=226654&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/.classpath (original)
+++ portals/jetspeed-2/trunk/.classpath Sun Jul 31 08:45:28 2005
@@ -77,7 +77,7 @@
 	<classpathentry exported="true" kind="var" path="MAVEN_REPO/regexp/jars/regexp-1.2.jar"/>
 	<classpathentry exported="true" kind="var" path="MAVEN_REPO/velocity/jars/velocity-1.3.1.jar"/>
 	<classpathentry exported="true" kind="var" path="MAVEN_REPO/tyrex/jars/tyrex-1.0.1.jar"/>
-	<classpathentry kind="var" path="MAVEN_REPO/ojb/jars/db-ojb-1.0.1.jar"/>
+	<classpathentry kind="var" path="MAVEN_REPO/ojb/jars/db-ojb-1.0.3.jar"/>
 	<classpathentry kind="var" path="MAVEN_REPO/commons-httpclient/jars/commons-httpclient-2.0.jar"/>
 	<classpathentry kind="var" path="MAVEN_REPO/velocity-tools/jars/velocity-tools-1.1.jar"/>
 	<classpathentry kind="var" path="MAVEN_REPO/commons-dbcp/jars/commons-dbcp-1.2.1.jar"/>

Modified: portals/jetspeed-2/trunk/components/portal/src/test/org/apache/jetspeed/userinfo/TestUserInfoManager.java
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/portal/src/test/org/apache/jetspeed/userinfo/TestUserInfoManager.java?rev=226654&r1=226653&r2=226654&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/portal/src/test/org/apache/jetspeed/userinfo/TestUserInfoManager.java (original)
+++ portals/jetspeed-2/trunk/components/portal/src/test/org/apache/jetspeed/userinfo/TestUserInfoManager.java Sun Jul 31 08:45:28 2005
@@ -37,35 +37,44 @@
 import org.apache.jetspeed.security.SecurityHelper;
 import org.apache.jetspeed.security.User;
 import org.apache.jetspeed.security.util.test.AbstractSecurityTestcase;
+import org.apache.jetspeed.testhelpers.BuildPropertiesHelper;
 import org.apache.jetspeed.util.descriptor.ExtendedPortletMetadata;
 import org.apache.jetspeed.util.descriptor.PortletApplicationDescriptor;
 
 /**
- * <p>Unit test for {@link UserInfoManager}</p>
- *
+ * <p>
+ * Unit test for {@link UserInfoManager}
+ * </p>
+ * 
  * @author <a href="mailto:dlestrat@apache.org">David Le Strat</a>
  */
 public class TestUserInfoManager extends AbstractSecurityTestcase
 {
 
+    /** The test MutablePortletApplication. */
+    private MutablePortletApplication portletApp;
+
+    /** The build properties helper. */
+    private BuildPropertiesHelper buildProperties = new BuildPropertiesHelper();
+
     /** The user info manager. */
     private UserInfoManager single;
+
     /** The Multi Source user info manager */
     private UserInfoManager multi;
-    
+
     private PortletRegistry portletRegistry;
 
-  
     /**
      * @see junit.framework.TestCase#setUp()
      */
     public void setUp() throws Exception
     {
         super.setUp();
-        
-        single = (UserInfoManager) ctx.getBean("org.apache.jetspeed.userinfo.UserInfoManager"); 
+
+        single = (UserInfoManager) ctx.getBean("org.apache.jetspeed.userinfo.UserInfoManager");
         portletRegistry = (PortletRegistry) ctx.getBean("portletRegistry");
-        multi = (UserInfoManager) ctx.getBean("org.apache.jetspeed.userinfo.MultiUserInfoManager");        
+        multi = (UserInfoManager) ctx.getBean("org.apache.jetspeed.userinfo.MultiUserInfoManager");
     }
 
     /**
@@ -74,6 +83,7 @@
     public void tearDown() throws Exception
     {
         super.tearDown();
+        cleanUp();
     }
 
     public static Test suite()
@@ -82,33 +92,35 @@
         return new TestSuite(TestUserInfoManager.class);
     }
 
-    /** Test set user info map. **/ 
+    /** Test set user info map. * */
     public void testSingleSetUserInfoMap() throws Exception
     {
         innerTestSetUserInfoMap(single);
     }
-    
-//    public void testMultiSetUserInfoMap() throws Exception
-//    {
-//        innerTestSetUserInfoMap(multi);
-//    }
-    
+
+    // public void testMultiSetUserInfoMap() throws Exception
+    // {
+    // innerTestSetUserInfoMap(multi);
+    // }
+
     private void innerTestSetUserInfoMap(UserInfoManager uim) throws Exception
     {
-        PortletApplicationDescriptor pad = new PortletApplicationDescriptor(new FileReader("./test/testdata/deploy/portlet.xml"), "unit-test");
-        MutablePortletApplication app = pad.createPortletApplication();            
-        assertNotNull("App is null", app);
+        PortletApplicationDescriptor pad = new PortletApplicationDescriptor(new FileReader(
+                buildProperties.getUserProperty("org.apache.jetspeed.project.home")
+                + "/components/portal/test/testdata/deploy/portlet.xml"), "unit-test");
+        portletApp = pad.createPortletApplication();
+        assertNotNull("App is null", portletApp);
 
         // persist the app
         try
-        {            
-            portletRegistry.registerPortletApplication(app);            
+        {
+            portletRegistry.registerPortletApplication(portletApp);
         }
         catch (Exception e)
         {
-            String msg =
-                "Unable to register portlet application, " + app.getName() + ", through the portlet portletRegistry: " + e.toString();
-            
+            String msg = "Unable to register portlet application, " + portletApp.getName()
+                    + ", through the portlet portletRegistry: " + e.toString();
+
             throw new Exception(msg, e);
         }
 
@@ -116,45 +128,51 @@
 
         // Without linked attributes
         // There are no preferences associated to the user profile.
-        Map userInfo = uim.getUserInfoMap(app.getId(), request);
+        Map userInfo = uim.getUserInfoMap(portletApp.getId(), request);
         assertNull(PortletRequest.USER_INFO + " is null", userInfo);
 
         // The user has preferences associated to the user profile.
         initUser();
         request = initRequestContext("test");
-        userInfo = uim.getUserInfoMap(app.getId(), request);
+        userInfo = uim.getUserInfoMap(portletApp.getId(), request);
         assertNotNull(PortletRequest.USER_INFO + " should not be null", userInfo);
         assertEquals("should contain user.name.given", "Test Dude", (String) userInfo.get("user.name.given"));
         assertEquals("should contain user.name.family", "Dudley", (String) userInfo.get("user.name.family"));
         assertNull("should not contain user.home-info.online.email", userInfo.get("user.home-info.online.email"));
-        
+
         // With linked attributes
-        ExtendedPortletMetadata extMetaData = new ExtendedPortletMetadata(new FileReader("./test/testdata/deploy/jetspeed-portlet.xml"), app);
+        ExtendedPortletMetadata extMetaData = new ExtendedPortletMetadata(new FileReader(
+                buildProperties.getUserProperty("org.apache.jetspeed.project.home")
+                + "/components/portal/test/testdata/deploy/jetspeed-portlet.xml"),
+                portletApp);
         extMetaData.load();
         
-        userInfo = uim.getUserInfoMap(app.getId(), request);
-        assertNotNull(PortletRequest.USER_INFO + " should not be null", userInfo);
-        assertEquals("should contain user-name-given", "Test Dude", (String) userInfo.get("user-name-given"));
-        assertEquals("should contain user-name-family", "Dudley", (String) userInfo.get("user-name-family"));
-         
-        // remove the app
+        // persist the app
         try
-        {            
-            portletRegistry.removeApplication(app);            
+        {
+            portletRegistry.updatePortletApplication(portletApp);
         }
         catch (Exception e)
         {
-            String msg =
-                "Unable to remove portlet application, " + app.getName() + ", through the portlet portletRegistry: " + e.toString();
+            String msg = "Unable to update portlet application, " + portletApp.getName()
+                    + ", through the portlet portletRegistry: " + e.toString();
+
             throw new Exception(msg, e);
         }
-                
-        destroyUser();
+
+        userInfo = uim.getUserInfoMap(portletApp.getId(), request);
+        assertNotNull(PortletRequest.USER_INFO + " should not be null", userInfo);
+        assertEquals("should contain user-name-given", "Test Dude", (String) userInfo.get("user-name-given"));
+        assertEquals("should contain user-name-family", "Dudley", (String) userInfo.get("user-name-family"));
     }
 
     /**
-     * <p>Initialize the mock request context.</p>
-     * @param username The username.
+     * <p>
+     * Initialize the mock request context.
+     * </p>
+     * 
+     * @param username
+     *            The username.
      * @return The request context.
      */
     private RequestContext initRequestContext(String username)
@@ -166,7 +184,9 @@
     }
 
     /**
-     * <p>Init test user.</p>
+     * <p>
+     * Init test user.
+     * </p>
      */
     private void initUser() throws Exception
     {
@@ -195,7 +215,9 @@
     }
 
     /**
-     * <p>Init property property keys map.</p>
+     * <p>
+     * Init property property keys map.
+     * </p>
      */
     protected Map initPropertyKeysMap()
     {
@@ -208,7 +230,9 @@
     }
 
     /**
-     * <p>Destroy user test object.</p>
+     * <p>
+     * Destroy user test object.
+     * </p>
      */
     protected void destroyUser()
     {
@@ -223,6 +247,28 @@
         {
             System.out.println("could not remove test users. exception caught: " + sex);
         }
+    }
+
+    /**
+     * <p>
+     * Clean up test.
+     * </p>
+     */
+    private void cleanUp() throws Exception
+    {
+        // remove the app
+        try
+        {
+            portletRegistry.removeApplication(portletApp);
+        }
+        catch (Exception e)
+        {
+            String msg = "Unable to remove portlet application, " + portletApp.getName()
+                    + ", through the portlet portletRegistry: " + e.toString();
+            throw new Exception(msg, e);
+        }
+
+        destroyUser();
     }
 
     protected String[] getConfigurations()

Modified: portals/jetspeed-2/trunk/components/sso/project.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/sso/project.xml?rev=226654&r1=226653&r2=226654&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/sso/project.xml (original)
+++ portals/jetspeed-2/trunk/components/sso/project.xml Sun Jul 31 08:45:28 2005
@@ -94,9 +94,6 @@
     <build>
         <unitTestSourceDirectory>${basedir}/src/test</unitTestSourceDirectory>
         <unitTest>
-            <excludes>
-                <exclude>**/TestSSOComponent.java</exclude>
-            </excludes>
             <resources>
                 <resource>
                     <directory>${basedir}/src/test</directory>

Modified: portals/jetspeed-2/trunk/components/sso/src/test/org/apache/jetspeed/sso/TestSSOComponent.java
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/sso/src/test/org/apache/jetspeed/sso/TestSSOComponent.java?rev=226654&r1=226653&r2=226654&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/sso/src/test/org/apache/jetspeed/sso/TestSSOComponent.java (original)
+++ portals/jetspeed-2/trunk/components/sso/src/test/org/apache/jetspeed/sso/TestSSOComponent.java Sun Jul 31 08:45:28 2005
@@ -20,6 +20,7 @@
 import org.apache.jetspeed.security.UserManager;
 import org.apache.jetspeed.security.impl.GroupPrincipalImpl;
 import org.apache.jetspeed.security.impl.UserPrincipalImpl;
+import org.apache.jetspeed.security.util.test.AbstractSecurityTestcase;
 import org.apache.jetspeed.sso.SSOProvider;
 
 import junit.framework.Test;
@@ -28,44 +29,49 @@
 import javax.security.auth.Subject;
 
 import java.security.Principal;
+import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.HashSet;
 import java.util.Iterator;
+import java.util.List;
 import java.util.Set;
 
 import org.apache.jetspeed.sso.SSOException;
 import java.lang.Exception;
 
-import org.apache.jetspeed.components.test.AbstractSpringTestCase;
-
 /**
- * <p>
- * Unit testing for {@link Preferences}.
- * </p>
- * 
- * @author <a href="rogerrut@apache.org">Roger Ruttimann </a>
+ * @author   David Le Strat
  */
-public class TestSSOComponent extends AbstractSpringTestCase
+public class TestSSOComponent extends AbstractSecurityTestcase
 {
-	/**
-	 * test url for this UnitTest
-	 */
-	static private String TEST_URL= "http://localhost/jetspeed";
-	static private String TEST_URL2= "http://localhost/jetspeed-2";
-	static private String TEST_USER= "joe";
-	static private String REMOTE_USER= "remoteJS";
-	static private String REMOTE_USER2= "remoteJS-2";
-	static private String REMOTE_PWD_1 = "remote_1";
-	static private String REMOTE_PWD_2 = "remote_2";
-	
-	static private String TEST_GROUP= "engineers";
-	static private String TEST_GROUP_USER= "jack";
-	
-		
+    /**
+     * test url for this UnitTest
+     */
+    static private String TEST_URL = "http://localhost/jetspeed";
+
+    static private String TEST_URL2 = "http://localhost/jetspeed-2";
+
+    static private String TEST_USER = "joe";
+
+    static private String REMOTE_USER = "remoteJS";
+
+    static private String REMOTE_USER2 = "remoteJS-2";
+
+    static private String REMOTE_PWD_1 = "remote_1";
+
+    static private String REMOTE_PWD_2 = "remote_2";
+
+    static private String TEST_GROUP = "engineers";
+
+    static private String TEST_GROUP_USER = "jack";
+
     /** The property manager. */
     private static SSOProvider ssoBroker = null;
+
     /** The user manager. */
     protected UserManager ums;
-    protected GroupManager gms;		// Group Manager
+
+    protected GroupManager gms; // Group Manager
 
     /**
      * @see junit.framework.TestCase#setUp()
@@ -107,83 +113,85 @@
      * Test user root.
      * </p>
      */
-  /*  public void testSSO() throws Exception
-    {
-        // TODO: FIXME: test fails on HSQL Oracle
-    }
-    */
     public void testSSOGroup() throws Exception
     {
-        System.out.println("*************************************\nStart Unit Test for SSO Group Support\n*************************************");
-        
+        System.out.println("*************************************\n" + "Start Unit Test for SSO Group Support"
+                + "\n*************************************");
+
         // Create a user
         try
-	    {
-	        ums.addUser(TEST_GROUP_USER, "password");
-	    }
-	    catch (SecurityException sex)
-	    {
-	        //assertTrue("user already exists. exception caught: " + sex, false);
-	    }
-        
+        {
+            ums.addUser(TEST_GROUP_USER, "password");
+        }
+        catch (SecurityException sex)
+        {
+            // assertTrue("user already exists. exception caught: " + sex, false);
+        }
+
         // Create a group
         try
         {
             gms.addGroup(TEST_GROUP);
-            // Add user to Group
-            gms.addUserToGroup(TEST_GROUP_USER,TEST_GROUP);
-            
             System.out.println("Creating Group " + TEST_GROUP + " and adding User " + TEST_GROUP_USER + " succeeded!.");
         }
         catch (SecurityException secex)
         {
-            System.out.println("Creating Group " + TEST_GROUP + " and adding User " + TEST_GROUP_USER + " failed. Group might already exist. Continue test...");
-            //secex.printStackTrace();
-    		//throw new Exception(secex.getMessage()); 
-        }
-        
-        
-        
-         //  Initialization of Group
-    	Principal principal = new GroupPrincipalImpl(TEST_GROUP);
+            System.out.println("Creating Group " + TEST_GROUP + " and adding User " + TEST_GROUP_USER
+                    + " failed. Group might already exist. Continue test...");
+            // secex.printStackTrace();
+            // throw new Exception(secex.getMessage());
+        }
+
+        if (gms.groupExists(TEST_GROUP))
+        {
+            // Add user to Group
+            gms.addUserToGroup(TEST_GROUP_USER, TEST_GROUP);
+        }
+        else
+        {
+            assertTrue("Could not create group. Abort test.", false);
+        }
+
+        // Initialization of Group
+        Principal principal = new GroupPrincipalImpl(TEST_GROUP);
         Set principals = new HashSet();
         principals.add(principal);
-        Subject subject = new Subject(true, principals, new HashSet(), new HashSet());	
-        
-        // Add SSO Credentail for Group
-        if ( ssoBroker.hasSSOCredentials(subject, TEST_URL) == false)
-        {
-	        try
-			{
-				ssoBroker.addCredentialsForSite(subject, REMOTE_USER, TEST_URL,REMOTE_PWD_1);
-				System.out.println("SSO Credential added for Group:" + TEST_GROUP+ " site: " + TEST_URL);
-			}
-			catch(SSOException ssoex)
-			{
-	    		System.out.println("SSO Credential add FAILED for Group:" + TEST_GROUP+ " site: " + TEST_URL);
-	    		ssoex.printStackTrace();
-	    		throw new Exception(ssoex.getMessage());
-			}
+        Subject subject = new Subject(true, principals, new HashSet(), new HashSet());
+
+        // Add SSO Credential for Group
+        if (ssoBroker.hasSSOCredentials(subject, TEST_URL) == false)
+        {
+            try
+            {
+                ssoBroker.addCredentialsForSite(subject, REMOTE_USER, TEST_URL, REMOTE_PWD_1);
+                System.out.println("SSO Credential added for Group:" + TEST_GROUP + " site: " + TEST_URL);
+            }
+            catch (SSOException ssoex)
+            {
+                System.out.println("SSO Credential add FAILED for Group:" + TEST_GROUP + " site: " + TEST_URL);
+                ssoex.printStackTrace();
+                throw new Exception(ssoex.getMessage());
+            }
         }
         else
         {
-            System.out.println("Group:" + TEST_GROUP+ " site: " + TEST_URL + " has already a remote credential");
+            System.out.println("Group:" + TEST_GROUP + " site: " + TEST_URL + " has already a remote credential");
         }
 
         // Create Principal for User
-		principal = new UserPrincipalImpl(TEST_GROUP_USER);
+        principal = new UserPrincipalImpl(TEST_GROUP_USER);
         principals = new HashSet();
         principals.add(principal);
-        subject = new Subject(true, principals, new HashSet(), new HashSet());	
-        
-        // User should have credential for site    
-        if ( ssoBroker.hasSSOCredentials(subject, TEST_URL) == false)
-    	{
+        subject = new Subject(true, principals, new HashSet(), new HashSet());
+
+        // User should have credential for site
+        if (ssoBroker.hasSSOCredentials(subject, TEST_URL) == false)
+        {
             // Group expansion failed. User not recognized
-    		System.out.println("No SSO Credential for user:" + TEST_GROUP_USER+ " site: " + TEST_URL);
-    		
-    		// Test failure
-    		try
+            System.out.println("No SSO Credential for user:" + TEST_GROUP_USER + " site: " + TEST_URL);
+
+            // Test failure
+            try
             {
                 ums.removeUser(TEST_GROUP_USER);
                 gms.removeGroup(TEST_GROUP);
@@ -192,36 +200,35 @@
             {
                 assertTrue("could not remove user and group. exception caught: " + sex, false);
             }
-            
+
             throw new Exception("SSO Unit test for Group support failed");
-    	}
+        }
         else
         {
             // Group lookup succesful
-    		System.out.println("SSO Test for Group support successful\nSSO Credential for user:" + TEST_GROUP_USER + " site: " + TEST_URL + " found. User is member of Group " + TEST_GROUP);
+            System.out.println("SSO Test for Group support successful" + "\nSSO Credential for user:" + TEST_GROUP_USER
+                    + " site: " + TEST_URL + " found. User is member of Group " + TEST_GROUP);
         }
-        
+
         // Cleanup test.
-        
-        /*
-    	 * For hypersonic the cascading deletes are not generated by Torque and the remove credentials
-    	 * fails with a constraint error.
-    	 * Comment test out for M1 release but the problem needs to be addressed for the upcoming releases
-    	*/
+
         /*
-     	try
-		{
-	    	// Remove credential for Site
-	    	ssoBroker.removeCredentialsForSite("/group/"+TEST_GROUP, TEST_URL);
-	    	System.out.println("SSO Credential removed for Group:" + TEST_GROUP+ " site: " + TEST_URL);
-		}
-    	catch(SSOException ssoex)
-		{
-    		System.out.println("SSO Credential remove FAILED for Group:" + TEST_GROUP+ " site: " + TEST_URL);
-    		throw new Exception(ssoex.getMessage());
-		}
-    	*/
-        
+         * For hypersonic the cascading deletes are not generated by Torque and the remove credentials fails with a
+         * constraint error. Comment test out for M1 release but the problem needs to be addressed for the upcoming
+         * releases
+         */
+        try
+        {
+            // Remove credential for Site
+            ssoBroker.removeCredentialsForSite("/group/" + TEST_GROUP, TEST_URL);
+            System.out.println("SSO Credential removed for Group:" + TEST_GROUP + " site: " + TEST_URL);
+        }
+        catch (SSOException ssoex)
+        {
+            System.out.println("SSO Credential remove FAILED for Group:" + TEST_GROUP + " site: " + TEST_URL);
+            throw new Exception(ssoex.getMessage());
+        }
+
         try
         {
             ums.removeUser(TEST_GROUP_USER);
@@ -231,142 +238,134 @@
         {
             assertTrue("could not remove user and group. exception caught: " + sex, false);
         }
-        
-        
-		
+
     }
-    
+
     public void testSSO() throws Exception
     {
         System.out.println("***************************\nStart Unit Test for SSO API\n***************************");
-        
-		// Create a user
-		 try
-		    {
-		        ums.addUser(TEST_USER, "password");
-		    }
-		    catch (SecurityException sex)
-		    {
-		        //assertTrue("user already exists. exception caught: " + sex, false);
-		    }
-	        
-    	// Initialization
-    	Principal principal = new UserPrincipalImpl(TEST_USER);
+
+        // Create a user
+        try
+        {
+            ums.addUser(TEST_USER, "password");
+        }
+        catch (SecurityException sex)
+        {
+            // assertTrue("user already exists. exception caught: " + sex, false);
+        }
+
+        // Initialization
+        Principal principal = new UserPrincipalImpl(TEST_USER);
         Set principals = new HashSet();
         principals.add(principal);
-        Subject subject = new Subject(true, principals, new HashSet(), new HashSet());	
-    	
-    	if ( ssoBroker.hasSSOCredentials(subject, TEST_URL) == false)
-    	{
-    		System.out.println("No SSO Credential for user:" + TEST_USER+ " site: " + TEST_URL);
-    		
-    		// Add credential
-    		try
-			{
-    			ssoBroker.addCredentialsForSite(subject, REMOTE_USER, TEST_URL,REMOTE_PWD_1);
-    			System.out.println("SSO Credential added for user:" + TEST_USER+ " site: " + TEST_URL);
-			}
-			catch(SSOException ssoex)
-			{
-	    		System.out.println("SSO Credential add FAILED for user:" + TEST_USER+ " site: " + TEST_URL);
-	    		ssoex.printStackTrace();
-	    		throw new Exception(ssoex.getMessage());
-			}
-    	}
-    	else
-    	{
-    		System.out.println("SSO Credential found for user:" + TEST_USER+ " site: " + TEST_URL);
-    	}
-    	
-    	// Add another remote principal for the same user
-    	if ( ssoBroker.hasSSOCredentials(subject, TEST_URL2) == false)
-    	{
-    		System.out.println("No SSO Credential for user:" + TEST_USER+ " site: " + TEST_URL2);
-    		
-    		// Add credential
-    		try
-			{
-    			ssoBroker.addCredentialsForSite(subject, REMOTE_USER2, TEST_URL2,REMOTE_PWD_1);
-    			System.out.println("SSO Credential added for user:" + TEST_USER+ " site: " + TEST_URL2);
-			}
-			catch(SSOException ssoex)
-			{
-	    		System.out.println("SSO Credential add FAILED for user:" + TEST_USER+ " site: " + TEST_URL2);
-	    		ssoex.printStackTrace();
-	    		throw new Exception(ssoex.getMessage());
-			}
-		}
-    	else
-    	{
-    		System.out.println("SSO Credential found for user:" + TEST_USER+ " site: " + TEST_URL2);
-    	}
-    	
-    	// Add the credentail again -- should get an error
-		try
-		{
-			ssoBroker.addCredentialsForSite(subject, REMOTE_USER2, TEST_URL2,REMOTE_PWD_1);
-			throw new Exception("Added same credentail twice -- API should prevent users from doing that.");
-			
-		}
-		catch(SSOException ssoex)
-		{
-    		System.out.println("Adding same SSO Credentialtwice failed (as expected) Message :" + ssoex.getMessage());
-		}
-		catch( Exception e)
-		{
-		    throw new Exception("Adding SSO Credential twice throw an unandled exception. Error: " + e.getMessage());
-		}
-    	
-    	// Test if the credential where persisted
-    	
-    	// Test credential update
-    	SSOContext ssocontext = ssoBroker.getCredentials(subject, TEST_URL);
-    	System.out.println("SSO Credential: User:" + ssocontext.getRemotePrincipalName() + " Password: " + ssocontext.getRemoteCredential()+ " for site: " + TEST_URL);
-    	
-    	SSOContext ssocontext2 = ssoBroker.getCredentials(subject, TEST_URL2);
-    	System.out.println("SSO Credential: User:" + ssocontext.getRemotePrincipalName() + " Password: " + ssocontext.getRemoteCredential() + " for site: " + TEST_URL2);
-    	
-    	try
-		{
-    		// Update Remote credential
-    		System.out.println("SSO Credential Update" );
-    		ssoBroker.updateCredentialsForSite(subject, REMOTE_USER , TEST_URL, REMOTE_PWD_2);
-    		
-    		ssocontext = ssoBroker.getCredentials(subject, TEST_URL);
-    		System.out.println("SSO Credential updated: User:" + ssocontext.getRemotePrincipalName() + " Password: " + ssocontext.getRemoteCredential());
-    		
-		}
-    	catch(SSOException ssoex)
-		{
-    		System.out.println("SSO Credential update FAILED for user:" + TEST_USER+ " site: " + TEST_URL);
-    		throw new Exception(ssoex.getMessage());
-		}
-    	
-    	/*
-    	 * For hypersonic the cascading deletes are not generated by Torque and the remove credentials
-    	 * fails with a constraint error.
-    	 * Comment test out for M1 release but the problem needs to be addressed for the upcoming releases
-    	 
-     	try
-		{
-	    	// Remove credential for Site
-	    	ssoBroker.removeCredentialsForSite(subject, TEST_URL);
-	    	System.out.println("SSO Credential removed for user:" + TEST_USER+ " site: " + TEST_URL);
-		}
-    	catch(SSOException ssoex)
-		{
-    		System.out.println("SSO Credential remove FAILED for user:" + TEST_USER+ " site: " + TEST_URL);
-    		throw new Exception(ssoex.getMessage());
-		}
-		*/
-        
+        Subject subject = new Subject(true, principals, new HashSet(), new HashSet());
+
+        if (ssoBroker.hasSSOCredentials(subject, TEST_URL) == false)
+        {
+            System.out.println("No SSO Credential for user:" + TEST_USER + " site: " + TEST_URL);
+
+            // Add credential
+            try
+            {
+                ssoBroker.addCredentialsForSite(subject, REMOTE_USER, TEST_URL, REMOTE_PWD_1);
+                System.out.println("SSO Credential added for user:" + TEST_USER + " site: " + TEST_URL);
+            }
+            catch (SSOException ssoex)
+            {
+                System.out.println("SSO Credential add FAILED for user:" + TEST_USER + " site: " + TEST_URL);
+                ssoex.printStackTrace();
+                throw new Exception(ssoex.getMessage());
+            }
+        }
+        else
+        {
+            System.out.println("SSO Credential found for user:" + TEST_USER + " site: " + TEST_URL);
+        }
+
+        // Add another remote principal for the same user
+        if (ssoBroker.hasSSOCredentials(subject, TEST_URL2) == false)
+        {
+            System.out.println("No SSO Credential for user:" + TEST_USER + " site: " + TEST_URL2);
+
+            // Add credential
+            try
+            {
+                ssoBroker.addCredentialsForSite(subject, REMOTE_USER2, TEST_URL2, REMOTE_PWD_1);
+                System.out.println("SSO Credential added for user:" + TEST_USER + " site: " + TEST_URL2);
+            }
+            catch (SSOException ssoex)
+            {
+                System.out.println("SSO Credential add FAILED for user:" + TEST_USER + " site: " + TEST_URL2);
+                ssoex.printStackTrace();
+                throw new Exception(ssoex.getMessage());
+            }
+        }
+        else
+        {
+            System.out.println("SSO Credential found for user:" + TEST_USER + " site: " + TEST_URL2);
+        }
+
+        // Add the credentail again -- should get an error
+        try
+        {
+            ssoBroker.addCredentialsForSite(subject, REMOTE_USER2, TEST_URL2, REMOTE_PWD_1);
+            throw new Exception("Added same credentail twice -- API should prevent users from doing that.");
+
+        }
+        catch (SSOException ssoex)
+        {
+            System.out.println("Adding same SSO Credentialtwice failed (as expected) Message :" + ssoex.getMessage());
+        }
+        catch (Exception e)
+        {
+            throw new Exception("Adding SSO Credential twice throw an unandled exception. Error: " + e.getMessage());
+        }
+
+        // Test if the credential where persisted
+
+        // Test credential update
+        SSOContext ssocontext = ssoBroker.getCredentials(subject, TEST_URL);
+        System.out.println("SSO Credential: User:" + ssocontext.getRemotePrincipalName() + " Password: "
+                + ssocontext.getRemoteCredential() + " for site: " + TEST_URL);
+
+        SSOContext ssocontext2 = ssoBroker.getCredentials(subject, TEST_URL2);
+        System.out.println("SSO Credential: User:" + ssocontext.getRemotePrincipalName() + " Password: "
+                + ssocontext.getRemoteCredential() + " for site: " + TEST_URL2);
+
+        try
+        {
+            // Update Remote credential
+            System.out.println("SSO Credential Update");
+            ssoBroker.updateCredentialsForSite(subject, REMOTE_USER, TEST_URL, REMOTE_PWD_2);
+
+            ssocontext = ssoBroker.getCredentials(subject, TEST_URL);
+            System.out.println("SSO Credential updated: User:" + ssocontext.getRemotePrincipalName() + " Password: "
+                    + ssocontext.getRemoteCredential());
+
+        }
+        catch (SSOException ssoex)
+        {
+            System.out.println("SSO Credential update FAILED for user:" + TEST_USER + " site: " + TEST_URL);
+            throw new Exception(ssoex.getMessage());
+        }
+
+        /*
+         * For hypersonic the cascading deletes are not generated by Torque and the remove credentials fails with a
+         * constraint error. Comment test out for M1 release but the problem needs to be addressed for the upcoming
+         * releases try { // Remove credential for Site ssoBroker.removeCredentialsForSite(subject, TEST_URL);
+         * System.out.println("SSO Credential removed for user:" + TEST_USER+ " site: " + TEST_URL); }
+         * catch(SSOException ssoex) { System.out.println("SSO Credential remove FAILED for user:" + TEST_USER+ " site: " +
+         * TEST_URL); throw new Exception(ssoex.getMessage()); }
+         */
+
         Iterator sites = ssoBroker.getSites("");
         while (sites.hasNext())
         {
-            SSOSite site = (SSOSite)sites.next();
+            SSOSite site = (SSOSite) sites.next();
             System.out.println("Site = " + site.getName());
         }
-        
+
     }
 
     /**
@@ -378,20 +377,15 @@
     {
         // Cleanup any credentails added during the test
         /*
-         * try { } catch (SSOException ex) { System.out.println("SSOException" +
-         * ex); }
+         * try { } catch (SSOException ex) { System.out.println("SSOException" + ex); }
          */
     }
 
     protected String[] getConfigurations()
     {
-        return new String[]
-        { "META-INF/sso-dao.xml", "META-INF/transaction.xml"};
-    }
-
-    protected String[] getBootConfigurations()
-    {
-        return new String[]
-        { "test-repository-datasource-spring.xml" };
+        String[] confs = super.getConfigurations();
+        List confList = new ArrayList(Arrays.asList(confs));
+        confList.add("sso.xml");
+        return (String[]) confList.toArray(new String[1]);
     }
 }

Modified: portals/jetspeed-2/trunk/core-build.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/core-build.xml?rev=226654&r1=226653&r2=226654&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/core-build.xml (original)
+++ portals/jetspeed-2/trunk/core-build.xml Sun Jul 31 08:45:28 2005
@@ -66,7 +66,7 @@
 		<!-- Apache OJB persistence framework -->
 	    <dependency>
 		   <id>ojb:db-ojb</id>
-	       <version>1.0.1</version>
+	       <version>1.0.3</version>
 	       <properties>
 	    	 <war.bundle>true</war.bundle>
 	       </properties>

Modified: portals/jetspeed-2/trunk/etc/db-ojb/OJB-logging.properties
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/etc/db-ojb/OJB-logging.properties?rev=226654&r1=226653&r2=226654&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/etc/db-ojb/OJB-logging.properties (original)
+++ portals/jetspeed-2/trunk/etc/db-ojb/OJB-logging.properties Sun Jul 31 08:45:28 2005
@@ -72,6 +72,16 @@
 org.apache.ojb.broker.accesslayer.ConnectionManagerImpl.LogLevel=WARN
 # Logger for IndirectionHandler class
 org.apache.ojb.broker.core.proxy.IndirectionHandler.LogLevel=WARN
+# Logger for MaterializationCache
+org.apache.ojb.broker.cache.MaterializationCache.LogLevel=WARN
+# Logger for CacheDistributor
+org.apache.ojb.broker.cache.CacheDistributor.LogLevel=WARN
+# Logger for ObjectCacheDefaultImpl
+org.apache.ojb.broker.cache.ObjectCacheDefaultImpl.LogLevel=WARN
+# Logger for ObjectCacheTwoLevelImpl
+org.apache.ojb.broker.cache.ObjectCacheTwoLevelImpl.LogLevel=WARN
+# Logger for Oracle9i platform, useful for tracing failing Oracle-extensions or large LOB-support
+org.apache.ojb.broker.platforms.PlatformOracle9iImpl.LogLevel=WARN
 #
 # Special Logger categories used in test suite and tutorials
 #
@@ -89,4 +99,4 @@
 #
 #----------------------------------------------------------------------------------------
 # End of OJB.properties file
-#----------------------------------------------------------------------------------------
+#----------------------------------------------------------------------------------------
\ No newline at end of file

Modified: portals/jetspeed-2/trunk/etc/db-ojb/OJB.properties
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/etc/db-ojb/OJB.properties?rev=226654&r1=226653&r2=226654&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/etc/db-ojb/OJB.properties (original)
+++ portals/jetspeed-2/trunk/etc/db-ojb/OJB.properties Sun Jul 31 08:45:28 2005
@@ -46,7 +46,7 @@
 # PersistenceBrokerFactory / PersistenceBroker
 #----------------------------------------------------------------------------------------
 # The PersistenceBrokerFactoryClass entry decides which concrete
-# PersistenceBrokerFactory implemention is to be used.
+# PersistenceBrokerFactory implementon is to be used.
 PersistenceBrokerFactoryClass=org.apache.ojb.broker.core.PersistenceBrokerFactoryDefaultImpl
 # If in managed environment *only* the PB-api was used it's recommended to use this factory
 # to enable the PersistenceBroker instances to participate in the JTA transaction. This makes
@@ -215,21 +215,13 @@
 # RowReader on class-descriptor level.
 RowReaderDefaultClass=org.apache.ojb.broker.accesslayer.RowReaderDefaultImpl
 #
+#
 #----------------------------------------------------------------------------------------
 # Object cache
 #----------------------------------------------------------------------------------------
-# The ObjectCacheClass entry tells OJB which concrete ObjectCache
-# implementation is to be used as standard cache.
-# Its also possible to override this entry adding object-cache elements
-# on jdbc-connection-descriptor level and
-# per class-descriptor in repository file. More info see documentation.
-#
-ObjectCacheClass=org.apache.ojb.broker.cache.ObjectCacheDefaultImpl
-#ObjectCacheClass=org.apache.ojb.broker.cache.ObjectCacheEmptyImpl
-#ObjectCacheClass=org.apache.ojb.broker.cache.ObjectCachePerBrokerImpl
-#ObjectCacheClass=org.apache.ojb.broker.cache.ObjectCacheJCSPerClassImpl
-#ObjectCacheClass=org.apache.ojb.broker.cache.ObjectCachePerClassImpl
-#
+# NOTE: ObjectCacheClass declaration in OJB.properties file was removed (since OJB 1.0.2).
+# The concrete ObjectCache implementation has to specified in the repository file using
+# the 'object-cache' element. See documentation for more detailed info.
 #
 # This property is only relevant if the per class-descriptor object-cache
 # declaration was used in conjunction with metadata runtime changes.
@@ -240,88 +232,69 @@
 # instances for the same class.
 descriptorBasedCaches=false
 #
-#
-# Use CacheFilters to do filter operations before caching methods were
-# called. Build your own filter class by implementing org.apache.ojb.cache.CacheFilter.
-# It is possible to use a arbitrary number of CacheFilters, but this slows
-# down the performance of the cache, thus handle with care.
-#
-# - org.apache.ojb.broker.cache.CacheFilterClassImpl
-# allows filtering of classes
-# - org.apache.ojb.broker.cache.CacheFilterPackageImpl
-# allows filtering of packages
-# More info see Javadoc of the according classes.
-# Set a comma separated list of CacheFilter.
-#ObjectCacheFilter=org.apache.ojb.broker.cache.CacheFilterClassImpl,org.apache.ojb.broker.cache.CacheFilterPackageImpl
-#
+# NOTE: CacheFilters declaration was removed (since OJB 1.0.2). To exclude
+# object of whole packages from being cache use a specific property in
+# cache declaration - see caching guide in reference docs.
 #----------------------------------------------------------------------------------------
 # Locking
 #----------------------------------------------------------------------------------------
-# The LockManagerClass entry tells OJB which concrete LockManager
-# implementation is to be used.
-LockManagerClass=org.apache.ojb.odmg.locking.LockManagerDefaultImpl
+# The 'LockManagerClass' specify the internal used LockManager implementation.
+# If OJB is running in distributed environment it is recommended to use the remote
+# lock manager. It guarantees to provide Lockmanagement across multiple JVM's.
+#
+# The deprecated odmg locking implementation. Needs enabled 'LockMapClass' too.
+#@deprecated LockManagerClass=org.apache.ojb.odmg.locking.LockManagerDefaultImpl
+# A servlet based lock implementation for distributed environments, needs enabled
+# property 'LockServletUrl' too.
+#LockManagerClass=org.apache.ojb.broker.locking.LockManagerRemoteImpl
+# Lock manager implementation using apache's commons-transaction locking api
+#LockManagerClass=org.apache.ojb.broker.locking.LockManagerCommonsImpl
+LockManagerClass=org.apache.ojb.broker.locking.LockManagerInMemoryImpl
+#
+# The LockServletUrl entry points to the Lockserver servlet.
+# This Servlet is addressed by all distributed JVMs if the RemoteLockMapImpl
+# is used.
+#LockServletUrl=http://127.0.0.1:8080/ojb-lockserver
+#
+# The LockTimeout entry defines the maximum time in milliseconds
+# that a lock may be hold. Defaults to 60000 = 1 minute
+LockTimeout=60000
+#
 #
+# ------ deprecated ------
 # The LockMapClass entry tells OJB which concrete LockMap
 # implementation is to be used.
 # If OJB is running on multiple concurrent clients it is recommended
-# to use the RemoteLockMapImpl. It guarantees to provide
+# to use the LockMapRemoteImpl. It guarantees to provide
 # Lockmanagement across multiple JVMs.
 # This Implemenation relies on a Servlet based Lockserver. To use it you have to
 # deploy the ojb-lockserver.war into a Servlet engine.
 # and you have to set the Property LockServletUrl to point to this servlet.
 # (see LockServletUrl section below).
 # If OJB is running in a single JVM (e.g. in a desktop app, or in a servlet
-# engine) it is save to use the InMemoryLockMapImpl. Using it will result
+# engine) it is save to use the LockMapInMemoryImpl. Using it will result
 # in a large performance gain.
-#LockMapClass=org.apache.ojb.odmg.locking.RemoteLockMapImpl
-LockMapClass=org.apache.ojb.odmg.locking.InMemoryLockMapImpl
-#
-# The LockTimeout entry defines the maximum time in milliseconds
-# that a lock may be hold. Defaults to 60000 = 1 minute
-LockTimeout=60000
-#
-# The ImplicitLocking entry defines if implicit lock acquisition is
-# to be used. If set to true OJB implicitely locks objects to ODMG
-# transactions after performing OQL queries.
-# If implicit locking is used locking objects is recursive, that is
-# associated objects are also locked.
-# If ImplicitLocking is set to false, no locks are obtained in OQL
-# queries and there is also no recursive locking.
-ImplicitLocking=true
-#ImplicitLocking=false
-#
-#
-# The LockServletUrl entry points to the Lockserver servlet.
-# This Servlet is addressed by all distributed JVMs if the RemoteLockMapImpl
-# is used.
-LockServletUrl=http://127.0.0.1:8080/ojb-lockserver
-#
-#
-# The LockAssociations entry defines the behaviour for the OJB
-# implicit locking feature. If set to WRITE (default) acquiring a write-
-# lock on a given object x implies write locks on all objects associated
-# to x. If set to READ implicit read-locks are acquired.
-# Acquiring a read-lock on x thus allways results in implicit read-locks
-# on all associated objects.
-#LockAssociations=READ
-LockAssociations=WRITE
+# These settings are deprecated, only needed in conjunction with the old odmg 'LockManagerClass'
+# @deprecated LockMapClass=org.apache.ojb.odmg.locking.RemoteLockMapImpl
+# @deprecated LockMapClass=org.apache.ojb.odmg.locking.InMemoryLockMapImpl
 #
 #
 #----------------------------------------------------------------------------------------
 # OQL / SQL settings
 #----------------------------------------------------------------------------------------
 # The OqlCollectionClass entry defines the collection type returned
-# from OQL queries. By default this value is set to DListImpl.
-# This will be good for most situations as DList allows maximum flexibility
-# in a ODMG environment. See also section 'ODMG settings'.
+# from OQL queries. By default this value is set to a List.
+# This will be good for most situations. If you need the additional features of
+# DList (DList itself is persistable, support of predicate) comment in the DList
+# implementation. See also section 'ODMG settings' (DListClass entry).
 # Using DLists for large resultsets may be bad for application performance.
 # For these scenarios you can use ArrayLists or Vectors.
 # Important note: the collections class to be used MUST implement the
-# interface org.apache.ojb.broker.ManageableCollection.
+# interface 'org.apache.ojb.broker.ManageableCollection'.
 #
-OqlCollectionClass=org.apache.ojb.odmg.collections.DListImpl_2
-# OqlCollectionClass=org.apache.ojb.broker.util.collections.ManageableArrayList
-# OqlCollectionClass=org.apache.ojb.broker.util.ManageableVector
+OqlCollectionClass=org.apache.ojb.broker.util.collections.ManageableArrayList
+# OqlCollectionClass=org.apache.ojb.odmg.collections.DListImpl
+# OqlCollectionClass=org.apache.ojb.broker.util.collections.ManageableVector
 #
 # The SqlInLimit entry limits the number of values in IN-sql statement,
 # -1 for no limits. This hint is used in Criteria.
@@ -329,7 +302,7 @@
 #
 #
 #----------------------------------------------------------------------------------------
-# ODMG settings
+# ODMG-api settings
 #----------------------------------------------------------------------------------------
 # Specify the used base class for ODMG API
 # - ImplementationDefaultImpl is the default class
@@ -339,7 +312,6 @@
 ImplementationClass=org.apache.ojb.odmg.ImplementationImpl
 #ImplementationClass=org.apache.ojb.odmg.ImplementationJTAImpl
 #
-#
 # Specify the used tx handling.
 # - LocalTxManager use if you want the transaction to be associated by a thread
 # - JTATxManager use if you want the transaction to be associated via the Transaction
@@ -349,16 +321,49 @@
 #OJBTxManagerClass=org.apache.ojb.odmg.JTATxManager
 #
 #
+# Specify the cascading delete behavior of the odmg-api. The
+# specified settings will be used by odmg-api as default settings. It
+# is also possible to change these settings at runtime using the
+# TransactionExt#setCascadingDelete method.
+#
+# Enable disable cascading delete for 1:1 references
+cascadingDeleteOneToOne=false
+#
+# Enable disable cascading delete for 1:n references
+cascadingDeleteOneToN=false
+#
+# Enable disable cascading delete for m:n references
+cascadingDeleteMToN=false
+#
+#
+# The ImplicitLocking entry defines if implicit lock acquisition is
+# to be used. If set to 'true' OJB implicitely locks objects to ODMG
+# transactions after performing OQL queries and lookup objects.
+# If implicit locking is used locking objects is recursive, that is
+# associated objects are also locked.
+# If ImplicitLocking is set to 'false', no locks are obtained in OQL
+# queries, lookup objects and there is also no recursive locking.
+ImplicitLocking=true
+#ImplicitLocking=false
+#
+# The LockAssociations entry defines the behaviour for the OJB
+# implicit locking feature. If set to WRITE (default) acquiring a write-
+# lock on a given object x implies write locks on all objects associated
+# to x. If set to READ implicit read-locks are acquired.
+# Acquiring a read-lock on x thus allways results in implicit read-locks
+# on all associated objects.
+#LockAssociations=READ
+LockAssociations=WRITE
+#
+#
 # Used ODMG collection implementation classes
 # (e.g. when do a Implementation#newDlist() call)
 #
 # org.odmg.DList implementation class
-DListClass=org.apache.ojb.odmg.collections.DListImpl_2
-#DListClass=org.apache.ojb.odmg.collections.DListImpl
+DListClass=org.apache.ojb.odmg.collections.DListImpl
 #
 # org.odmg.DArray implementation class
-DArrayClass=org.apache.ojb.odmg.collections.DListImpl_2
-#DArrayClass=org.apache.ojb.odmg.collections.DListImpl
+DArrayClass=org.apache.ojb.odmg.collections.DListImpl
 #
 # org.odmg.DMap implementation class
 DMapClass=org.apache.ojb.odmg.collections.DMapImpl
@@ -405,7 +410,7 @@
 #PersistentFieldClass=org.apache.ojb.broker.metadata.fieldaccess.PersistentFieldAutoProxyImpl
 #
 # Here are the new upcoming PersistentField implementations. These classes will replace the
-# 'old' ones on next release. They pass the test-suite, but should be tested by community too.
+# 'old' ones on next release. They pass the test-suite and be tested the last months.
 # The new implementations are about 50 times faster in handling nested fields.
 PersistentFieldClass=org.apache.ojb.broker.metadata.fieldaccess.PersistentFieldDirectAccessImplNew
 #PersistentFieldClass=org.apache.ojb.broker.metadata.fieldaccess.PersistentFieldPrivilegedImplNew
@@ -454,4 +459,4 @@
 #----------------------------------------------------------------------------------------
 #----------------------------------------------------------------------------------------
 # End of OJB.properties file
-#----------------------------------------------------------------------------------------
+#----------------------------------------------------------------------------------------
\ No newline at end of file

Modified: portals/jetspeed-2/trunk/etc/db-ojb/repository.dtd
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/etc/db-ojb/repository.dtd?rev=226654&r1=226653&r2=226654&view=diff
==============================================================================
Binary files - no diff available.

Modified: portals/jetspeed-2/trunk/etc/db-ojb/repository.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/etc/db-ojb/repository.xml?rev=226654&r1=226653&r2=226654&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/etc/db-ojb/repository.xml (original)
+++ portals/jetspeed-2/trunk/etc/db-ojb/repository.xml Sun Jul 31 08:45:28 2005
@@ -22,11 +22,11 @@
 <!DOCTYPE descriptor-repository SYSTEM "repository.dtd" [
 <!ENTITY database SYSTEM "repository_database.xml">
 <!ENTITY internal SYSTEM "repository_internal.xml">
-
 ]>
 
-
-<descriptor-repository version="1.0" isolation-level="read-uncommitted">
+<descriptor-repository version="1.0"
+                       isolation-level="read-uncommitted"
+                       proxy-prefetching-limit="50">
 
     <!-- include all used database connections -->
     &database;

Modified: portals/jetspeed-2/trunk/etc/db-ojb/repository_database.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/etc/db-ojb/repository_database.xml?rev=226654&r1=226653&r2=226654&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/etc/db-ojb/repository_database.xml (original)
+++ portals/jetspeed-2/trunk/etc/db-ojb/repository_database.xml Sun Jul 31 08:45:28 2005
@@ -35,9 +35,10 @@
 	There is no need to specify any DB or JNDI info as the org.springframework.orm.ojb.support.LocalDataSourceConnectionFactory
 	defined in OJB.properties will be using a matching Datasource that is defined in Spring.
 	-->
+	<!-- platform="@PLATFORM@" -->
     <jdbc-connection-descriptor
         jcd-alias="JetspeedDS"
-        platform="@PLATFORM@"
+        platform="Hsqldb"
         default-connection="true"
         jdbc-level="2.0"
         batch-mode="false"

Modified: portals/jetspeed-2/trunk/etc/db-ojb/repository_internal.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/etc/db-ojb/repository_internal.xml?rev=226654&r1=226653&r2=226654&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/etc/db-ojb/repository_internal.xml (original)
+++ portals/jetspeed-2/trunk/etc/db-ojb/repository_internal.xml Sun Jul 31 08:45:28 2005
@@ -55,44 +55,9 @@
    </class-descriptor>
 
 
-<!-- The OJB Lock Table -->
-   <class-descriptor
-   	  class="org.apache.ojb.odmg.locking.LockEntry"
-   	  table="OJB_LOCKENTRY"
-   >
-      <field-descriptor
-         name="oidString"
-         column="OID_"
-         jdbc-type="VARCHAR"
-         primarykey="true"
-      />
-      <field-descriptor
-         name="transactionId"
-         column="TX_ID"
-         jdbc-type="VARCHAR"
-         primarykey="true"
-      />
-      <field-descriptor
-         name="timestamp"
-         column="TIMESTAMP_"
-         jdbc-type="BIGINT"
-      />
-      <field-descriptor
-         name="isolationLevel"
-         column="ISOLATIONLEVEL"
-         jdbc-type="INTEGER"
-      />
-      <field-descriptor
-         name="lockType"
-         column="LOCKTYPE"
-         jdbc-type="INTEGER"
-      />
-   </class-descriptor>
-
-
 <!-- THIS IS THE OJB NAMED ROOTS TABLE, DO NOT EDIT-->
    <class-descriptor
-   	  class="org.apache.ojb.odmg.NamedRootsEntry"
+   	  class="org.apache.ojb.odmg.NamedRootsMap$NamedEntry"
    	  table="OJB_NRM"
    >
       <field-descriptor
@@ -120,14 +85,13 @@
          primarykey="true"
          autoincrement="true"
       />
-      <field-descriptor
-         name="size"
-         column="SIZE_"
-         jdbc-type="INTEGER"
-      />
+
       <collection-descriptor
          name="elements"
          element-class-ref="org.apache.ojb.odmg.collections.DListEntry"
+          auto-retrieve = "true"
+          auto-update="none"
+          auto-delete="none"
       >
          <inverse-foreignkey field-ref="dlistId"/>
       </collection-descriptor>
@@ -163,63 +127,6 @@
       />
    </class-descriptor>
 
-   <!-- THIS IS THE OJB DLIST IMPLEMENTATION, DO NOT EDIT-->
-   <!-- alternative implementation of DList -->
-   <class-descriptor
-   	  class="org.apache.ojb.odmg.collections.DListImpl_2"
-   	  table="OJB_DLIST"
-   >
-      <field-descriptor
-         name="id"
-         column="ID"
-         jdbc-type="INTEGER"
-         primarykey="true"
-         autoincrement="true"
-      />
-      <field-descriptor
-         name="size"
-         column="SIZE_"
-         jdbc-type="INTEGER"
-      />
-      <collection-descriptor
-         name="elements"
-         element-class-ref="org.apache.ojb.odmg.collections.DListEntry_2"
-         auto-retrieve = "true"
-      >
-         <inverse-foreignkey field-ref="dlistId"/>
-      </collection-descriptor>
-   </class-descriptor>
-
-<!-- THIS IS THE OJB DLIST ENTRY IMPLEMENTATION, DO NOT EDIT-->
-   <class-descriptor
-      class="org.apache.ojb.odmg.collections.DListEntry_2"
-      table="OJB_DLIST_ENTRIES"
-   >
-      <field-descriptor
-         name="id"
-         column="ID"
-         jdbc-type="INTEGER"
-         primarykey="true"
-         autoincrement="true"
-      />
-      <field-descriptor
-         name="dlistId"
-         column="DLIST_ID"
-         jdbc-type="INTEGER"
-      />
-      <field-descriptor
-         name="position"
-         column="POSITION_"
-         jdbc-type="INTEGER"
-      />
-      <field-descriptor
-         name="oid"
-         column="OID_"
-         jdbc-type="LONGVARBINARY"
-         conversion="org.apache.ojb.broker.accesslayer.conversions.Object2ByteArrFieldConversion"
-      />
-   </class-descriptor>
-
    <!-- THIS IS THE OJB DBAG IMPLEMENTATION, DO NOT EDIT-->
    <class-descriptor
    	  class="org.apache.ojb.odmg.collections.DBagImpl"
@@ -232,14 +139,12 @@
          primarykey="true"
          autoincrement="true"
       />
-      <field-descriptor
-         name="size"
-         column="SIZE_"
-         jdbc-type="INTEGER"
-      />
       <collection-descriptor
          name="elements"
          element-class-ref="org.apache.ojb.odmg.collections.DListEntry"
+          auto-retrieve = "true"
+          auto-update="none"
+          auto-delete="none"
       >
          <inverse-foreignkey field-ref="dlistId"/>
       </collection-descriptor>
@@ -257,14 +162,12 @@
          primarykey="true"
          autoincrement="true"
       />
-      <field-descriptor
-         name="size"
-         column="SIZE_"
-         jdbc-type="INTEGER"
-      />
       <collection-descriptor
          name="elements"
          element-class-ref="org.apache.ojb.odmg.collections.DSetEntry"
+          auto-retrieve = "true"
+          auto-update="none"
+          auto-delete="none"
       >
          <inverse-foreignkey field-ref="dlistId"/>
       </collection-descriptor>
@@ -312,15 +215,13 @@
          primarykey="true"
          autoincrement="true"
       />
-      <field-descriptor
-         name="size"
-         column="SIZE_"
-         jdbc-type="INTEGER"
-      />
       <collection-descriptor
          name="entries"
          element-class-ref="org.apache.ojb.odmg.collections.DMapEntry"
          collection-class="org.apache.ojb.broker.util.collections.ManageableHashSet"
+          auto-retrieve = "true"
+          auto-update="none"
+          auto-delete="none"
       >
          <inverse-foreignkey field-ref="dmapId"/>
       </collection-descriptor>
@@ -344,13 +245,13 @@
          jdbc-type="INTEGER"
       />
       <field-descriptor
-         name="keyOID"
+         name="keyOid"
          column="KEY_OID"
          jdbc-type="LONGVARBINARY"
          conversion="org.apache.ojb.broker.accesslayer.conversions.Object2ByteArrFieldConversion"
       />
       <field-descriptor
-         name="valueOID"
+         name="valueOid"
          column="VALUE_OID"
          jdbc-type="LONGVARBINARY"
          conversion="org.apache.ojb.broker.accesslayer.conversions.Object2ByteArrFieldConversion"

Modified: portals/jetspeed-2/trunk/maven-plugin/project.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/maven-plugin/project.xml?rev=226654&r1=226653&r2=226654&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/maven-plugin/project.xml (original)
+++ portals/jetspeed-2/trunk/maven-plugin/project.xml Sun Jul 31 08:45:28 2005
@@ -33,10 +33,10 @@
     </repository>
     <dependencies>
         <dependency>
-            <groupId>maven-plugins</groupId>
+            <groupId>torque</groupId>
             <artifactId>maven-torque-plugin</artifactId>
-            <id>maven-plugins:maven-torque-plugin</id>
-            <version>3.2</version>
+            <id>torque:maven-torque-plugin</id>
+            <version>3.2-rc1</version>
             <type>plugin</type>
         </dependency>
         <dependency>

Modified: portals/jetspeed-2/trunk/portal-webapp/portal-project.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/portal-webapp/portal-project.xml?rev=226654&r1=226653&r2=226654&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/portal-webapp/portal-project.xml (original)
+++ portals/jetspeed-2/trunk/portal-webapp/portal-project.xml Sun Jul 31 08:45:28 2005
@@ -39,9 +39,9 @@
             </properties>
         </dependency>
         <dependency>
-            <groupId>maven-plugins</groupId>
+            <groupId>torque</groupId>
             <artifactId>maven-torque-plugin</artifactId>
-            <version>3.2</version>
+            <version>3.2-rc1</version>
             <type>plugin</type>
             <properties/>
         </dependency>

Modified: portals/jetspeed-2/trunk/project.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/project.xml?rev=226654&r1=226653&r2=226654&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/project.xml (original)
+++ portals/jetspeed-2/trunk/project.xml Sun Jul 31 08:45:28 2005
@@ -33,9 +33,9 @@
             </properties>
         </dependency>
         <dependency>
-            <groupId>maven-plugins</groupId>
+            <groupId>torque</groupId>
             <artifactId>maven-torque-plugin</artifactId>
-            <version>3.2</version>
+            <version>3.2-rc1</version>
             <type>plugin</type>
             <properties/>
         </dependency>



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