diff options
Diffstat (limited to '')
15 files changed, 148 insertions, 134 deletions
diff --git a/java/sca/vtest/wsbinding/nowsdl/defaultbinding/src/main/resources/nowsdl.composite b/java/sca/vtest/wsbinding/nowsdl/defaultbinding/src/main/resources/nowsdl.composite index d8ef16316a..39d66fa365 100644 --- a/java/sca/vtest/wsbinding/nowsdl/defaultbinding/src/main/resources/nowsdl.composite +++ b/java/sca/vtest/wsbinding/nowsdl/defaultbinding/src/main/resources/nowsdl.composite @@ -26,7 +26,7 @@ <implementation.java class="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.defaultbinding.impl.BServiceImpl"/> <service name="BService"> <interface.java interface="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.defaultbinding.BService"/> - <binding.ws/> + <binding.ws uri="http://localhost:8085/BComponent"/> </service> </component> @@ -34,7 +34,7 @@ <implementation.java class="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.defaultbinding.impl.CServiceImpl"/> <service name="CService"> <interface.java interface="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.defaultbinding.CService"/> - <binding.ws/> + <binding.ws uri="http://localhost:8085/CComponent"/> </service> </component> @@ -42,7 +42,7 @@ <implementation.java class="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.defaultbinding.impl.AServiceImpl"/> <reference name="b1" target="BComponent/BService"> <interface.java interface="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.defaultbinding.BService"/> - <binding.ws uri="http://localhost:8080/BComponent"/> + <binding.ws uri="http://localhost:8085/BComponent"/> </reference> </component> @@ -50,11 +50,11 @@ <implementation.java class="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.defaultbinding.impl.DServiceImpl"/> <reference name="b1" target="BComponent/BService"> <interface.java interface="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.defaultbinding.BService"/> - <binding.ws uri="http://localhost:8080/BComponent"/> + <binding.ws uri="http://localhost:8085/BComponent"/> </reference> <reference name="c1" target="CComponent/CService"> <interface.java interface="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.defaultbinding.CService"/> - <binding.ws uri="http://localhost:8080/CComponent"/> + <binding.ws uri="http://localhost:8085/CComponent"/> </reference> </component> diff --git a/java/sca/vtest/wsbinding/nowsdl/multisoapbindings/src/main/resources/nowsdlmultisoapbindings.composite b/java/sca/vtest/wsbinding/nowsdl/multisoapbindings/src/main/resources/nowsdlmultisoapbindings.composite index 8da87d88fc..db9d0e9732 100644 --- a/java/sca/vtest/wsbinding/nowsdl/multisoapbindings/src/main/resources/nowsdlmultisoapbindings.composite +++ b/java/sca/vtest/wsbinding/nowsdl/multisoapbindings/src/main/resources/nowsdlmultisoapbindings.composite @@ -26,8 +26,8 @@ <implementation.java class="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.multisoapbindings.impl.BServiceImpl"/> <service name="BService"> <interface.java interface="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.multisoapbindings.BService"/> - <binding.ws name="BServiceSOAP11" requires="soap.1_1" uri="http://localhost:8080/BService/soap11"/> - <binding.ws requires="soap.1_2" uri="http://localhost:8080/BService/soap12"/> + <binding.ws name="BServiceSOAP11" requires="soap.1_1" uri="http://localhost:8085/BService/soap11"/> + <binding.ws requires="soap.1_2" uri="http://localhost:8085/BService/soap12"/> </service> </component> @@ -35,8 +35,8 @@ <implementation.java class="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.multisoapbindings.impl.CServiceImpl"/> <service name="CService"> <interface.java interface="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.multisoapbindings.CService"/> - <binding.ws name="CServiceSOAP12" requires="soap.1_2" uri="http://localhost:8080/CService/soap12"/> - <binding.ws requires="soap.1_1" uri="http://localhost:8080/CService/soap11"/> + <binding.ws name="CServiceSOAP12" requires="soap.1_2" uri="http://localhost:8085/CService/soap12"/> + <binding.ws requires="soap.1_1" uri="http://localhost:8085/CService/soap11"/> </service> </component> @@ -98,14 +98,14 @@ <service name="BServicePromoted" promote="BComponentPromoted"> <interface.java interface="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.multisoapbindings.BService"/> - <binding.ws name="BServicePromotedSOAP11" requires="soap.1_1" uri="http://localhost:8080/BServicePromoted/soap11"/> - <binding.ws requires="soap.1_2" uri="http://localhost:8080/BServicePromoted/soap12"/> + <binding.ws name="BServicePromotedSOAP11" requires="soap.1_1" uri="http://localhost:8085/BServicePromoted/soap11"/> + <binding.ws requires="soap.1_2" uri="http://localhost:8085/BServicePromoted/soap12"/> </service> <service name="CServicePromoted" promote="CComponentPromoted"> <interface.java interface="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.multisoapbindings.CService"/> - <binding.ws name="CServicePromotedSOAP12" requires="soap.1_2" uri="http://localhost:8080/CServicePromoted/soap12"/> - <binding.ws requires="soap.1_1" uri="http://localhost:8080/CServicePromoted/soap11"/> + <binding.ws name="CServicePromotedSOAP12" requires="soap.1_2" uri="http://localhost:8085/CServicePromoted/soap12"/> + <binding.ws requires="soap.1_1" uri="http://localhost:8085/CServicePromoted/soap11"/> </service> <component name="BComponentPromoted"> @@ -118,12 +118,12 @@ <reference name="DComponent3B1" promote="DComponent3/b1"> <interface.java interface="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.multisoapbindings.BService"/> - <binding.ws requires="soap.1_2" uri="http://localhost:8080/BServicePromoted/soap12"/> + <binding.ws requires="soap.1_2" uri="http://localhost:8085/BServicePromoted/soap12"/> </reference> <reference name="DComponent3C1" promote="DComponent3/c1"> <interface.java interface="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.multisoapbindings.CService"/> - <binding.ws requires="soap.1_1" uri="http://localhost:8080/CServicePromoted/soap11"/> + <binding.ws requires="soap.1_1" uri="http://localhost:8085/CServicePromoted/soap11"/> </reference> <component name="DComponent3"> diff --git a/java/sca/vtest/wsbinding/nowsdl/promoted/src/main/resources/nowsdlpromoted.composite b/java/sca/vtest/wsbinding/nowsdl/promoted/src/main/resources/nowsdlpromoted.composite index cf47c072a7..964996a638 100644 --- a/java/sca/vtest/wsbinding/nowsdl/promoted/src/main/resources/nowsdlpromoted.composite +++ b/java/sca/vtest/wsbinding/nowsdl/promoted/src/main/resources/nowsdlpromoted.composite @@ -24,27 +24,27 @@ <service name="BService" promote="BComponent"> <interface.java interface="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.promoted.BService"/> - <binding.ws/> + <binding.ws uri="http://localhost:8085/BService"/> </service> <service name="BServiceSOAP" promote="BComponentSOAP"> <interface.java interface="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.promoted.BServiceSOAP"/> - <binding.ws requires="soap"/> + <binding.ws requires="soap" uri="http://localhost:8085/BServiceSOAP"/> </service> <service name="BServiceSOAP11" promote="BComponentSOAP11"> <interface.java interface="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.promoted.BServiceSOAP11"/> - <binding.ws requires="soap.1_1"/> + <binding.ws requires="soap.1_1" uri="http://localhost:8085/BServiceSOAP11"/> </service> <service name="BServiceSOAP12" promote="BComponentSOAP12"> <interface.java interface="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.promoted.BServiceSOAP12"/> - <binding.ws requires="soap.1_2"/> + <binding.ws requires="soap.1_2" uri="http://localhost:8085/BServiceSOAP12"/> </service> <service name="CService" promote="CComponent"> <interface.java interface="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.promoted.CService"/> - <binding.ws requires="soap.1_2"/> + <binding.ws requires="soap.1_2" uri="http://localhost:8085/CService"/> </service> <component name="BComponent"> @@ -69,92 +69,92 @@ <reference name="AComponent1B1" promote="AComponent1/b1"> <interface.java interface="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.promoted.BService"/> - <binding.ws uri="http://localhost:8080/BService"/> + <binding.ws uri="http://localhost:8085/BService"/> </reference> <reference name="AComponent2B1" promote="AComponent2/b1"> <interface.java interface="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.promoted.BService"/> - <binding.ws requires="soap" uri="http://localhost:8080/BService"/> + <binding.ws requires="soap" uri="http://localhost:8085/BService"/> </reference> <reference name="AComponent3B1" promote="AComponent3/b1"> <interface.java interface="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.promoted.BService"/> - <binding.ws requires="soap.1_1" uri="http://localhost:8080/BService"/> + <binding.ws requires="soap.1_1" uri="http://localhost:8085/BService"/> </reference> <reference name="AComponent4B1" promote="AComponent4/b1"> <interface.java interface="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.promoted.BService"/> - <binding.ws requires="soap.1_2" uri="http://localhost:8080/BService"/> + <binding.ws requires="soap.1_2" uri="http://localhost:8085/BService"/> </reference> <reference name="AComponent5B1" promote="AComponent5/b1"> <interface.java interface="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.promoted.BServiceSOAP"/> - <binding.ws uri="http://localhost:8080/BServiceSOAP"/> + <binding.ws uri="http://localhost:8085/BServiceSOAP"/> </reference> <reference name="AComponent6B1" promote="AComponent6/b1"> <interface.java interface="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.promoted.BServiceSOAP"/> - <binding.ws requires="soap" uri="http://localhost:8080/BServiceSOAP"/> + <binding.ws requires="soap" uri="http://localhost:8085/BServiceSOAP"/> </reference> <reference name="AComponent7B1" promote="AComponent7/b1"> <interface.java interface="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.promoted.BServiceSOAP"/> - <binding.ws requires="soap.1_1" uri="http://localhost:8080/BServiceSOAP"/> + <binding.ws requires="soap.1_1" uri="http://localhost:8085/BServiceSOAP"/> </reference> <reference name="AComponent8B1" promote="AComponent8/b1"> <interface.java interface="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.promoted.BServiceSOAP"/> - <binding.ws requires="soap.1_2" uri="http://localhost:8080/BServiceSOAP"/> + <binding.ws requires="soap.1_2" uri="http://localhost:8085/BServiceSOAP"/> </reference> <reference name="AComponent9B1" promote="AComponent9/b1"> <interface.java interface="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.promoted.BServiceSOAP11"/> - <binding.ws uri="http://localhost:8080/BServiceSOAP11"/> + <binding.ws uri="http://localhost:8085/BServiceSOAP11"/> </reference> <reference name="AComponent10B1" promote="AComponent10/b1"> <interface.java interface="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.promoted.BServiceSOAP11"/> - <binding.ws requires="soap" uri="http://localhost:8080/BServiceSOAP11"/> + <binding.ws requires="soap" uri="http://localhost:8085/BServiceSOAP11"/> </reference> <reference name="AComponent11B1" promote="AComponent11/b1"> <interface.java interface="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.promoted.BServiceSOAP11"/> - <binding.ws requires="soap.1_1" uri="http://localhost:8080/BServiceSOAP11"/> + <binding.ws requires="soap.1_1" uri="http://localhost:8085/BServiceSOAP11"/> </reference> <reference name="AComponent12B1" promote="AComponent12/b1"> <interface.java interface="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.promoted.BServiceSOAP11"/> - <binding.ws requires="soap.1_2" uri="http://localhost:8080/BServiceSOAP11"/> + <binding.ws requires="soap.1_2" uri="http://localhost:8085/BServiceSOAP11"/> </reference> <reference name="AComponent13B1" promote="AComponent13/b1"> <interface.java interface="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.promoted.BServiceSOAP12"/> - <binding.ws uri="http://localhost:8080/BServiceSOAP12"/> + <binding.ws uri="http://localhost:8085/BServiceSOAP12"/> </reference> <reference name="AComponent14B1" promote="AComponent14/b1"> <interface.java interface="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.promoted.BServiceSOAP12"/> - <binding.ws requires="soap" uri="http://localhost:8080/BServiceSOAP12"/> + <binding.ws requires="soap" uri="http://localhost:8085/BServiceSOAP12"/> </reference> <reference name="AComponent15B1" promote="AComponent15/b1"> <interface.java interface="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.promoted.BServiceSOAP12"/> - <binding.ws requires="soap.1_1" uri="http://localhost:8080/BServiceSOAP12"/> + <binding.ws requires="soap.1_1" uri="http://localhost:8085/BServiceSOAP12"/> </reference> <reference name="AComponent16B1" promote="AComponent16/b1"> <interface.java interface="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.promoted.BServiceSOAP12"/> - <binding.ws requires="soap.1_2" uri="http://localhost:8080/BServiceSOAP12"/> + <binding.ws requires="soap.1_2" uri="http://localhost:8085/BServiceSOAP12"/> </reference> <reference name="DComponentB1" promote="DComponent/b1"> <interface.java interface="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.promoted.BServiceSOAP11"/> - <binding.ws requires="soap.1_1" uri="http://localhost:8080/BServiceSOAP11"/> + <binding.ws requires="soap.1_1" uri="http://localhost:8085/BServiceSOAP11"/> </reference> <reference name="DComponentC1" promote="DComponent/c1"> <interface.java interface="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.promoted.CService"/> - <binding.ws requires="soap.1_2" uri="http://localhost:8080/CService"/> + <binding.ws requires="soap.1_2" uri="http://localhost:8085/CService"/> </reference> <component name="AComponent1"> diff --git a/java/sca/vtest/wsbinding/nowsdl/soapversion/src/main/resources/nowsdlsoapversion.composite b/java/sca/vtest/wsbinding/nowsdl/soapversion/src/main/resources/nowsdlsoapversion.composite index 464bb4ebf3..58831e9b93 100644 --- a/java/sca/vtest/wsbinding/nowsdl/soapversion/src/main/resources/nowsdlsoapversion.composite +++ b/java/sca/vtest/wsbinding/nowsdl/soapversion/src/main/resources/nowsdlsoapversion.composite @@ -26,7 +26,7 @@ <implementation.java class="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.soapversion.impl.BServiceImpl"/> <service name="BService"> <interface.java interface="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.soapversion.BService"/> - <binding.ws uri="http://localhost:8080/BComponent"/> + <binding.ws uri="http://localhost:8085/BComponent"/> </service> </component> @@ -34,7 +34,7 @@ <implementation.java class="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.soapversion.impl.BServiceSOAPImpl"/> <service name="BServiceSOAP"> <interface.java interface="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.soapversion.BServiceSOAP"/> - <binding.ws requires="soap"/> + <binding.ws requires="soap" uri="http://localhost:8085/BComponentSOAP"/> </service> </component> @@ -42,7 +42,7 @@ <implementation.java class="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.soapversion.impl.BServiceSOAP11Impl"/> <service name="BServiceSOAP11"> <interface.java interface="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.soapversion.BServiceSOAP11"/> - <binding.ws requires="soap.1_1"/> + <binding.ws requires="soap.1_1" uri="http://localhost:8085/BComponentSOAP11"/> </service> </component> @@ -50,7 +50,7 @@ <implementation.java class="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.soapversion.impl.BServiceSOAP12Impl"/> <service name="BServiceSOAP12"> <interface.java interface="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.soapversion.BServiceSOAP12"/> - <binding.ws requires="soap.1_2"/> + <binding.ws requires="soap.1_2" uri="http://localhost:8085/BComponentSOAP12"/> </service> </component> @@ -58,7 +58,7 @@ <implementation.java class="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.soapversion.impl.CServiceImpl"/> <service name="CService"> <interface.java interface="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.soapversion.CService"/> - <binding.ws requires="soap.1_2" uri="http://localhost:8080/CComponent"/> + <binding.ws requires="soap.1_2" uri="http://localhost:8085/CComponent"/> </service> </component> @@ -66,7 +66,7 @@ <implementation.java class="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.soapversion.impl.AServiceImpl"/> <reference name="b1" target="BComponent/BService"> <interface.java interface="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.soapversion.BService"/> - <binding.ws uri="http://localhost:8080/BComponent"/> + <binding.ws uri="http://localhost:8085/BComponent"/> </reference> </component> @@ -74,7 +74,7 @@ <implementation.java class="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.soapversion.impl.AServiceImpl"/> <reference name="b1" target="BComponent/BService"> <interface.java interface="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.soapversion.BService"/> - <binding.ws requires="soap" uri="http://localhost:8080/BComponent"/> + <binding.ws requires="soap" uri="http://localhost:8085/BComponent"/> </reference> </component> @@ -82,7 +82,7 @@ <implementation.java class="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.soapversion.impl.AServiceImpl"/> <reference name="b1" target="BComponent/BService"> <interface.java interface="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.soapversion.BService"/> - <binding.ws requires="soap.1_1" uri="http://localhost:8080/BComponent"/> + <binding.ws requires="soap.1_1" uri="http://localhost:8085/BComponent"/> </reference> </component> @@ -90,7 +90,7 @@ <implementation.java class="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.soapversion.impl.AServiceImpl"/> <reference name="b1" target="BComponent/BService"> <interface.java interface="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.soapversion.BService"/> - <binding.ws requires="soap.1_2" uri="http://localhost:8080/BComponent"/> + <binding.ws requires="soap.1_2" uri="http://localhost:8085/BComponent"/> </reference> </component> @@ -98,7 +98,7 @@ <implementation.java class="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.soapversion.impl.AServiceImpl"/> <reference name="b1" target="BComponentSOAP/BServiceSOAP"> <interface.java interface="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.soapversion.BServiceSOAP"/> - <binding.ws uri="http://localhost:8080/BComponentSOAP"/> + <binding.ws uri="http://localhost:8085/BComponentSOAP"/> </reference> </component> @@ -106,7 +106,7 @@ <implementation.java class="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.soapversion.impl.AServiceImpl"/> <reference name="b1" target="BComponentSOAP/BServiceSOAP"> <interface.java interface="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.soapversion.BServiceSOAP"/> - <binding.ws requires="soap" uri="http://localhost:8080/BComponentSOAP"/> + <binding.ws requires="soap" uri="http://localhost:8085/BComponentSOAP"/> </reference> </component> @@ -114,7 +114,7 @@ <implementation.java class="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.soapversion.impl.AServiceImpl"/> <reference name="b1" target="BComponentSOAP/BServiceSOAP"> <interface.java interface="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.soapversion.BServiceSOAP"/> - <binding.ws requires="soap.1_1" uri="http://localhost:8080/BComponentSOAP"/> + <binding.ws requires="soap.1_1" uri="http://localhost:8085/BComponentSOAP"/> </reference> </component> @@ -122,7 +122,7 @@ <implementation.java class="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.soapversion.impl.AServiceImpl"/> <reference name="b1" target="BComponentSOAP/BServiceSOAP"> <interface.java interface="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.soapversion.BServiceSOAP"/> - <binding.ws requires="soap.1_2" uri="http://localhost:8080/BComponentSOAP"/> + <binding.ws requires="soap.1_2" uri="http://localhost:8085/BComponentSOAP"/> </reference> </component> @@ -130,7 +130,7 @@ <implementation.java class="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.soapversion.impl.AServiceImpl"/> <reference name="b1" target="BComponentSOAP11/BServiceSOAP11"> <interface.java interface="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.soapversion.BServiceSOAP11"/> - <binding.ws uri="http://localhost:8080/BComponentSOAP11"/> + <binding.ws uri="http://localhost:8085/BComponentSOAP11"/> </reference> </component> @@ -138,7 +138,7 @@ <implementation.java class="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.soapversion.impl.AServiceImpl"/> <reference name="b1" target="BComponentSOAP11/BServiceSOAP11"> <interface.java interface="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.soapversion.BServiceSOAP11"/> - <binding.ws requires="soap" uri="http://localhost:8080/BComponentSOAP11"/> + <binding.ws requires="soap" uri="http://localhost:8085/BComponentSOAP11"/> </reference> </component> @@ -146,7 +146,7 @@ <implementation.java class="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.soapversion.impl.AServiceImpl"/> <reference name="b1" target="BComponentSOAP11/BServiceSOAP11"> <interface.java interface="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.soapversion.BServiceSOAP11"/> - <binding.ws requires="soap.1_1" uri="http://localhost:8080/BComponentSOAP11"/> + <binding.ws requires="soap.1_1" uri="http://localhost:8085/BComponentSOAP11"/> </reference> </component> @@ -154,7 +154,7 @@ <implementation.java class="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.soapversion.impl.AServiceImpl"/> <reference name="b1" target="BComponentSOAP11/BServiceSOAP11"> <interface.java interface="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.soapversion.BServiceSOAP11"/> - <binding.ws requires="soap.1_2" uri="http://localhost:8080/BComponentSOAP11"/> + <binding.ws requires="soap.1_2" uri="http://localhost:8085/BComponentSOAP11"/> </reference> </component> @@ -162,7 +162,7 @@ <implementation.java class="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.soapversion.impl.AServiceImpl"/> <reference name="b1" target="BComponentSOAP12/BServiceSOAP12"> <interface.java interface="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.soapversion.BServiceSOAP12"/> - <binding.ws uri="http://localhost:8080/BComponentSOAP12"/> + <binding.ws uri="http://localhost:8085/BComponentSOAP12"/> </reference> </component> @@ -170,7 +170,7 @@ <implementation.java class="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.soapversion.impl.AServiceImpl"/> <reference name="b1" target="BComponentSOAP12/BServiceSOAP12"> <interface.java interface="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.soapversion.BServiceSOAP12"/> - <binding.ws requires="soap" uri="http://localhost:8080/BComponentSOAP12"/> + <binding.ws requires="soap" uri="http://localhost:8085/BComponentSOAP12"/> </reference> </component> @@ -178,7 +178,7 @@ <implementation.java class="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.soapversion.impl.AServiceImpl"/> <reference name="b1" target="BComponentSOAP12/BServiceSOAP12"> <interface.java interface="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.soapversion.BServiceSOAP12"/> - <binding.ws requires="soap.1_1" uri="http://localhost:8080/BComponentSOAP12"/> + <binding.ws requires="soap.1_1" uri="http://localhost:8085/BComponentSOAP12"/> </reference> </component> @@ -186,7 +186,7 @@ <implementation.java class="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.soapversion.impl.AServiceImpl"/> <reference name="b1" target="BComponentSOAP12/BServiceSOAP12"> <interface.java interface="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.soapversion.BServiceSOAP12"/> - <binding.ws requires="soap.1_2" uri="http://localhost:8080/BComponentSOAP12"/> + <binding.ws requires="soap.1_2" uri="http://localhost:8085/BComponentSOAP12"/> </reference> </component> @@ -194,11 +194,11 @@ <implementation.java class="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.soapversion.impl.DServiceImpl"/> <reference name="b1" target="BComponentSOAP11/BServiceSOAP11"> <interface.java interface="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.soapversion.BServiceSOAP11"/> - <binding.ws requires="soap.1_1" uri="http://localhost:8080/BComponentSOAP11"/> + <binding.ws requires="soap.1_1" uri="http://localhost:8085/BComponentSOAP11"/> </reference> <reference name="c1" target="CComponent/CService"> <interface.java interface="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.soapversion.CService"/> - <binding.ws requires="soap.1_2" uri="http://localhost:8080/CComponent"/> + <binding.ws requires="soap.1_2" uri="http://localhost:8085/CComponent"/> </reference> </component> 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"); diff --git a/java/sca/vtest/wsbinding/wsdlelement/binding/src/main/resources/wsdlelement.binding.composite b/java/sca/vtest/wsbinding/wsdlelement/binding/src/main/resources/wsdlelement.binding.composite index d1a92a3499..6b97b5e602 100644 --- a/java/sca/vtest/wsbinding/wsdlelement/binding/src/main/resources/wsdlelement.binding.composite +++ b/java/sca/vtest/wsbinding/wsdlelement/binding/src/main/resources/wsdlelement.binding.composite @@ -26,7 +26,8 @@ <implementation.java class="org.apache.tuscany.sca.vtest.wsbinding.wsdlelement.binding.impl.BServiceImpl"/> <service name="BService"> <interface.java interface="org.apache.tuscany.sca.vtest.wsbinding.wsdlelement.binding.BService"/> - <binding.ws wsdlElement="http://vtest.wsbinding.wsdlelement.binding.bservice#wsdl.binding(BService1SOAPBinding)"/> + <binding.ws wsdlElement="http://vtest.wsbinding.wsdlelement.binding.bservice#wsdl.binding(BService1SOAPBinding)" + uri="http://localhost:8085/BComponent1"/> </service> </component> @@ -34,7 +35,8 @@ <implementation.java class="org.apache.tuscany.sca.vtest.wsbinding.wsdlelement.binding.impl.BServiceImpl"/> <service name="BService"> <interface.java interface="org.apache.tuscany.sca.vtest.wsbinding.wsdlelement.binding.BService"/> - <binding.ws wsdlElement="http://vtest.wsbinding.wsdlelement.binding.bservice#wsdl.binding(BService2SOAPBinding)"/> + <binding.ws wsdlElement="http://vtest.wsbinding.wsdlelement.binding.bservice#wsdl.binding(BService2SOAPBinding)" + uri="http://localhost:8085/BComponent2"/> </service> </component> @@ -42,7 +44,8 @@ <implementation.java class="org.apache.tuscany.sca.vtest.wsbinding.wsdlelement.binding.impl.BService2Impl"/> <service name="BService2"> <interface.java interface="org.apache.tuscany.sca.vtest.wsbinding.wsdlelement.binding.BService2"/> - <binding.ws wsdlElement="http://vtest.wsbinding.wsdlelement.binding.bservice#wsdl.binding(BService2SOAPBinding)"/> + <binding.ws wsdlElement="http://vtest.wsbinding.wsdlelement.binding.bservice#wsdl.binding(BService2SOAPBinding)" + uri="http://localhost:8085/BComponent3"/> </service> </component> @@ -50,7 +53,8 @@ <implementation.java class="org.apache.tuscany.sca.vtest.wsbinding.wsdlelement.binding.impl.BServiceImpl"/> <service name="BService"> <interface.java interface="org.apache.tuscany.sca.vtest.wsbinding.wsdlelement.binding.BService"/> - <binding.ws wsdlElement="http://vtest.wsbinding.wsdlelement.binding.bservice#wsdl.binding(BService3SOAP12Binding)"/> + <binding.ws wsdlElement="http://vtest.wsbinding.wsdlelement.binding.bservice#wsdl.binding(BService3SOAP12Binding)" + uri="http://localhost:8085/BComponent4"/> </service> </component> @@ -58,7 +62,8 @@ <implementation.java class="org.apache.tuscany.sca.vtest.wsbinding.wsdlelement.binding.impl.CServiceImpl"/> <service name="CService"> <interface.java interface="org.apache.tuscany.sca.vtest.wsbinding.wsdlelement.binding.CService"/> - <binding.ws wsdlElement="http://vtest.wsbinding.wsdlelement.binding.cservice#wsdl.binding(CServiceSOAPBinding)"/> + <binding.ws wsdlElement="http://vtest.wsbinding.wsdlelement.binding.cservice#wsdl.binding(CServiceSOAPBinding)" + uri="http://localhost:8085/CComponent"/> </service> </component> @@ -66,7 +71,7 @@ <implementation.java class="org.apache.tuscany.sca.vtest.wsbinding.wsdlelement.binding.impl.AServiceImpl"/> <reference name="b1" target="BComponent1/BService"> <interface.java interface="org.apache.tuscany.sca.vtest.wsbinding.wsdlelement.binding.BService"/> - <binding.ws wsdlElement="http://vtest.wsbinding.wsdlelement.binding.bservice#wsdl.binding(BService1SOAPBinding)" uri="http://localhost:8080/BComponent1"/> + <binding.ws wsdlElement="http://vtest.wsbinding.wsdlelement.binding.bservice#wsdl.binding(BService1SOAPBinding)" uri="http://localhost:8085/BComponent1"/> </reference> </component> @@ -74,7 +79,7 @@ <implementation.java class="org.apache.tuscany.sca.vtest.wsbinding.wsdlelement.binding.impl.AServiceImpl"/> <reference name="b1" target="BComponent2/BService"> <interface.java interface="org.apache.tuscany.sca.vtest.wsbinding.wsdlelement.binding.BService"/> - <binding.ws wsdlElement="http://vtest.wsbinding.wsdlelement.binding.bservice#wsdl.binding(BService2SOAPBinding)" uri="http://localhost:8080/BComponent2"/> + <binding.ws wsdlElement="http://vtest.wsbinding.wsdlelement.binding.bservice#wsdl.binding(BService2SOAPBinding)" uri="http://localhost:8085/BComponent2"/> </reference> </component> @@ -82,7 +87,7 @@ <implementation.java class="org.apache.tuscany.sca.vtest.wsbinding.wsdlelement.binding.impl.AServiceImpl"/> <reference name="b2" target="BComponent3/BService2"> <interface.java interface="org.apache.tuscany.sca.vtest.wsbinding.wsdlelement.binding.BService2"/> - <binding.ws wsdlElement="http://vtest.wsbinding.wsdlelement.binding.bservice#wsdl.binding(BService2SOAPBinding)" uri="http://localhost:8080/BComponent3"/> + <binding.ws wsdlElement="http://vtest.wsbinding.wsdlelement.binding.bservice#wsdl.binding(BService2SOAPBinding)" uri="http://localhost:8085/BComponent3"/> </reference> </component> @@ -90,7 +95,7 @@ <implementation.java class="org.apache.tuscany.sca.vtest.wsbinding.wsdlelement.binding.impl.AServiceImpl"/> <reference name="b1" target="BComponent4/BService"> <interface.java interface="org.apache.tuscany.sca.vtest.wsbinding.wsdlelement.binding.BService"/> - <binding.ws wsdlElement="http://vtest.wsbinding.wsdlelement.binding.bservice#wsdl.binding(BService3SOAP12Binding)" uri="http://localhost:8080/BComponent4"/> + <binding.ws wsdlElement="http://vtest.wsbinding.wsdlelement.binding.bservice#wsdl.binding(BService3SOAP12Binding)" uri="http://localhost:8085/BComponent4"/> </reference> </component> @@ -98,11 +103,11 @@ <implementation.java class="org.apache.tuscany.sca.vtest.wsbinding.wsdlelement.binding.impl.DServiceImpl"/> <reference name="b1" target="BComponent1/BService"> <interface.java interface="org.apache.tuscany.sca.vtest.wsbinding.wsdlelement.binding.BService"/> - <binding.ws wsdlElement="http://vtest.wsbinding.wsdlelement.binding.bservice#wsdl.binding(BService1SOAPBinding)" uri="http://localhost:8080/BComponent1"/> + <binding.ws wsdlElement="http://vtest.wsbinding.wsdlelement.binding.bservice#wsdl.binding(BService1SOAPBinding)" uri="http://localhost:8085/BComponent1"/> </reference> <reference name="c1" target="CComponent/CService"> <interface.java interface="org.apache.tuscany.sca.vtest.wsbinding.wsdlelement.binding.CService"/> - <binding.ws wsdlElement="http://vtest.wsbinding.wsdlelement.binding.cservice#wsdl.binding(CServiceSOAPBinding)" uri="http://localhost:8080/CComponent"/> + <binding.ws wsdlElement="http://vtest.wsbinding.wsdlelement.binding.cservice#wsdl.binding(CServiceSOAPBinding)" uri="http://localhost:8085/CComponent"/> </reference> </component> diff --git a/java/sca/vtest/wsbinding/wsdlelement/port/src/main/resources/wsdlelement.port.composite b/java/sca/vtest/wsbinding/wsdlelement/port/src/main/resources/wsdlelement.port.composite index 28c10ff599..5b9b77683e 100644 --- a/java/sca/vtest/wsbinding/wsdlelement/port/src/main/resources/wsdlelement.port.composite +++ b/java/sca/vtest/wsbinding/wsdlelement/port/src/main/resources/wsdlelement.port.composite @@ -27,7 +27,8 @@ <implementation.java class="org.apache.tuscany.sca.vtest.wsbinding.wsdlelement.port.impl.BServiceImpl"/> <service name="BService"> <interface.java interface="org.apache.tuscany.sca.vtest.wsbinding.wsdlelement.port.BService"/> - <binding.ws wsdlElement="http://vtest.wsbinding.wsdlelement.port.bservice#wsdl.port(BService/BService1SOAP)"/> + <binding.ws wsdlElement="http://vtest.wsbinding.wsdlelement.port.bservice#wsdl.port(BService/BService1SOAP)" + uri="http://localhost:8085/BComponent1"/> </service> </component> @@ -35,7 +36,8 @@ <implementation.java class="org.apache.tuscany.sca.vtest.wsbinding.wsdlelement.port.impl.BServiceImpl"/> <service name="BService"> <interface.java interface="org.apache.tuscany.sca.vtest.wsbinding.wsdlelement.port.BService"/> - <binding.ws wsdlElement="http://vtest.wsbinding.wsdlelement.port.bservice#wsdl.port(BService/BService2SOAP)"/> + <binding.ws wsdlElement="http://vtest.wsbinding.wsdlelement.port.bservice#wsdl.port(BService/BService2SOAP)" + uri="http://localhost:8085/BComponent2"/> </service> </component> @@ -43,7 +45,8 @@ <implementation.java class="org.apache.tuscany.sca.vtest.wsbinding.wsdlelement.port.impl.BService2Impl"/> <service name="BService2"> <interface.java interface="org.apache.tuscany.sca.vtest.wsbinding.wsdlelement.port.BService2"/> - <binding.ws wsdlElement="http://vtest.wsbinding.wsdlelement.port.bservice#wsdl.port(BService2/BService2Port)"/> + <binding.ws wsdlElement="http://vtest.wsbinding.wsdlelement.port.bservice#wsdl.port(BService2/BService2Port)" + uri="http://localhost:8085/BComponent3"/> </service> </component> @@ -51,7 +54,8 @@ <implementation.java class="org.apache.tuscany.sca.vtest.wsbinding.wsdlelement.port.impl.BServiceImpl"/> <service name="BService"> <interface.java interface="org.apache.tuscany.sca.vtest.wsbinding.wsdlelement.port.BService"/> - <binding.ws wsdlElement="http://vtest.wsbinding.wsdlelement.port.bservice#wsdl.port(BService/BService3SOAP12)"/> + <binding.ws wsdlElement="http://vtest.wsbinding.wsdlelement.port.bservice#wsdl.port(BService/BService3SOAP12)" + uri="http://localhost:8085/BComponent4"/> </service> </component> @@ -59,7 +63,8 @@ <implementation.java class="org.apache.tuscany.sca.vtest.wsbinding.wsdlelement.port.impl.CServiceImpl"/> <service name="CService"> <interface.java interface="org.apache.tuscany.sca.vtest.wsbinding.wsdlelement.port.CService"/> - <binding.ws wsdlElement="http://vtest.wsbinding.wsdlelement.port.cservice#wsdl.port(CService/CServiceSOAP)"/> + <binding.ws wsdlElement="http://vtest.wsbinding.wsdlelement.port.cservice#wsdl.port(CService/CServiceSOAP)" + uri="http://localhost:8085/CComponent"/> </service> </component> @@ -67,7 +72,7 @@ <implementation.java class="org.apache.tuscany.sca.vtest.wsbinding.wsdlelement.port.impl.AServiceImpl"/> <reference name="b1" target="BComponent1/BService"> <interface.java interface="org.apache.tuscany.sca.vtest.wsbinding.wsdlelement.port.BService"/> - <binding.ws wsdlElement="http://vtest.wsbinding.wsdlelement.port.bservice#wsdl.port(BService/BService1SOAP)" uri="http://localhost:8080/BComponent1"/> + <binding.ws wsdlElement="http://vtest.wsbinding.wsdlelement.port.bservice#wsdl.port(BService/BService1SOAP)" uri="http://localhost:8085/BComponent1"/> </reference> </component> @@ -75,7 +80,7 @@ <implementation.java class="org.apache.tuscany.sca.vtest.wsbinding.wsdlelement.port.impl.AServiceImpl"/> <reference name="b1" target="BComponent2/BService"> <interface.java interface="org.apache.tuscany.sca.vtest.wsbinding.wsdlelement.port.BService"/> - <binding.ws wsdlElement="http://vtest.wsbinding.wsdlelement.port.bservice#wsdl.port(BService/BService2SOAP)" uri="http://localhost:8080/BComponent2"/> + <binding.ws wsdlElement="http://vtest.wsbinding.wsdlelement.port.bservice#wsdl.port(BService/BService2SOAP)" uri="http://localhost:8085/BComponent2"/> </reference> </component> @@ -83,7 +88,7 @@ <implementation.java class="org.apache.tuscany.sca.vtest.wsbinding.wsdlelement.port.impl.AServiceImpl"/> <reference name="b2" target="BComponent3/BService2"> <interface.java interface="org.apache.tuscany.sca.vtest.wsbinding.wsdlelement.port.BService2"/> - <binding.ws wsdlElement="http://vtest.wsbinding.wsdlelement.port.bservice#wsdl.port(BService2/BService2Port)" uri="http://localhost:8080/BComponent3"/> + <binding.ws wsdlElement="http://vtest.wsbinding.wsdlelement.port.bservice#wsdl.port(BService2/BService2Port)" uri="http://localhost:8085/BComponent3"/> </reference> </component> @@ -91,7 +96,7 @@ <implementation.java class="org.apache.tuscany.sca.vtest.wsbinding.wsdlelement.port.impl.AServiceImpl"/> <reference name="b1" target="BComponent4/BService"> <interface.java interface="org.apache.tuscany.sca.vtest.wsbinding.wsdlelement.port.BService"/> - <binding.ws wsdlElement="http://vtest.wsbinding.wsdlelement.port.bservice#wsdl.port(BService/BService3SOAP12)" uri="http://localhost:8080/BComponent4"/> + <binding.ws wsdlElement="http://vtest.wsbinding.wsdlelement.port.bservice#wsdl.port(BService/BService3SOAP12)" uri="http://localhost:8085/BComponent4"/> </reference> </component> @@ -99,11 +104,11 @@ <implementation.java class="org.apache.tuscany.sca.vtest.wsbinding.wsdlelement.port.impl.DServiceImpl"/> <reference name="b1" target="BComponent1/BService"> <interface.java interface="org.apache.tuscany.sca.vtest.wsbinding.wsdlelement.port.BService"/> - <binding.ws wsdlElement="http://vtest.wsbinding.wsdlelement.port.bservice#wsdl.port(BService/BService1SOAP)" uri="http://localhost:8080/BComponent1"/> + <binding.ws wsdlElement="http://vtest.wsbinding.wsdlelement.port.bservice#wsdl.port(BService/BService1SOAP)" uri="http://localhost:8085/BComponent1"/> </reference> <reference name="c1" target="CComponent/CService"> <interface.java interface="org.apache.tuscany.sca.vtest.wsbinding.wsdlelement.port.CService"/> - <binding.ws wsdlElement="http://vtest.wsbinding.wsdlelement.port.cservice#wsdl.port(CService/CServiceSOAP)" uri="http://localhost:8080/CComponent"/> + <binding.ws wsdlElement="http://vtest.wsbinding.wsdlelement.port.cservice#wsdl.port(CService/CServiceSOAP)" uri="http://localhost:8085/CComponent"/> </reference> </component> diff --git a/java/sca/vtest/wsbinding/wsdlelement/service/src/main/resources/wsdlelement.service.composite b/java/sca/vtest/wsbinding/wsdlelement/service/src/main/resources/wsdlelement.service.composite index 0fa6897965..9801ecd037 100644 --- a/java/sca/vtest/wsbinding/wsdlelement/service/src/main/resources/wsdlelement.service.composite +++ b/java/sca/vtest/wsbinding/wsdlelement/service/src/main/resources/wsdlelement.service.composite @@ -26,7 +26,7 @@ <implementation.java class="org.apache.tuscany.sca.vtest.wsbinding.wsdlelement.service.impl.BServiceImpl"/> <service name="BService"> <interface.java interface="org.apache.tuscany.sca.vtest.wsbinding.wsdlelement.service.BService"/> - <binding.ws wsdlElement="http://vtest.wsbinding.wsdlelement.service.bservice#wsdl.service(BService)"/> + <binding.ws wsdlElement="http://vtest.wsbinding.wsdlelement.service.bservice#wsdl.service(BService)" uri="http://localhost:8085/BComponent1"/> </service> </component> @@ -34,7 +34,7 @@ <implementation.java class="org.apache.tuscany.sca.vtest.wsbinding.wsdlelement.service.impl.BServiceImpl"/> <service name="BService"> <interface.java interface="org.apache.tuscany.sca.vtest.wsbinding.wsdlelement.service.BService"/> - <binding.ws wsdlElement="http://vtest.wsbinding.wsdlelement.service.bservice#wsdl.service(BService2)"/> + <binding.ws wsdlElement="http://vtest.wsbinding.wsdlelement.service.bservice#wsdl.service(BService2)" uri="http://localhost:8085/BComponent2"/> </service> </component> @@ -42,7 +42,7 @@ <implementation.java class="org.apache.tuscany.sca.vtest.wsbinding.wsdlelement.service.impl.BService2Impl"/> <service name="BService2"> <interface.java interface="org.apache.tuscany.sca.vtest.wsbinding.wsdlelement.service.BService2"/> - <binding.ws wsdlElement="http://vtest.wsbinding.wsdlelement.service.bservice#wsdl.service(BService2)"/> + <binding.ws wsdlElement="http://vtest.wsbinding.wsdlelement.service.bservice#wsdl.service(BService2)" uri="http://localhost:8085/BComponent3"/> </service> </component> @@ -50,7 +50,7 @@ <implementation.java class="org.apache.tuscany.sca.vtest.wsbinding.wsdlelement.service.impl.BServiceImpl"/> <service name="BService"> <interface.java interface="org.apache.tuscany.sca.vtest.wsbinding.wsdlelement.service.BService"/> - <binding.ws wsdlElement="http://vtest.wsbinding.wsdlelement.service.bservice#wsdl.port(BService/BService1SOAP)"/> + <binding.ws wsdlElement="http://vtest.wsbinding.wsdlelement.service.bservice#wsdl.port(BService/BService1SOAP)" uri="http://localhost:8085/BComponent4"/> </service> </component> @@ -58,7 +58,7 @@ <implementation.java class="org.apache.tuscany.sca.vtest.wsbinding.wsdlelement.service.impl.BService2Impl"/> <service name="BService2"> <interface.java interface="org.apache.tuscany.sca.vtest.wsbinding.wsdlelement.service.BService2"/> - <binding.ws wsdlElement="http://vtest.wsbinding.wsdlelement.service.bservice#wsdl.binding(BService2SOAPBinding)"/> + <binding.ws wsdlElement="http://vtest.wsbinding.wsdlelement.service.bservice#wsdl.binding(BService2SOAPBinding)" uri="http://localhost:8085/BComponent5"/> </service> </component> @@ -66,7 +66,7 @@ <implementation.java class="org.apache.tuscany.sca.vtest.wsbinding.wsdlelement.service.impl.BServiceImpl"/> <service name="BService"> <interface.java interface="org.apache.tuscany.sca.vtest.wsbinding.wsdlelement.service.BService"/> - <binding.ws wsdlElement="http://vtest.wsbinding.wsdlelement.service.bservice#wsdl.service(BService3)"/> + <binding.ws wsdlElement="http://vtest.wsbinding.wsdlelement.service.bservice#wsdl.service(BService3)" uri="http://localhost:8085/BComponent6"/> </service> </component> @@ -74,7 +74,7 @@ <implementation.java class="org.apache.tuscany.sca.vtest.wsbinding.wsdlelement.service.impl.CServiceImpl"/> <service name="CService"> <interface.java interface="org.apache.tuscany.sca.vtest.wsbinding.wsdlelement.service.CService"/> - <binding.ws wsdlElement="http://vtest.wsbinding.wsdlelement.service.cservice#wsdl.service(CService)"/> + <binding.ws wsdlElement="http://vtest.wsbinding.wsdlelement.service.cservice#wsdl.service(CService)" uri="http://localhost:8085/CComponent"/> </service> </component> @@ -82,7 +82,7 @@ <implementation.java class="org.apache.tuscany.sca.vtest.wsbinding.wsdlelement.service.impl.AServiceImpl"/> <reference name="b1" target="BComponent1/BService"> <interface.java interface="org.apache.tuscany.sca.vtest.wsbinding.wsdlelement.service.BService"/> - <binding.ws wsdlElement="http://vtest.wsbinding.wsdlelement.service.bservice#wsdl.service(BService)" uri="http://localhost:8080/BComponent1"/> + <binding.ws wsdlElement="http://vtest.wsbinding.wsdlelement.service.bservice#wsdl.service(BService)" uri="http://localhost:8085/BComponent1"/> </reference> </component> @@ -90,7 +90,7 @@ <implementation.java class="org.apache.tuscany.sca.vtest.wsbinding.wsdlelement.service.impl.AServiceImpl"/> <reference name="b1" target="BComponent2/BService"> <interface.java interface="org.apache.tuscany.sca.vtest.wsbinding.wsdlelement.service.BService"/> - <binding.ws wsdlElement="http://vtest.wsbinding.wsdlelement.service.bservice#wsdl.service(BService2)" uri="http://localhost:8080/BComponent2"/> + <binding.ws wsdlElement="http://vtest.wsbinding.wsdlelement.service.bservice#wsdl.service(BService2)" uri="http://localhost:8085/BComponent2"/> </reference> </component> @@ -98,7 +98,7 @@ <implementation.java class="org.apache.tuscany.sca.vtest.wsbinding.wsdlelement.service.impl.AServiceImpl"/> <reference name="b2" target="BComponent3/BService2"> <interface.java interface="org.apache.tuscany.sca.vtest.wsbinding.wsdlelement.service.BService2"/> - <binding.ws wsdlElement="http://vtest.wsbinding.wsdlelement.service.bservice#wsdl.service(BService2)" uri="http://localhost:8080/BComponent3"/> + <binding.ws wsdlElement="http://vtest.wsbinding.wsdlelement.service.bservice#wsdl.service(BService2)" uri="http://localhost:8085/BComponent3"/> </reference> </component> @@ -106,19 +106,19 @@ <implementation.java class="org.apache.tuscany.sca.vtest.wsbinding.wsdlelement.service.impl.AServiceImpl"/> <reference name="b1" target="BComponent4/BService"> <interface.java interface="org.apache.tuscany.sca.vtest.wsbinding.wsdlelement.service.BService"/> - <binding.ws wsdlElement="http://vtest.wsbinding.wsdlelement.service.bservice#wsdl.port(BService/BService1SOAP)" uri="http://localhost:8080/BComponent4"/> + <binding.ws wsdlElement="http://vtest.wsbinding.wsdlelement.service.bservice#wsdl.port(BService/BService1SOAP)" uri="http://localhost:8085/BComponent4"/> </reference> <reference name="b2" target="BComponent3/BService2"> <interface.java interface="org.apache.tuscany.sca.vtest.wsbinding.wsdlelement.service.BService2"/> - <binding.ws wsdlElement="http://vtest.wsbinding.wsdlelement.service.bservice#wsdl.service(BService2)" uri="http://localhost:8080/BComponent3"/> + <binding.ws wsdlElement="http://vtest.wsbinding.wsdlelement.service.bservice#wsdl.service(BService2)" uri="http://localhost:8085/BComponent3"/> </reference> <reference name="b3" target="BComponent5/BService2"> <interface.java interface="org.apache.tuscany.sca.vtest.wsbinding.wsdlelement.service.BService2"/> - <binding.ws wsdlElement="http://vtest.wsbinding.wsdlelement.service.bservice#wsdl.binding(BService2SOAPBinding)" uri="http://localhost:8080/BComponent5"/> + <binding.ws wsdlElement="http://vtest.wsbinding.wsdlelement.service.bservice#wsdl.binding(BService2SOAPBinding)" uri="http://localhost:8085/BComponent5"/> </reference> <reference name="b4" target="BComponent6/BService"> <interface.java interface="org.apache.tuscany.sca.vtest.wsbinding.wsdlelement.service.BService"/> - <binding.ws wsdlElement="http://vtest.wsbinding.wsdlelement.service.bservice#wsdl.service(BService3)" uri="http://localhost:8080/BComponent6"/> + <binding.ws wsdlElement="http://vtest.wsbinding.wsdlelement.service.bservice#wsdl.service(BService3)" uri="http://localhost:8085/BComponent6"/> </reference> </component> @@ -126,7 +126,7 @@ <implementation.java class="org.apache.tuscany.sca.vtest.wsbinding.wsdlelement.service.impl.AServiceImpl"/> <reference name="b1" target="BComponent6/BService"> <interface.java interface="org.apache.tuscany.sca.vtest.wsbinding.wsdlelement.service.BService"/> - <binding.ws wsdlElement="http://vtest.wsbinding.wsdlelement.service.bservice#wsdl.service(BService3)" uri="http://localhost:8080/BComponent6"/> + <binding.ws wsdlElement="http://vtest.wsbinding.wsdlelement.service.bservice#wsdl.service(BService3)" uri="http://localhost:8085/BComponent6"/> </reference> </component> @@ -134,11 +134,11 @@ <implementation.java class="org.apache.tuscany.sca.vtest.wsbinding.wsdlelement.service.impl.DServiceImpl"/> <reference name="b1" target="BComponent1/BService"> <interface.java interface="org.apache.tuscany.sca.vtest.wsbinding.wsdlelement.service.BService"/> - <binding.ws wsdlElement="http://vtest.wsbinding.wsdlelement.service.bservice#wsdl.service(BService)" uri="http://localhost:8080/BComponent1"/> + <binding.ws wsdlElement="http://vtest.wsbinding.wsdlelement.service.bservice#wsdl.service(BService)" uri="http://localhost:8085/BComponent1"/> </reference> <reference name="c1" target="CComponent/CService"> <interface.java interface="org.apache.tuscany.sca.vtest.wsbinding.wsdlelement.service.CService"/> - <binding.ws wsdlElement="http://vtest.wsbinding.wsdlelement.service.cservice#wsdl.service(CService)" uri="http://localhost:8080/CComponent"/> + <binding.ws wsdlElement="http://vtest.wsbinding.wsdlelement.service.cservice#wsdl.service(CService)" uri="http://localhost:8085/CComponent"/> </reference> </component> |