Author: midon
Date: Thu Jun 12 22:23:21 2008
New Revision: 667356
URL: http://svn.apache.org/viewvc?rev=667356&view=rev
Log:
Create a specific namespace for http wsdl extensions. Fix a test case.
Modified:
ode/trunk/axis2-war/src/test/resources/TestHttpBinding/Arithmetics.wsdl
ode/trunk/axis2/src/test/resources/http-binding-validator.wsdl
ode/trunk/utils/src/main/java/org/apache/ode/utils/Namespaces.java
ode/trunk/utils/src/main/java/org/apache/ode/utils/wsdl/WsdlUtils.java
Modified:
ode/trunk/axis2-war/src/test/resources/TestHttpBinding/Arithmetics.wsdl
URL:
http://svn.apache.org/viewvc/ode/trunk/axis2-war/src/test/resources/TestHttpBinding/Arithmetics.wsdl?rev=667356&r1=667355&r2=667356&view=diff
==============================================================================
--- ode/trunk/axis2-war/src/test/resources/TestHttpBinding/Arithmetics.wsdl
(original)
+++ ode/trunk/axis2-war/src/test/resources/TestHttpBinding/Arithmetics.wsdl Thu
Jun 12 22:23:21 2008
@@ -25,6 +25,7 @@
xmlns:tns="http://ode/bpel/arithmetics";
xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/";
xmlns:xsd="http://www.w3.org/2001/XMLSchema";
+ xmlns:odex="http://www.apache.org/ode/type/extension/http";
targetNamespace="http://ode/bpel/arithmetics";>
@@ -102,7 +103,7 @@
<!-- It's meant to test a wsdl extension defined for RESTful BPEL -->
<wsdl:operation name="plus">
<http:operation location="plus/(left):(right)"/>
- <http:binding verb="GET"/>
+ <odex:binding verb="GET"/>
<wsdl:input>
<http:urlReplacement/>
</wsdl:input>
@@ -112,7 +113,7 @@
</wsdl:operation>
<wsdl:operation name="minus">
<http:operation location="minus"/>
- <http:binding verb="GET"/>
+ <odex:binding verb="GET"/>
<wsdl:input>
<http:urlEncoded/>
</wsdl:input>
@@ -128,7 +129,7 @@
<http:binding verb="GET"/>
<wsdl:operation name="plus">
<http:operation location="plus"/>
- <http:binding verb="POST"/>
+ <odex:binding verb="POST"/>
<wsdl:input>
<mime:content type="application/x-www-form-urlencoded"/>
</wsdl:input>
@@ -138,7 +139,7 @@
</wsdl:operation>
<wsdl:operation name="minus">
<http:operation location="minus"/>
- <http:binding verb="POST"/>
+ <odex:binding verb="POST"/>
<wsdl:input>
<http:urlEncoded/>
</wsdl:input>
Modified: ode/trunk/axis2/src/test/resources/http-binding-validator.wsdl
URL:
http://svn.apache.org/viewvc/ode/trunk/axis2/src/test/resources/http-binding-validator.wsdl?rev=667356&r1=667355&r2=667356&view=diff
==============================================================================
--- ode/trunk/axis2/src/test/resources/http-binding-validator.wsdl (original)
+++ ode/trunk/axis2/src/test/resources/http-binding-validator.wsdl Thu Jun 12
22:23:21 2008
@@ -8,7 +8,7 @@
xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl";
xmlns:xs="http://www.w3.org/2001/XMLSchema";
xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/";
- xmlns:ode="http://www.apache.org/ode/type/extension";
+ xmlns:odex="http://www.apache.org/ode/type/extension/http";
targetNamespace="http://axis2.ode.apache.org";>
<wsdl:message name="helloRequest">
<wsdl:part name="TestPart" type="xs:string"/>
@@ -434,7 +434,7 @@
</wsdl:documentation>
<wsdl:operation name="hello">
<http:operation location="DummyService/hello"/>
- <ode:binding verb="GET"/>
+ <odex:binding verb="GET"/>
<wsdl:input>
<http:urlEncoded/>
</wsdl:input>
@@ -458,7 +458,7 @@
</wsdl:documentation>
<wsdl:operation name="hello">
<http:operation location="DummyService/hello"/>
- <ode:binding verb="GET"/>
+ <odex:binding verb="GET"/>
<wsdl:input>
<http:urlEncoded/>
</wsdl:input>
@@ -474,7 +474,7 @@
<http:binding verb="GET"/>
<wsdl:operation name="hello">
<http:operation location="DummyService/hello"/>
- <ode:binding verb="POST"/>
+ <odex:binding verb="POST"/>
<wsdl:input>
<http:urlEncoded/>
</wsdl:input>
Modified: ode/trunk/utils/src/main/java/org/apache/ode/utils/Namespaces.java
URL:
http://svn.apache.org/viewvc/ode/trunk/utils/src/main/java/org/apache/ode/utils/Namespaces.java?rev=667356&r1=667355&r2=667356&view=diff
==============================================================================
--- ode/trunk/utils/src/main/java/org/apache/ode/utils/Namespaces.java
(original)
+++ ode/trunk/utils/src/main/java/org/apache/ode/utils/Namespaces.java Thu Jun
12 22:23:21 2008
@@ -56,6 +56,7 @@
/** ODE stuff */
public static final String ODE_PMAPI =
"http://www.apache.org/ode/pmapi/types/2006/08/02/";;
public static final String ODE_EXTENSION_NS =
"http://www.apache.org/ode/type/extension";;
+ public static final String ODE_HTTP_EXTENSION_NS =
"http://www.apache.org/ode/type/extension/http";;
public static final String INTALIO_SESSION_NS =
"http://www.intalio.com/type/session";;
}
Modified: ode/trunk/utils/src/main/java/org/apache/ode/utils/wsdl/WsdlUtils.java
URL:
http://svn.apache.org/viewvc/ode/trunk/utils/src/main/java/org/apache/ode/utils/wsdl/WsdlUtils.java?rev=667356&r1=667355&r2=667356&view=diff
==============================================================================
--- ode/trunk/utils/src/main/java/org/apache/ode/utils/wsdl/WsdlUtils.java
(original)
+++ ode/trunk/utils/src/main/java/org/apache/ode/utils/wsdl/WsdlUtils.java Thu
Jun 12 22:23:21 2008
@@ -271,7 +271,7 @@
final Collection<UnknownExtensibilityElement> unknownExtElements =
CollectionsX.filter(bindingOperation.getExtensibilityElements(),
UnknownExtensibilityElement.class);
for (UnknownExtensibilityElement extensibilityElement :
unknownExtElements) {
final Element e = extensibilityElement.getElement();
- if
(Namespaces.ODE_EXTENSION_NS.equalsIgnoreCase(e.getNamespaceURI())
+ if
(Namespaces.ODE_HTTP_EXTENSION_NS.equalsIgnoreCase(e.getNamespaceURI())
&&
"binding".equals(extensibilityElement.getElement().getLocalName())
&& e.hasAttribute("verb")) {
return e.getAttribute("verb");
