djencks 2005/07/21 00:32:11
Modified: modules/core/src/java/org/openejb/server/axis
WSContainer.java WSContainerGBean.java
Log:
GERONIMO-782 step 2. Use WebserviceBuilder interfaces from tomcat builder and
openejb builder. openejb builder still needs cleanup
Revision Changes Path
1.12 +17 -22
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.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- WSContainer.java 17 May 2005 00:29:26 -0000 1.11
+++ WSContainer.java 21 Jul 2005 04:32:11 -0000 1.12
@@ -74,31 +74,26 @@
String realmName,
String transportGuarantee,
String authMethod) throws Exception {
- try {
- this.soapHandler = soapHandler;
- this.location = location;
+ this.soapHandler = soapHandler;
+ this.location = location;
- RPCProvider provider = new EJBContainerProvider(ejbContainer);
- SOAPService service = new SOAPService(null, provider, null);
+ RPCProvider provider = new EJBContainerProvider(ejbContainer);
+ SOAPService service = new SOAPService(null, provider, null);
- JavaServiceDesc serviceDesc = serviceInfo.getServiceDesc();
- service.setServiceDescription(serviceDesc);
- Class serviceEndpointInterface =
ejbContainer.getProxyInfo().getServiceEndpointInterface();
-
- service.setOption("className",
serviceEndpointInterface.getName());
- serviceDesc.setImplClass(serviceEndpointInterface);
-
- ClassLoader classLoader = ejbContainer.getClassLoader();
- AxisWebServiceContainer axisContainer = new
AxisWebServiceContainer(location, wsdlURI, service, serviceInfo.getWsdlMap(),
classLoader);
- if (soapHandler != null) {
- soapHandler.addWebService(location.getPath(), axisContainer,
securityRealmName, realmName, transportGuarantee, authMethod, classLoader);
- }
-
- } catch (Exception e) {
- e.printStackTrace();
- throw new RuntimeException(e);
+ JavaServiceDesc serviceDesc = serviceInfo.getServiceDesc();
+ service.setServiceDescription(serviceDesc);
+ Class serviceEndpointInterface =
ejbContainer.getProxyInfo().getServiceEndpointInterface();
+
+ service.setOption("className", serviceEndpointInterface.getName());
+ serviceDesc.setImplClass(serviceEndpointInterface);
+
+ ClassLoader classLoader = ejbContainer.getClassLoader();
+ AxisWebServiceContainer axisContainer = new
AxisWebServiceContainer(location, wsdlURI, service, serviceInfo.getWsdlMap(),
classLoader);
+ if (soapHandler != null) {
+ soapHandler.addWebService(location.getPath(), axisContainer,
securityRealmName, realmName, transportGuarantee, authMethod, classLoader);
}
+
}
public void doStart() throws Exception {
1.6 +27 -27
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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- WSContainerGBean.java 17 May 2005 00:29:26 -0000 1.5
+++ WSContainerGBean.java 21 Jul 2005 04:32:11 -0000 1.6
@@ -97,30 +97,30 @@
}
//TODO why is a test method in runtime code?
- public static ObjectName addGBean(Kernel kernel, String name, ObjectName
ejbContainer, ObjectName listener, URI location, URI wsdlURI, ServiceInfo
serviceInfo) throws GBeanAlreadyExistsException, GBeanNotFoundException {
- GBeanData gbean = createGBean(name, ejbContainer, listener,
location, wsdlURI, serviceInfo, null, null, null, null);
- kernel.loadGBean(gbean, WSContainer.class.getClassLoader());
- kernel.startGBean(gbean.getName());
- return gbean.getName();
- }
-
- public static GBeanData createGBean(String name, ObjectName
ejbContainer, ObjectName listener, URI location, URI wsdlURI, ServiceInfo
serviceInfo, String securityRealmName, String realmName, String
transportGuarantee, String authMethod) {
- assert ejbContainer != null : "EJBContainer objectname is null";
-
- ObjectName gbeanName =
JMXUtil.getObjectName("openejb:type=WSContainer,name=" + name);
-
- GBeanData gbean = new GBeanData(gbeanName,
WSContainerGBean.GBEAN_INFO);
- gbean.setReferencePattern("EJBContainer", ejbContainer);
- gbean.setAttribute("location", location);
- gbean.setAttribute("wsdlURI", wsdlURI);
- gbean.setAttribute("serviceInfo", serviceInfo);
- gbean.setAttribute("securityRealmName", securityRealmName);
- gbean.setAttribute("realmName", realmName);
- gbean.setAttribute("transportGuarantee", transportGuarantee);
- gbean.setAttribute("authMethod", authMethod);
-
- gbean.setReferencePattern("WebServiceContainer", listener);
-
- return gbean;
- }
+// public static ObjectName addGBean(Kernel kernel, String name,
ObjectName ejbContainer, ObjectName listener, URI location, URI wsdlURI,
ServiceInfo serviceInfo) throws GBeanAlreadyExistsException,
GBeanNotFoundException {
+// GBeanData gbean = createGBean(name, ejbContainer, listener,
location, wsdlURI, serviceInfo, null, null, null, null);
+// kernel.loadGBean(gbean, WSContainer.class.getClassLoader());
+// kernel.startGBean(gbean.getName());
+// return gbean.getName();
+// }
+//
+// private static GBeanData createGBean(String name, ObjectName
ejbContainer, ObjectName listener, URI location, URI wsdlURI, ServiceInfo
serviceInfo, String securityRealmName, String realmName, String
transportGuarantee, String authMethod) {
+// assert ejbContainer != null : "EJBContainer objectname is null";
+//
+// ObjectName gbeanName =
JMXUtil.getObjectName("openejb:type=WSContainer,name=" + name);
+//
+// GBeanData gbean = new GBeanData(gbeanName,
WSContainerGBean.GBEAN_INFO);
+// gbean.setReferencePattern("EJBContainer", ejbContainer);
+// gbean.setAttribute("location", location);
+// gbean.setAttribute("wsdlURI", wsdlURI);
+// gbean.setAttribute("serviceInfo", serviceInfo);
+// gbean.setAttribute("securityRealmName", securityRealmName);
+// gbean.setAttribute("realmName", realmName);
+// gbean.setAttribute("transportGuarantee", transportGuarantee);
+// gbean.setAttribute("authMethod", authMethod);
+//
+// gbean.setReferencePattern("WebServiceContainer", listener);
+//
+// return gbean;
+// }
}
