Catch up with changes for otests that, following the spec, don't allow the presence of wsdl.service on a binding.ws on a component service [BWS20003]

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

6 files changed, 7 insertions, 7 deletions

diff --git a/sca-java-2.x/trunk/itest/ws/wsdl/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/questionmark-wsdl-import.composite b/sca-java-2.x/trunk/itest/ws/wsdl/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/questionmark-wsdl-import.composite
index aca50f466a..65270b8d6c 100644
--- a/sca-java-2.x/trunk/itest/ws/wsdl/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/questionmark-wsdl-import.composite
+++ b/sca-java-2.x/trunk/itest/ws/wsdl/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/questionmark-wsdl-import.composite
@@ -24,7 +24,7 @@
     <component name="AccountService">
 		<implementation.java class="org.apache.tuscany.sca.binding.ws.axis2.AccountService" />
 		<service name="Account">
-            <binding.ws wsdlElement="http://account2#wsdl.port(AccountService/AccountSoapPort)" />
+            <binding.ws uri="http://localhost:8086/AccountService" wsdlElement="http://account2#wsdl.binding(AccountSoapBinding)" />
         </service>
     </component>
 
diff --git a/sca-java-2.x/trunk/itest/ws/wsdl/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/questionmark-wsdl-include.composite b/sca-java-2.x/trunk/itest/ws/wsdl/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/questionmark-wsdl-include.composite
index 9f84fab262..02395c4615 100644
--- a/sca-java-2.x/trunk/itest/ws/wsdl/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/questionmark-wsdl-include.composite
+++ b/sca-java-2.x/trunk/itest/ws/wsdl/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/questionmark-wsdl-include.composite
@@ -24,7 +24,7 @@
     <component name="AccountService">
 		<implementation.java class="org.apache.tuscany.sca.binding.ws.axis2.AccountService" />
 		<service name="Account">
-	        <binding.ws wsdlElement="http://accounts#wsdl.port(AccountService/AccountSoapPort)" />
+	        <binding.ws uri="http://localhost:8085/AccountService" wsdlElement="http://accounts#wsdl.binding(AccountSoapBinding)" />
 	    </service>
     </component>
 
diff --git a/sca-java-2.x/trunk/itest/ws/wsdl/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/questionmark-wsdl.composite b/sca-java-2.x/trunk/itest/ws/wsdl/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/questionmark-wsdl.composite
index b57d5f5b54..6b06cec722 100644
--- a/sca-java-2.x/trunk/itest/ws/wsdl/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/questionmark-wsdl.composite
+++ b/sca-java-2.x/trunk/itest/ws/wsdl/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/questionmark-wsdl.composite
@@ -26,7 +26,7 @@
 		<implementation.java class="org.apache.tuscany.sca.binding.ws.axis2.HelloWorldService"/>
 		<service name="HelloWorld">
 	        <binding.ws name="ep1" uri="http://localhost:8085/foo/bar" />
-	        <binding.ws name="ep2" wsdlElement="http://helloworld#wsdl.service(HelloWorldService)"/>
+	        <binding.ws name="ep2" uri="http://localhost:8085/services/HelloWorldWebService2" wsdlElement="http://helloworld#wsdl.binding(HelloWorldSoapBinding)"/>
 	    </service>
     </component>
 
diff --git a/sca-java-2.x/trunk/itest/ws/wsdl/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/QuestionMarkWSDLImportTestCase.java b/sca-java-2.x/trunk/itest/ws/wsdl/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/QuestionMarkWSDLImportTestCase.java
index 1814e2cc7f..76ea53681f 100644
--- a/sca-java-2.x/trunk/itest/ws/wsdl/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/QuestionMarkWSDLImportTestCase.java
+++ b/sca-java-2.x/trunk/itest/ws/wsdl/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/QuestionMarkWSDLImportTestCase.java
@@ -67,7 +67,7 @@ public class QuestionMarkWSDLImportTestCase extends TestCase {
         Definition definition = wsdlReader.readWSDL("http://localhost:8086/AccountService?wsdl");
         assertNotNull(definition);
         Service service = definition.getService(new QName("http://account2/AccountService/Account", "AccountService"));
-        Port port = service.getPort("AccountSoapPort");
+        Port port = service.getPort("AccountPort");
 
         String endpoint = getEndpoint(port);
        // String ip = HttpUtils.getIpAddress();
diff --git a/sca-java-2.x/trunk/itest/ws/wsdl/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/QuestionMarkWSDLIncludeTestCase.java b/sca-java-2.x/trunk/itest/ws/wsdl/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/QuestionMarkWSDLIncludeTestCase.java
index fb2ba66e6c..54a40afc63 100644
--- a/sca-java-2.x/trunk/itest/ws/wsdl/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/QuestionMarkWSDLIncludeTestCase.java
+++ b/sca-java-2.x/trunk/itest/ws/wsdl/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/QuestionMarkWSDLIncludeTestCase.java
@@ -67,7 +67,7 @@ public class QuestionMarkWSDLIncludeTestCase extends TestCase {
         Definition definition = wsdlReader.readWSDL("http://localhost:8085/AccountService?wsdl");
         assertNotNull(definition);
         Service service = definition.getService(new QName("http://accounts/AccountService/Account", "AccountService"));
-        Port port = service.getPort("AccountSoapPort");
+        Port port = service.getPort("AccountPort");
 
         String endpoint = getEndpoint(port);
         assertEquals("http://localhost:8085/AccountService", endpoint);
diff --git a/sca-java-2.x/trunk/itest/ws/wsdl/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/QuestionMarkWSDLTestCase.java b/sca-java-2.x/trunk/itest/ws/wsdl/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/QuestionMarkWSDLTestCase.java
index 55c2a4822d..0148460b5c 100644
--- a/sca-java-2.x/trunk/itest/ws/wsdl/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/QuestionMarkWSDLTestCase.java
+++ b/sca-java-2.x/trunk/itest/ws/wsdl/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/QuestionMarkWSDLTestCase.java
@@ -68,10 +68,10 @@ public class QuestionMarkWSDLTestCase extends TestCase {
         assertNotNull(definition);
         Service service = definition.getService(new QName("http://helloworld/HelloWorldService/HelloWorld",
                                                  "HelloWorldService"));        
-        Port port = service.getPort("HelloWorldSoapPort");
+        Port port = service.getPort("HelloWorldPort");
 
         String endpoint = getEndpoint(port);
-        assertEquals("http://localhost:8085/services/HelloWorldWebService", endpoint);
+        assertEquals("http://localhost:8085/services/HelloWorldWebService2", endpoint);
     }
 
     /**