db-ojb-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From t...@apache.org
Subject cvs commit: jakarta-ojb/src/java/org/apache/ojb/broker/singlevm PersistenceBrokerImpl.java
Date Sat, 21 Dec 2002 16:12:50 GMT
thma        2002/12/21 08:12:49

  Modified:    src/java/org/apache/ojb/otm/locking LockStrategyFactory.java
               src/java/org/apache/ojb/broker/singlevm
                        PersistenceBrokerImpl.java
  Log:
  repair //#ifdef
  
  Revision  Changes    Path
  1.6       +0 -1      jakarta-ojb/src/java/org/apache/ojb/otm/locking/LockStrategyFactory.java
  
  Index: LockStrategyFactory.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ojb/src/java/org/apache/ojb/otm/locking/LockStrategyFactory.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- LockStrategyFactory.java	17 Dec 2002 20:50:01 -0000	1.5
  +++ LockStrategyFactory.java	21 Dec 2002 16:12:49 -0000	1.6
  @@ -54,7 +54,6 @@
    * <http://www.apache.org/>.
    */
   
  -//#ifdef JDK13
   import org.apache.ojb.broker.PersistenceBrokerException;
   import org.apache.ojb.broker.metadata.ClassDescriptor;
   import org.apache.ojb.broker.metadata.IsolationLevels;
  
  
  
  1.96      +15 -3     jakarta-ojb/src/java/org/apache/ojb/broker/singlevm/PersistenceBrokerImpl.java
  
  Index: PersistenceBrokerImpl.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ojb/src/java/org/apache/ojb/broker/singlevm/PersistenceBrokerImpl.java,v
  retrieving revision 1.95
  retrieving revision 1.96
  diff -u -r1.95 -r1.96
  --- PersistenceBrokerImpl.java	20 Dec 2002 20:37:38 -0000	1.95
  +++ PersistenceBrokerImpl.java	21 Dec 2002 16:12:49 -0000	1.96
  @@ -55,7 +55,6 @@
    */
   
   import java.lang.reflect.Array;
  -import java.lang.reflect.Proxy;
   import java.sql.Connection;
   import java.util.ArrayList;
   import java.util.Collection;
  @@ -77,7 +76,17 @@
   import org.apache.ojb.broker.TransactionInProgressException;
   import org.apache.ojb.broker.TransactionNotInProgressException;
   import org.apache.ojb.broker.VirtualProxy;
  -import org.apache.ojb.broker.accesslayer.*;
  +import org.apache.ojb.broker.accesslayer.ChainingIterator;
  +import org.apache.ojb.broker.accesslayer.CollectionProxy;
  +import org.apache.ojb.broker.accesslayer.ConnectionManager;
  +import org.apache.ojb.broker.accesslayer.ConnectionManagerIF;
  +import org.apache.ojb.broker.accesslayer.JdbcAccess;
  +import org.apache.ojb.broker.accesslayer.LookupException;
  +import org.apache.ojb.broker.accesslayer.OJBIterator;
  +import org.apache.ojb.broker.accesslayer.PkEnumeration;
  +import org.apache.ojb.broker.accesslayer.ResultSetAndStatement;
  +import org.apache.ojb.broker.accesslayer.StatementManager;
  +import org.apache.ojb.broker.accesslayer.StatementManagerIF;
   import org.apache.ojb.broker.accesslayer.sql.SqlGenerator;
   import org.apache.ojb.broker.accesslayer.sql.SqlGeneratorFactory;
   import org.apache.ojb.broker.cache.ObjectCache;
  @@ -118,6 +127,9 @@
   import org.apache.ojb.broker.util.sequence.SequenceManager;
   import org.apache.ojb.broker.util.sequence.SequenceManagerException;
   import org.apache.ojb.broker.util.sequence.SequenceManagerFactory;
  +
  +//#ifdef JDK13
  +import java.lang.reflect.Proxy;
   //#else
   /*
   import com.develop.java.lang.reflect.Proxy;
  
  
  

Mime
View raw message