Author: slaws
Date: Mon Jun 21 11:56:35 2010
New Revision: 956538
URL: http://svn.apache.org/viewvc?rev=956538&view=rev
Log:
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]
Modified:
tuscany/sca-java-2.x/trunk/itest/ws/wsdl/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/questionmark-wsdl-import.composite
tuscany/sca-java-2.x/trunk/itest/ws/wsdl/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/questionmark-wsdl-include.composite
tuscany/sca-java-2.x/trunk/itest/ws/wsdl/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/questionmark-wsdl.composite
tuscany/sca-java-2.x/trunk/itest/ws/wsdl/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/QuestionMarkWSDLImportTestCase.java
tuscany/sca-java-2.x/trunk/itest/ws/wsdl/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/QuestionMarkWSDLIncludeTestCase.java
tuscany/sca-java-2.x/trunk/itest/ws/wsdl/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/QuestionMarkWSDLTestCase.java
Modified:
tuscany/sca-java-2.x/trunk/itest/ws/wsdl/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/questionmark-wsdl-import.composite
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/itest/ws/wsdl/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/questionmark-wsdl-import.composite?rev=956538&r1=956537&r2=956538&view=diff
==============================================================================
---
tuscany/sca-java-2.x/trunk/itest/ws/wsdl/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/questionmark-wsdl-import.composite
(original)
+++
tuscany/sca-java-2.x/trunk/itest/ws/wsdl/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/questionmark-wsdl-import.composite
Mon Jun 21 11:56:35 2010
@@ -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>
Modified:
tuscany/sca-java-2.x/trunk/itest/ws/wsdl/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/questionmark-wsdl-include.composite
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/itest/ws/wsdl/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/questionmark-wsdl-include.composite?rev=956538&r1=956537&r2=956538&view=diff
==============================================================================
---
tuscany/sca-java-2.x/trunk/itest/ws/wsdl/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/questionmark-wsdl-include.composite
(original)
+++
tuscany/sca-java-2.x/trunk/itest/ws/wsdl/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/questionmark-wsdl-include.composite
Mon Jun 21 11:56:35 2010
@@ -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>
Modified:
tuscany/sca-java-2.x/trunk/itest/ws/wsdl/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/questionmark-wsdl.composite
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/itest/ws/wsdl/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/questionmark-wsdl.composite?rev=956538&r1=956537&r2=956538&view=diff
==============================================================================
---
tuscany/sca-java-2.x/trunk/itest/ws/wsdl/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/questionmark-wsdl.composite
(original)
+++
tuscany/sca-java-2.x/trunk/itest/ws/wsdl/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/questionmark-wsdl.composite
Mon Jun 21 11:56:35 2010
@@ -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>
Modified:
tuscany/sca-java-2.x/trunk/itest/ws/wsdl/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/QuestionMarkWSDLImportTestCase.java
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/itest/ws/wsdl/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/QuestionMarkWSDLImportTestCase.java?rev=956538&r1=956537&r2=956538&view=diff
==============================================================================
---
tuscany/sca-java-2.x/trunk/itest/ws/wsdl/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/QuestionMarkWSDLImportTestCase.java
(original)
+++
tuscany/sca-java-2.x/trunk/itest/ws/wsdl/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/QuestionMarkWSDLImportTestCase.java
Mon Jun 21 11:56:35 2010
@@ -67,7 +67,7 @@ public class QuestionMarkWSDLImportTestC
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();
Modified:
tuscany/sca-java-2.x/trunk/itest/ws/wsdl/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/QuestionMarkWSDLIncludeTestCase.java
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/itest/ws/wsdl/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/QuestionMarkWSDLIncludeTestCase.java?rev=956538&r1=956537&r2=956538&view=diff
==============================================================================
---
tuscany/sca-java-2.x/trunk/itest/ws/wsdl/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/QuestionMarkWSDLIncludeTestCase.java
(original)
+++
tuscany/sca-java-2.x/trunk/itest/ws/wsdl/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/QuestionMarkWSDLIncludeTestCase.java
Mon Jun 21 11:56:35 2010
@@ -67,7 +67,7 @@ public class QuestionMarkWSDLIncludeTest
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);
Modified:
tuscany/sca-java-2.x/trunk/itest/ws/wsdl/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/QuestionMarkWSDLTestCase.java
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/itest/ws/wsdl/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/QuestionMarkWSDLTestCase.java?rev=956538&r1=956537&r2=956538&view=diff
==============================================================================
---
tuscany/sca-java-2.x/trunk/itest/ws/wsdl/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/QuestionMarkWSDLTestCase.java
(original)
+++
tuscany/sca-java-2.x/trunk/itest/ws/wsdl/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/QuestionMarkWSDLTestCase.java
Mon Jun 21 11:56:35 2010
@@ -68,10 +68,10 @@ public class QuestionMarkWSDLTestCase ex
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);
}
/**
