arminw      2005/08/27 05:12:10

  Modified:    src/java/org/apache/ojb/broker/core/proxy
                        AbstractCollectionProxy.java
                        AbstractIndirectionHandler.java
                        AbstractProxyFactory.java CollectionProxy.java
               src/java/org/apache/ojb/broker/core
                        DelegatingPersistenceBroker.java
                        IdentityFactoryImpl.java MtoNBroker.java
                        PersistenceBrokerAbstractImpl.java
                        PersistenceBrokerFactoryBaseImpl.java
                        PersistenceBrokerFactoryDefaultImpl.java
                        PersistenceBrokerFactoryIF.java
                        PersistenceBrokerFactorySyncImpl.java
                        PersistenceBrokerHandle.java
                        PersistenceBrokerImpl.java
                        PersistenceBrokerThreadMapping.java
                        PoolablePersistenceBroker.java
                        QueryReferenceBroker.java ValueContainer.java
  Removed:     src/java/org/apache/ojb/broker/core
                        PersistenceBrokerConfiguration.java
  Log:
  merge 1.0.x branch with 1.x trunk
  
  Revision  Changes    Path
  1.7       +8 -4      
db-ojb/src/java/org/apache/ojb/broker/core/proxy/AbstractCollectionProxy.java
  
  
http://cvs.apache.org/viewcvs/db-ojb/src/java/org/apache/ojb/broker/core/proxy/AbstractCollectionProxy.java.diff?r1=1.6&r2=1.7
  
  
  1.2       +8 -5      
db-ojb/src/java/org/apache/ojb/broker/core/proxy/AbstractIndirectionHandler.java
  
  
http://cvs.apache.org/viewcvs/db-ojb/src/java/org/apache/ojb/broker/core/proxy/AbstractIndirectionHandler.java.diff?r1=1.1&r2=1.2
  
  
  1.3       +10 -9     
db-ojb/src/java/org/apache/ojb/broker/core/proxy/AbstractProxyFactory.java
  
  
http://cvs.apache.org/viewcvs/db-ojb/src/java/org/apache/ojb/broker/core/proxy/AbstractProxyFactory.java.diff?r1=1.2&r2=1.3
  
  
  1.5       +3 -4      
db-ojb/src/java/org/apache/ojb/broker/core/proxy/CollectionProxy.java
  
  
http://cvs.apache.org/viewcvs/db-ojb/src/java/org/apache/ojb/broker/core/proxy/CollectionProxy.java.diff?r1=1.4&r2=1.5
  
  
  1.22      +88 -49    
db-ojb/src/java/org/apache/ojb/broker/core/DelegatingPersistenceBroker.java
  
  
http://cvs.apache.org/viewcvs/db-ojb/src/java/org/apache/ojb/broker/core/DelegatingPersistenceBroker.java.diff?r1=1.21&r2=1.22
  
  
  1.4       +8 -8      
db-ojb/src/java/org/apache/ojb/broker/core/IdentityFactoryImpl.java
  
  
http://cvs.apache.org/viewcvs/db-ojb/src/java/org/apache/ojb/broker/core/IdentityFactoryImpl.java.diff?r1=1.3&r2=1.4
  
  
  1.18      +16 -33    
db-ojb/src/java/org/apache/ojb/broker/core/MtoNBroker.java
  
  
http://cvs.apache.org/viewcvs/db-ojb/src/java/org/apache/ojb/broker/core/MtoNBroker.java.diff?r1=1.17&r2=1.18
  
  
  1.8       +31 -1     
db-ojb/src/java/org/apache/ojb/broker/core/PersistenceBrokerAbstractImpl.java
  
  
http://cvs.apache.org/viewcvs/db-ojb/src/java/org/apache/ojb/broker/core/PersistenceBrokerAbstractImpl.java.diff?r1=1.7&r2=1.8
  
  
  1.7       +22 -4     
db-ojb/src/java/org/apache/ojb/broker/core/PersistenceBrokerFactoryBaseImpl.java
  
  
http://cvs.apache.org/viewcvs/db-ojb/src/java/org/apache/ojb/broker/core/PersistenceBrokerFactoryBaseImpl.java.diff?r1=1.6&r2=1.7
  
  
  1.15      +46 -19    
db-ojb/src/java/org/apache/ojb/broker/core/PersistenceBrokerFactoryDefaultImpl.java
  
  
http://cvs.apache.org/viewcvs/db-ojb/src/java/org/apache/ojb/broker/core/PersistenceBrokerFactoryDefaultImpl.java.diff?r1=1.14&r2=1.15
  
  
  1.7       +13 -2     
db-ojb/src/java/org/apache/ojb/broker/core/PersistenceBrokerFactoryIF.java
  
  
http://cvs.apache.org/viewcvs/db-ojb/src/java/org/apache/ojb/broker/core/PersistenceBrokerFactoryIF.java.diff?r1=1.6&r2=1.7
  
  
  1.12      +27 -16    
db-ojb/src/java/org/apache/ojb/broker/core/PersistenceBrokerFactorySyncImpl.java
  
  
http://cvs.apache.org/viewcvs/db-ojb/src/java/org/apache/ojb/broker/core/PersistenceBrokerFactorySyncImpl.java.diff?r1=1.11&r2=1.12
  
  
  1.12      +2 -2      
db-ojb/src/java/org/apache/ojb/broker/core/PersistenceBrokerHandle.java
  
  
http://cvs.apache.org/viewcvs/db-ojb/src/java/org/apache/ojb/broker/core/PersistenceBrokerHandle.java.diff?r1=1.11&r2=1.12
  
  
  1.119     +526 -313  
db-ojb/src/java/org/apache/ojb/broker/core/PersistenceBrokerImpl.java
  
  
http://cvs.apache.org/viewcvs/db-ojb/src/java/org/apache/ojb/broker/core/PersistenceBrokerImpl.java.diff?r1=1.118&r2=1.119
  
  
  1.7       +71 -22    
db-ojb/src/java/org/apache/ojb/broker/core/PersistenceBrokerThreadMapping.java
  
  
http://cvs.apache.org/viewcvs/db-ojb/src/java/org/apache/ojb/broker/core/PersistenceBrokerThreadMapping.java.diff?r1=1.6&r2=1.7
  
  
  1.9       +3 -2      
db-ojb/src/java/org/apache/ojb/broker/core/PoolablePersistenceBroker.java
  
  
http://cvs.apache.org/viewcvs/db-ojb/src/java/org/apache/ojb/broker/core/PoolablePersistenceBroker.java.diff?r1=1.8&r2=1.9
  
  
  1.39      +45 -64    
db-ojb/src/java/org/apache/ojb/broker/core/QueryReferenceBroker.java
  
  
http://cvs.apache.org/viewcvs/db-ojb/src/java/org/apache/ojb/broker/core/QueryReferenceBroker.java.diff?r1=1.38&r2=1.39
  
  
  1.9       +19 -28    
db-ojb/src/java/org/apache/ojb/broker/core/ValueContainer.java
  
  
http://cvs.apache.org/viewcvs/db-ojb/src/java/org/apache/ojb/broker/core/ValueContainer.java.diff?r1=1.8&r2=1.9
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to