djencks 2005/07/02 04:41:31
Modified: modules/openejb-builder/src/java/org/openejb/deployment
AxisWebServiceContainerBuilder.java
Log:
GERONIMO-672 fix broken wsdl location in wsdlmap
Revision Changes Path
1.8 +4 -9
openejb/modules/openejb-builder/src/java/org/openejb/deployment/AxisWebServiceContainerBuilder.java
Index: AxisWebServiceContainerBuilder.java
===================================================================
RCS file:
/home/projects/openejb/scm/openejb/modules/openejb-builder/src/java/org/openejb/deployment/AxisWebServiceContainerBuilder.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- AxisWebServiceContainerBuilder.java 22 May 2005 22:27:58 -0000
1.7
+++ AxisWebServiceContainerBuilder.java 2 Jul 2005 08:41:31 -0000
1.8
@@ -50,8 +50,6 @@
import javax.management.ObjectName;
import org.apache.axis.description.JavaServiceDesc;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.geronimo.axis.builder.AxisServiceBuilder;
import org.apache.geronimo.axis.server.ServiceInfo;
import org.apache.geronimo.common.DeploymentException;
@@ -95,16 +93,13 @@
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);
-
+ //ejbServiceDesc.getWSDLFile() is the wsdl-file from webservices.xml
URI wsdlURI = null;
try {
- wsdlURI = new URI(wsdlFile);
+ wsdlURI = new URI(ejbServiceDesc.getWSDLFile());
}
catch (URISyntaxException e) {
- throw new DeploymentException("Invalid WSDL URI: "+ wsdlFile, e);
+ throw new DeploymentException("Invalid WSDL URI: "+
ejbServiceDesc.getWSDLFile(), e);
}
URI locationURI = null;
try {
