[openejb-scm] openejb/modules/core/src/java/org/openejb/entity/cmp/pkgenerator AutoIncrementTablePrimaryKeyGeneratorWrapper.java SQLPrimaryKeyGeneratorWrapper.java SequenceTablePrimaryKeyGeneratorWrapper.java

[dain]

dain        2005/02/02 22:09:53

  Modified:    modules/core/src/java/org/openejb/entity/cmp/pkgenerator
                        AutoIncrementTablePrimaryKeyGeneratorWrapper.java
                        SQLPrimaryKeyGeneratorWrapper.java
                        SequenceTablePrimaryKeyGeneratorWrapper.java
  Log:

  Removed references to WaitingException (no code was actually using it)
  
  Revision  Changes    Path
  1.3       +3 -4      
openejb/modules/core/src/java/org/openejb/entity/cmp/pkgenerator/AutoIncrementTablePrimaryKeyGeneratorWrapper.java
  
  Index: AutoIncrementTablePrimaryKeyGeneratorWrapper.java
  ===================================================================
  RCS file: 
/home/projects/openejb/scm/openejb/modules/core/src/java/org/openejb/entity/cmp/pkgenerator/AutoIncrementTablePrimaryKeyGeneratorWrapper.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- AutoIncrementTablePrimaryKeyGeneratorWrapper.java 2 Dec 2004 23:13:55 
-0000       1.2
  +++ AutoIncrementTablePrimaryKeyGeneratorWrapper.java 3 Feb 2005 03:09:53 
-0000       1.3
  @@ -55,7 +55,6 @@
   import org.apache.geronimo.gbean.GBeanInfo;
   import org.apache.geronimo.gbean.GBeanInfoBuilder;
   import org.apache.geronimo.gbean.GBeanLifecycle;
  -import org.apache.geronimo.gbean.WaitingException;
   import org.tranql.cache.CacheRow;
   import org.tranql.cache.InTxCache;
   import org.tranql.identity.GlobalIdentity;
  @@ -84,12 +83,12 @@
           this.returnType = returnType;
       }
       
  -    public void doStart() throws WaitingException, Exception {
  +    public void doStart() throws Exception {
           DataSource dataSource = (DataSource) 
connectionFactoryWrapper.$getResource();
           delegate = new AutoIncrementTablePrimaryKeyGenerator(dataSource, 
sql, BindingFactory.getResultBinding(1, new QueryBindingImpl(0, returnType)));
       }
   
  -    public void doStop() throws WaitingException, Exception {
  +    public void doStop() throws Exception {
           delegate = null;
       }
   
  
  
  
  1.6       +3 -4      
openejb/modules/core/src/java/org/openejb/entity/cmp/pkgenerator/SQLPrimaryKeyGeneratorWrapper.java
  
  Index: SQLPrimaryKeyGeneratorWrapper.java
  ===================================================================
  RCS file: 
/home/projects/openejb/scm/openejb/modules/core/src/java/org/openejb/entity/cmp/pkgenerator/SQLPrimaryKeyGeneratorWrapper.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- SQLPrimaryKeyGeneratorWrapper.java        2 Dec 2004 23:13:55 -0000       
1.5
  +++ SQLPrimaryKeyGeneratorWrapper.java        3 Feb 2005 03:09:53 -0000       
1.6
  @@ -59,7 +59,6 @@
   import org.apache.geronimo.gbean.GBeanInfo;
   import org.apache.geronimo.gbean.GBeanInfoBuilder;
   import org.apache.geronimo.gbean.GBeanLifecycle;
  -import org.apache.geronimo.gbean.WaitingException;
   import org.tranql.cache.CacheRow;
   import org.tranql.cache.InTxCache;
   import org.tranql.identity.GlobalIdentity;
  @@ -90,7 +89,7 @@
           this.returnType = returnType;
       }
       
  -    public void doStart() throws WaitingException, Exception {
  +    public void doStart() throws Exception {
           DataSource dataSource = (DataSource) 
connectionFactoryWrapper.$getResource();
           
           Connection c = dataSource.getConnection();
  @@ -111,7 +110,7 @@
           delegate = new SQLPrimaryKeyGenerator(dataSource, sql, 
BindingFactory.getResultBinding(1, new QueryBindingImpl(0, returnType)));
       }
   
  -    public void doStop() throws WaitingException, Exception {
  +    public void doStop() throws Exception {
           delegate = null;
       }
   
  
  
  
  1.5       +3 -4      
openejb/modules/core/src/java/org/openejb/entity/cmp/pkgenerator/SequenceTablePrimaryKeyGeneratorWrapper.java
  
  Index: SequenceTablePrimaryKeyGeneratorWrapper.java
  ===================================================================
  RCS file: 
/home/projects/openejb/scm/openejb/modules/core/src/java/org/openejb/entity/cmp/pkgenerator/SequenceTablePrimaryKeyGeneratorWrapper.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- SequenceTablePrimaryKeyGeneratorWrapper.java      8 Nov 2004 15:47:27 
-0000       1.4
  +++ SequenceTablePrimaryKeyGeneratorWrapper.java      3 Feb 2005 03:09:53 
-0000       1.5
  @@ -55,7 +55,6 @@
   import org.apache.geronimo.gbean.GBeanInfo;
   import org.apache.geronimo.gbean.GBeanInfoBuilder;
   import org.apache.geronimo.gbean.GBeanLifecycle;
  -import org.apache.geronimo.gbean.WaitingException;
   import org.tranql.cache.CacheRow;
   import org.tranql.cache.InTxCache;
   import org.tranql.identity.GlobalIdentity;
  @@ -84,13 +83,13 @@
           this.batchSize = batchSize;
       }
       
  -    public void doStart() throws WaitingException, Exception {
  +    public void doStart() throws Exception {
           DataSource dataSource = (DataSource) 
connectionFactoryWrapper.$getResource();
           delegate = new SequenceTablePrimaryKeyGenerator(dataSource, 
tableName, sequenceName, batchSize);
           delegate.initSequenceTable();
       }
   
  -    public void doStop() throws WaitingException, Exception {
  +    public void doStop() throws Exception {
           delegate = null;
       }