svn commit: r667243 - in /ode/trunk: axis2-war/src/test/resources/TestHttpBinding/Arithmetics.wsdl axis2/src/test/resources/http-binding-validator.wsdl utils/src/main/java/org/apache/ode/utils/wsdl/WsdlUtils.java

[midon]

Author: midon
Date: Thu Jun 12 14:41:20 2008
New Revision: 667243

URL: http://svn.apache.org/viewvc?rev=667243&view=rev
Log:
ODE-283 use the ODE-extension namespace instead of wsdl ns

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/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=667243&r1=667242&r2=667243&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 14:41:20 2008
@@ -219,7 +219,7 @@
 
 
     <!--
-        6 urls to handle:
+        8 urls to handle:
         (GET)       
http://localhost:8080/HttpBindingTestService/OlaElMundo-GET/plus/(left):(right)
         (GET)       http://         ........                    
/OlaElMundo-GET/minus?left=&right=
         (DELETE)    
http://localhost:8080/HttpBindingTestService/OlaElMundo-DELETE/plus/(left):(right)

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=667243&r1=667242&r2=667243&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 
14:41:20 2008
@@ -8,6 +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";
                   targetNamespace="http://axis2.ode.apache.org";>
     <wsdl:message name="helloRequest">
         <wsdl:part name="TestPart" type="xs:string"/>
@@ -433,7 +434,7 @@
         </wsdl:documentation>
         <wsdl:operation name="hello">
             <http:operation location="DummyService/hello"/>
-            <http:binding verb="GET"/>
+            <ode:binding verb="GET"/>
             <wsdl:input>
                 <http:urlEncoded/>
             </wsdl:input>
@@ -457,7 +458,7 @@
         </wsdl:documentation>
         <wsdl:operation name="hello">
             <http:operation location="DummyService/hello"/>
-            <http:binding verb="GET"/>
+            <ode:binding verb="GET"/>
             <wsdl:input>
                 <http:urlEncoded/>
             </wsdl:input>
@@ -473,7 +474,7 @@
         <http:binding verb="GET"/>
         <wsdl:operation name="hello">
             <http:operation location="DummyService/hello"/>
-            <http:binding verb="POST"/>
+            <ode:binding verb="POST"/>
             <wsdl:input>
                 <http:urlEncoded/>
             </wsdl:input>

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=667243&r1=667242&r2=667243&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 14:41:20 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.HTTP_NS.equalsIgnoreCase(e.getNamespaceURI())
+            if 
(Namespaces.ODE_EXTENSION_NS.equalsIgnoreCase(e.getNamespaceURI())
                     && 
"binding".equals(extensibilityElement.getElement().getLocalName())
                     && e.hasAttribute("verb")) {
                 return e.getAttribute("verb");