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/08/04 21:19:44 UTC
svn commit: r682471 - in /webservices/axis2/trunk/java/modules:
kernel/src/org/apache/axis2/description/ osgi/src/org/apache/axis2/osgi/tx/
transports/src/org/apache/axis2/transport/http/
Author: keithc
Date: Mon Aug 4 12:19:43 2008
New Revision: 682471
URL: http://svn.apache.org/viewvc?rev=682471&view=rev
Log:
getting rid of the trailing / added in axisEndpoint and adding it in the http related listeners
Modified:
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisEndpoint.java
webservices/axis2/trunk/java/modules/osgi/src/org/apache/axis2/osgi/tx/HttpListener.java
webservices/axis2/trunk/java/modules/transports/src/org/apache/axis2/transport/http/AxisServlet.java
webservices/axis2/trunk/java/modules/transports/src/org/apache/axis2/transport/http/CustomListener.java
webservices/axis2/trunk/java/modules/transports/src/org/apache/axis2/transport/http/SimpleHTTPServer.java
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=682471&r1=682470&r2=682471&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 Mon Aug 4 12:19:43 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/osgi/src/org/apache/axis2/osgi/tx/HttpListener.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/osgi/src/org/apache/axis2/osgi/tx/HttpListener.java?rev=682471&r1=682470&r2=682471&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/osgi/src/org/apache/axis2/osgi/tx/HttpListener.java (original)
+++ webservices/axis2/trunk/java/modules/osgi/src/org/apache/axis2/osgi/tx/HttpListener.java Mon Aug 4 12:19:43 2008
@@ -89,6 +89,6 @@
contextRoot = "";
}
return new EndpointReference(protocol + "://" + ip + ":" + port + contextRoot + "/" +
- servicePath + "/" + serviceName);
+ servicePath + "/" + serviceName + "/");
}
}
Modified: webservices/axis2/trunk/java/modules/transports/src/org/apache/axis2/transport/http/AxisServlet.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/transports/src/org/apache/axis2/transport/http/AxisServlet.java?rev=682471&r1=682470&r2=682471&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/transports/src/org/apache/axis2/transport/http/AxisServlet.java (original)
+++ webservices/axis2/trunk/java/modules/transports/src/org/apache/axis2/transport/http/AxisServlet.java Mon Aug 4 12:19:43 2008
@@ -593,7 +593,7 @@
endpointRefernce = endpointRefernce + '/' +
configContext.getServiceContextPath() + "/" + serviceName;
}
- EndpointReference endpoint = new EndpointReference(endpointRefernce);
+ EndpointReference endpoint = new EndpointReference(endpointRefernce + "/");
return new EndpointReference[]{endpoint};
}
Modified: webservices/axis2/trunk/java/modules/transports/src/org/apache/axis2/transport/http/CustomListener.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/transports/src/org/apache/axis2/transport/http/CustomListener.java?rev=682471&r1=682470&r2=682471&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/transports/src/org/apache/axis2/transport/http/CustomListener.java (original)
+++ webservices/axis2/trunk/java/modules/transports/src/org/apache/axis2/transport/http/CustomListener.java Mon Aug 4 12:19:43 2008
@@ -71,7 +71,7 @@
if(path.charAt(0)!='/'){
path = '/' + path;
}
- return new EndpointReference[]{new EndpointReference(schema + "://" + ip + ":" + port + path )};
+ return new EndpointReference[]{new EndpointReference(schema + "://" + ip + ":" + port + path + "/" )};
}
public EndpointReference getEPRForService(String serviceName, String ip) throws AxisFault {
Modified: webservices/axis2/trunk/java/modules/transports/src/org/apache/axis2/transport/http/SimpleHTTPServer.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/transports/src/org/apache/axis2/transport/http/SimpleHTTPServer.java?rev=682471&r1=682470&r2=682471&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/transports/src/org/apache/axis2/transport/http/SimpleHTTPServer.java (original)
+++ webservices/axis2/trunk/java/modules/transports/src/org/apache/axis2/transport/http/SimpleHTTPServer.java Mon Aug 4 12:19:43 2008
@@ -263,7 +263,7 @@
endpointRefernce = endpointRefernce + '/' +
configurationContext.getServiceContextPath() + "/" + serviceName;
}
- return new EndpointReference[]{new EndpointReference(endpointRefernce)};
+ return new EndpointReference[]{new EndpointReference(endpointRefernce + "/")};
} else {
throw new AxisFault("Unable to generate EPR for the transport : http");
}
@@ -297,7 +297,7 @@
}
- return new EndpointReference[]{new EndpointReference(endpointRefernce)};
+ return new EndpointReference[]{new EndpointReference(endpointRefernce + "/")};
} else {
throw new AxisFault("Unable to generate EPR for the transport : http");
}