TUSCANY-2626 - add EndpointReference back into the binding.ws schema. This is not the wsa:EnpointReference though. To get this to work I have had EndpointReference goes in the target namespace. The code to read EndpointReference still reads wsa:EndpointReference so this shouldn't break anyone already using that but at least it gives the reader an idea about what can validly go in the schema.

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@768993 13f79535-47bb-0310-9956-ffa450edef68

2 files changed, 10 insertions, 8 deletions

diff --git a/branches/sca-java-1.x/modules/assembly-xsd/src/main/resources/sca-binding-webservice.xsd b/branches/sca-java-1.x/modules/assembly-xsd/src/main/resources/sca-binding-webservice.xsd
index 2dd44f8e06..53e40f74b1 100644
--- a/branches/sca-java-1.x/modules/assembly-xsd/src/main/resources/sca-binding-webservice.xsd
+++ b/branches/sca-java-1.x/modules/assembly-xsd/src/main/resources/sca-binding-webservice.xsd
@@ -4,13 +4,13 @@
     targetNamespace="http://www.osoa.org/xmlns/sca/1.0" 
     xmlns:sca="http://www.osoa.org/xmlns/sca/1.0"
     xmlns:wsdli="http://www.w3.org/2004/08/wsdl-instance"
-    xmlns:wsa="http://www.w3.org/2004/12/addressing"
+    xmlns:wsa="http://www.w3.org/2005/08/addressing"
     elementFormDefault="qualified">
     
     <import namespace="http://www.w3.org/2004/08/wsdl-instance"
             schemaLocation="wsdli.xsd" />
-    <!-- import namespace="http://www.w3.org/2005/08/addressing" 
-            schemaLocation="ws-addr.xsd" /-->
+    <import namespace="http://www.w3.org/2005/08/addressing" 
+            schemaLocation="ws-addr.xsd" />
 
     <include schemaLocation="sca-core.xsd"/>
 
@@ -20,8 +20,10 @@
         <complexContent>
             <extension base="sca:Binding">
                 <sequence>
-                    <!-- element ref="wsa:EndpointReference" minOccurs="0"
-                         maxOccurs="unbounded"/-->                  
+                    <element name="EndpointReference"
+                             type="wsa:EndpointReferenceType" 
+                             minOccurs="0"
+                             maxOccurs="unbounded"/>                  
                     <any namespace="##other" processContents="lax" minOccurs="0"
                          maxOccurs="unbounded"/>
                 </sequence>
diff --git a/branches/sca-java-1.x/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/epr/HelloWorld.composite b/branches/sca-java-1.x/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/epr/HelloWorld.composite
index 38a7c045be..47ce6cc1a3 100644
--- a/branches/sca-java-1.x/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/epr/HelloWorld.composite
+++ b/branches/sca-java-1.x/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/epr/HelloWorld.composite
@@ -24,9 +24,9 @@
     <service name="helloWorld" promote="HelloWorldService">

         <interface.wsdl interface="http://helloworld#wsdl.interface(HelloWorld)" />

         <binding.ws>

-           <wsa:EndpointReference xmlns:wsa="http://www.w3.org/2005/08/addressing">

-              <wsa:Address>http://localhost:8085/myService</wsa:Address>

-           </wsa:EndpointReference>

+           <EndpointReference>

+              <wsa:Address xmlns:wsa="http://www.w3.org/2005/08/addressing">http://localhost:8085/myService</wsa:Address>

+           </EndpointReference>

         </binding.ws>

     </service>