svn commit: r650406 - in /incubator/tuscany/java/sca/modules: binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/ binding-ws-xml/src/main/java/org/apache/tuscany/sca/binding/ws/xml/

[antelder]

Author: antelder
Date: Tue Apr 22 00:57:57 2008
New Revision: 650406

URL: http://svn.apache.org/viewvc?rev=650406&view=rev
Log:
TUSCANY-2241: Apply patch from Vamsavardhana Reddy -EndpointReference in 
binding.ws when wsdlElement is not of 'Binding' form

Modified:
    
incubator/tuscany/java/sca/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorld.composite
    
incubator/tuscany/java/sca/modules/binding-ws-xml/src/main/java/org/apache/tuscany/sca/binding/ws/xml/WebServiceBindingProcessor.java

Modified: 
incubator/tuscany/java/sca/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorld.composite
URL: 
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorld.composite?rev=650406&r1=650405&r2=650406&view=diff
==============================================================================
--- 
incubator/tuscany/java/sca/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorld.composite
 (original)
+++ 
incubator/tuscany/java/sca/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/HelloWorld.composite
 Tue Apr 22 00:57:57 2008
@@ -24,7 +24,7 @@
     <service name="helloWorld" promote="HelloWorldService">
         <interface.wsdl 
interface="http://helloworld#wsdl.interface(HelloWorld)" />
         <!-- interface.java 
interface="org.apache.tuscany.sca.binding.ws.axis2.itests.HelloWorld" / -->
-        <binding.ws 
wsdlElement="http://helloworld#wsdl.port(HelloWorldService/HelloWorldSoapPort)">
+        <binding.ws 
wsdlElement="http://helloworld#wsdl.binding(HelloWorldSoapBinding)">
            <wsa:EndpointReference 
xmlns:wsa="http://www.w3.org/2005/08/addressing";>
               
<wsa:Address>http://localhost:8085/services/HelloWorldWebService</wsa:Address>
            </wsa:EndpointReference>

Modified: 
incubator/tuscany/java/sca/modules/binding-ws-xml/src/main/java/org/apache/tuscany/sca/binding/ws/xml/WebServiceBindingProcessor.java
URL: 
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-ws-xml/src/main/java/org/apache/tuscany/sca/binding/ws/xml/WebServiceBindingProcessor.java?rev=650406&r1=650405&r2=650406&view=diff
==============================================================================
--- 
incubator/tuscany/java/sca/modules/binding-ws-xml/src/main/java/org/apache/tuscany/sca/binding/ws/xml/WebServiceBindingProcessor.java
 (original)
+++ 
incubator/tuscany/java/sca/modules/binding-ws-xml/src/main/java/org/apache/tuscany/sca/binding/ws/xml/WebServiceBindingProcessor.java
 Tue Apr 22 00:57:57 2008
@@ -143,7 +143,7 @@
 
             } else if (localName.startsWith("wsdl.binding")) {
 
-                // Read a wsdl.service
+                // Read a wsdl.binding
                 localName = localName.substring("wsdl.binding(".length(), 
localName.length() - 1);
                 wsBinding.setBindingName(new QName(namespace, localName));
 
@@ -164,7 +164,7 @@
             switch (event) {
                 case START_ELEMENT: {
                     if 
(END_POINT_REFERENCE.equals(reader.getName().getLocalPart())) {
-                        if (wsdlElementIsBinding != null && 
wsdlElementIsBinding) {
+                        if (wsdlElement != null && (wsdlElementIsBinding == 
null || !wsdlElementIsBinding)) {
                             throw new ContributionReadException(
                                                                 wsdlElement + 
" must use wsdl.binding when using wsa:EndpointReference");
                         }