[openejb-scm] openejb/modules/core/src/java/org/openejb/server/axis WSContainer.java WSContainerGBean.java

[djencks]

djencks     2005/07/21 18:56:00

  Modified:    modules/core/src/java/org/openejb/server/axis
                        WSContainer.java WSContainerGBean.java
  Log:

  GERONIMO-782 step 3. Use a template gbean for the ws link
  
  Revision  Changes    Path
  1.13      +8 -3      
openejb/modules/core/src/java/org/openejb/server/axis/WSContainer.java
  
  Index: WSContainer.java
  ===================================================================
  RCS file: 
/home/projects/openejb/scm/openejb/modules/core/src/java/org/openejb/server/axis/WSContainer.java,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- WSContainer.java  21 Jul 2005 04:32:11 -0000      1.12
  +++ WSContainer.java  21 Jul 2005 22:56:00 -0000      1.13
  @@ -77,7 +77,10 @@
   
           this.soapHandler = soapHandler;
           this.location = location;
  -
  +        //for use as a template
  +        if (ejbContainer == null) {
  +            return;
  +        }
           RPCProvider provider = new EJBContainerProvider(ejbContainer);
           SOAPService service = new SOAPService(null, provider, null);
   
  @@ -101,7 +104,9 @@
       }
   
       public void doStop() throws Exception {
  -        soapHandler.removeWebService(location.getPath());
  +        if (soapHandler != null) {
  +            soapHandler.removeWebService(location.getPath());
  +        }
       }
   
       public void doFail() {
  
  
  
  1.7       +3 -8      
openejb/modules/core/src/java/org/openejb/server/axis/WSContainerGBean.java
  
  Index: WSContainerGBean.java
  ===================================================================
  RCS file: 
/home/projects/openejb/scm/openejb/modules/core/src/java/org/openejb/server/axis/WSContainerGBean.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- WSContainerGBean.java     21 Jul 2005 04:32:11 -0000      1.6
  +++ WSContainerGBean.java     21 Jul 2005 22:56:00 -0000      1.7
  @@ -45,16 +45,11 @@
   package org.openejb.server.axis;
   
   import java.net.URI;
  -import javax.management.ObjectName;
   
   import org.apache.geronimo.axis.server.ServiceInfo;
  -import org.apache.geronimo.gbean.GBeanData;
   import org.apache.geronimo.gbean.GBeanInfo;
   import org.apache.geronimo.gbean.GBeanInfoBuilder;
  -import org.apache.geronimo.kernel.GBeanAlreadyExistsException;
  -import org.apache.geronimo.kernel.GBeanNotFoundException;
  -import org.apache.geronimo.kernel.Kernel;
  -import org.apache.geronimo.kernel.jmx.JMXUtil;
  +import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
   import org.apache.geronimo.webservices.SoapHandler;
   import org.openejb.EJBContainer;
   
  @@ -63,7 +58,7 @@
       public static final GBeanInfo GBEAN_INFO;
   
       static {
  -        GBeanInfoBuilder infoFactory = new 
GBeanInfoBuilder(WSContainer.class);
  +        GBeanInfoBuilder infoFactory = new 
GBeanInfoBuilder(WSContainer.class, NameFactory.WEB_SERVICE_LINK);
   
   //        infoFactory.addOperation("invoke", new 
Class[]{WebServiceContainer.Request.class, WebServiceContainer.Response.class});