Author: keithc
Date: Thu Jun 14 05:45:10 2007
New Revision: 547238
URL: http://svn.apache.org/viewvc?view=rev&rev=547238
Log:
Fixing HTTPLocation resolving. Removing the incorrect / appended the the
endpoint address (This was a bogus fix to the original prolem).
The resolution of the HTTPLocation against the base uri should produce a uri
such as http://XXXXX/axis2/services/serviceName/operationName
This is the default of axis2. The most economisc way to produce is to change
the httpLocation attribute to be serviceName/operationName.
Modified:
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisBinding.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisBindingOperation.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisService2WSDL11.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisService2WSDL20.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/description/AxisBinding.java
URL:
http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisBinding.java?view=diff&rev=547238&r1=547237&r2=547238
==============================================================================
---
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisBinding.java
(original)
+++
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisBinding.java
Thu Jun 14 05:45:10 2007
@@ -117,7 +117,7 @@
* @return The generated binding element
*/
public OMElement toWSDL20(OMNamespace wsdl, OMNamespace tns, OMNamespace
wsoap, OMNamespace whttp,
- String interfaceName, Map nameSpaceMap, String
addressingFlag) {
+ String interfaceName, Map nameSpaceMap, String
addressingFlag, String serviceName) {
String property;
OMFactory omFactory = OMAbstractFactory.getOMFactory();
OMElement bindingElement;
@@ -197,7 +197,7 @@
Iterator iterator = this.getChildren();
while (iterator.hasNext()) {
AxisBindingOperation axisBindingOperation = (AxisBindingOperation)
iterator.next();
- bindingElement.addChild(axisBindingOperation.toWSDL20(wsdl, tns,
wsoap, whttp, type, nameSpaceMap));
+ bindingElement.addChild(axisBindingOperation.toWSDL20(wsdl, tns,
wsoap, whttp, type, nameSpaceMap, serviceName));
}
WSDLSerializationUtil.addWSDLDocumentationElement(this,
bindingElement, omFactory, wsdl);
return bindingElement;
Modified:
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisBindingOperation.java
URL:
http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisBindingOperation.java?view=diff&rev=547238&r1=547237&r2=547238
==============================================================================
---
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisBindingOperation.java
(original)
+++
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisBindingOperation.java
Thu Jun 14 05:45:10 2007
@@ -117,7 +117,7 @@
* @return The generated binding element
*/
public OMElement toWSDL20(OMNamespace wsdl, OMNamespace tns, OMNamespace
wsoap, OMNamespace whttp,
- String type, Map nameSpaceMap) {
+ String type, Map nameSpaceMap, String
serviceName) {
String property;
OMFactory omFactory = OMAbstractFactory.getOMFactory();
OMElement bindingOpElement =
@@ -178,7 +178,7 @@
property = (String)
this.options.get(WSDL2Constants.ATTR_WHTTP_LOCATION);
if (property != null) {
bindingOpElement.addAttribute(omFactory.createOMAttribute(
- WSDL2Constants.ATTRIBUTE_LOCATION, whttp, property));
+ WSDL2Constants.ATTRIBUTE_LOCATION, whttp, serviceName +
"/" + property));
}
property = (String)
this.options.get(WSDL2Constants.ATTR_WHTTP_CONTENT_ENCODING);
if (property != null) {
Modified:
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisService2WSDL11.java
URL:
http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisService2WSDL11.java?view=diff&rev=547238&r1=547237&r2=547238
==============================================================================
---
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisService2WSDL11.java
(original)
+++
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisService2WSDL11.java
Thu Jun 14 05:45:10 2007
@@ -783,7 +783,7 @@
OMElement httpOperation = fac.createOMElement("operation", http);
operation.addChild(httpOperation);
- httpOperation.addAttribute("location", axisOperation.getName()
+ httpOperation.addAttribute("location", axisService.getName() + "/"
+ axisOperation.getName()
.getLocalPart(), null);
String MEP = axisOperation.getMessageExchangePattern();
Modified:
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisService2WSDL20.java
URL:
http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisService2WSDL20.java?view=diff&rev=547238&r1=547237&r2=547238
==============================================================================
---
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisService2WSDL20.java
(original)
+++
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisService2WSDL20.java
Thu Jun 14 05:45:10 2007
@@ -182,9 +182,6 @@
bindings.add(axisEndpoint.getBinding());
for (int i = 0; i < eprs.length; i++) {
String epr = eprs[i];
- if (!epr.endsWith("/")) {
- epr = epr + "/";
- }
OMElement endpointElement = axisEndpoint.toWSDL20(wsdl,
tns, whttp, epr);
boolean endpointAlreadyAdded = false;
Iterator endpointsAdded = serviceElement.getChildren();
@@ -214,7 +211,8 @@
.addChild(binding.toWSDL20(wsdl, tns, wsoap, whttp,
interfaceName,
axisService.getNameSpacesMap(),
-
axisService.getWSAddressingFlag()));
+
axisService.getWSAddressingFlag(),
+ axisService.getName()));
}
descriptionElement.addChild(serviceElement);
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?view=diff&rev=547238&r1=547237&r2=547238
==============================================================================
---
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
Thu Jun 14 05:45:10 2007
@@ -227,8 +227,9 @@
public static OMElement generateHTTPBinding(OMFactory fac, AxisService
axisService,
OMNamespace wsdl, OMNamespace
whttp, OMNamespace tns) {
OMElement binding =
fac.createOMElement(WSDL2Constants.BINDING_LOCAL_NAME, wsdl);
+ String serviceName = axisService.getName();
binding.addAttribute(
- fac.createOMAttribute(WSDL2Constants.ATTRIBUTE_NAME, null,
axisService.getName() +
+ fac.createOMAttribute(WSDL2Constants.ATTRIBUTE_NAME, null,
serviceName +
Java2WSDLConstants.HTTP_BINDING));
binding.addAttribute(fac.createOMAttribute(WSDL2Constants.INTERFACE_LOCAL_NAME,
null, tns
.getPrefix() + ":" + WSDL2Constants.DEFAULT_INTERFACE_NAME));
@@ -244,7 +245,7 @@
opElement.addAttribute(fac.createOMAttribute(WSDL2Constants.ATTRIBUTE_REF, null,
tns.getPrefix() + ":"
+ name));
opElement.addAttribute(fac.createOMAttribute(WSDL2Constants.ATTRIBUTE_LOCATION,
whttp,
- name));
+ serviceName + "/" +
name));
}
return binding;
}
@@ -287,9 +288,6 @@
for (int i = 0; i < eprs.length; i++) {
String name = "";
String epr = eprs[i];
- if (!epr.endsWith("/")) {
- epr = epr + "/";
- }
if (epr.startsWith("https://";)) {
name = WSDL2Constants.DEFAULT_HTTPS_PREFIX;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
