db-ojb-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From arm...@apache.org
Subject cvs commit: db-ojb/src/test/org/apache/ojb repository_junit.xml
Date Sat, 09 Aug 2003 13:23:40 GMT
arminw      2003/08/09 06:23:40

  Modified:    src/test/org/apache/ojb/broker ObjectCacheTest.java
                        ComplexMultiMappedTableWithCollectionByQueryTest.java
                        ComplexMultiMappedTableTest.java
               src/test/org/apache/ojb/broker/sequence
                        SequenceManagerTest.java
               src/test/org/apache/ojb/broker/metadata
                        MetadataMultithreadedTest.java
               src/test/org/apache/ojb repository_junit.xml
  Added:       src/test/org/apache/ojb/broker ComplexMultiMapped.java
               src/test/org/apache/ojb/broker/sequence Repository.java
  Removed:     src/test/org/apache/ojb/broker
                        ComplexObjectMappedToMultiMappedTableF.java
                        ComplexObjectMappedToMultiMappedTableE.java
                        ComplexObjectMappedToMultiMappedTableD.java
                        ComplexObjectMappedToMultiMappedTableC.java
                        ComplexObjectMappedToMultiMappedTableB.java
                        ComplexObjectMappedToMultiMappedTableA.java
               src/test/org/apache/ojb/broker/sequence SMSameTableBB.java
                        SMSameTableB.java SMSameTableAA.java
                        SMSameTableA.java SMMaxBB.java SMMaxB.java
                        SMMaxAB.java SMMaxAAA.java SMMaxAA.java SMMaxA.java
                        SMMax.java SMKey.java SMInterfaceExtendBB.java
                        SMInterfaceExtendB.java SMInterfaceExtendAB.java
                        SMInterfaceExtendAAA.java SMInterfaceExtendAA.java
                        SMInterfaceExtendA.java SMInterface.java
                        SMDatabaseSequence.java
  Log:
  reduce java test file count
  
  declare test objects as static inner
  classes/interfaces to reduce file count
  
  Revision  Changes    Path
  1.5       +10 -10    db-ojb/src/test/org/apache/ojb/broker/ObjectCacheTest.java
  
  Index: ObjectCacheTest.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/test/org/apache/ojb/broker/ObjectCacheTest.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- ObjectCacheTest.java	2 Jun 2003 15:18:00 -0000	1.4
  +++ ObjectCacheTest.java	9 Aug 2003 13:23:40 -0000	1.5
  @@ -16,10 +16,10 @@
   import org.apache.ojb.broker.cache.ObjectCachePerBrokerImpl;
   import org.apache.ojb.broker.metadata.MetadataManager;
   import org.apache.ojb.broker.query.QueryByIdentity;
  -import org.apache.ojb.broker.sequence.SMKey;
   import org.apache.ojb.broker.util.GUID;
   import org.apache.ojb.broker.util.configuration.impl.OjbConfiguration;
   import org.apache.ojb.broker.util.configuration.impl.OjbConfigurator;
  +import org.apache.ojb.broker.sequence.Repository;
   
   /**
    * Do some basic tests using ObjectCache implementations.
  @@ -34,7 +34,7 @@
       static final String EXCLUDE_PACKAGE_NOT_EXIST = "org.apache.ojb.broker.sequence.xyz";
   
       Class[] objectCacheImpls = new Class[]{
  -        ObjectCacheEmptyImpl.class,
  +        // ObjectCacheEmptyImpl.class,
           ObjectCacheDefaultImpl.class,
           ObjectCachePerBrokerImpl.class,
           ObjectCacheJCSImpl.class,
  @@ -110,7 +110,7 @@
                   CacheObject filterOutObject = new CacheObject_2(null, "CacheObject_2 persistent obj");
                   Identity filterOutOid = new Identity(filterOutObject, broker);
   
  -                SMKey filterOutPackageObject = new SMKey();
  +                Repository.SMKey filterOutPackageObject = new Repository.SMKey();
                   filterOutPackageObject.setName("ObjectCacheTest: package filter");
                   Identity filterOutPackageOid = new Identity(filterOutPackageObject, broker);
   
  @@ -134,7 +134,7 @@
                   assertEquals(obj, result);
                   result = (CacheObject) cache.lookup(filterOutOid);
                   assertNull(result);
  -                result = (SMKey) cache.lookup(filterOutPackageOid);
  +                result = (Repository.SMKey) cache.lookup(filterOutPackageOid);
                   assertNull(result);
               }
               finally
  @@ -153,8 +153,8 @@
       {
           Object[] pk = new Object[] { new Long(42)};
           Identity oid = new Identity(Article.class, InterfaceArticle.class, pk);
  -        
  -        GUID guid = new GUID();        
  +
  +        GUID guid = new GUID();
   
           PersistenceBroker broker1 = PersistenceBrokerFactory.defaultPersistenceBroker();
           broker1.beginTransaction();
  @@ -168,15 +168,15 @@
           broker2.beginTransaction();
   
           Article a2 = (Article) broker2.getObjectByQuery(new QueryByIdentity(oid));
  -        
  +
           assertEquals(guid.toString(), a1.getArticleName());
           assertEquals(originalName, a2.getArticleName());
           assertNotSame(a1, a2);
  -        
  +
   
           broker1.commitTransaction();
   		broker1.close();
  -		
  +
           broker2.commitTransaction();
   		broker2.close();
       }
  
  
  
  1.6       +50 -50    db-ojb/src/test/org/apache/ojb/broker/ComplexMultiMappedTableWithCollectionByQueryTest.java
  
  Index: ComplexMultiMappedTableWithCollectionByQueryTest.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/test/org/apache/ojb/broker/ComplexMultiMappedTableWithCollectionByQueryTest.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- ComplexMultiMappedTableWithCollectionByQueryTest.java	7 Jun 2003 10:13:51 -0000	1.5
  +++ ComplexMultiMappedTableWithCollectionByQueryTest.java	9 Aug 2003 13:23:40 -0000	1.6
  @@ -63,7 +63,7 @@
       {
           int number_deleted = 0;
           Criteria crit = new Criteria();
  -        Query q = QueryFactory.newQuery(ComplexObjectMappedToMultiMappedTableA.class, crit);
  +        Query q = QueryFactory.newQuery(ComplexMultiMapped.PersistentA.class, crit);
           Iterator iter = broker.getCollectionByQuery(q).iterator();
           while (iter.hasNext())
           {
  @@ -74,7 +74,7 @@
            * will delete all B and D and E (both of which extends B)
            */
           crit = new Criteria();
  -        q = QueryFactory.newQuery(ComplexObjectMappedToMultiMappedTableB.class, crit);
  +        q = QueryFactory.newQuery(ComplexMultiMapped.PersistentB.class, crit);
           iter = broker.getCollectionByQuery(q).iterator();
           while (iter.hasNext())
           {
  @@ -85,7 +85,7 @@
            * will delete all C
            */
           crit = new Criteria();
  -        q = QueryFactory.newQuery(ComplexObjectMappedToMultiMappedTableC.class, crit);
  +        q = QueryFactory.newQuery(ComplexMultiMapped.PersistentC.class, crit);
           iter = broker.getCollectionByQuery(q).iterator();
           while (iter.hasNext())
           {
  @@ -102,19 +102,19 @@
            */
           for (int i = 0; i < COUNT; i++)
           {
  -            ComplexObjectMappedToMultiMappedTableA a = new ComplexObjectMappedToMultiMappedTableA();
  +            ComplexMultiMapped.PersistentA a = new ComplexMultiMapped.PersistentA();
               a.setValue1("a");
               a.setValue2(i);
               a.setValue3(new Timestamp(System.currentTimeMillis()));
               broker.store(a);
   
  -            ComplexObjectMappedToMultiMappedTableB b = new ComplexObjectMappedToMultiMappedTableB();
  +            ComplexMultiMapped.PersistentB b = new ComplexMultiMapped.PersistentB();
               b.setValue4("b");
               b.setValue5(i);
               b.setValue6(new Timestamp(System.currentTimeMillis()));
               broker.store(b);
   
  -            ComplexObjectMappedToMultiMappedTableC c = new ComplexObjectMappedToMultiMappedTableC();
  +            ComplexMultiMapped.PersistentC c = new ComplexMultiMapped.PersistentC();
               c.setValue1("c");
               c.setValue2(i);
               c.setValue3(new Timestamp(System.currentTimeMillis()));
  @@ -123,7 +123,7 @@
               c.setValue6(new Timestamp(System.currentTimeMillis()));
               broker.store(c);
   
  -            ComplexObjectMappedToMultiMappedTableD d = new ComplexObjectMappedToMultiMappedTableD();
  +            ComplexMultiMapped.PersistentD d = new ComplexMultiMapped.PersistentD();
               d.setValue1("d");
               d.setValue2(i);
               d.setValue3(new Timestamp(System.currentTimeMillis()));
  @@ -132,7 +132,7 @@
               d.setValue6(new Timestamp(System.currentTimeMillis()));
               broker.store(d);
   
  -            ComplexObjectMappedToMultiMappedTableE e = new ComplexObjectMappedToMultiMappedTableE();
  +            ComplexMultiMapped.PersistentE e = new ComplexMultiMapped.PersistentE();
               e.setValue1("e");
               e.setValue2(i);
               e.setValue3(new Timestamp(System.currentTimeMillis()));
  @@ -140,8 +140,8 @@
               e.setValue5(i);
               e.setValue6(new Timestamp(System.currentTimeMillis()));
               broker.store(e);
  -            
  -            ComplexObjectMappedToMultiMappedTableF f = new ComplexObjectMappedToMultiMappedTableF();
  +
  +            ComplexMultiMapped.PersistentF f = new ComplexMultiMapped.PersistentF();
               f.setValue1("f");
               f.setValue2(i);
               f.setValue3(new Timestamp(System.currentTimeMillis()));
  @@ -175,13 +175,13 @@
           /**
            * check all A's
            */
  -        q = QueryFactory.newQuery(ComplexObjectMappedToMultiMappedTableA.class, crit);
  +        q = QueryFactory.newQuery(ComplexMultiMapped.PersistentA.class, crit);
           iter = broker.getCollectionByQuery(q).iterator();
  -        ComplexObjectMappedToMultiMappedTableA a = null;
  +        ComplexMultiMapped.PersistentA a = null;
           count = 0;
           while (iter.hasNext())
           {
  -            a = (ComplexObjectMappedToMultiMappedTableA) iter.next();
  +            a = (ComplexMultiMapped.PersistentA) iter.next();
               if (!a.getValue1().equals("a"))
               {
                   fail("getValue1 should have returned 'a', it in fact returned '" + a.getValue1() + "'");
  @@ -189,7 +189,7 @@
               count++;
           }
           if (count != COUNT)
  -            fail("should have found " + COUNT + " ComplexObjectMappedToMultiMappedTableA's, in fact found " + count);
  +            fail("should have found " + COUNT + " ComplexMultiMapped.PersistentA's, in fact found " + count);
   
   		assertEquals("counted size", broker.getCount(q), count);
   
  @@ -197,13 +197,13 @@
            * check all B's
            */
           crit = new Criteria();
  -        q = QueryFactory.newQuery(ComplexObjectMappedToMultiMappedTableB.class, crit);
  +        q = QueryFactory.newQuery(ComplexMultiMapped.PersistentB.class, crit);
           iter = broker.getCollectionByQuery(q).iterator();
  -        ComplexObjectMappedToMultiMappedTableB b = null;
  +        ComplexMultiMapped.PersistentB b = null;
           count = 0;
           while (iter.hasNext())
           {
  -            b = (ComplexObjectMappedToMultiMappedTableB) iter.next();
  +            b = (ComplexMultiMapped.PersistentB) iter.next();
               if (!b.getValue4().equals("b") && !b.getValue4().equals("d") && !b.getValue4().equals("e") && !b.getValue4().equals("f"))
               {
                   fail("getValue4 should have returned 'b' or 'd' or 'e' or 'f' (from extent), it in fact returned '" + b.getValue4() + "'");
  @@ -214,21 +214,21 @@
            * should find ALL b's, d's, e's and f's, so COUNT*4 is the expected result
            */
           if (count != COUNT*4)
  -            fail("should have found " + (COUNT *4) + " ComplexObjectMappedToMultiMappedTableB's, in fact found " + count);
  +            fail("should have found " + (COUNT *4) + " ComplexMultiMapped.PersistentB's, in fact found " + count);
   
   		assertEquals("counted size", broker.getCount(q), count);
  -		
  +
           /**
            * check all C's
            */
           crit = new Criteria();
  -        q = QueryFactory.newQuery(ComplexObjectMappedToMultiMappedTableC.class, crit);
  +        q = QueryFactory.newQuery(ComplexMultiMapped.PersistentC.class, crit);
           iter = broker.getCollectionByQuery(q).iterator();
  -        ComplexObjectMappedToMultiMappedTableC c = null;
  +        ComplexMultiMapped.PersistentC c = null;
           count = 0;
           while (iter.hasNext())
           {
  -            c = (ComplexObjectMappedToMultiMappedTableC) iter.next();
  +            c = (ComplexMultiMapped.PersistentC) iter.next();
               if (!c.getValue1().equals("c"))
               {
                   fail("getValue1 should have returned 'c', it in fact returned '" + c.getValue1() + "'");
  @@ -236,7 +236,7 @@
               count++;
           }
           if (count != COUNT)
  -            fail("should have found " + COUNT + " ComplexObjectMappedToMultiMappedTableC's, in fact found " + count);
  +            fail("should have found " + COUNT + " ComplexMultiMapped.PersistentC's, in fact found " + count);
   
   		assertEquals("counted size", broker.getCount(q), count);
   
  @@ -244,13 +244,13 @@
            * check all D's
            */
           crit = new Criteria();
  -        q = QueryFactory.newQuery(ComplexObjectMappedToMultiMappedTableD.class, crit);
  +        q = QueryFactory.newQuery(ComplexMultiMapped.PersistentD.class, crit);
           iter = broker.getCollectionByQuery(q).iterator();
  -        ComplexObjectMappedToMultiMappedTableD d = null;
  +        ComplexMultiMapped.PersistentD d = null;
           count = 0;
           while (iter.hasNext())
           {
  -            d = (ComplexObjectMappedToMultiMappedTableD) iter.next();
  +            d = (ComplexMultiMapped.PersistentD) iter.next();
               if (!d.getValue1().equals("d"))
               {
                   fail("getValue1 should have returned 'd', it in fact returned '" + d.getValue1() + "'");
  @@ -258,7 +258,7 @@
               count++;
           }
           if (count != COUNT)
  -            fail("should have found " + COUNT + " ComplexObjectMappedToMultiMappedTableD's, in fact found " + count);
  +            fail("should have found " + COUNT + " ComplexMultiMapped.PersistentD's, in fact found " + count);
   
   		assertEquals("counted size", broker.getCount(q), count);
   
  @@ -266,13 +266,13 @@
            * check all E's
            */
           crit = new Criteria();
  -        q = QueryFactory.newQuery(ComplexObjectMappedToMultiMappedTableE.class, crit);
  +        q = QueryFactory.newQuery(ComplexMultiMapped.PersistentE.class, crit);
           iter = broker.getCollectionByQuery(q).iterator();
  -        ComplexObjectMappedToMultiMappedTableE e = null;
  +        ComplexMultiMapped.PersistentE e = null;
           count = 0;
           while (iter.hasNext())
           {
  -            e = (ComplexObjectMappedToMultiMappedTableE) iter.next();
  +            e = (ComplexMultiMapped.PersistentE) iter.next();
               if (!e.getValue1().equals("e") && !e.getValue1().equals("f"))
               {
                   fail("getValue1 should have returned 'e' or 'f' (extent), it in fact returned '" + e.getValue1() + "'");
  @@ -280,29 +280,29 @@
               count++;
           }
           if (count != COUNT *2)
  -            fail("should have found " + (COUNT*2) + " ComplexObjectMappedToMultiMappedTableE's, in fact found " + count);
  +            fail("should have found " + (COUNT*2) + " ComplexMultiMapped.PersistentE's, in fact found " + count);
   
   		assertEquals("counted size", broker.getCount(q), count);
   
  -		/**
  -         * check all F's NEeds to be figured out.
  -        crit = new Criteria();
  -        q = QueryFactory.newQuery(ComplexObjectMappedToMultiMappedTableF.class, crit);
  -        iter = broker.getCollectionByQuery(q).iterator();
  -        ComplexObjectMappedToMultiMappedTableF f = null;
  -        count = 0;
  -        while (iter.hasNext())
  -        {
  -            f = (ComplexObjectMappedToMultiMappedTableF) iter.next();
  -            if (!f.getValue1().equals("f"))
  -            {
  -                fail("getValue1 should have returned 'f', it in fact returned '" + f.getValue1() + "'");
  -            }
  -            count++;
  -        }
  -        if (count != COUNT)
  -            fail("should have found " + COUNT + " ComplexObjectMappedToMultiMappedTableF's, in fact found " + count);
  -         */
  +        /**
  +                 * check all F's NEeds to be figured out.
  +                crit = new Criteria();
  +                q = QueryFactory.newQuery(ComplexMultiMapped.PersistentF.class, crit);
  +                iter = broker.getCollectionByQuery(q).iterator();
  +                ComplexMultiMapped.PersistentF f = null;
  +                count = 0;
  +                while (iter.hasNext())
  +                {
  +                    f = (ComplexMultiMapped.PersistentF) iter.next();
  +                    if (!f.getValue1().equals("f"))
  +                    {
  +                        fail("getValue1 should have returned 'f', it in fact returned '" + f.getValue1() + "'");
  +                    }
  +                    count++;
  +                }
  +                if (count != COUNT)
  +                    fail("should have found " + COUNT + " ComplexMultiMapped.PersistentF's, in fact found " + count);
  +                 */
   
       }
   
  
  
  
  1.5       +58 -53    db-ojb/src/test/org/apache/ojb/broker/ComplexMultiMappedTableTest.java
  
  Index: ComplexMultiMappedTableTest.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/test/org/apache/ojb/broker/ComplexMultiMappedTableTest.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- ComplexMultiMappedTableTest.java	14 Aug 2002 13:22:28 -0000	1.4
  +++ ComplexMultiMappedTableTest.java	9 Aug 2003 13:23:40 -0000	1.5
  @@ -20,11 +20,10 @@
   {
       private int COUNT = 10;
       PersistenceBroker broker;
  -    private static Class CLASS = ComplexMultiMappedTableTest.class;
   
       public static void main(String[] args)
       {
  -        String[] arr = {CLASS.getName()};
  +        String[] arr = {ComplexMultiMappedTableTest.class.getName()};
           junit.textui.TestRunner.main(arr);
       }
   
  @@ -41,10 +40,12 @@
        * Insert the method's description here.
        * Creation date: (06.12.2000 21:58:53)
        */
  -    public void setUp() throws PBFactoryException
  +    public void setUp() throws Exception
       {
           broker = PersistenceBrokerFactory.defaultPersistenceBroker();
  +        broker.beginTransaction();
           createTestData();
  +        broker.commitTransaction();
       }
   
       /**
  @@ -67,9 +68,9 @@
       	Collection result;
      		Iterator iter;
           int number_deleted = 0;
  - 
  +
           Criteria crit = new Criteria();
  -        Query q = QueryFactory.newQuery(ComplexObjectMappedToMultiMappedTableA.class, crit);
  +        Query q = QueryFactory.newQuery(ComplexMultiMapped.PersistentA.class, crit);
           result = broker.getCollectionByQuery(q);
           iter = result.iterator();
           while (iter.hasNext())
  @@ -81,7 +82,7 @@
            * will delete all B and D and E (both of which extends B)
            */
           crit = new Criteria();
  -        q = QueryFactory.newQuery(ComplexObjectMappedToMultiMappedTableB.class, crit);
  +        q = QueryFactory.newQuery(ComplexMultiMapped.PersistentB.class, crit);
           result = broker.getCollectionByQuery(q);
           iter = result.iterator();
           while (iter.hasNext())
  @@ -93,7 +94,7 @@
            * will delete all C
            */
           crit = new Criteria();
  -        q = QueryFactory.newQuery(ComplexObjectMappedToMultiMappedTableC.class, crit);
  +        q = QueryFactory.newQuery(ComplexMultiMapped.PersistentC.class, crit);
           result = broker.getCollectionByQuery(q);
           iter = result.iterator();
           while (iter.hasNext())
  @@ -111,19 +112,19 @@
            */
           for (int i = 0; i < COUNT; i++)
           {
  -            ComplexObjectMappedToMultiMappedTableA a = new ComplexObjectMappedToMultiMappedTableA();
  +            ComplexMultiMapped.PersistentA a = new ComplexMultiMapped.PersistentA();
               a.setValue1("a");
               a.setValue2(i);
               a.setValue3(new Timestamp(System.currentTimeMillis()));
               broker.store(a);
   
  -            ComplexObjectMappedToMultiMappedTableB b = new ComplexObjectMappedToMultiMappedTableB();
  +            ComplexMultiMapped.PersistentB b = new ComplexMultiMapped.PersistentB();
               b.setValue4("b");
               b.setValue5(i);
               b.setValue6(new Timestamp(System.currentTimeMillis()));
               broker.store(b);
   
  -            ComplexObjectMappedToMultiMappedTableC c = new ComplexObjectMappedToMultiMappedTableC();
  +            ComplexMultiMapped.PersistentC c = new ComplexMultiMapped.PersistentC();
               c.setValue1("c");
               c.setValue2(i);
               c.setValue3(new Timestamp(System.currentTimeMillis()));
  @@ -132,7 +133,7 @@
               c.setValue6(new Timestamp(System.currentTimeMillis()));
               broker.store(c);
   
  -            ComplexObjectMappedToMultiMappedTableD d = new ComplexObjectMappedToMultiMappedTableD();
  +            ComplexMultiMapped.PersistentD d = new ComplexMultiMapped.PersistentD();
               d.setValue1("d");
               d.setValue2(i);
               d.setValue3(new Timestamp(System.currentTimeMillis()));
  @@ -141,7 +142,7 @@
               d.setValue6(new Timestamp(System.currentTimeMillis()));
               broker.store(d);
   
  -            ComplexObjectMappedToMultiMappedTableE e = new ComplexObjectMappedToMultiMappedTableE();
  +            ComplexMultiMapped.PersistentE e = new ComplexMultiMapped.PersistentE();
               e.setValue1("e");
               e.setValue2(i);
               e.setValue3(new Timestamp(System.currentTimeMillis()));
  @@ -149,8 +150,8 @@
               e.setValue5(i);
               e.setValue6(new Timestamp(System.currentTimeMillis()));
               broker.store(e);
  -            
  -            ComplexObjectMappedToMultiMappedTableF f = new ComplexObjectMappedToMultiMappedTableF();
  +
  +            ComplexMultiMapped.PersistentF f = new ComplexMultiMapped.PersistentF();
               f.setValue1("f");
               f.setValue2(i);
               f.setValue3(new Timestamp(System.currentTimeMillis()));
  @@ -172,11 +173,15 @@
           /**
            * get to a clean, known state.
            */
  +        broker.beginTransaction();
           deleteAllData();
  +        broker.commitTransaction();
           /**
            * now create a bunch of test data.
            */
  +        broker.beginTransaction();
           createTestData();
  +        broker.commitTransaction();
   
           Criteria crit = new Criteria();
           Query q;
  @@ -185,13 +190,13 @@
           /**
            * check all A's
            */
  -        q = QueryFactory.newQuery(ComplexObjectMappedToMultiMappedTableA.class, crit);
  +        q = QueryFactory.newQuery(ComplexMultiMapped.PersistentA.class, crit);
           iter = broker.getIteratorByQuery(q);
  -        ComplexObjectMappedToMultiMappedTableA a = null;
  +        ComplexMultiMapped.PersistentA a = null;
           count = 0;
           while (iter.hasNext())
           {
  -            a = (ComplexObjectMappedToMultiMappedTableA) iter.next();
  +            a = (ComplexMultiMapped.PersistentA) iter.next();
               if (!a.getValue1().equals("a"))
               {
                   fail("getValue1 should have returned 'a', it in fact returned '" + a.getValue1() + "'");
  @@ -199,19 +204,19 @@
               count++;
           }
           if (count != COUNT)
  -            fail("should have found " + COUNT + " ComplexObjectMappedToMultiMappedTableA's, in fact found " + count);
  +            fail("should have found " + COUNT + " ComplexMultiMapped.PersistentA's, in fact found " + count);
   
           /**
            * check all B's
            */
           crit = new Criteria();
  -        q = QueryFactory.newQuery(ComplexObjectMappedToMultiMappedTableB.class, crit);
  +        q = QueryFactory.newQuery(ComplexMultiMapped.PersistentB.class, crit);
           iter = broker.getIteratorByQuery(q);
  -        ComplexObjectMappedToMultiMappedTableB b = null;
  +        ComplexMultiMapped.PersistentB b = null;
           count = 0;
           while (iter.hasNext())
           {
  -            b = (ComplexObjectMappedToMultiMappedTableB) iter.next();
  +            b = (ComplexMultiMapped.PersistentB) iter.next();
               if (!b.getValue4().equals("b") && !b.getValue4().equals("d") && !b.getValue4().equals("e") && !b.getValue4().equals("f"))
               {
                   fail("getValue4 should have returned 'b' or 'd' or 'e' or 'f' (from extent), it in fact returned '" + b.getValue4() + "'");
  @@ -222,19 +227,19 @@
            * should find ALL b's, d's, e's and f's, so COUNT*4 is the expected result
            */
           if (count != COUNT*4)
  -            fail("should have found " + (COUNT *4) + " ComplexObjectMappedToMultiMappedTableB's, in fact found " + count);
  +            fail("should have found " + (COUNT *4) + " ComplexMultiMapped.PersistentB's, in fact found " + count);
   
           /**
            * check all C's
            */
           crit = new Criteria();
  -        q = QueryFactory.newQuery(ComplexObjectMappedToMultiMappedTableC.class, crit);
  +        q = QueryFactory.newQuery(ComplexMultiMapped.PersistentC.class, crit);
           iter = broker.getIteratorByQuery(q);
  -        ComplexObjectMappedToMultiMappedTableC c = null;
  +        ComplexMultiMapped.PersistentC c = null;
           count = 0;
           while (iter.hasNext())
           {
  -            c = (ComplexObjectMappedToMultiMappedTableC) iter.next();
  +            c = (ComplexMultiMapped.PersistentC) iter.next();
               if (!c.getValue1().equals("c"))
               {
                   fail("getValue1 should have returned 'c', it in fact returned '" + c.getValue1() + "'");
  @@ -242,19 +247,19 @@
               count++;
           }
           if (count != COUNT)
  -            fail("should have found " + COUNT + " ComplexObjectMappedToMultiMappedTableC's, in fact found " + count);
  +            fail("should have found " + COUNT + " ComplexMultiMapped.PersistentC's, in fact found " + count);
   
           /**
            * check all D's
            */
           crit = new Criteria();
  -        q = QueryFactory.newQuery(ComplexObjectMappedToMultiMappedTableD.class, crit);
  +        q = QueryFactory.newQuery(ComplexMultiMapped.PersistentD.class, crit);
           iter = broker.getIteratorByQuery(q);
  -        ComplexObjectMappedToMultiMappedTableD d = null;
  +        ComplexMultiMapped.PersistentD d = null;
           count = 0;
           while (iter.hasNext())
           {
  -            d = (ComplexObjectMappedToMultiMappedTableD) iter.next();
  +            d = (ComplexMultiMapped.PersistentD) iter.next();
               if (!d.getValue1().equals("d"))
               {
                   fail("getValue1 should have returned 'd', it in fact returned '" + d.getValue1() + "'");
  @@ -262,19 +267,19 @@
               count++;
           }
           if (count != COUNT)
  -            fail("should have found " + COUNT + " ComplexObjectMappedToMultiMappedTableD's, in fact found " + count);
  +            fail("should have found " + COUNT + " ComplexMultiMapped.PersistentD's, in fact found " + count);
   
   		/**
            * check all E's
            */
           crit = new Criteria();
  -        q = QueryFactory.newQuery(ComplexObjectMappedToMultiMappedTableE.class, crit);
  +        q = QueryFactory.newQuery(ComplexMultiMapped.PersistentE.class, crit);
           iter = broker.getIteratorByQuery(q);
  -        ComplexObjectMappedToMultiMappedTableE e = null;
  +        ComplexMultiMapped.PersistentE e = null;
           count = 0;
           while (iter.hasNext())
           {
  -            e = (ComplexObjectMappedToMultiMappedTableE) iter.next();
  +            e = (ComplexMultiMapped.PersistentE) iter.next();
               if (!e.getValue1().equals("e") && !e.getValue1().equals("f"))
               {
                   fail("getValue1 should have returned 'e' or 'f' (extent), it in fact returned '" + e.getValue1() + "'");
  @@ -282,27 +287,27 @@
               count++;
           }
           if (count != COUNT *2)
  -            fail("should have found " + (COUNT*2) + " ComplexObjectMappedToMultiMappedTableE's, in fact found " + count);
  +            fail("should have found " + (COUNT*2) + " ComplexMultiMapped.PersistentE's, in fact found " + count);
   
  -		/**
  -         * check all F's NEEDS TO BE FIGURED OUT.
  -        crit = new Criteria();
  -        q = QueryFactory.newQuery(ComplexObjectMappedToMultiMappedTableF.class, crit);
  -        iter = broker.getIteratorByQuery(q);
  -        ComplexObjectMappedToMultiMappedTableF f = null;
  -        count = 0;
  -        while (iter.hasNext())
  -        {
  -            f = (ComplexObjectMappedToMultiMappedTableF) iter.next();
  -            if (!f.getValue1().equals("f"))
  -            {
  -                fail("getValue1 should have returned 'f', it in fact returned '" + f.getValue1() + "'");
  -            }
  -            count++;
  -        }
  -        if (count != COUNT)
  -            fail("should have found " + COUNT + " ComplexObjectMappedToMultiMappedTableF's, in fact found " + count);
  -         */
  +        /**
  +                 * check all F's NEEDS TO BE FIGURED OUT.
  +                crit = new Criteria();
  +                q = QueryFactory.newQuery(ComplexMultiMapped.PersistentF.class, crit);
  +                iter = broker.getIteratorByQuery(q);
  +                ComplexMultiMapped.PersistentF f = null;
  +                count = 0;
  +                while (iter.hasNext())
  +                {
  +                    f = (ComplexMultiMapped.PersistentF) iter.next();
  +                    if (!f.getValue1().equals("f"))
  +                    {
  +                        fail("getValue1 should have returned 'f', it in fact returned '" + f.getValue1() + "'");
  +                    }
  +                    count++;
  +                }
  +                if (count != COUNT)
  +                    fail("should have found " + COUNT + " ComplexMultiMapped.PersistentF's, in fact found " + count);
  +                 */
   
       }
   
  
  
  
  1.1                  db-ojb/src/test/org/apache/ojb/broker/ComplexMultiMapped.java
  
  Index: ComplexMultiMapped.java
  ===================================================================
  package org.apache.ojb.broker;
  
  import java.io.Serializable;
  import java.util.Date;
  
  /**
   * Test case helper class.
   *
   * @author <a href="mailto:armin@codeAuLait.de">Armin Waibel</a>
   * @version $Id: ComplexMultiMapped.java,v 1.1 2003/08/09 13:23:40 arminw Exp $
   */
  public class ComplexMultiMapped
  {
      //*******************************************************
      // Inner class
      //*******************************************************
      public static class PersistentA implements Serializable
      {
          private int ID = 0;
          private String value1;
          private int value2;
          private Date value3;
          private String ojbConcreteClass = PersistentA.class.getName();
  
          public int getID()
          {
              return ID;
          }
  
          public void setID(int ID)
          {
              this.ID = ID;
          }
  
          public String getValue1()
          {
              return value1;
          }
  
          public void setValue1(String value1)
          {
              this.value1 = value1;
          }
  
          public int getValue2()
          {
              return value2;
          }
  
          public void setValue2(int value2)
          {
              this.value2 = value2;
          }
  
          public Date getValue3()
          {
              return value3;
          }
  
          public void setValue3(Date value3)
          {
              this.value3 = value3;
          }
  
          public String getOjbConcreteClass()
          {
              return ojbConcreteClass;
          }
  
          public void setOjbConcreteClass(String ojbConcreteClass)
          {
              this.ojbConcreteClass = ojbConcreteClass;
          }
      }
  
  
      //*******************************************************
      // Inner class
      //*******************************************************
      public static class PersistentB implements Serializable
      {
          private int ID = 0;
          private String value4;
          private int value5;
          private Date value6;
          private String ojbConcreteClass = PersistentB.class.getName();
  
          public int getID()
          {
              return ID;
          }
  
          public void setID(int ID)
          {
              this.ID = ID;
          }
  
          public String getValue4()
          {
              return value4;
          }
  
          public void setValue4(String value4)
          {
              this.value4 = value4;
          }
  
          public int getValue5()
          {
              return value5;
          }
  
          public void setValue5(int value5)
          {
              this.value5 = value5;
          }
  
          public Date getValue6()
          {
              return value6;
          }
  
          public void setValue6(Date value6)
          {
              this.value6 = value6;
          }
  
          public String getOjbConcreteClass()
          {
              return ojbConcreteClass;
          }
  
          public void setOjbConcreteClass(String ojbConcreteClass)
          {
              this.ojbConcreteClass = ojbConcreteClass;
          }
      }
  
  
      //*******************************************************
      // Inner class
      //*******************************************************
      public static class PersistentC implements Serializable
      {
          private int ID = 0;
          private String value1;
          private int value2;
          private Date value3;
          private String value4;
          private int value5;
          private Date value6;
          private String value7;
          private String ojbConcreteClass = PersistentC.class.getName();
  
          public int getID()
          {
              return ID;
          }
  
          public void setID(int ID)
          {
              this.ID = ID;
          }
  
          public String getValue1()
          {
              return value1;
          }
  
          public void setValue1(String value1)
          {
              this.value1 = value1;
          }
  
          public int getValue2()
          {
              return value2;
          }
  
          public void setValue2(int value2)
          {
              this.value2 = value2;
          }
  
          public Date getValue3()
          {
              return value3;
          }
  
          public void setValue3(Date value3)
          {
              this.value3 = value3;
          }
  
          public String getValue4()
          {
              return value4;
          }
  
          public void setValue4(String value4)
          {
              this.value4 = value4;
          }
  
          public int getValue5()
          {
              return value5;
          }
  
          public void setValue5(int value5)
          {
              this.value5 = value5;
          }
  
          public Date getValue6()
          {
              return value6;
          }
  
          public void setValue6(Date value6)
          {
              this.value6 = value6;
          }
  
          public String getValue7()
          {
              return value7;
          }
  
          public void setValue7(String value7)
          {
              this.value7 = value7;
          }
  
          public String getOjbConcreteClass()
          {
              return ojbConcreteClass;
          }
  
          public void setOjbConcreteClass(String ojbConcreteClass)
          {
              this.ojbConcreteClass = ojbConcreteClass;
          }
      }
  
      //*******************************************************
      // Inner class
      //*******************************************************
      public static class PersistentD extends PersistentB
      {
          private int ID = 0;
          private String value1;
          private int value2;
          private Date value3;
          private String ojbConcreteClass = PersistentD.class.getName();
  
          public int getID()
          {
              return ID;
          }
  
          public void setID(int ID)
          {
              this.ID = ID;
          }
  
          public String getValue1()
          {
              return value1;
          }
  
          public void setValue1(String value1)
          {
              this.value1 = value1;
          }
  
          public int getValue2()
          {
              return value2;
          }
  
          public void setValue2(int value2)
          {
              this.value2 = value2;
          }
  
          public Date getValue3()
          {
              return value3;
          }
  
          public void setValue3(Date value3)
          {
              this.value3 = value3;
          }
  
          public String getOjbConcreteClass()
          {
              return ojbConcreteClass;
          }
  
          public void setOjbConcreteClass(String ojbConcreteClass)
          {
              this.ojbConcreteClass = ojbConcreteClass;
          }
      }
  
      //*******************************************************
      // Inner class
      //*******************************************************
      public static class PersistentE extends PersistentB
      {
          private int ID = 0;
          private String value1;
          private int value2;
          private Date value3;
          private String ojbConcreteClass =
                  PersistentE.class.getName();
  
          public int getID()
          {
              return ID;
          }
  
          public void setID(int ID)
          {
              this.ID = ID;
          }
  
          public String getValue1()
          {
              return value1;
          }
  
          public void setValue1(String value1)
          {
              this.value1 = value1;
          }
  
          public int getValue2()
          {
              return value2;
          }
  
          public void setValue2(int value2)
          {
              this.value2 = value2;
          }
  
          public Date getValue3()
          {
              return value3;
          }
  
          public void setValue3(Date value3)
          {
              this.value3 = value3;
          }
  
          public String getOjbConcreteClass()
          {
              return ojbConcreteClass;
          }
  
          public void setOjbConcreteClass(String ojbConcreteClass)
          {
              this.ojbConcreteClass = ojbConcreteClass;
          }
      }
  
  
      //*******************************************************
      // Inner class
      //*******************************************************
      public static class PersistentF extends PersistentE
      {
      }
  }
  
  
  
  1.23      +24 -24    db-ojb/src/test/org/apache/ojb/broker/sequence/SequenceManagerTest.java
  
  Index: SequenceManagerTest.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/test/org/apache/ojb/broker/sequence/SequenceManagerTest.java,v
  retrieving revision 1.22
  retrieving revision 1.23
  diff -u -r1.22 -r1.23
  --- SequenceManagerTest.java	1 Jul 2003 07:29:17 -0000	1.22
  +++ SequenceManagerTest.java	9 Aug 2003 13:23:40 -0000	1.23
  @@ -63,7 +63,7 @@
       */
       private int loops = 1000;
       private int instances = 10;
  -    private Class targetClass = SMSameTableA.class;
  +    private Class targetClass = Repository.SMSameTableA.class;
       // end
   
       private int numberOfKeys = 200;
  @@ -143,7 +143,7 @@
       {
           String MESSAGE = "Autoincrement field was not incremented: ";
           String name = "my test key " + System.currentTimeMillis();
  -        SMKey key = new SMKey();
  +        Repository.SMKey key = new Repository.SMKey();
           key.setName(name);
           PersistenceBroker broker = PersistenceBrokerFactory.defaultPersistenceBroker();
           broker.beginTransaction();
  @@ -158,8 +158,8 @@
   
           Criteria cr = new Criteria();
           cr.addEqualTo("name", name);
  -        Query query = new QueryByCriteria(SMKey.class, cr);
  -        key = (SMKey) broker.getObjectByQuery(query);
  +        Query query = new QueryByCriteria(Repository.SMKey.class, cr);
  +        key = (Repository.SMKey) broker.getObjectByQuery(query);
   
           assertEquals("Value was not store: ", name, key.getName());
           assertNotNull(MESSAGE + key, key.getIntegerKey());
  @@ -180,7 +180,7 @@
           // sequence name used in the repository
           String fieldName = "stringKey";
           PersistenceBroker broker = PersistenceBrokerFactory.defaultPersistenceBroker();
  -        FieldDescriptor field = broker.getClassDescriptor(SMKey.class).getFieldDescriptorByName(fieldName);
  +        FieldDescriptor field = broker.getClassDescriptor(Repository.SMKey.class).getFieldDescriptorByName(fieldName);
           String result = SequenceManagerHelper.buildSequenceName(broker, field, true);
   
           assertEquals(TEST_SEQUENCE_NAME, result);
  @@ -298,7 +298,7 @@
           }
           int count = 0;
           FieldDescriptor idFld = broker.getClassDescriptor(
  -                SMDatabaseSequence.class).getAutoIncrementField();
  +                Repository.SMDatabaseSequence.class).getAutoIncrementField();
           for (int i = 0; i < 10; i++)
           {
               Integer val = (Integer) sm.getUniqueValue(idFld);
  @@ -318,15 +318,15 @@
           PersistenceBroker broker = PersistenceBrokerFactory.defaultPersistenceBroker();
   
           // find max from classes using different tables
  -        FieldDescriptor field = broker.getClassDescriptor(SMMax.class).getAutoIncrementField();
  +        FieldDescriptor field = broker.getClassDescriptor(Repository.SMMax.class).getAutoIncrementField();
           long result1 = SequenceManagerHelper.getMaxForExtent(broker, field);
  -        field = broker.getClassDescriptor(SMMaxA.class).getAutoIncrementField();
  +        field = broker.getClassDescriptor(Repository.SMMaxA.class).getAutoIncrementField();
           long result2 = SequenceManagerHelper.getMaxForExtent(broker, field);
  -        field = broker.getClassDescriptor(SMMaxAA.class).getAutoIncrementField();
  +        field = broker.getClassDescriptor(Repository.SMMaxAA.class).getAutoIncrementField();
           long result3 = SequenceManagerHelper.getMaxForExtent(broker, field);
  -        field = broker.getClassDescriptor(SMMaxAB.class).getAutoIncrementField();
  +        field = broker.getClassDescriptor(Repository.SMMaxAB.class).getAutoIncrementField();
           long result4 = SequenceManagerHelper.getMaxForExtent(broker, field);
  -        field = broker.getClassDescriptor(SMMaxAAA.class).getAutoIncrementField();
  +        field = broker.getClassDescriptor(Repository.SMMaxAAA.class).getAutoIncrementField();
           long result5 = SequenceManagerHelper.getMaxForExtent(broker, field);
   
           assertEquals(SMMAX_FAIL_MESSAGE, SMMAX_MAX_PK_VALUE, result1);
  @@ -415,8 +415,8 @@
        */
       public void testUniqueAcrossExtendsWithDifferentTables1() throws Exception
       {
  -        Class classOne = SMInterfaceExtendAAA.class;
  -        Class classTwo = SMInterfaceExtendBB.class;
  +        Class classOne = Repository.SMInterfaceExtendAAA.class;
  +        Class classTwo = Repository.SMInterfaceExtendBB.class;
           doKeyAnalysing(classOne, classTwo);
       }
   
  @@ -425,8 +425,8 @@
        */
       public void testUniqueAcrossExtendsWithDifferentTables2() throws Exception
       {
  -        Class classOne = SMInterfaceExtendAA.class;
  -        Class classTwo = SMInterfaceExtendB.class;
  +        Class classOne = Repository.SMInterfaceExtendAA.class;
  +        Class classTwo = Repository.SMInterfaceExtendB.class;
           doKeyAnalysing(classOne, classTwo);
       }
   
  @@ -435,8 +435,8 @@
        */
       public void testUniqueAcrossExtendsWithDifferentTables3() throws Exception
       {
  -        Class classOne = SMInterfaceExtendA.class;
  -        Class classTwo = SMInterfaceExtendAB.class;
  +        Class classOne = Repository.SMInterfaceExtendA.class;
  +        Class classTwo = Repository.SMInterfaceExtendAB.class;
           doKeyAnalysing(classOne, classTwo);
       }
   
  @@ -445,8 +445,8 @@
        */
       public void testUniqueAcrossExtendsWithSameTable1() throws Exception
       {
  -        Class classOne = SMSameTableAA.class;
  -        Class classTwo = SMSameTableBB.class;
  +        Class classOne = Repository.SMSameTableAA.class;
  +        Class classTwo = Repository.SMSameTableBB.class;
           doKeyAnalysing(classOne, classTwo);
       }
   
  @@ -455,8 +455,8 @@
        */
       public void testUniqueAcrossExtendsWithSameTable3() throws Exception
       {
  -        Class classOne = SMSameTableA.class;
  -        Class classTwo = SMSameTableB.class;
  +        Class classOne = Repository.SMSameTableA.class;
  +        Class classTwo = Repository.SMSameTableB.class;
           doKeyAnalysing(classOne, classTwo);
       }
   
  @@ -757,8 +757,8 @@
   
           PersistenceBroker broker = PersistenceBrokerFactory.defaultPersistenceBroker();
   
  -        SMSameTableBB dummy1 = new SMSameTableBB();
  -        SMInterfaceExtendA dummy2 = new SMInterfaceExtendA();
  +        Repository.SMSameTableBB dummy1 = new Repository.SMSameTableBB();
  +        Repository.SMInterfaceExtendA dummy2 = new Repository.SMInterfaceExtendA();
   
           SMObjectOne smOne_1 = new SMObjectOne(objectName_One);
           SMObjectOne smOne_2 = new SMObjectOne(objectName_One);
  
  
  
  1.1                  db-ojb/src/test/org/apache/ojb/broker/sequence/Repository.java
  
  Index: Repository.java
  ===================================================================
  package org.apache.ojb.broker.sequence;
  
  import java.io.Serializable;
  
  /**
   * Repository class for sequence test classes.
   *
   * @author <a href="mailto:armin@codeAuLait.de">Armin Waibel</a>
   * @version $Id: Repository.java,v 1.1 2003/08/09 13:23:40 arminw Exp $
   */
  public class Repository
  {
      public static class SMDatabaseSequence implements Serializable
      {
          private Integer seqId;
          private String name;
  
          public SMDatabaseSequence(Integer seqId, String name)
          {
              this.seqId = seqId;
              this.name = name;
          }
  
          public SMDatabaseSequence()
          {
          }
  
          public Integer getSeqId()
          {
              return seqId;
          }
  
          public void setSeqId(Integer seqId)
          {
              this.seqId = seqId;
          }
  
          public String getName()
          {
              return name;
          }
  
          public void setName(String name)
          {
              this.name = name;
          }
      }
  
  
      public static interface SMInterface extends Serializable
      {
          public Integer getId();
          public void setId(Integer id);
  
          public String getName();
          public void setName(String name);
      }
  
      public static class SMInterfaceExtendA implements SMInterface
      {
          private Integer id;
          private String name;
  
          public Integer getId()
          {
              return id;
          }
  
          public void setId(Integer id)
          {
              this.id = id;
          }
  
          public String getName()
          {
              return this.name;
          }
  
          public void setName(String name)
          {
              this.name = name;
          }
      }
  
      public static class SMInterfaceExtendAA extends SMInterfaceExtendA
      {
      }
  
      public static class SMInterfaceExtendAAA extends SMInterfaceExtendAA
      {
      }
  
      public static class SMInterfaceExtendAB extends SMInterfaceExtendA
      {
      }
  
      public static class SMInterfaceExtendB implements SMInterface
      {
          private Integer id;
          private String name;
  
          public Integer getId()
          {
              return id;
          }
  
          public void setId(Integer id)
          {
              this.id = id;
          }
  
          public String getName()
          {
              return this.name;
          }
  
          public void setName(String name)
          {
              this.name = name;
          }
      }
  
      public static class SMInterfaceExtendBB extends SMInterfaceExtendB
      {
      }
  
  
  
      public static class SMKey implements Serializable
      {
          private int intKey;
          private String name;
          private String stringKey;
          private Long longKey;
          private Integer integerKey;
  
          public int getIntKey()
          {
              return intKey;
          }
  
          public void setIntKey(int intKey)
          {
              this.intKey = intKey;
          }
  
          public String getName()
          {
              return name;
          }
  
          public void setName(String name)
          {
              this.name = name;
          }
  
          public String getStringKey()
          {
              return stringKey;
          }
  
          public void setStringKey(String stringKey)
          {
              this.stringKey = stringKey;
          }
  
          public Long getLongKey()
          {
              return longKey;
          }
  
          public void setLongKey(Long longKey)
          {
              this.longKey = longKey;
          }
  
          public Integer getIntegerKey()
          {
              return integerKey;
          }
  
          public void setIntegerKey(Integer integerKey)
          {
              this.integerKey = integerKey;
          }
  
          public String toString()
          {
              StringBuffer buf = new StringBuffer(this.getClass().getName());
              buf.append(": name="+getName());
              buf.append(", intKey="+getIntKey());
              buf.append(", longKey="+getLongKey());
              buf.append(", stringKey="+getStringKey());
              buf.append(", integerKey="+getIntegerKey());
              return buf.toString();
          }
      }
  
  
      public static interface SMMax extends Serializable
      {
          public Integer getId();
          public void setId(Integer id);
  
          public String getName();
          public void setName(String name);
      }
  
      public static class SMMaxA implements SMMax
      {
          private Integer id;
          private String name;
  
          public Integer getId()
          {
              return id;
          }
  
          public void setId(Integer id)
          {
              this.id = id;
          }
  
          public String getName()
          {
              return this.name;
          }
  
          public void setName(String name)
          {
              this.name = name;
          }
      }
  
  
      public static class SMMaxAA extends SMMaxA
      {
      }
  
      public static class SMMaxAAA extends SMMaxAA
      {
      }
  
      public static class SMMaxAB extends SMMaxA
      {
      }
  
      public static class SMMaxB implements SMMax
      {
          private Integer id;
          private String name;
  
          public Integer getId()
          {
              return id;
          }
  
          public void setId(Integer id)
          {
              this.id = id;
          }
  
          public String getName()
          {
              return this.name;
          }
  
          public void setName(String name)
          {
              this.name = name;
          }
      }
  
      public static class SMMaxBB extends SMMaxB
      {
      }
  
      public static class SMSameTableA implements Serializable
      {
          private Integer id;
          private String name;
  
          public Integer getId()
          {
              return id;
          }
  
          public void setId(Integer id)
          {
              this.id = id;
          }
  
          public String getName()
          {
              return this.name;
          }
  
          public void setName(String name)
          {
              this.name = name;
          }
      }
  
      public static class SMSameTableAA extends SMSameTableA
      {
      }
  
      public static class SMSameTableB implements Serializable
      {
          private Integer id;
          private String name;
  
          public Integer getId()
          {
              return id;
          }
  
          public void setId(Integer id)
          {
              this.id = id;
          }
  
          public String getName()
          {
              return this.name;
          }
  
          public void setName(String name)
          {
              this.name = name;
          }
      }
  
      public static class SMSameTableBB extends SMSameTableB
      {
      }
  
  }
  
  
  
  1.3       +3 -3      db-ojb/src/test/org/apache/ojb/broker/metadata/MetadataMultithreadedTest.java
  
  Index: MetadataMultithreadedTest.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/test/org/apache/ojb/broker/metadata/MetadataMultithreadedTest.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- MetadataMultithreadedTest.java	24 May 2003 01:41:59 -0000	1.2
  +++ MetadataMultithreadedTest.java	9 Aug 2003 13:23:40 -0000	1.3
  @@ -4,7 +4,7 @@
   import org.apache.ojb.broker.OJBRuntimeException;
   import org.apache.ojb.broker.PersistenceBroker;
   import org.apache.ojb.broker.PersistenceBrokerFactory;
  -import org.apache.ojb.broker.sequence.SMMaxA;
  +import org.apache.ojb.broker.sequence.Repository;
   
   /**
    *
  @@ -15,7 +15,7 @@
   {
       private String newTestObjectString = "test_string";
       private String oldTestObjectString;
  -    private Class targetTestClass = SMMaxA.class;
  +    private Class targetTestClass = Repository.SMMaxA.class;
   
       public MetadataMultithreadedTest(String s)
       {
  
  
  
  1.84      +65 -65    db-ojb/src/test/org/apache/ojb/repository_junit.xml
  
  Index: repository_junit.xml
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/test/org/apache/ojb/repository_junit.xml,v
  retrieving revision 1.83
  retrieving revision 1.84
  diff -u -r1.83 -r1.84
  --- repository_junit.xml	9 Aug 2003 10:04:34 -0000	1.83
  +++ repository_junit.xml	9 Aug 2003 13:23:40 -0000	1.84
  @@ -1924,7 +1924,7 @@
    <!-- testing for complex mapping of many objects to one table -->
   
    <class-descriptor
  -	class="org.apache.ojb.broker.ComplexObjectMappedToMultiMappedTableA"
  +	class="org.apache.ojb.broker.ComplexMultiMapped$PersistentA"
   	table="MultiMappedTable"
    >
        <field-descriptor
  @@ -1957,11 +1957,11 @@
    </class-descriptor>
   
    <class-descriptor
  -	class="org.apache.ojb.broker.ComplexObjectMappedToMultiMappedTableB"
  +	class="org.apache.ojb.broker.ComplexMultiMapped$PersistentB"
   	table="MultiMappedTable"
    >
  -     <extent-class class-ref="org.apache.ojb.broker.ComplexObjectMappedToMultiMappedTableD" />
  -     <extent-class class-ref="org.apache.ojb.broker.ComplexObjectMappedToMultiMappedTableE" />
  +     <extent-class class-ref="org.apache.ojb.broker.ComplexMultiMapped$PersistentD" />
  +     <extent-class class-ref="org.apache.ojb.broker.ComplexMultiMapped$PersistentE" />
        <field-descriptor
           name="ID"
           column="ID"
  @@ -1992,7 +1992,7 @@
    </class-descriptor>
   
   <class-descriptor
  -	class="org.apache.ojb.broker.ComplexObjectMappedToMultiMappedTableC"
  +	class="org.apache.ojb.broker.ComplexMultiMapped$PersistentC"
   	table="MultiMappedTable"
    >
        <field-descriptor
  @@ -2040,7 +2040,7 @@
    </class-descriptor>
   
   <class-descriptor
  -	class="org.apache.ojb.broker.ComplexObjectMappedToMultiMappedTableD"
  +	class="org.apache.ojb.broker.ComplexMultiMapped$PersistentD"
   	table="MultiMappedTable"
    >
        <field-descriptor
  @@ -2088,10 +2088,10 @@
    </class-descriptor>
   
   <class-descriptor
  -	class="org.apache.ojb.broker.ComplexObjectMappedToMultiMappedTableE"
  +	class="org.apache.ojb.broker.ComplexMultiMapped$PersistentE"
   	table="MultiMappedTable"
    >
  -     <extent-class class-ref="org.apache.ojb.broker.ComplexObjectMappedToMultiMappedTableF" />
  +     <extent-class class-ref="org.apache.ojb.broker.ComplexMultiMapped$PersistentF" />
        <field-descriptor
           name="ID"
           column="ID"
  @@ -2138,7 +2138,7 @@
   
   
   <class-descriptor
  -	class="org.apache.ojb.broker.ComplexObjectMappedToMultiMappedTableF"
  +	class="org.apache.ojb.broker.ComplexMultiMapped$PersistentF"
   	table="MultiMappedTable"
    >
        <field-descriptor
  @@ -2777,21 +2777,21 @@
   <!--      START  -  Sequence manager test classes      -->
   <!-- ************************************************* -->
   
  -    <!-- Definitions for org.apache.ojb.broker.SMInterface -->
  -    <class-descriptor class="org.apache.ojb.broker.sequence.SMInterface">
  -        <extent-class class-ref="org.apache.ojb.broker.sequence.SMInterfaceExtendA" />
  -        <extent-class class-ref="org.apache.ojb.broker.sequence.SMInterfaceExtendB" />
  -        <extent-class class-ref="org.apache.ojb.broker.sequence.SMInterfaceExtendAA" />
  -        <extent-class class-ref="org.apache.ojb.broker.sequence.SMInterfaceExtendAAA" />
  +    <!-- Definitions for org.apache.ojb.broker.Repository$SMInterface -->
  +    <class-descriptor class="org.apache.ojb.broker.sequence.Repository$SMInterface">
  +        <extent-class class-ref="org.apache.ojb.broker.sequence.Repository$SMInterfaceExtendA" />
  +        <extent-class class-ref="org.apache.ojb.broker.sequence.Repository$SMInterfaceExtendB" />
  +        <extent-class class-ref="org.apache.ojb.broker.sequence.Repository$SMInterfaceExtendAA" />
  +        <extent-class class-ref="org.apache.ojb.broker.sequence.Repository$SMInterfaceExtendAAA" />
       </class-descriptor>
   
  -    <!-- Definitions for org.apache.ojb.broker.sequence.SMInterfaceExtendA -->
  +    <!-- Definitions for org.apache.ojb.broker.sequence.Repository$SMInterfaceExtendA -->
       <class-descriptor
  -      class="org.apache.ojb.broker.sequence.SMInterfaceExtendA"
  +      class="org.apache.ojb.broker.sequence.Repository$SMInterfaceExtendA"
         table="SM_TAB_A"
       >
  -        <extent-class class-ref="org.apache.ojb.broker.sequence.SMInterfaceExtendAA" />
  -        <extent-class class-ref="org.apache.ojb.broker.sequence.SMInterfaceExtendAB" />
  +        <extent-class class-ref="org.apache.ojb.broker.sequence.Repository$SMInterfaceExtendAA" />
  +        <extent-class class-ref="org.apache.ojb.broker.sequence.Repository$SMInterfaceExtendAB" />
           <field-descriptor
            name="id"
            column="SM_ID"
  @@ -2807,9 +2807,9 @@
           />
       </class-descriptor>
   
  -    <!-- Definitions for org.apache.ojb.broker.sequence.SMInterfaceExtendAB -->
  +    <!-- Definitions for org.apache.ojb.broker.sequence.Repository$SMInterfaceExtendAB -->
       <class-descriptor
  -      class="org.apache.ojb.broker.sequence.SMInterfaceExtendAB"
  +      class="org.apache.ojb.broker.sequence.Repository$SMInterfaceExtendAB"
         table="SM_TAB_AB"
       >
           <field-descriptor
  @@ -2827,12 +2827,12 @@
           />
       </class-descriptor>
   
  -    <!-- Definitions for org.apache.ojb.broker.sequence.SMInterfaceExtendAA -->
  +    <!-- Definitions for org.apache.ojb.broker.sequence.Repository$SMInterfaceExtendAA -->
       <class-descriptor
  -      class="org.apache.ojb.broker.sequence.SMInterfaceExtendAA"
  +      class="org.apache.ojb.broker.sequence.Repository$SMInterfaceExtendAA"
         table="SM_TAB_AA"
       >
  -        <extent-class class-ref="org.apache.ojb.broker.sequence.SMInterfaceExtendAAA" />
  +        <extent-class class-ref="org.apache.ojb.broker.sequence.Repository$SMInterfaceExtendAAA" />
   
           <field-descriptor
            name="id"
  @@ -2849,9 +2849,9 @@
           />
       </class-descriptor>
   
  -    <!-- Definitions for org.apache.ojb.broker.sequence.SMInterfaceExtendAAA -->
  +    <!-- Definitions for org.apache.ojb.broker.sequence.Repository$SMInterfaceExtendAAA -->
       <class-descriptor
  -      class="org.apache.ojb.broker.sequence.SMInterfaceExtendAAA"
  +      class="org.apache.ojb.broker.sequence.Repository$SMInterfaceExtendAAA"
         table="SM_TAB_AAA"
       >
           <field-descriptor
  @@ -2869,12 +2869,12 @@
           />
       </class-descriptor>
   
  -    <!-- Definitions for org.apache.ojb.broker.sequence.SMInterfaceExtendB -->
  +    <!-- Definitions for org.apache.ojb.broker.sequence.Repository$SMInterfaceExtendB -->
       <class-descriptor
  -      class="org.apache.ojb.broker.sequence.SMInterfaceExtendB"
  +      class="org.apache.ojb.broker.sequence.Repository$SMInterfaceExtendB"
         table="SM_TAB_B"
       >
  -        <extent-class class-ref="org.apache.ojb.broker.sequence.SMInterfaceExtendBB" />
  +        <extent-class class-ref="org.apache.ojb.broker.sequence.Repository$SMInterfaceExtendBB" />
           <field-descriptor
            name="id"
            column="SM_ID"
  @@ -2890,9 +2890,9 @@
           />
       </class-descriptor>
   
  -    <!-- Definitions for org.apache.ojb.broker.sequence.SMInterfaceExtendBB -->
  +    <!-- Definitions for org.apache.ojb.broker.sequence.Repository$SMInterfaceExtendBB -->
       <class-descriptor
  -      class="org.apache.ojb.broker.sequence.SMInterfaceExtendBB"
  +      class="org.apache.ojb.broker.sequence.Repository$SMInterfaceExtendBB"
         table="SM_TAB_BB"
       >
           <field-descriptor
  @@ -2910,12 +2910,12 @@
           />
       </class-descriptor>
   
  -    <!-- Definitions for org.apache.ojb.broker.sequence.SMSameTableA -->
  +    <!-- Definitions for org.apache.ojb.broker.sequence.Repository$SMSameTableA -->
       <class-descriptor
  -      class="org.apache.ojb.broker.sequence.SMSameTableA"
  +      class="org.apache.ojb.broker.sequence.Repository$SMSameTableA"
         table="SM_SAME_TAB"
       >
  -        <extent-class class-ref="org.apache.ojb.broker.sequence.SMSameTableAA" />
  +        <extent-class class-ref="org.apache.ojb.broker.sequence.Repository$SMSameTableAA" />
           <field-descriptor
            name="id"
            column="SM_ID"
  @@ -2931,9 +2931,9 @@
           />
       </class-descriptor>
   
  -    <!-- Definitions for org.apache.ojb.broker.sequence.SMSameTableAA -->
  +    <!-- Definitions for org.apache.ojb.broker.sequence.Repository$SMSameTableAA -->
       <class-descriptor
  -      class="org.apache.ojb.broker.sequence.SMSameTableAA"
  +      class="org.apache.ojb.broker.sequence.Repository$SMSameTableAA"
         table="SM_SAME_TAB"
       >
           <field-descriptor
  @@ -2951,12 +2951,12 @@
           />
       </class-descriptor>
   
  -    <!-- Definitions for org.apache.ojb.broker.sequence.SMSameTableB -->
  +    <!-- Definitions for org.apache.ojb.broker.sequence.Repository$SMSameTableB -->
       <class-descriptor
  -      class="org.apache.ojb.broker.sequence.SMSameTableB"
  +      class="org.apache.ojb.broker.sequence.Repository$SMSameTableB"
         table="SM_SAME_TAB"
       >
  -        <extent-class class-ref="org.apache.ojb.broker.sequence.SMSameTableBB" />
  +        <extent-class class-ref="org.apache.ojb.broker.sequence.Repository$SMSameTableBB" />
           <field-descriptor
            name="id"
            column="SM_ID"
  @@ -2972,9 +2972,9 @@
           />
       </class-descriptor>
   
  -    <!-- Definitions for org.apache.ojb.broker.sequence.SMSameTableBB -->
  +    <!-- Definitions for org.apache.ojb.broker.sequence.Repository$SMSameTableBB -->
       <class-descriptor
  -      class="org.apache.ojb.broker.sequence.SMSameTableBB"
  +      class="org.apache.ojb.broker.sequence.Repository$SMSameTableBB"
         table="SM_SAME_TAB"
       >
           <field-descriptor
  @@ -2995,19 +2995,19 @@
   
   
   
  -    <!-- Definitions for org.apache.ojb.broker.SMMax -->
  -    <class-descriptor class="org.apache.ojb.broker.sequence.SMMax">
  -        <extent-class class-ref="org.apache.ojb.broker.sequence.SMMaxA" />
  -        <extent-class class-ref="org.apache.ojb.broker.sequence.SMMaxB" />
  +    <!-- Definitions for org.apache.ojb.broker.Repository$SMMax -->
  +    <class-descriptor class="org.apache.ojb.broker.sequence.Repository$SMMax">
  +        <extent-class class-ref="org.apache.ojb.broker.sequence.Repository$SMMaxA" />
  +        <extent-class class-ref="org.apache.ojb.broker.sequence.Repository$SMMaxB" />
       </class-descriptor>
   
  -    <!-- Definitions for org.apache.ojb.broker.sequence.SMMaxA -->
  +    <!-- Definitions for org.apache.ojb.broker.sequence.Repository$SMMaxA -->
       <class-descriptor
  -      class="org.apache.ojb.broker.sequence.SMMaxA"
  +      class="org.apache.ojb.broker.sequence.Repository$SMMaxA"
         table="SM_TAB_MAX_A"
       >
  -        <extent-class class-ref="org.apache.ojb.broker.sequence.SMMaxAA" />
  -        <extent-class class-ref="org.apache.ojb.broker.sequence.SMMaxAB" />
  +        <extent-class class-ref="org.apache.ojb.broker.sequence.Repository$SMMaxAA" />
  +        <extent-class class-ref="org.apache.ojb.broker.sequence.Repository$SMMaxAB" />
           <field-descriptor
            name="id"
            column="SM_ID"
  @@ -3023,9 +3023,9 @@
           />
       </class-descriptor>
   
  -    <!-- Definitions for org.apache.ojb.broker.sequence.SMMaxAB -->
  +    <!-- Definitions for org.apache.ojb.broker.sequence.Repository$SMMaxAB -->
       <class-descriptor
  -      class="org.apache.ojb.broker.sequence.SMMaxAB"
  +      class="org.apache.ojb.broker.sequence.Repository$SMMaxAB"
         table="SM_TAB_MAX_AB"
       >
           <field-descriptor
  @@ -3043,12 +3043,12 @@
           />
       </class-descriptor>
   
  -    <!-- Definitions for org.apache.ojb.broker.sequence.SMMaxAA -->
  +    <!-- Definitions for org.apache.ojb.broker.sequence.Repository$SMMaxAA -->
       <class-descriptor
  -      class="org.apache.ojb.broker.sequence.SMMaxAA"
  +      class="org.apache.ojb.broker.sequence.Repository$SMMaxAA"
         table="SM_TAB_MAX_AA"
       >
  -        <extent-class class-ref="org.apache.ojb.broker.sequence.SMMaxAAA" />
  +        <extent-class class-ref="org.apache.ojb.broker.sequence.Repository$SMMaxAAA" />
   
           <field-descriptor
            name="id"
  @@ -3065,9 +3065,9 @@
           />
       </class-descriptor>
   
  -    <!-- Definitions for org.apache.ojb.broker.sequence.SMMaxAAA -->
  +    <!-- Definitions for org.apache.ojb.broker.sequence.Repository$SMMaxAAA -->
       <class-descriptor
  -      class="org.apache.ojb.broker.sequence.SMMaxAAA"
  +      class="org.apache.ojb.broker.sequence.Repository$SMMaxAAA"
         table="SM_TAB_MAX_AAA"
       >
           <field-descriptor
  @@ -3085,12 +3085,12 @@
           />
       </class-descriptor>
   
  -    <!-- Definitions for org.apache.ojb.broker.sequence.SMMaxB -->
  +    <!-- Definitions for org.apache.ojb.broker.sequence.Repository$SMMaxB -->
       <class-descriptor
  -      class="org.apache.ojb.broker.sequence.SMMaxB"
  +      class="org.apache.ojb.broker.sequence.Repository$SMMaxB"
         table="SM_TAB_MAX_B"
       >
  -        <extent-class class-ref="org.apache.ojb.broker.sequence.SMMaxBB" />
  +        <extent-class class-ref="org.apache.ojb.broker.sequence.Repository$SMMaxBB" />
           <field-descriptor
            name="id"
            column="SM_ID"
  @@ -3106,9 +3106,9 @@
           />
       </class-descriptor>
   
  -    <!-- Definitions for org.apache.ojb.broker.sequence.SMMaxBB -->
  +    <!-- Definitions for org.apache.ojb.broker.sequence.Repository$SMMaxBB -->
       <class-descriptor
  -      class="org.apache.ojb.broker.sequence.SMMaxBB"
  +      class="org.apache.ojb.broker.sequence.Repository$SMMaxBB"
         table="SM_TAB_MAX_BB"
       >
           <field-descriptor
  @@ -3127,9 +3127,9 @@
       </class-descriptor>
   
   
  -    <!-- Definitions for org.apache.ojb.broker.sequence.SMMaxBB -->
  +    <!-- Definitions for org.apache.ojb.broker.sequence.Repository$SMMaxBB -->
       <class-descriptor
  -      class="org.apache.ojb.broker.sequence.SMKey"
  +      class="org.apache.ojb.broker.sequence.Repository$SMKey"
         table="SM_KEY"
       >
           <field-descriptor
  @@ -3173,9 +3173,9 @@
       </class-descriptor>
   
   
  -<!-- Definitions for org.apache.ojb.broker.sequence.SMDatabaseSequence -->
  +<!-- Definitions for org.apache.ojb.broker.sequence.Repository$SMDatabaseSequence -->
       <class-descriptor
  -      class="org.apache.ojb.broker.sequence.SMDatabaseSequence"
  +      class="org.apache.ojb.broker.sequence.Repository$SMDatabaseSequence"
         table="SM_TAB_DATABASE_SEQUENCE"
       >
           <field-descriptor
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: ojb-dev-unsubscribe@db.apache.org
For additional commands, e-mail: ojb-dev-help@db.apache.org


Mime
View raw message