You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by ke...@apache.org on 2008/07/22 15:03:30 UTC

svn commit: r678750 - in /webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2: deployment/util/Utils.java description/AxisEndpoint.java util/WSDLSerializationUtil.java

Author: keithc
Date: Tue Jul 22 06:03:30 2008
New Revision: 678750

URL: http://svn.apache.org/viewvc?rev=678750&view=rev
Log:
Fixing https://issues.apache.org/jira/browse/AXIS2-3877

Modified:
    webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/util/Utils.java
    webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisEndpoint.java
    webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/WSDLSerializationUtil.java

Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/util/Utils.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/util/Utils.java?rev=678750&r1=678749&r2=678750&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/util/Utils.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/util/Utils.java Tue Jul 22 06:03:30 2008
@@ -1399,7 +1399,7 @@
                 QName operationQName = operation.getName();
                 axisBindingOperation.setName(operationQName);
 				axisBindingOperation.setAxisOperation(operation);
-                String httpLocation = serviceName + "/" + operationQName.getLocalPart();
+                String httpLocation = operationQName.getLocalPart();
                 axisBindingOperation.setProperty(WSDL2Constants.ATTR_WHTTP_LOCATION, httpLocation);
                 axisBinding.addChild(axisBindingOperation.getName(),
 						axisBindingOperation);

Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisEndpoint.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisEndpoint.java?rev=678750&r1=678749&r2=678750&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisEndpoint.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisEndpoint.java Tue Jul 22 06:03:30 2008
@@ -185,7 +185,7 @@
 					String ip = Utils.getIpAddress(axisConfiguration);
 					// we should pass [serviceName].[endpointName] instead of
 					// [endpointName]
-					String sDOTe = serviceName + "." + name;
+					String sDOTe = serviceName + "." + name + "/";
 					EndpointReference[] eprsForService = listener
 							.getEPRsForService(sDOTe, ip);
 					// we consider only the first address return by the listener

Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/WSDLSerializationUtil.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/WSDLSerializationUtil.java?rev=678750&r1=678749&r2=678750&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/WSDLSerializationUtil.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/WSDLSerializationUtil.java Tue Jul 22 06:03:30 2008
@@ -262,7 +262,7 @@
             opElement.addAttribute(fac.createOMAttribute(WSDL2Constants.ATTRIBUTE_REF, null,
                                                          tns.getPrefix() + ":" + name));
             opElement.addAttribute(fac.createOMAttribute(WSDL2Constants.ATTRIBUTE_LOCATION, whttp,
-                                                         serviceName + "/" + name));
+                                                         name));
         }
         return binding;
     }