summaryrefslogtreecommitdiffstats
path: root/java/sca/vtest/wsbinding/service/src
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--java/sca/vtest/wsbinding/service/src/main/resources/aservice.wsdl8
-rw-r--r--java/sca/vtest/wsbinding/service/src/main/resources/endpoint-uri-resolution.composite34
-rw-r--r--java/sca/vtest/wsbinding/service/src/main/resources/endpointreference.composite4
-rw-r--r--java/sca/vtest/wsbinding/service/src/main/resources/wsdlbinding.composite8
-rw-r--r--java/sca/vtest/wsbinding/service/src/main/resources/wsdlendpoint.composite5
-rw-r--r--java/sca/vtest/wsbinding/service/src/main/resources/wsdlport.composite4
-rw-r--r--java/sca/vtest/wsbinding/service/src/main/resources/wsdlservice.composite7
-rw-r--r--java/sca/vtest/wsbinding/service/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/EndpointUriResolutionTestCase.java2
8 files changed, 38 insertions, 34 deletions
diff --git a/java/sca/vtest/wsbinding/service/src/main/resources/aservice.wsdl b/java/sca/vtest/wsbinding/service/src/main/resources/aservice.wsdl
index 861ab471ee..e7953eb2b4 100644
--- a/java/sca/vtest/wsbinding/service/src/main/resources/aservice.wsdl
+++ b/java/sca/vtest/wsbinding/service/src/main/resources/aservice.wsdl
@@ -115,19 +115,19 @@
<wsdl:service name="AServicePortTypeService">
<wsdl:port name="AServicePortTypePort" binding="ns0:AServicePortTypeBinding">
- <soap:address location="http://localhost:8080/AService"/>
+ <soap:address location="http://localhost:8085/AService"/>
</wsdl:port>
</wsdl:service>
<wsdl:service name="AService">
<wsdl:port name="AServiceHttpport" binding="ns0:AServiceHttpBinding">
- <http:address location="http://localhost:8080/AService/httpport"/>
+ <http:address location="http://localhost:8085/AService/httpport"/>
</wsdl:port>
<wsdl:port name="AServiceSOAP12port_http" binding="ns0:AServiceSOAP12Binding">
- <soap12:address location="http://localhost:8080/AService/soap12port"/>
+ <soap12:address location="http://localhost:8085/AService/soap12port"/>
</wsdl:port>
<wsdl:port name="AServiceSOAP11port_http" binding="ns0:AServiceSOAP11Binding">
- <soap:address location="http://localhost:8080/AService/soap11port"/>
+ <soap:address location="http://localhost:8085/AService/soap11port"/>
</wsdl:port>
<wsdl:port name="AServiceSOAP12port_http_null" binding="ns0:AServiceSOAP12Binding">
<soap12:address location=""/>
diff --git a/java/sca/vtest/wsbinding/service/src/main/resources/endpoint-uri-resolution.composite b/java/sca/vtest/wsbinding/service/src/main/resources/endpoint-uri-resolution.composite
index b3ab971c67..0d92174442 100644
--- a/java/sca/vtest/wsbinding/service/src/main/resources/endpoint-uri-resolution.composite
+++ b/java/sca/vtest/wsbinding/service/src/main/resources/endpoint-uri-resolution.composite
@@ -25,27 +25,27 @@
<implementation.java class="org.apache.tuscany.sca.vtest.wsbinding.impl.AServiceImpl"/>
<service name="AService">
<binding.ws name="bnd1" wsdlElement="http://wsbinding.vtest.sca.tuscany.apache.org#wsdl.port(AService/AServiceSOAP12port_http)"
- uri="http://localhost:8080/AService/soap12portxxx"/>
+ uri="http://localhost:8085/AService/soap12portxxx"/>
<binding.ws name="bnd2" wsdlElement="http://wsbinding.vtest.sca.tuscany.apache.org#wsdl.binding(AServiceSOAP11Binding)"
- uri="http://localhost:8080/AService/endpointrefxxx">
+ uri="http://localhost:8085/AService/endpointrefxxx">
<wsa:EndpointReference xmlns:wsa="http://www.w3.org/2005/08/addressing">
- <wsa:Address>http://localhost:8080/AService/endpointref</wsa:Address>
+ <wsa:Address>http://localhost:8085/AService/endpointref</wsa:Address>
</wsa:EndpointReference>
</binding.ws>
<binding.ws name="bnd3" wsdlElement="http://wsbinding.vtest.sca.tuscany.apache.org#wsdl.port(AService/AServiceSOAP12port_http_null)"
- uri="http://localhost:8080/AService/uriInBinding"/>
- <binding.ws name="bnd4" wsdlElement="http://wsbinding.vtest.sca.tuscany.apache.org#wsdl.port(AService/AServiceSOAP12port_http_null)"/>
- <binding.ws name="bnd5" uri="http://localhost:8080/AService/noWsdlElement"/>
+ uri="http://localhost:8085/AService/uriInBinding"/>
+ <!-- binding.ws name="bnd4" wsdlElement="http://wsbinding.vtest.sca.tuscany.apache.org#wsdl.port(AService/AServiceSOAP12port_http_null)"/-->
+ <binding.ws name="bnd5" uri="http://localhost:8085/AService/noWsdlElement"/>
<binding.ws name="bnd6" wsdlElement="http://wsbinding.vtest.sca.tuscany.apache.org#wsdl.port(AService/AServiceSOAP12port_http_wsdl)"
- uri="http://localhost:8080/AService/endpointref6"/>
+ uri="http://localhost:8085/AService/endpointref6"/>
<binding.ws name="bnd7" wsdlElement="http://wsbinding.vtest.sca.tuscany.apache.org#wsdl.binding(AServiceSOAP11Binding)"
- uri="http://localhost:8080/AService/endpointref7">
+ uri="http://localhost:8085/AService/endpointref7">
<wsa:EndpointReference xmlns:wsa="http://www.w3.org/2005/08/addressing">
<wsa:Address>inAddress</wsa:Address>
</wsa:EndpointReference>
</binding.ws>
<binding.ws name="bnd8" wsdlElement="http://wsbinding.vtest.sca.tuscany.apache.org#wsdl.binding(AServiceSOAP12Binding)"
- uri="http://localhost:8080/AService/endpointref8">
+ uri="http://localhost:8085/AService/endpointref8">
<wsa:EndpointReference xmlns:wsa="http://www.w3.org/2005/08/addressing">
<wsa:Address></wsa:Address>
</wsa:EndpointReference>
@@ -55,49 +55,49 @@
<component name="AClientComponent1">
<implementation.java class="org.apache.tuscany.sca.vtest.wsbinding.impl.AClientServiceImpl"/>
<reference name="aService">
- <binding.ws uri="http://localhost:8080/AService/soap12port"/>
+ <binding.ws uri="http://localhost:8085/AService/soap12port"/>
</reference>
</component>
<component name="AClientComponent2">
<implementation.java class="org.apache.tuscany.sca.vtest.wsbinding.impl.AClientServiceImpl"/>
<reference name="aService">
- <binding.ws uri="http://localhost:8080/AService/endpointref"/>
+ <binding.ws uri="http://localhost:8085/AService/endpointref"/>
</reference>
</component>
<component name="AClientComponent3">
<implementation.java class="org.apache.tuscany.sca.vtest.wsbinding.impl.AClientServiceImpl"/>
<reference name="aService">
- <binding.ws uri="http://localhost:8080/AService/uriInBinding"/>
+ <binding.ws uri="http://localhost:8085/AService/uriInBinding"/>
</reference>
</component>
<component name="AClientComponent4">
<implementation.java class="org.apache.tuscany.sca.vtest.wsbinding.impl.AClientServiceImpl"/>
<reference name="aService">
- <binding.ws uri="http://localhost:8080/AComponent"/>
+ <binding.ws uri="http://localhost:8085/AComponent"/>
</reference>
</component>
<component name="AClientComponent5">
<implementation.java class="org.apache.tuscany.sca.vtest.wsbinding.impl.AClientServiceImpl"/>
<reference name="aService">
- <binding.ws uri="http://localhost:8080/AService/noWsdlElement"/>
+ <binding.ws uri="http://localhost:8085/AService/noWsdlElement"/>
</reference>
</component>
<component name="AClientComponent6">
<implementation.java class="org.apache.tuscany.sca.vtest.wsbinding.impl.AClientServiceImpl"/>
<reference name="aService">
- <binding.ws uri="http://localhost:8080/AService/endpointref6/inWsdl"/>
+ <binding.ws uri="http://localhost:8085/AService/endpointref6/inWsdl"/>
</reference>
</component>
<component name="AClientComponent7">
<implementation.java class="org.apache.tuscany.sca.vtest.wsbinding.impl.AClientServiceImpl"/>
<reference name="aService">
- <binding.ws uri="http://localhost:8080/AService/endpointref7/inAddress"/>
+ <binding.ws uri="http://localhost:8085/AService/endpointref7/inAddress"/>
</reference>
</component>
<component name="AClientComponent8">
<implementation.java class="org.apache.tuscany.sca.vtest.wsbinding.impl.AClientServiceImpl"/>
<reference name="aService">
- <binding.ws uri="http://localhost:8080/AService/endpointref8"/>
+ <binding.ws uri="http://localhost:8085/AService/endpointref8"/>
</reference>
</component>
</composite>
diff --git a/java/sca/vtest/wsbinding/service/src/main/resources/endpointreference.composite b/java/sca/vtest/wsbinding/service/src/main/resources/endpointreference.composite
index bb3bbef390..3ba152b7b8 100644
--- a/java/sca/vtest/wsbinding/service/src/main/resources/endpointreference.composite
+++ b/java/sca/vtest/wsbinding/service/src/main/resources/endpointreference.composite
@@ -26,7 +26,7 @@
<service name="AService">
<binding.ws wsdlElement="http://wsbinding.vtest.sca.tuscany.apache.org#wsdl.binding(AServiceSOAP11Binding)">
<wsa:EndpointReference xmlns:wsa="http://www.w3.org/2005/08/addressing">
- <wsa:Address>http://localhost:8080/AService/endpointref</wsa:Address>
+ <wsa:Address>http://localhost:8085/AService/endpointref</wsa:Address>
</wsa:EndpointReference>
</binding.ws>
</service>
@@ -34,7 +34,7 @@
<component name="AClientComponent">
<implementation.java class="org.apache.tuscany.sca.vtest.wsbinding.impl.AClientServiceImpl"/>
<reference name="aService">
- <binding.ws uri="http://localhost:8080/AService/endpointref"/>
+ <binding.ws uri="http://localhost:8085/AService/endpointref"/>
</reference>
</component>
</composite>
diff --git a/java/sca/vtest/wsbinding/service/src/main/resources/wsdlbinding.composite b/java/sca/vtest/wsbinding/service/src/main/resources/wsdlbinding.composite
index d24c1ac4af..85c604070a 100644
--- a/java/sca/vtest/wsbinding/service/src/main/resources/wsdlbinding.composite
+++ b/java/sca/vtest/wsbinding/service/src/main/resources/wsdlbinding.composite
@@ -25,21 +25,21 @@
<implementation.java class="org.apache.tuscany.sca.vtest.wsbinding.impl.AServiceImpl"/>
<service name="AService">
<binding.ws name="bnd11" wsdlElement="http://wsbinding.vtest.sca.tuscany.apache.org#wsdl.binding(AServiceSOAP11Binding)"
- uri="http://localhost:8080/AService/bnd11"/>
+ uri="http://localhost:8085/AService/bnd11"/>
<binding.ws name="bnd12" wsdlElement="http://wsbinding.vtest.sca.tuscany.apache.org#wsdl.binding(AServiceSOAP12Binding)"
- uri="http://localhost:8080/AService/bnd12"/>
+ uri="http://localhost:8085/AService/bnd12"/>
</service>
</component>
<component name="AClientBnd11Component">
<implementation.java class="org.apache.tuscany.sca.vtest.wsbinding.impl.AClientServiceImpl"/>
<reference name="aService">
- <binding.ws uri="http://localhost:8080/AService/bnd11"/>
+ <binding.ws uri="http://localhost:8085/AService/bnd11"/>
</reference>
</component>
<component name="AClientBnd12Component">
<implementation.java class="org.apache.tuscany.sca.vtest.wsbinding.impl.AClientServiceImpl"/>
<reference name="aService">
- <binding.ws uri="http://localhost:8080/AService/bnd12"/>
+ <binding.ws uri="http://localhost:8085/AService/bnd12"/>
</reference>
</component>
</composite>
diff --git a/java/sca/vtest/wsbinding/service/src/main/resources/wsdlendpoint.composite b/java/sca/vtest/wsbinding/service/src/main/resources/wsdlendpoint.composite
index 92c30e5d90..0c11c79efe 100644
--- a/java/sca/vtest/wsbinding/service/src/main/resources/wsdlendpoint.composite
+++ b/java/sca/vtest/wsbinding/service/src/main/resources/wsdlendpoint.composite
@@ -24,13 +24,14 @@
<component name="AComponent">
<implementation.java class="org.apache.tuscany.sca.vtest.wsbinding.impl.AServiceImpl"/>
<service name="AService">
- <binding.ws wsdlElement="http://wsbinding.vtest.sca.tuscany.apache.org#wsdl.endpoint(AService/AServiceEndPoint)"/>
+ <binding.ws wsdlElement="http://wsbinding.vtest.sca.tuscany.apache.org#wsdl.endpoint(AService/AServiceEndPoint)"
+ uri="http://localhost:8085/AService/endpoint"/>
</service>
</component>
<component name="AClientComponent">
<implementation.java class="org.apache.tuscany.sca.vtest.wsbinding.impl.AClientServiceImpl"/>
<reference name="aService">
- <binding.ws uri="http://localhost:8080/AService/endpoint"/>
+ <binding.ws uri="http://localhost:8085/AService/endpoint"/>
</reference>
</component>
</composite>
diff --git a/java/sca/vtest/wsbinding/service/src/main/resources/wsdlport.composite b/java/sca/vtest/wsbinding/service/src/main/resources/wsdlport.composite
index 961ae28e5a..859b93bec4 100644
--- a/java/sca/vtest/wsbinding/service/src/main/resources/wsdlport.composite
+++ b/java/sca/vtest/wsbinding/service/src/main/resources/wsdlport.composite
@@ -31,13 +31,13 @@
<component name="AClientP11Component">
<implementation.java class="org.apache.tuscany.sca.vtest.wsbinding.impl.AClientServiceImpl"/>
<reference name="aService">
- <binding.ws uri="http://localhost:8080/AService/soap11port"/>
+ <binding.ws uri="http://localhost:8085/AService/soap11port"/>
</reference>
</component>
<component name="AClientP12Component">
<implementation.java class="org.apache.tuscany.sca.vtest.wsbinding.impl.AClientServiceImpl"/>
<reference name="aService">
- <binding.ws uri="http://localhost:8080/AService/soap12port"/>
+ <binding.ws uri="http://localhost:8085/AService/soap12port"/>
</reference>
</component>
</composite>
diff --git a/java/sca/vtest/wsbinding/service/src/main/resources/wsdlservice.composite b/java/sca/vtest/wsbinding/service/src/main/resources/wsdlservice.composite
index 093eb83323..fa96e650de 100644
--- a/java/sca/vtest/wsbinding/service/src/main/resources/wsdlservice.composite
+++ b/java/sca/vtest/wsbinding/service/src/main/resources/wsdlservice.composite
@@ -24,19 +24,20 @@
<component name="AComponent">
<implementation.java class="org.apache.tuscany.sca.vtest.wsbinding.impl.AServiceImpl"/>
<service name="AService">
- <binding.ws wsdlElement="http://wsbinding.vtest.sca.tuscany.apache.org#wsdl.service(AService)"/>
+ <binding.ws wsdlElement="http://wsbinding.vtest.sca.tuscany.apache.org#wsdl.service(AService)"
+ uri="http://localhost:8085/AComponent"/>
</service>
</component>
<component name="AClientS11Component">
<implementation.java class="org.apache.tuscany.sca.vtest.wsbinding.impl.AClientServiceImpl"/>
<reference name="aService">
- <binding.ws uri="http://localhost:8080/AService/soap11port"/>
+ <binding.ws uri="http://localhost:8085/AService/soap11port"/>
</reference>
</component>
<component name="AClientS12Component">
<implementation.java class="org.apache.tuscany.sca.vtest.wsbinding.impl.AClientServiceImpl"/>
<reference name="aService">
- <binding.ws uri="http://localhost:8080/AService/soap12port"/>
+ <binding.ws uri="http://localhost:8085/AService/soap12port"/>
</reference>
</component>
</composite>
diff --git a/java/sca/vtest/wsbinding/service/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/EndpointUriResolutionTestCase.java b/java/sca/vtest/wsbinding/service/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/EndpointUriResolutionTestCase.java
index b9f679c9a7..49f9db248f 100644
--- a/java/sca/vtest/wsbinding/service/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/EndpointUriResolutionTestCase.java
+++ b/java/sca/vtest/wsbinding/service/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/EndpointUriResolutionTestCase.java
@@ -23,6 +23,7 @@ import junit.framework.Assert;
import org.apache.tuscany.sca.vtest.utilities.ServiceFinder;
import org.junit.AfterClass;
import org.junit.BeforeClass;
+import org.junit.Ignore;
import org.junit.Test;
/**
@@ -114,6 +115,7 @@ public class EndpointUriResolutionTestCase {
* <p>
* This method tests that implicit URI is used.
*/
+ @Ignore("TUSCANY-2523 - Port 8080 conflicts with Continuum")
@Test
public void testImplicitUri() throws Exception {
AClientService aClient = ServiceFinder.getService(AClientService.class, "AClientComponent4");
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-05 12:38:41 +0000