db-ojb-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From t...@apache.org
Subject cvs commit: db-ojb/src/java/org/apache/ojb/broker/util/interceptor TracingInterceptor.java
Date Mon, 10 Mar 2003 06:07:21 GMT
thma        2003/03/09 22:07:21

  Modified:    src/java/org/apache/ojb/odmg/oql OQLLexer.java
                        OQLLexerTokenTypes.java OQLParser.java
               src/java/org/apache/ojb/otm/lock/isolation
                        ReadUncommittedIsolation.java
                        TransactionIsolation.java
               src/java/org/apache/ojb/tools/mapping/reversedb2/actions
                        ActionNewOJBRepository.java
               src/test/org/apache/ojb/tutorial2 Application.java
               src/java/org/apache/ojb/broker/accesslayer RsIterator.java
               src/java/org/apache/ojb/otm/core RequestContext.java
                        BaseConnection.java Transaction.java
               src/java/org/apache/ojb/otm/cache GlobalCache.java
               src/java/org/apache/ojb/broker/server
                        PersistenceBrokerClient.java
               src/test/org/apache/ojb/broker BatchModeTest.java
                        OJBPerfTest.java
               src/java/org/apache/ojb/otm/transaction
                        ManagedTransactionFactory.java
                        LocalTransactionFactory.java
                        TransactionFactory.java
               src/java/org/apache/ojb/broker/metadata MetadataManager.java
               src/java/org/apache/ojb/soda ObjectSetImpl.java
               src/jdori/org/apache/ojb/tutorial5 UCQuitApplication.java
               src/java/org/apache/ojb/odmg/locking
                        LockStrategyFactory.java
               src/test/org/apache/ojb/odmg UserTestCases.java
                        BatchModeTest.java
               src/java/org/apache/ojb/otm OTMConnection.java
               src/java/org/apache/ojb/otm/kit SimpleKit.java
               src/java/org/apache/ojb/odmg ObjectEnvelopeTable.java
               src/java/org/apache/ojb/otm/lock ObjectLock.java
               src/java/org/apache/ojb/broker/util/interceptor
                        TracingInterceptor.java
  Log:
  remove unused import statements
  
  Revision  Changes    Path
  1.5       +11 -18    db-ojb/src/java/org/apache/ojb/odmg/oql/OQLLexer.java
  
  Index: OQLLexer.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/odmg/oql/OQLLexer.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- OQLLexer.java	2 Mar 2003 15:41:52 -0000	1.4
  +++ OQLLexer.java	10 Mar 2003 06:07:19 -0000	1.5
  @@ -40,32 +40,25 @@
    */
   package org.apache.ojb.odmg.oql;
   
  -import org.apache.ojb.broker.query.*;
  -import java.util.*;
  -
   import java.io.InputStream;
  -import antlr.TokenStreamException;
  -import antlr.TokenStreamIOException;
  -import antlr.TokenStreamRecognitionException;
  -import antlr.CharStreamException;
  -import antlr.CharStreamIOException;
  -import antlr.ANTLRException;
   import java.io.Reader;
   import java.util.Hashtable;
  -import antlr.CharScanner;
  -import antlr.InputBuffer;
  +
  +import antlr.ANTLRHashString;
   import antlr.ByteBuffer;
   import antlr.CharBuffer;
  -import antlr.Token;
  -import antlr.CommonToken;
  -import antlr.RecognitionException;
  +import antlr.CharStreamException;
  +import antlr.CharStreamIOException;
  +import antlr.InputBuffer;
  +import antlr.LexerSharedInputState;
   import antlr.NoViableAltForCharException;
  -import antlr.MismatchedCharException;
  +import antlr.RecognitionException;
  +import antlr.Token;
   import antlr.TokenStream;
  -import antlr.ANTLRHashString;
  -import antlr.LexerSharedInputState;
  +import antlr.TokenStreamException;
  +import antlr.TokenStreamIOException;
  +import antlr.TokenStreamRecognitionException;
   import antlr.collections.impl.BitSet;
  -import antlr.SemanticException;
   
   public class OQLLexer extends antlr.CharScanner implements OQLLexerTokenTypes, TokenStream
    {
  
  
  
  1.3       +1 -2      db-ojb/src/java/org/apache/ojb/odmg/oql/OQLLexerTokenTypes.java
  
  Index: OQLLexerTokenTypes.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/odmg/oql/OQLLexerTokenTypes.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- OQLLexerTokenTypes.java	17 Jun 2002 19:34:32 -0000	1.2
  +++ OQLLexerTokenTypes.java	10 Mar 2003 06:07:19 -0000	1.3
  @@ -40,8 +40,7 @@
    */
   package org.apache.ojb.odmg.oql;
   
  -import org.apache.ojb.broker.query.*;
  -import java.util.*;
  +
   
   public interface OQLLexerTokenTypes {
   	int EOF = 1;
  
  
  
  1.10      +12 -15    db-ojb/src/java/org/apache/ojb/odmg/oql/OQLParser.java
  
  Index: OQLParser.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/odmg/oql/OQLParser.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- OQLParser.java	4 Feb 2003 20:36:16 -0000	1.9
  +++ OQLParser.java	10 Mar 2003 06:07:19 -0000	1.10
  @@ -40,25 +40,22 @@
    */
   package org.apache.ojb.odmg.oql;
   
  -import org.apache.ojb.broker.query.*;
  -import java.util.*;
  +import java.util.ArrayList;
  +import java.util.Collection;
  +import java.util.Vector;
  +
  +import org.apache.ojb.broker.query.Criteria;
  +import org.apache.ojb.broker.query.Query;
  +import org.apache.ojb.broker.query.QueryFactory;
   
  -import antlr.TokenBuffer;
  -import antlr.TokenStreamException;
  -import antlr.TokenStreamIOException;
  -import antlr.ANTLRException;
  -import antlr.LLkParser;
  -import antlr.Token;
  -import antlr.TokenStream;
  -import antlr.RecognitionException;
   import antlr.NoViableAltException;
  -import antlr.MismatchedTokenException;
  -import antlr.SemanticException;
   import antlr.ParserSharedInputState;
  +import antlr.RecognitionException;
  +import antlr.Token;
  +import antlr.TokenBuffer;
  +import antlr.TokenStream;
  +import antlr.TokenStreamException;
   import antlr.collections.impl.BitSet;
  -import antlr.collections.AST;
  -import antlr.ASTPair;
  -import antlr.collections.impl.ASTArray;
   
   public class OQLParser extends antlr.LLkParser
          implements OQLLexerTokenTypes
  
  
  
  1.2       +0 -2      db-ojb/src/java/org/apache/ojb/otm/lock/isolation/ReadUncommittedIsolation.java
  
  Index: ReadUncommittedIsolation.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/otm/lock/isolation/ReadUncommittedIsolation.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- ReadUncommittedIsolation.java	1 Feb 2003 18:39:56 -0000	1.1
  +++ ReadUncommittedIsolation.java	10 Mar 2003 06:07:19 -0000	1.2
  @@ -1,7 +1,5 @@
   package org.apache.ojb.otm.lock.isolation;
   
  -import org.apache.ojb.broker.Identity;
  -import org.apache.ojb.otm.OTMKit;
   import org.apache.ojb.otm.core.Transaction;
   import org.apache.ojb.otm.lock.LockingException;
   import org.apache.ojb.otm.lock.ObjectLock;
  
  
  
  1.2       +0 -1      db-ojb/src/java/org/apache/ojb/otm/lock/isolation/TransactionIsolation.java
  
  Index: TransactionIsolation.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/otm/lock/isolation/TransactionIsolation.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- TransactionIsolation.java	1 Feb 2003 18:39:56 -0000	1.1
  +++ TransactionIsolation.java	10 Mar 2003 06:07:19 -0000	1.2
  @@ -54,7 +54,6 @@
    * <http://www.apache.org/>.
    */
   
  -import org.apache.ojb.broker.Identity;
   import org.apache.ojb.otm.core.Transaction;
   import org.apache.ojb.otm.lock.LockingException;
   import org.apache.ojb.otm.lock.ObjectLock;
  
  
  
  1.4       +0 -1      db-ojb/src/java/org/apache/ojb/tools/mapping/reversedb2/actions/ActionNewOJBRepository.java
  
  Index: ActionNewOJBRepository.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/tools/mapping/reversedb2/actions/ActionNewOJBRepository.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- ActionNewOJBRepository.java	24 Dec 2002 13:49:22 -0000	1.3
  +++ ActionNewOJBRepository.java	10 Mar 2003 06:07:19 -0000	1.4
  @@ -1,6 +1,5 @@
   package org.apache.ojb.tools.mapping.reversedb2.actions;
   import org.apache.ojb.broker.metadata.DescriptorRepository;
  -import org.apache.ojb.broker.metadata.JdbcConnectionDescriptor;
   import org.apache.ojb.tools.mapping.reversedb2.gui.JIFrmOJBRepository;
   /*
    * ====================================================================
  
  
  
  1.4       +4 -7      db-ojb/src/test/org/apache/ojb/tutorial2/Application.java
  
  Index: Application.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/test/org/apache/ojb/tutorial2/Application.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- Application.java	24 Feb 2003 18:13:43 -0000	1.3
  +++ Application.java	10 Mar 2003 06:07:20 -0000	1.4
  @@ -1,18 +1,15 @@
   package org.apache.ojb.tutorial2;
   
  -import org.apache.ojb.broker.PersistenceBrokerFactory;
  +import java.io.BufferedReader;
  +import java.io.InputStreamReader;
  +import java.util.Vector;
  +
   import org.apache.ojb.broker.TestHelper;
  -import org.apache.ojb.broker.singlevm.PersistenceBrokerConfiguration;
  -import org.apache.ojb.broker.util.configuration.ConfigurationException;
   import org.apache.ojb.broker.util.ui.AsciiSplash;
   import org.apache.ojb.odmg.OJB;
   import org.odmg.Database;
   import org.odmg.Implementation;
   import org.odmg.ODMGException;
  -
  -import java.io.BufferedReader;
  -import java.io.InputStreamReader;
  -import java.util.Vector;
   
   /**
    * The tutorial application.
  
  
  
  1.31      +10 -11    db-ojb/src/java/org/apache/ojb/broker/accesslayer/RsIterator.java
  
  Index: RsIterator.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/broker/accesslayer/RsIterator.java,v
  retrieving revision 1.30
  retrieving revision 1.31
  diff -u -r1.30 -r1.31
  --- RsIterator.java	2 Mar 2003 17:32:04 -0000	1.30
  +++ RsIterator.java	10 Mar 2003 06:07:20 -0000	1.31
  @@ -54,11 +54,19 @@
    * <http://www.apache.org/>.
    */
   
  +import java.sql.ResultSet;
  +import java.sql.SQLException;
  +import java.util.Collection;
  +import java.util.HashMap;
  +import java.util.List;
  +import java.util.Map;
  +import java.util.NoSuchElementException;
  +import java.util.Vector;
  +
   import org.apache.ojb.broker.Identity;
   import org.apache.ojb.broker.PersistenceBrokerException;
   import org.apache.ojb.broker.VirtualProxy;
   import org.apache.ojb.broker.cache.ObjectCache;
  -import org.apache.ojb.broker.cache.ObjectCacheFactory;
   import org.apache.ojb.broker.metadata.ClassDescriptor;
   import org.apache.ojb.broker.metadata.DescriptorRepository;
   import org.apache.ojb.broker.metadata.FieldDescriptor;
  @@ -68,15 +76,6 @@
   import org.apache.ojb.broker.singlevm.PersistenceBrokerImpl;
   import org.apache.ojb.broker.util.logging.Logger;
   import org.apache.ojb.broker.util.logging.LoggerFactory;
  -
  -import java.sql.ResultSet;
  -import java.sql.SQLException;
  -import java.util.Collection;
  -import java.util.HashMap;
  -import java.util.List;
  -import java.util.Map;
  -import java.util.NoSuchElementException;
  -import java.util.Vector;
   
   /**
    * RsIterator can be used to iterate over a jdbc ResultSet to retrieve
  
  
  
  1.3       +0 -3      db-ojb/src/java/org/apache/ojb/otm/core/RequestContext.java
  
  Index: RequestContext.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/otm/core/RequestContext.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- RequestContext.java	15 Feb 2003 10:06:48 -0000	1.2
  +++ RequestContext.java	10 Mar 2003 06:07:20 -0000	1.3
  @@ -56,9 +56,6 @@
   
   import org.apache.ojb.broker.Identity;
   import org.apache.ojb.broker.cache.ObjectCache;
  -import org.apache.ojb.broker.metadata.ClassNotPersistenceCapableException;
  -import org.apache.ojb.otm.EditingContext;
  -import org.apache.ojb.otm.OTMKit;
   import org.apache.ojb.otm.lock.LockingException;
   
   /**
  
  
  
  1.2       +1 -2      db-ojb/src/java/org/apache/ojb/otm/core/BaseConnection.java
  
  Index: BaseConnection.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/otm/core/BaseConnection.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- BaseConnection.java	1 Feb 2003 18:39:55 -0000	1.1
  +++ BaseConnection.java	10 Mar 2003 06:07:20 -0000	1.2
  @@ -57,12 +57,11 @@
   import org.apache.ojb.broker.Identity;
   import org.apache.ojb.broker.PBKey;
   import org.apache.ojb.broker.PersistenceBroker;
  -import org.apache.ojb.broker.PersistenceBrokerFactory;
   import org.apache.ojb.broker.cache.ObjectCache;
   import org.apache.ojb.broker.singlevm.PersistenceBrokerImpl;
   import org.apache.ojb.broker.ta.PersistenceBrokerFactoryFactory;
  -import org.apache.ojb.otm.OTMConnection;
   import org.apache.ojb.otm.EditingContext;
  +import org.apache.ojb.otm.OTMConnection;
   import org.apache.ojb.otm.OTMKit;
   import org.apache.ojb.otm.lock.LockType;
   import org.apache.ojb.otm.lock.LockingException;
  
  
  
  1.2       +0 -1      db-ojb/src/java/org/apache/ojb/otm/core/Transaction.java
  
  Index: Transaction.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/otm/core/Transaction.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- Transaction.java	1 Feb 2003 18:39:56 -0000	1.1
  +++ Transaction.java	10 Mar 2003 06:07:20 -0000	1.2
  @@ -59,7 +59,6 @@
   import java.util.List;
   
   import org.apache.ojb.broker.PersistenceBroker;
  -import org.apache.ojb.otm.OTMKit;
   
   /**
    *  Transaction delivers the core function of OTMKit - to manage objects within the
  
  
  
  1.2       +1 -3      db-ojb/src/java/org/apache/ojb/otm/cache/GlobalCache.java
  
  Index: GlobalCache.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/otm/cache/GlobalCache.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- GlobalCache.java	1 Feb 2003 18:39:58 -0000	1.1
  +++ GlobalCache.java	10 Mar 2003 06:07:20 -0000	1.2
  @@ -1,12 +1,10 @@
   package org.apache.ojb.otm.cache;
   
   import org.apache.ojb.broker.Identity;
  -import org.apache.ojb.broker.cache.ObjectCache;
   import org.apache.ojb.broker.metadata.ClassNotPersistenceCapableException;
   import org.apache.ojb.otm.OTMKit;
   import org.apache.ojb.otm.cache.store.ObjectStore;
  -import org.apache.ojb.otm.copy.*;
  -import org.apache.ojb.otm.lock.LockManager;
  +import org.apache.ojb.otm.copy.ObjectCopyStrategy;
   import org.apache.ojb.otm.lock.LockType;
   
   /**
  
  
  
  1.24      +21 -22    db-ojb/src/java/org/apache/ojb/broker/server/PersistenceBrokerClient.java
  
  Index: PersistenceBrokerClient.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/broker/server/PersistenceBrokerClient.java,v
  retrieving revision 1.23
  retrieving revision 1.24
  diff -u -r1.23 -r1.24
  --- PersistenceBrokerClient.java	9 Mar 2003 09:25:28 -0000	1.23
  +++ PersistenceBrokerClient.java	10 Mar 2003 06:07:20 -0000	1.24
  @@ -53,6 +53,22 @@
    */
   package org.apache.ojb.broker.server;
   
  +import java.io.IOException;
  +import java.io.InputStream;
  +import java.io.ObjectInputStream;
  +import java.io.ObjectOutputStream;
  +import java.io.OutputStream;
  +import java.io.Serializable;
  +import java.util.Collection;
  +import java.util.Enumeration;
  +import java.util.HashMap;
  +import java.util.Hashtable;
  +import java.util.Iterator;
  +import java.util.Map;
  +import java.util.Vector;
  +import java.util.zip.GZIPInputStream;
  +import java.util.zip.GZIPOutputStream;
  +
   import org.apache.ojb.broker.Identity;
   import org.apache.ojb.broker.ManageableCollection;
   import org.apache.ojb.broker.PBKey;
  @@ -60,11 +76,11 @@
   import org.apache.ojb.broker.PersistenceBrokerException;
   import org.apache.ojb.broker.PersistenceBrokerFactory;
   import org.apache.ojb.broker.PersistenceBrokerListener;
  -import org.apache.ojb.broker.cache.ObjectCache;
   import org.apache.ojb.broker.accesslayer.ConnectionManagerIF;
  -import org.apache.ojb.broker.accesslayer.StatementManagerIF;
   import org.apache.ojb.broker.accesslayer.JdbcAccess;
  +import org.apache.ojb.broker.accesslayer.StatementManagerIF;
   import org.apache.ojb.broker.accesslayer.sql.SqlGenerator;
  +import org.apache.ojb.broker.cache.ObjectCache;
   import org.apache.ojb.broker.metadata.ClassDescriptor;
   import org.apache.ojb.broker.metadata.CollectionDescriptor;
   import org.apache.ojb.broker.metadata.DescriptorRepository;
  @@ -72,33 +88,16 @@
   import org.apache.ojb.broker.metadata.ObjectReferenceDescriptor;
   import org.apache.ojb.broker.metadata.fieldaccess.PersistentField;
   import org.apache.ojb.broker.query.Query;
  -import org.apache.ojb.broker.singlevm.PersistenceBrokerThreadMapping;
  -import org.apache.ojb.broker.util.ObjectModification;
   import org.apache.ojb.broker.util.BrokerHelper;
  -import org.apache.ojb.broker.util.sequence.SequenceManager;
  +import org.apache.ojb.broker.util.ObjectModification;
   import org.apache.ojb.broker.util.configuration.Configuration;
   import org.apache.ojb.broker.util.configuration.ConfigurationException;
   import org.apache.ojb.broker.util.logging.Logger;
   import org.apache.ojb.broker.util.logging.LoggerFactory;
  +import org.apache.ojb.broker.util.sequence.SequenceManager;
   import org.odmg.TransactionAbortedException;
   import org.odmg.TransactionInProgressException;
   import org.odmg.TransactionNotInProgressException;
  -
  -import java.io.IOException;
  -import java.io.InputStream;
  -import java.io.ObjectInputStream;
  -import java.io.ObjectOutputStream;
  -import java.io.OutputStream;
  -import java.io.Serializable;
  -import java.util.Collection;
  -import java.util.Enumeration;
  -import java.util.HashMap;
  -import java.util.Hashtable;
  -import java.util.Iterator;
  -import java.util.Map;
  -import java.util.Vector;
  -import java.util.zip.GZIPInputStream;
  -import java.util.zip.GZIPOutputStream;
   
   /**
    * This class implements the Client side of the Client/Server-Mode of OJB.
  
  
  
  1.2       +5 -3      db-ojb/src/test/org/apache/ojb/broker/BatchModeTest.java
  
  Index: BatchModeTest.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/test/org/apache/ojb/broker/BatchModeTest.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- BatchModeTest.java	16 Feb 2003 17:32:05 -0000	1.1
  +++ BatchModeTest.java	10 Mar 2003 06:07:20 -0000	1.2
  @@ -7,10 +7,12 @@
   
   package org.apache.ojb.broker;
   
  -import junit.framework.*;
  -import org.apache.ojb.broker.util.logging.LoggerFactory;
  +import junit.framework.Test;
  +import junit.framework.TestCase;
  +import junit.framework.TestSuite;
  +
   import org.apache.ojb.broker.accesslayer.ConnectionManagerIF;
  -import java.util.*;
  +import org.apache.ojb.broker.util.logging.LoggerFactory;
   
   /**
    * @author Oleg Nitz
  
  
  
  1.3       +4 -5      db-ojb/src/test/org/apache/ojb/broker/OJBPerfTest.java
  
  Index: OJBPerfTest.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/test/org/apache/ojb/broker/OJBPerfTest.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- OJBPerfTest.java	7 Feb 2003 10:58:40 -0000	1.2
  +++ OJBPerfTest.java	10 Mar 2003 06:07:20 -0000	1.3
  @@ -1,5 +1,8 @@
   package org.apache.ojb.broker;
   
  +import java.util.Collection;
  +import java.util.List;
  +
   import org.apache.ojb.broker.query.Criteria;
   import org.apache.ojb.broker.query.Query;
   import org.apache.ojb.broker.query.QueryByCriteria;
  @@ -14,10 +17,6 @@
   import org.odmg.ODMGException;
   import org.odmg.OQLQuery;
   import org.odmg.Transaction;
  -
  -import java.math.BigDecimal;
  -import java.util.Collection;
  -import java.util.List;
   
   /**
    * Performance test implementation classes for testing
  
  
  
  1.2       +0 -1      db-ojb/src/java/org/apache/ojb/otm/transaction/ManagedTransactionFactory.java
  
  Index: ManagedTransactionFactory.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/otm/transaction/ManagedTransactionFactory.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- ManagedTransactionFactory.java	1 Feb 2003 18:39:56 -0000	1.1
  +++ ManagedTransactionFactory.java	10 Mar 2003 06:07:20 -0000	1.2
  @@ -61,7 +61,6 @@
   
   import org.apache.ojb.broker.PBKey;
   import org.apache.ojb.otm.OTMConnection;
  -import org.apache.ojb.otm.OTMKit;
   import org.apache.ojb.otm.core.BaseConnection;
   import org.apache.ojb.otm.core.Transaction;
   import org.apache.ojb.otm.core.TransactionException;
  
  
  
  1.2       +0 -1      db-ojb/src/java/org/apache/ojb/otm/transaction/LocalTransactionFactory.java
  
  Index: LocalTransactionFactory.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/otm/transaction/LocalTransactionFactory.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- LocalTransactionFactory.java	1 Feb 2003 18:39:56 -0000	1.1
  +++ LocalTransactionFactory.java	10 Mar 2003 06:07:20 -0000	1.2
  @@ -58,7 +58,6 @@
   
   import org.apache.ojb.broker.PBKey;
   import org.apache.ojb.otm.OTMConnection;
  -import org.apache.ojb.otm.OTMKit;
   import org.apache.ojb.otm.core.BaseConnection;
   import org.apache.ojb.otm.core.Transaction;
   import org.apache.ojb.otm.core.TransactionException;
  
  
  
  1.2       +0 -1      db-ojb/src/java/org/apache/ojb/otm/transaction/TransactionFactory.java
  
  Index: TransactionFactory.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/otm/transaction/TransactionFactory.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- TransactionFactory.java	1 Feb 2003 18:39:56 -0000	1.1
  +++ TransactionFactory.java	10 Mar 2003 06:07:20 -0000	1.2
  @@ -56,7 +56,6 @@
   
   import org.apache.ojb.broker.PBKey;
   import org.apache.ojb.otm.OTMConnection;
  -import org.apache.ojb.otm.OTMKit;
   import org.apache.ojb.otm.core.Transaction;
   
   
  
  
  
  1.8       +4 -7      db-ojb/src/java/org/apache/ojb/broker/metadata/MetadataManager.java
  
  Index: MetadataManager.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/broker/metadata/MetadataManager.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- MetadataManager.java	6 Mar 2003 14:10:38 -0000	1.7
  +++ MetadataManager.java	10 Mar 2003 06:07:20 -0000	1.8
  @@ -1,16 +1,13 @@
   package org.apache.ojb.broker.metadata;
   
  +import java.util.Iterator;
  +import java.util.List;
  +
   import org.apache.commons.lang.SerializationUtils;
   import org.apache.ojb.broker.singlevm.PersistenceBrokerConfiguration;
   import org.apache.ojb.broker.util.configuration.impl.OjbConfigurator;
   import org.apache.ojb.broker.util.logging.Logger;
   import org.apache.ojb.broker.util.logging.LoggerFactory;
  -import org.xml.sax.SAXException;
  -
  -import javax.xml.parsers.ParserConfigurationException;
  -import java.util.List;
  -import java.util.Iterator;
  -import java.io.IOException;
   
   /**
    * Central class for metadata operations - manages all OJB's
  
  
  
  1.5       +2 -5      db-ojb/src/java/org/apache/ojb/soda/ObjectSetImpl.java
  
  Index: ObjectSetImpl.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/soda/ObjectSetImpl.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- ObjectSetImpl.java	19 Feb 2003 22:10:13 -0000	1.4
  +++ ObjectSetImpl.java	10 Mar 2003 06:07:20 -0000	1.5
  @@ -58,12 +58,9 @@
   import java.util.Iterator;
   import java.util.Vector;
   
  -import org.apache.ojb.broker.PBFactoryException;
   import org.apache.ojb.broker.PersistenceBroker;
  -import org.apache.ojb.broker.PersistenceBrokerException;
  -import org.apache.ojb.broker.PersistenceBrokerFactory;
  -import org.apache.ojb.broker.query.Query;
   import org.apache.ojb.broker.accesslayer.RsIterator;
  +import org.apache.ojb.broker.query.Query;
   import org.apache.ojb.broker.server.RsIteratorStub;
   import org.odbms.ObjectSet;
   
  
  
  
  1.2       +0 -1      db-ojb/src/jdori/org/apache/ojb/tutorial5/UCQuitApplication.java
  
  Index: UCQuitApplication.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/jdori/org/apache/ojb/tutorial5/UCQuitApplication.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- UCQuitApplication.java	28 Nov 2002 07:24:02 -0000	1.1
  +++ UCQuitApplication.java	10 Mar 2003 06:07:20 -0000	1.2
  @@ -1,6 +1,5 @@
   package org.apache.ojb.tutorial5;
   
  -import javax.jdo.PersistenceManager;
   import javax.jdo.PersistenceManagerFactory;
   
   /**
  
  
  
  1.9       +1 -10     db-ojb/src/java/org/apache/ojb/odmg/locking/LockStrategyFactory.java
  
  Index: LockStrategyFactory.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/odmg/locking/LockStrategyFactory.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- LockStrategyFactory.java	1 Feb 2003 15:44:39 -0000	1.8
  +++ LockStrategyFactory.java	10 Mar 2003 06:07:20 -0000	1.9
  @@ -61,15 +61,6 @@
   import org.apache.ojb.odmg.HasBroker;
   import org.apache.ojb.odmg.TxManagerFactory;
   
  -//#ifdef JDK13
  -import java.lang.reflect.Proxy;
  -//#else
  -/*
  -import com.develop.java.lang.reflect.Proxy;
  -*/
  -//#endif
  -
  -
   /**
    * Factory class used to obtain the proper LockingStrategy for an Object.
    * @author Thomas Mahler & David Dixon-Peugh
  
  
  
  1.9       +5 -7      db-ojb/src/test/org/apache/ojb/odmg/UserTestCases.java
  
  Index: UserTestCases.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/test/org/apache/ojb/odmg/UserTestCases.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- UserTestCases.java	3 Mar 2003 17:22:12 -0000	1.8
  +++ UserTestCases.java	10 Mar 2003 06:07:21 -0000	1.9
  @@ -1,18 +1,16 @@
   package org.apache.ojb.odmg;
   
  +import java.util.List;
  +
   import junit.framework.TestCase;
  +
   import org.apache.ojb.broker.TestHelper;
  -import org.apache.ojb.broker.util.configuration.impl.OjbConfigurator;
   import org.apache.ojb.broker.util.configuration.impl.OjbConfiguration;
  -import org.apache.ojb.broker.metadata.MetadataManager;
  -import org.apache.ojb.broker.metadata.DescriptorRepository;
  -import org.apache.ojb.broker.metadata.JdbcConnectionDescriptor;
  +import org.apache.ojb.broker.util.configuration.impl.OjbConfigurator;
   import org.odmg.Database;
   import org.odmg.Implementation;
   import org.odmg.OQLQuery;
   import org.odmg.Transaction;
  -
  -import java.util.List;
   
   
   /**
  
  
  
  1.2       +5 -6      db-ojb/src/test/org/apache/ojb/odmg/BatchModeTest.java
  
  Index: BatchModeTest.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/test/org/apache/ojb/odmg/BatchModeTest.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- BatchModeTest.java	16 Feb 2003 17:32:05 -0000	1.1
  +++ BatchModeTest.java	10 Mar 2003 06:07:21 -0000	1.2
  @@ -7,17 +7,16 @@
   
   package org.apache.ojb.odmg;
   
  -import junit.framework.*;
  -import java.util.*;
  +import junit.framework.TestCase;
  +import junit.framework.TestSuite;
   
  +import org.apache.ojb.broker.Article;
  +import org.apache.ojb.broker.ProductGroup;
  +import org.apache.ojb.broker.TestHelper;
   import org.odmg.Database;
   import org.odmg.Implementation;
   import org.odmg.ODMGException;
   import org.odmg.Transaction;
  -
  -import org.apache.ojb.broker.Article;
  -import org.apache.ojb.broker.ProductGroup;
  -import org.apache.ojb.broker.TestHelper;
   
   /**
    * @author Oleg Nitz
  
  
  
  1.2       +0 -3      db-ojb/src/java/org/apache/ojb/otm/OTMConnection.java
  
  Index: OTMConnection.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/otm/OTMConnection.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- OTMConnection.java	1 Feb 2003 18:39:57 -0000	1.1
  +++ OTMConnection.java	10 Mar 2003 06:07:21 -0000	1.2
  @@ -55,9 +55,6 @@
    */
   
   import org.apache.ojb.broker.Identity;
  -import org.apache.ojb.broker.PBKey;
  -import org.apache.ojb.broker.PersistenceBroker;
  -import org.apache.ojb.broker.PersistenceBrokerFactory;
   import org.apache.ojb.otm.lock.LockingException;
   
   /**
  
  
  
  1.2       +0 -1      db-ojb/src/java/org/apache/ojb/otm/kit/SimpleKit.java
  
  Index: SimpleKit.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/otm/kit/SimpleKit.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- SimpleKit.java	1 Feb 2003 18:39:57 -0000	1.1
  +++ SimpleKit.java	10 Mar 2003 06:07:21 -0000	1.2
  @@ -3,7 +3,6 @@
   import org.apache.ojb.broker.Identity;
   import org.apache.ojb.broker.metadata.ClassDescriptor;
   import org.apache.ojb.otm.OTMKit;
  -import org.apache.ojb.otm.cache.GlobalCache;
   import org.apache.ojb.otm.cache.store.ObjectStore;
   import org.apache.ojb.otm.copy.ObjectCopyStrategy;
   import org.apache.ojb.otm.lock.map.InMemoryLockMap;
  
  
  
  1.20      +0 -1      db-ojb/src/java/org/apache/ojb/odmg/ObjectEnvelopeTable.java
  
  Index: ObjectEnvelopeTable.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/odmg/ObjectEnvelopeTable.java,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- ObjectEnvelopeTable.java	6 Mar 2003 08:12:51 -0000	1.19
  +++ ObjectEnvelopeTable.java	10 Mar 2003 06:07:21 -0000	1.20
  @@ -76,7 +76,6 @@
   import org.apache.ojb.broker.util.ArrayIterator;
   import org.apache.ojb.broker.util.logging.Logger;
   import org.apache.ojb.broker.util.logging.LoggerFactory;
  -import org.apache.ojb.odmg.locking.LockManager;
   import org.apache.ojb.odmg.locking.LockManagerFactory;
   import org.odmg.Transaction;
   import org.odmg.TransactionAbortedException;
  
  
  
  1.2       +0 -1      db-ojb/src/java/org/apache/ojb/otm/lock/ObjectLock.java
  
  Index: ObjectLock.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/otm/lock/ObjectLock.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- ObjectLock.java	1 Feb 2003 18:39:57 -0000	1.1
  +++ ObjectLock.java	10 Mar 2003 06:07:21 -0000	1.2
  @@ -63,7 +63,6 @@
   import org.apache.ojb.broker.Identity;
   import org.apache.ojb.otm.OTMKit;
   import org.apache.ojb.otm.core.Transaction;
  -import org.apache.ojb.otm.lock.isolation.*;
   import org.apache.ojb.otm.lock.wait.LockWaitStrategy;
   
   /**
  
  
  
  1.9       +2 -12     db-ojb/src/java/org/apache/ojb/broker/util/interceptor/TracingInterceptor.java
  
  Index: TracingInterceptor.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/broker/util/interceptor/TracingInterceptor.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- TracingInterceptor.java	2 Mar 2003 22:37:06 -0000	1.8
  +++ TracingInterceptor.java	10 Mar 2003 06:07:21 -0000	1.9
  @@ -54,18 +54,8 @@
    * <http://www.apache.org/>.
    */
   
  -import org.apache.ojb.broker.util.logging.LoggerFactory;
   import java.lang.reflect.Method;
  -
  -//#ifdef JDK13
  -import java.lang.reflect.InvocationHandler;
  -import java.lang.reflect.Proxy;
  -//#else
  -/*
  -import com.develop.java.lang.reflect.InvocationHandler;
  -import com.develop.java.lang.reflect.Proxy;
  -*/
  -//#endif
  +import org.apache.ojb.broker.util.logging.LoggerFactory;
   
   
   /**
  
  
  

Mime
View raw message