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_internal.xml
Date Mon, 20 Sep 2004 14:32:26 GMT
arminw      2004/09/20 07:32:26

  Modified:    src/java/org/apache/ojb/broker/core
                        PersistenceBrokerConfiguration.java
                        PersistenceBrokerImpl.java
               src/java/org/apache/ojb/broker/util/configuration/impl
                        OjbConfiguration.java
               src/test/org/apache/ojb repository_internal.xml
  Added:       src/java/org/apache/ojb/broker/locking
                        AbstractLockStrategy.java LockEntry.java
                        LockManager.java LockManagerDefaultImpl.java
                        LockMap.java LockMapInMemoryImpl.java
                        LockMapRemoteImpl.java LockServerServlet.java
                        LockStrategy.java LockStrategyManager.java
                        ReadCommittedStrategy.java
                        ReadUncommittedStrategy.java
                        RepeatableReadStrategy.java
                        SerializableStrategy.java
  Log:
  merge with branch
  
  - add new locking stuff, adapt existing classes
  - minor improvements
  - remove unused methods in OJBConfiguration
  
  Revision  Changes    Path
  1.5       +1 -5      db-ojb/src/java/org/apache/ojb/broker/core/PersistenceBrokerConfiguration.java
  
  Index: PersistenceBrokerConfiguration.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/broker/core/PersistenceBrokerConfiguration.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- PersistenceBrokerConfiguration.java	9 Apr 2004 13:22:28 -0000	1.4
  +++ PersistenceBrokerConfiguration.java	20 Sep 2004 14:32:25 -0000	1.5
  @@ -24,10 +24,6 @@
   
   public interface PersistenceBrokerConfiguration
   {
  -    public Class getConnectionFactoryClass();
  -
  -    public Class getObjectCacheClass();
  -
       /**
        * Returns an array of the declared
        * {@link org.apache.ojb.broker.cache.CacheFilter},
  
  
  
  1.94      +2 -2      db-ojb/src/java/org/apache/ojb/broker/core/PersistenceBrokerImpl.java
  
  Index: PersistenceBrokerImpl.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/broker/core/PersistenceBrokerImpl.java,v
  retrieving revision 1.93
  retrieving revision 1.94
  diff -u -r1.93 -r1.94
  --- PersistenceBrokerImpl.java	15 Sep 2004 19:10:36 -0000	1.93
  +++ PersistenceBrokerImpl.java	20 Sep 2004 14:32:25 -0000	1.94
  @@ -711,7 +711,7 @@
                   if (!doInsert)
                   {
                       doInsert = localCache.lookup(oid) == null
  -                        && !serviceBrokerHelper().doesExist(cld, oid, obj);
  +                        && !serviceJdbcAccess().doesExist(cld, oid);
                   }
               }
               
  
  
  
  1.2       +115 -0    db-ojb/src/java/org/apache/ojb/broker/locking/AbstractLockStrategy.java
  
  
  
  
  1.2       +195 -0    db-ojb/src/java/org/apache/ojb/broker/locking/LockEntry.java
  
  
  
  
  1.2       +68 -0     db-ojb/src/java/org/apache/ojb/broker/locking/LockManager.java
  
  
  
  
  1.2       +122 -0    db-ojb/src/java/org/apache/ojb/broker/locking/LockManagerDefaultImpl.java
  
  
  
  
  1.2       +69 -0     db-ojb/src/java/org/apache/ojb/broker/locking/LockMap.java
  
  
  
  
  1.2       +451 -0    db-ojb/src/java/org/apache/ojb/broker/locking/LockMapInMemoryImpl.java
  
  
  
  
  1.2       +474 -0    db-ojb/src/java/org/apache/ojb/broker/locking/LockMapRemoteImpl.java
  
  
  
  
  1.2       +362 -0    db-ojb/src/java/org/apache/ojb/broker/locking/LockServerServlet.java
  
  
  
  
  1.2       +80 -0     db-ojb/src/java/org/apache/ojb/broker/locking/LockStrategy.java
  
  
  
  
  1.2       +66 -0     db-ojb/src/java/org/apache/ojb/broker/locking/LockStrategyManager.java
  
  
  
  
  1.2       +170 -0    db-ojb/src/java/org/apache/ojb/broker/locking/ReadCommittedStrategy.java
  
  
  
  
  1.2       +125 -0    db-ojb/src/java/org/apache/ojb/broker/locking/ReadUncommittedStrategy.java
  
  
  
  
  1.2       +177 -0    db-ojb/src/java/org/apache/ojb/broker/locking/RepeatableReadStrategy.java
  
  
  
  
  1.2       +196 -0    db-ojb/src/java/org/apache/ojb/broker/locking/SerializableStrategy.java
  
  
  
  
  1.36      +9 -44     db-ojb/src/java/org/apache/ojb/broker/util/configuration/impl/OjbConfiguration.java
  
  Index: OjbConfiguration.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/broker/util/configuration/impl/OjbConfiguration.java,v
  retrieving revision 1.35
  retrieving revision 1.36
  diff -u -r1.35 -r1.36
  --- OjbConfiguration.java	1 Jun 2004 21:42:21 -0000	1.35
  +++ OjbConfiguration.java	20 Sep 2004 14:32:26 -0000	1.36
  @@ -17,31 +17,24 @@
   
   import org.apache.ojb.broker.ManageableCollection;
   import org.apache.ojb.broker.PersistenceBroker;
  -import org.apache.ojb.broker.accesslayer.ConnectionFactory;
   import org.apache.ojb.broker.accesslayer.ConnectionFactoryPooledImpl;
  -import org.apache.ojb.broker.cache.ObjectCache;
  -import org.apache.ojb.broker.cache.ObjectCacheDefaultImpl;
  -import org.apache.ojb.broker.metadata.MetadataConfiguration;
  -import org.apache.ojb.broker.metadata.fieldaccess.PersistentField;
  -import org.apache.ojb.broker.metadata.fieldaccess.PersistentFieldDirectAccessImpl;
  +import org.apache.ojb.broker.accesslayer.ConnectionFactory;
  +import org.apache.ojb.broker.core.PBPoolConfiguration;
   import org.apache.ojb.broker.core.PersistenceBrokerConfiguration;
   import org.apache.ojb.broker.core.PersistenceBrokerImpl;
  -import org.apache.ojb.broker.core.PBPoolConfiguration;
   import org.apache.ojb.broker.core.proxy.CollectionProxyDefaultImpl;
   import org.apache.ojb.broker.core.proxy.IndirectionHandler;
  +import org.apache.ojb.broker.core.proxy.IndirectionHandlerDefaultImpl;
   import org.apache.ojb.broker.core.proxy.ListProxyDefaultImpl;
   import org.apache.ojb.broker.core.proxy.ProxyConfiguration;
  -import org.apache.ojb.broker.core.proxy.IndirectionHandlerDefaultImpl;
   import org.apache.ojb.broker.core.proxy.SetProxyDefaultImpl;
  +import org.apache.ojb.broker.locking.AbstractLockStrategy;
  +import org.apache.ojb.broker.metadata.MetadataConfiguration;
  +import org.apache.ojb.broker.metadata.fieldaccess.PersistentField;
  +import org.apache.ojb.broker.metadata.fieldaccess.PersistentFieldDirectAccessImpl;
   import org.apache.ojb.broker.util.pooling.PoolConfiguration;
   import org.apache.ojb.odmg.OdmgConfiguration;
   import org.apache.ojb.odmg.collections.DListImpl;
  -import org.apache.ojb.odmg.locking.AbstractLockStrategy;
  -import org.apache.ojb.odmg.locking.LockManager;
  -import org.apache.ojb.odmg.locking.LockManagerDefaultImpl;
  -import org.apache.ojb.odmg.locking.LockMap;
  -import org.apache.ojb.odmg.locking.LockingConfiguration;
  -import org.apache.ojb.odmg.locking.InMemoryLockMapImpl;
   
   /**
    * This class contains the runtime configuration of the OJB
  @@ -54,7 +47,6 @@
    */
   public class OjbConfiguration extends    ConfigurationAbstractImpl
                                 implements OdmgConfiguration,
  -                                         LockingConfiguration,
                                            PersistenceBrokerConfiguration,
                                            ProxyConfiguration,
                                            PBPoolConfiguration,
  @@ -67,7 +59,6 @@
   
       /** the repository file keeping the O/R Metadata*/
       private String repositoryFilename;
  -    private Class objectCacheClass;
       private String[] objectCacheFilter;
       private Class connectionFactoryClass;
       private Class persistentFieldClass;
  @@ -94,8 +85,6 @@
       private boolean useImplicitLocking;
       private boolean lockAssociationAsWrites;
       private Class oqlCollectionClass;
  -    private Class lockManagerClass;
  -    private Class lockMapClass;
   
       // Metadata configuration
       private boolean useSerializedRepository;
  @@ -157,12 +146,6 @@
   
   
       //*************************************************************
  -
  -    public Class getObjectCacheClass()
  -    {
  -        return objectCacheClass;
  -    }
  -
       public String[] getCacheFilters()
       {
           if(objectCacheFilter == null || objectCacheFilter.length == 0)
  @@ -186,21 +169,11 @@
           return connectionFactoryClass;
       }
   
  -    public Class getLockManagerClass()
  -    {
  -        return lockManagerClass;
  -    }
  -
       public Class getOqlCollectionClass()
       {
           return oqlCollectionClass;
       }
   
  -    public Class getLockMapClass()
  -    {
  -        return lockMapClass;
  -    }
  -
       public Class getPersistentFieldClass()
       {
           return persistentFieldClass;
  @@ -272,20 +245,12 @@
           // default repository & connection descriptor file
           repositoryFilename = getString("repositoryFile", OJB_METADATA_FILE);
   
  -        // object cache class
  -        objectCacheClass = getClass("ObjectCacheClass", ObjectCacheDefaultImpl.class, ObjectCache.class);
           // load ObjectCache filters
           objectCacheFilter = getStrings("ObjectCacheFilter", "", ",");
   
  -        // load ConnectionFactory Class
  +    // load ConnectionFactory Class
           connectionFactoryClass =
                   getClass("ConnectionFactoryClass", ConnectionFactoryPooledImpl.class, ConnectionFactory.class);
  -
  -        // load LockManager Class
  -        lockManagerClass = getClass("LockManagerClass", LockManagerDefaultImpl.class, LockManager.class);
  -
  -        // load LockMap Class
  -        lockMapClass = getClass("LockMapClass", InMemoryLockMapImpl.class, LockMap.class);
   
           // load PersistentField Class
           persistentFieldClass =
  
  
  
  1.16      +0 -36     db-ojb/src/test/org/apache/ojb/repository_internal.xml
  
  Index: repository_internal.xml
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/test/org/apache/ojb/repository_internal.xml,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- repository_internal.xml	14 Sep 2004 16:51:04 -0000	1.15
  +++ repository_internal.xml	20 Sep 2004 14:32:26 -0000	1.16
  @@ -56,42 +56,6 @@
      </class-descriptor>
   
   
  -<!-- The OJB Lock Table -->
  -   <class-descriptor
  -        class="org.apache.ojb.odmg.locking.LockEntry"
  -        table="OJB_LOCKENTRY"
  -        batchable="false"
  -   >
  -      <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"
  
  
  

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