[openejb-scm] openejb/modules/openejb-builder/src/java/org/openejb/deployment AxisWebServiceContainerBuilder.java

[dblevins]

dblevins    2005/03/25 21:43:34

  Modified:    modules/openejb-builder/src/java/org/openejb/deployment
                        AxisWebServiceContainerBuilder.java
  Log:

  Basic handler support.  More work to be done on EJB sercurity/handlers.
  
  Revision  Changes    Path
  1.3       +6 -4      
openejb/modules/openejb-builder/src/java/org/openejb/deployment/AxisWebServiceContainerBuilder.java
  
  Index: AxisWebServiceContainerBuilder.java
  ===================================================================
  RCS file: 
/scm/openejb/openejb/modules/openejb-builder/src/java/org/openejb/deployment/AxisWebServiceContainerBuilder.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- AxisWebServiceContainerBuilder.java       18 Mar 2005 07:40:21 -0000      
1.2
  +++ AxisWebServiceContainerBuilder.java       26 Mar 2005 02:43:34 -0000      
1.3
  @@ -54,6 +54,7 @@
   import org.apache.commons.logging.Log;
   import org.apache.commons.logging.LogFactory;
   import org.apache.geronimo.axis.builder.AxisServiceBuilder;
  +import org.apache.geronimo.axis.builder.ServiceInfo;
   import org.apache.geronimo.common.DeploymentException;
   import org.apache.geronimo.gbean.GBeanData;
   import org.apache.geronimo.j2ee.deployment.EARContext;
  @@ -90,8 +91,9 @@
       }
   
       public GBeanData buildGBeanData(ObjectName sessionObjectName, ObjectName 
listener, String ejbName, String serviceEndpointName, JarFile jarFile, 
ClassLoader cl) throws DeploymentException {
  -        JavaServiceDesc ejbServiceDesc = 
AxisServiceBuilder.createEJBServiceDesc(jarFile, ejbName, cl);    
  -        
  +        ServiceInfo serviceInfo = 
AxisServiceBuilder.createServiceInfo(jarFile, ejbName, cl);
  +        JavaServiceDesc ejbServiceDesc = serviceInfo.getServiceDesc();
  +
           // Strip the jar file path from the WSDL file since jar file 
location may change at runtime.
           String wsdlFile = ejbServiceDesc.getWSDLFile();
           wsdlFile = wsdlFile.substring(wsdlFile.indexOf("!")+2);
  @@ -110,7 +112,7 @@
               throw new DeploymentException("Invalid address location URI: 
"+ejbServiceDesc.getEndpointURL(), e);
           }
   
  -        GBeanData gBean = 
WSContainerGBean.createGBean(ejbName,sessionObjectName,listener, location, 
wsdlURI, ejbServiceDesc);
  +        GBeanData gBean = 
WSContainerGBean.createGBean(ejbName,sessionObjectName,listener, location, 
wsdlURI, serviceInfo);
           return gBean;
       }
   }