TUSCANY-3711 Change generated binding and port names to match recommended values from the ws binding spec appendix D. The old value for service name is still being used for the time being.

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

3 files changed, 4 insertions, 4 deletions

diff --git a/sca-java-2.x/trunk/testing/itest/ws/wsdl/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/QuestionMarkWSDLImportTestCase.java b/sca-java-2.x/trunk/testing/itest/ws/wsdl/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/QuestionMarkWSDLImportTestCase.java
index 76ea53681f..707932425f 100644
--- a/sca-java-2.x/trunk/testing/itest/ws/wsdl/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/QuestionMarkWSDLImportTestCase.java
+++ b/sca-java-2.x/trunk/testing/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("AccountPort");
+        Port port = service.getPort("AccountSOAP11Port");
 
         String endpoint = getEndpoint(port);
        // String ip = HttpUtils.getIpAddress();
diff --git a/sca-java-2.x/trunk/testing/itest/ws/wsdl/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/QuestionMarkWSDLIncludeTestCase.java b/sca-java-2.x/trunk/testing/itest/ws/wsdl/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/QuestionMarkWSDLIncludeTestCase.java
index 54a40afc63..5b5076ae14 100644
--- a/sca-java-2.x/trunk/testing/itest/ws/wsdl/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/QuestionMarkWSDLIncludeTestCase.java
+++ b/sca-java-2.x/trunk/testing/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("AccountPort");
+        Port port = service.getPort("AccountSOAP11Port");
 
         String endpoint = getEndpoint(port);
         assertEquals("http://localhost:8085/AccountService", endpoint);
diff --git a/sca-java-2.x/trunk/testing/itest/ws/wsdl/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/QuestionMarkWSDLTestCase.java b/sca-java-2.x/trunk/testing/itest/ws/wsdl/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/QuestionMarkWSDLTestCase.java
index 0148460b5c..c216c23765 100644
--- a/sca-java-2.x/trunk/testing/itest/ws/wsdl/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/QuestionMarkWSDLTestCase.java
+++ b/sca-java-2.x/trunk/testing/itest/ws/wsdl/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/QuestionMarkWSDLTestCase.java
@@ -68,7 +68,7 @@ public class QuestionMarkWSDLTestCase extends TestCase {
         assertNotNull(definition);
         Service service = definition.getService(new QName("http://helloworld/HelloWorldService/HelloWorld",
                                                  "HelloWorldService"));        
-        Port port = service.getPort("HelloWorldPort");
+        Port port = service.getPort("ep2SOAP11Port");
 
         String endpoint = getEndpoint(port);
         assertEquals("http://localhost:8085/services/HelloWorldWebService2", endpoint);
@@ -94,7 +94,7 @@ public class QuestionMarkWSDLTestCase extends TestCase {
         assertNotNull(definition);
         Service service = definition.getService(new QName("http://axis2.ws.binding.sca.tuscany.apache.org/",
                                                           "HelloWorldService"));
-        Port port = service.getPort("HelloWorldPort");
+        Port port = service.getPort("ep1SOAP11Port");
 
         String endpoint = getEndpoint(port);
         // TODO - used to get the real host here but WSDL seems to have localhost in it atm?