[openejb-scm] openejb/modules/core/src/java/org/openejb/corba CORBABean.java OpenORBNameBean.java POABean.java

[dain]

dain        2005/02/02 22:09:53

  Modified:    modules/core/src/java/org/openejb/corba CORBABean.java
                        OpenORBNameBean.java POABean.java
  Log:

  Removed references to WaitingException (no code was actually using it)
  
  Revision  Changes    Path
  1.4       +4 -5      
openejb/modules/core/src/java/org/openejb/corba/CORBABean.java
  
  Index: CORBABean.java
  ===================================================================
  RCS file: 
/home/projects/openejb/scm/openejb/modules/core/src/java/org/openejb/corba/CORBABean.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- CORBABean.java    1 Feb 2005 19:09:39 -0000       1.3
  +++ CORBABean.java    3 Feb 2005 03:09:52 -0000       1.4
  @@ -56,7 +56,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.pool.ThreadPool;
   import EDU.oswego.cs.dl.util.concurrent.Executor;
   
  @@ -109,7 +108,7 @@
           this.props = props;
       }
   
  -    public void doStart() throws WaitingException, Exception {
  +    public void doStart() throws Exception {
   
           ClassLoader savedLoader = 
Thread.currentThread().getContextClassLoader();
           try {
  @@ -133,7 +132,7 @@
           log.info("Started CORBABean");
       }
   
  -    public void doStop() throws WaitingException, Exception {
  +    public void doStop() throws Exception {
           orb.shutdown(true);
           log.info("Stopped CORBABean");
       }
  
  
  
  1.3       +4 -5      
openejb/modules/core/src/java/org/openejb/corba/OpenORBNameBean.java
  
  Index: OpenORBNameBean.java
  ===================================================================
  RCS file: 
/home/projects/openejb/scm/openejb/modules/core/src/java/org/openejb/corba/OpenORBNameBean.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- OpenORBNameBean.java      1 Feb 2005 19:09:40 -0000       1.2
  +++ OpenORBNameBean.java      3 Feb 2005 03:09:52 -0000       1.3
  @@ -58,7 +58,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.pool.ThreadPool;
   import EDU.oswego.cs.dl.util.concurrent.Executor;
   
  @@ -123,7 +122,7 @@
           return props;
       }
   
  -    public void doStart() throws WaitingException, Exception {
  +    public void doStart() throws Exception {
           threadPool.execute(new Runnable() {
               public void run() {
                   Thread.currentThread().setContextClassLoader(classLoader);
  @@ -134,7 +133,7 @@
           log.info("Started OpenORBNameBean");
       }
   
  -    public void doStop() throws WaitingException, Exception {
  +    public void doStop() throws Exception {
           server.getORB().shutdown(true);
   
           log.info("Stopped OpenORBNameBean");
  
  
  
  1.3       +4 -5      
openejb/modules/core/src/java/org/openejb/corba/POABean.java
  
  Index: POABean.java
  ===================================================================
  RCS file: 
/home/projects/openejb/scm/openejb/modules/core/src/java/org/openejb/corba/POABean.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- POABean.java      13 Jan 2005 17:00:22 -0000      1.2
  +++ POABean.java      3 Feb 2005 03:09:52 -0000       1.3
  @@ -68,7 +68,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;
   
   import org.openejb.EJBContainer;
   import org.openejb.corba.util.TieLoader;
  @@ -129,7 +128,7 @@
           return (EJBContainer) containerMap.get(containerId);
       }
   
  -    public void doStart() throws WaitingException, Exception {
  +    public void doStart() throws Exception {
           ClassLoader savedLoader = 
Thread.currentThread().getContextClassLoader();
           try {
               Thread.currentThread().setContextClassLoader(classLoader);
  @@ -167,7 +166,7 @@
           log.info("Started POABean");
       }
   
  -    public void doStop() throws WaitingException, Exception {
  +    public void doStop() throws Exception {
           if (localPOA != null) {
               for (Iterator iter = adapters.keySet().iterator(); 
iter.hasNext();) {
                   AdapterWrapper adapterWrapper = (AdapterWrapper) 
adapters.get(iter.next());