From 4b6980bc70a11fe4e47fff13b08ea479afb2d169 Mon Sep 17 00:00:00 2001 From: slaws Date: Mon, 4 Aug 2008 15:54:30 +0000 Subject: Change to vtests to use port 8085 instead of the default 8080 to avoid continuum clashes. This exercise raised TUSCANY-2523 and also involved many additions of default binding.ws uris where there were none before. git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@682428 13f79535-47bb-0310-9956-ffa450edef68 --- .../service/src/main/resources/aservice.wsdl | 8 ++--- .../resources/endpoint-uri-resolution.composite | 34 +++++++++++----------- .../src/main/resources/endpointreference.composite | 4 +-- .../src/main/resources/wsdlbinding.composite | 8 ++--- .../src/main/resources/wsdlendpoint.composite | 5 ++-- .../service/src/main/resources/wsdlport.composite | 4 +-- .../src/main/resources/wsdlservice.composite | 7 +++-- .../wsbinding/EndpointUriResolutionTestCase.java | 2 ++ 8 files changed, 38 insertions(+), 34 deletions(-) (limited to 'java/sca/vtest/wsbinding/service') 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 @@ - + - + - + - + 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 @@ + uri="http://localhost:8085/AService/soap12portxxx"/> + uri="http://localhost:8085/AService/endpointrefxxx"> - http://localhost:8080/AService/endpointref + http://localhost:8085/AService/endpointref - - + uri="http://localhost:8085/AService/uriInBinding"/> + + + uri="http://localhost:8085/AService/endpointref6"/> + uri="http://localhost:8085/AService/endpointref7"> inAddress + uri="http://localhost:8085/AService/endpointref8"> @@ -55,49 +55,49 @@ - + - + - + - + - + - + - + - + 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 @@ - http://localhost:8080/AService/endpointref + http://localhost:8085/AService/endpointref @@ -34,7 +34,7 @@ - + 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 @@ + uri="http://localhost:8085/AService/bnd11"/> + uri="http://localhost:8085/AService/bnd12"/> - + - + 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 @@ - + - + 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 @@ - + - + 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 @@ - + - + - + 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 { *

* 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"); -- cgit v1.2.3