[openejb-scm] openejb/modules/core/src/java/org/openejb ContainerIndex.java EJBModuleImpl.java GenericEJBContainer.java

[dain]

dain        2005/02/02 22:09:52

  Modified:    modules/core/src/java/org/openejb ContainerIndex.java
                        EJBModuleImpl.java GenericEJBContainer.java
  Log:

  Removed references to WaitingException (no code was actually using it)
  
  Revision  Changes    Path
  1.14      +3 -4      
openejb/modules/core/src/java/org/openejb/ContainerIndex.java
  
  Index: ContainerIndex.java
  ===================================================================
  RCS file: 
/home/projects/openejb/scm/openejb/modules/core/src/java/org/openejb/ContainerIndex.java,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- ContainerIndex.java       24 Jan 2005 21:16:48 -0000      1.13
  +++ ContainerIndex.java       3 Feb 2005 03:09:52 -0000       1.14
  @@ -55,7 +55,6 @@
   import org.apache.geronimo.gbean.ReferenceCollection;
   import org.apache.geronimo.gbean.ReferenceCollectionEvent;
   import org.apache.geronimo.gbean.ReferenceCollectionListener;
  -import org.apache.geronimo.gbean.WaitingException;
   
   
   /**
  @@ -99,7 +98,7 @@
           this.ejbContainers.addReferenceCollectionListener(this);
       }
   
  -    public void doStart() throws WaitingException, Exception {
  +    public void doStart() throws Exception {
           containers = new EJBContainer[ejbContainers.size() + 1];
           Iterator iterator = ejbContainers.iterator();
           for (int i = 1; i < containers.length && iterator.hasNext(); i++) {
  @@ -121,7 +120,7 @@
           }
       }
   
  -    public void doStop() throws WaitingException, Exception {
  +    public void doStop() throws Exception {
           containerIdToIndex.clear();
           Arrays.fill(containers, null);
           jndiNameToIndex.clear();
  
  
  
  1.13      +3 -4      
openejb/modules/core/src/java/org/openejb/EJBModuleImpl.java
  
  Index: EJBModuleImpl.java
  ===================================================================
  RCS file: 
/home/projects/openejb/scm/openejb/modules/core/src/java/org/openejb/EJBModuleImpl.java,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- EJBModuleImpl.java        24 Jan 2005 21:16:48 -0000      1.12
  +++ EJBModuleImpl.java        3 Feb 2005 03:09:52 -0000       1.13
  @@ -54,7 +54,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.apache.geronimo.j2ee.management.J2EEApplication;
   import org.apache.geronimo.j2ee.management.J2EEServer;
   import org.apache.geronimo.j2ee.management.impl.InvalidObjectNameException;
  @@ -154,7 +153,7 @@
           }
       }
   
  -    public void doStart() throws WaitingException, Exception {
  +    public void doStart() throws Exception {
           if (delegate != null) {
               delegate.setConnectionFactory(connectionFactory.$getResource());
           }
  @@ -163,7 +162,7 @@
           }
       }
   
  -    public void doStop() throws WaitingException, Exception {
  +    public void doStop() throws Exception {
           if (delegate != null) {
               delegate.setConnectionFactory(null);
           }
  
  
  
  1.35      +3 -4      
openejb/modules/core/src/java/org/openejb/GenericEJBContainer.java
  
  Index: GenericEJBContainer.java
  ===================================================================
  RCS file: 
/home/projects/openejb/scm/openejb/modules/core/src/java/org/openejb/GenericEJBContainer.java,v
  retrieving revision 1.34
  retrieving revision 1.35
  diff -u -r1.34 -r1.35
  --- GenericEJBContainer.java  1 Feb 2005 22:26:00 -0000       1.34
  +++ GenericEJBContainer.java  3 Feb 2005 03:09:52 -0000       1.35
  @@ -75,7 +75,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.apache.geronimo.kernel.Kernel;
   import org.apache.geronimo.naming.java.SimpleReadOnlyContext;
   import org.apache.geronimo.naming.reference.ClassLoaderAwareReference;
  @@ -359,7 +358,7 @@
           System.setProperty(javax.naming.Context.URL_PKG_PREFIXES, str);
       }
   
  -    public void doStart() throws WaitingException, Exception {
  +    public void doStart() throws Exception {
   
           if (timerService != null) {
               timerService.doStart();
  @@ -411,7 +410,7 @@
           log.info("GenericEJBContainer '" + containerId + "'started");
       }
   
  -    public void doStop() throws WaitingException, Exception {
  +    public void doStop() throws Exception {
           if (timerService != null) {
               timerService.doStop();
           }