db-ojb-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From to...@apache.org
Subject cvs commit: db-ojb build.xml
Date Sun, 14 Nov 2004 09:43:34 GMT
tomdz       2004/11/14 01:43:34

  Modified:    src/tools/org/apache/ojb/tools/mapping/reversedb2/actions
                        ActionNewOJBRepository.java
                        ActionOpenOJBRepository.java
               src/xdoclet/test/xdoclet/modules/ojb/tests
                        TestRowReader.java
               .        build.xml
  Log:
  Reworked the OJB core:
  - replaced the factories/configuration concept with the ComponentContainer
  - removal of most static calls within OJB
  - removed the old "D" collection implementations and renamed the new ones
  - moved StatementForClassIF handling to the PersistenceConfiguration
  - moved RowReader caching from the ClassDescriptor to the PersistenceConfiguration
  and other changes (see mail on the dev list for more details)
  
  Revision  Changes    Path
  1.3       +6 -5      db-ojb/src/tools/org/apache/ojb/tools/mapping/reversedb2/actions/ActionNewOJBRepository.java
  
  Index: ActionNewOJBRepository.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/tools/org/apache/ojb/tools/mapping/reversedb2/actions/ActionNewOJBRepository.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- ActionNewOJBRepository.java	26 Oct 2004 15:27:41 -0000	1.2
  +++ ActionNewOJBRepository.java	14 Nov 2004 09:43:34 -0000	1.3
  @@ -1,8 +1,5 @@
   package org.apache.ojb.tools.mapping.reversedb2.actions;
  -import org.apache.ojb.broker.core.Factories;
  -import org.apache.ojb.broker.core.factory.ObjectFactoryDefaultImpl;
  -import org.apache.ojb.broker.metadata.DescriptorRepository;
  -import org.apache.ojb.tools.mapping.reversedb2.gui.JIFrmOJBRepository;
  +
   /* Copyright 2002-2004 The Apache Software Foundation
    *
    * Licensed under the Apache License, Version 2.0 (the "License");
  @@ -18,6 +15,10 @@
    * limitations under the License.
    */
   
  +import org.apache.ojb.broker.core.factory.ObjectFactoryDefaultImpl;
  +import org.apache.ojb.broker.metadata.DescriptorRepository;
  +import org.apache.ojb.tools.mapping.reversedb2.gui.JIFrmOJBRepository;
  +
   /**
    * Opens a new JIFrmOBJRepository in the specified frame.
    * @author  Administrator
  @@ -42,7 +43,7 @@
                   try
                   {
                       // RepositoryPersistor persistor = new RepositoryPersistor ();
  -                    DescriptorRepository repository = new DescriptorRepository(new Factories());
  +                    DescriptorRepository repository = new DescriptorRepository();
                       JIFrmOJBRepository frm = new JIFrmOJBRepository(repository);
                       containingFrame.getContentPane().add(frm);
                       frm.setVisible(true);
  
  
  
  1.2       +10 -6     db-ojb/src/tools/org/apache/ojb/tools/mapping/reversedb2/actions/ActionOpenOJBRepository.java
  
  Index: ActionOpenOJBRepository.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/tools/org/apache/ojb/tools/mapping/reversedb2/actions/ActionOpenOJBRepository.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- ActionOpenOJBRepository.java	5 May 2004 16:44:28 -0000	1.1
  +++ ActionOpenOJBRepository.java	14 Nov 2004 09:43:34 -0000	1.2
  @@ -1,10 +1,5 @@
   package org.apache.ojb.tools.mapping.reversedb2.actions;
  -import javax.swing.JFileChooser;
   
  -import org.apache.ojb.broker.metadata.DescriptorRepository;
  -import org.apache.ojb.broker.metadata.RepositoryPersistor;
  -import org.apache.ojb.tools.mapping.reversedb2.Main;
  -import org.apache.ojb.tools.mapping.reversedb2.gui.JIFrmOJBRepository;
   /* Copyright 2002-2004 The Apache Software Foundation
    *
    * Licensed under the Apache License, Version 2.0 (the "License");
  @@ -20,6 +15,15 @@
    * limitations under the License.
    */
   
  +import javax.swing.JFileChooser;
  +
  +import org.apache.ojb.broker.metadata.DescriptorRepository;
  +import org.apache.ojb.broker.metadata.RepositoryPersistor;
  +import org.apache.ojb.broker.metadata.fieldaccess.PersistentFieldFactory;
  +import org.apache.ojb.broker.metadata.fieldaccess.PersistentFieldDirectAccessImplNew;
  +import org.apache.ojb.tools.mapping.reversedb2.Main;
  +import org.apache.ojb.tools.mapping.reversedb2.gui.JIFrmOJBRepository;
  +
   /**
    * Opens a new JIFrmOBJRepository in the specified frame.
    * @author  Administrator
  @@ -50,7 +54,7 @@
                   {
                       try
                       {
  -                        RepositoryPersistor persistor = new RepositoryPersistor ();
  +                        RepositoryPersistor persistor = new RepositoryPersistor(new PersistentFieldFactory(PersistentFieldDirectAccessImplNew.class));
                           DescriptorRepository repository = persistor.readDescriptorRepository(selectedFile.getCanonicalPath());
                           JIFrmOJBRepository frm = new JIFrmOJBRepository(repository);
                           containingFrame.getContentPane().add(frm);
  
  
  
  1.4       +5 -0      db-ojb/src/xdoclet/test/xdoclet/modules/ojb/tests/TestRowReader.java
  
  Index: TestRowReader.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/xdoclet/test/xdoclet/modules/ojb/tests/TestRowReader.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- TestRowReader.java	5 Apr 2004 12:16:16 -0000	1.3
  +++ TestRowReader.java	14 Nov 2004 09:43:34 -0000	1.4
  @@ -19,6 +19,7 @@
   import java.util.Map;
   
   import org.apache.ojb.broker.accesslayer.RowReader;
  +import org.apache.ojb.broker.core.factory.ObjectCreator;
   import org.apache.ojb.broker.metadata.ClassDescriptor;
   
   /**
  @@ -49,6 +50,10 @@
       }
   
       public void setClassDescriptor(ClassDescriptor cld)
  +    {
  +    }
  +
  +    public void setObjectFactory(ObjectCreator factory)
       {
       }
   }
  
  
  
  1.155     +3 -2      db-ojb/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/db-ojb/build.xml,v
  retrieving revision 1.154
  retrieving revision 1.155
  diff -u -r1.154 -r1.155
  --- build.xml	13 Nov 2004 16:59:36 -0000	1.154
  +++ build.xml	14 Nov 2004 09:43:34 -0000	1.155
  @@ -1062,6 +1062,7 @@
           <junit printsummary="yes" fork="yes" dir="${build.test}/ojb">
               <jvmarg value="-DOJB.bootLogLevel=INFO" />
               <jvmarg value="-DOJB.skip.issues=${OJB.skip.issues}" />
  +<!--            <jvmarg value="-Xrunyjpagent:alloc,onexit=memory"/> -->
               <classpath refid="runtime-classpath"/>
               <formatter type="plain" />
               <formatter type="xml" />
  @@ -1069,7 +1070,7 @@
               <!-- For whatever reason you have to provide source files to batchtest
                    so the usage of this would be somthing like:
   
  -                 and -Dojb.testsToRun=org/apache/ojb/broker/AllTests.java
  +                 ant -Dojb.testsToRun=org/apache/ojb/broker/AllTests.java junit
   
                    to execute all PB tests -->
               <batchtest fork="yes" haltonfailure="no"
  
  
  

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