diff options
Diffstat (limited to '')
22 files changed, 161 insertions, 156 deletions
diff --git a/branches/sca-java-1.3.2/itest/validation/src/main/resources/impl/osgi/MissingComponentTypeFile/OSGiTestService.jar b/branches/sca-java-1.3.2/itest/validation/src/main/resources/impl/osgi/MissingComponentTypeFile/OSGiTestService.jar Binary files differindex 27b33bff3f..09085705e0 100644 --- a/branches/sca-java-1.3.2/itest/validation/src/main/resources/impl/osgi/MissingComponentTypeFile/OSGiTestService.jar +++ b/branches/sca-java-1.3.2/itest/validation/src/main/resources/impl/osgi/MissingComponentTypeFile/OSGiTestService.jar diff --git a/branches/sca-java-1.3.2/itest/validation/src/main/resources/impl/osgi/PropertyShouldSpecifySR/OSGiTestService.jar b/branches/sca-java-1.3.2/itest/validation/src/main/resources/impl/osgi/PropertyShouldSpecifySR/OSGiTestService.jar Binary files differindex d57906dffa..192924ed0e 100644 --- a/branches/sca-java-1.3.2/itest/validation/src/main/resources/impl/osgi/PropertyShouldSpecifySR/OSGiTestService.jar +++ b/branches/sca-java-1.3.2/itest/validation/src/main/resources/impl/osgi/PropertyShouldSpecifySR/OSGiTestService.jar diff --git a/branches/sca-java-1.3.2/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/AxisPolicyHelper.java b/branches/sca-java-1.3.2/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/AxisPolicyHelper.java index c5b1666e4f..1f389b422f 100644 --- a/branches/sca-java-1.3.2/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/AxisPolicyHelper.java +++ b/branches/sca-java-1.3.2/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/AxisPolicyHelper.java @@ -39,7 +39,7 @@ public class AxisPolicyHelper { public static final QName CONFIDENTIALITY_INTENT = new QName(XMLNS_SCA_1_0, "confidentiality"); public static final QName INTEGRITY_INTENT = new QName(XMLNS_SCA_1_0, "integrity"); public static final QName MTOM_INTENT = new QName(XMLNS_SCA_1_0, "MTOM"); - public static final QName SOAP12_INTENT = new QName(XMLNS_SCA_1_0, "soap12"); + public static final QName SOAP12_INTENT = new QName(XMLNS_SCA_1_0, "SOAP12"); public static PolicySet getPolicySet(Binding wsBinding, QName intentName) { PolicySet returnPolicySet = null; diff --git a/branches/sca-java-1.3.2/modules/binding-ws-axis2/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/definitions.xml b/branches/sca-java-1.3.2/modules/binding-ws-axis2/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/definitions.xml index 57b3eaa565..b11059df15 100644 --- a/branches/sca-java-1.3.2/modules/binding-ws-axis2/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/definitions.xml +++ b/branches/sca-java-1.3.2/modules/binding-ws-axis2/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/definitions.xml @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="ASCII"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!--
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -17,37 +17,38 @@ * specific language governing permissions and limitations
* under the License.
-->
+
+<!-- $Rev$ $Date$ -->
+
<sca:definitions xmlns="http://www.osoa.org/xmlns/sca/1.0"
- targetNamespace="http://www.osoa.org/xmlns/sca/1.0"
- xmlns:sca="http://www.osoa.org/xmlns/sca/1.0"
- xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0">
-
- <sca:bindingType type="sca:binding.ws" mayProvide="soap soap.1_1 soap.1_2" alwaysProvides=""
- />
+ targetNamespace="http://www.osoa.org/xmlns/sca/1.0"
+ xmlns:sca="http://www.osoa.org/xmlns/sca/1.0"
+ xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0">
+
+ <sca:bindingType type="sca:binding.ws" mayProvide="SOAP SOAP.1_1 SOAP.1_2" alwaysProvides=""/>
- <!-- PolicyIntents defined by the SCA Runtime Extension for WS Binding Axis 2 -->
- <sca:intent name="soap"
- constrains="sca:binding.ws">
- <sca:description>
- Communitcation thro this binding requires SOAP
- </sca:description>
- </sca:intent>
-
- <sca:intent name="soap.1_1">
- <sca:description>
- Communitcation thro this binding requires SOAP 1.1
- </sca:description>
- </sca:intent>
-
- <sca:intent name="soap.1_2">
- <sca:description>
- Communitcation thro this binding requires SOAP 1.2
- </sca:description>
- </sca:intent>
- <sca:intent name="MTOM"
- constrains="sca:binding.ws">
- <sca:description>
- Communitcation thro this binding requires MTOM support
- </sca:description>
- </sca:intent>
+ <!-- PolicyIntents defined by the SCA Runtime Extension for WS Binding Axis 2 -->
+ <sca:intent name="SOAP" constrains="sca:binding.ws">
+ <sca:description>
+ Communication through this binding requires SOAP
+ </sca:description>
+ </sca:intent>
+
+ <sca:intent name="SOAP.1_1">
+ <sca:description>
+ Communication through this binding requires SOAP 1.1
+ </sca:description>
+ </sca:intent>
+
+ <sca:intent name="SOAP.1_2">
+ <sca:description>
+ Communication through this binding requires SOAP 1.2
+ </sca:description>
+ </sca:intent>
+
+ <sca:intent name="MTOM" constrains="sca:binding.ws">
+ <sca:description>
+ Communication through this binding requires MTOM support
+ </sca:description>
+ </sca:intent>
</sca:definitions>
diff --git a/branches/sca-java-1.3.2/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/soap12/QuestionMarkWSDLTestCase.java b/branches/sca-java-1.3.2/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/soap12/QuestionMarkWSDLTestCase.java index 88a8b9b01d..8d378565d4 100644 --- a/branches/sca-java-1.3.2/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/soap12/QuestionMarkWSDLTestCase.java +++ b/branches/sca-java-1.3.2/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/soap12/QuestionMarkWSDLTestCase.java @@ -66,7 +66,7 @@ public class QuestionMarkWSDLTestCase extends TestCase { } /** - * Tests ?wsdl returns a soap 1.1 port when binding uses requires="soap.1_1" + * Tests ?wsdl returns a soap 1.1 port when binding uses requires="SOAP.1_1" */ public void testSOAP11Endpoint() throws Exception { WSDLReader wsdlReader = WSDLFactory.newInstance().newWSDLReader(); @@ -86,7 +86,7 @@ public class QuestionMarkWSDLTestCase extends TestCase { } /** - * Tests ?wsdl returns a soap 1.2 port when binding uses requires="soap.1_2" + * Tests ?wsdl returns a soap 1.2 port when binding uses requires="SOAP.1_2" */ public void testSOAP12Endpoint() throws Exception { WSDLReader wsdlReader = WSDLFactory.newInstance().newWSDLReader(); diff --git a/branches/sca-java-1.3.2/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/soap12/HelloWorldSOAP12.composite b/branches/sca-java-1.3.2/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/soap12/HelloWorldSOAP12.composite index 5042dc7a0c..fbd4c66c45 100644 --- a/branches/sca-java-1.3.2/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/soap12/HelloWorldSOAP12.composite +++ b/branches/sca-java-1.3.2/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/soap12/HelloWorldSOAP12.composite @@ -25,13 +25,13 @@ <binding.ws uri="http://localhost:8085/helloWorld"/>
</service>
<service name="helloWorldSOAP" promote="HelloWorldService">
- <binding.ws requires="soap" uri="http://localhost:8085/helloWorldSOAP"/>
+ <binding.ws requires="SOAP" uri="http://localhost:8085/helloWorldSOAP"/>
</service>
<service name="helloWorldSOAP11" promote="HelloWorldService">
- <binding.ws requires="soap.1_1" uri="http://localhost:8085/helloWorldSOAP11"/>
+ <binding.ws requires="SOAP.1_1" uri="http://localhost:8085/helloWorldSOAP11"/>
</service>
<service name="helloWorldSOAP12" promote="HelloWorldService">
- <binding.ws requires="soap.1_2" uri="http://localhost:8085/helloWorldSOAP12"/>
+ <binding.ws requires="SOAP.1_2" uri="http://localhost:8085/helloWorldSOAP12"/>
</service>
<component name="HelloWorldService">
@@ -59,13 +59,13 @@ <binding.ws uri="http://localhost:8085/helloWorld"/>
</reference>
<reference name="helloWorldWS" promote="HelloWorldClientSOAP/helloWorldWS">
- <binding.ws uri="http://localhost:8085/helloWorldSOAP" requires="soap"/>
+ <binding.ws uri="http://localhost:8085/helloWorldSOAP" requires="SOAP"/>
</reference>
<reference name="helloWorldWS" promote="HelloWorldClientSOAP11/helloWorldWS">
- <binding.ws uri="http://localhost:8085/helloWorldSOAP11" requires="soap.1_1"/>
+ <binding.ws uri="http://localhost:8085/helloWorldSOAP11" requires="SOAP.1_1"/>
</reference>
<reference name="helloWorldWS" promote="HelloWorldClientSOAP12/helloWorldWS">
- <binding.ws uri="http://localhost:8085/helloWorldSOAP12" requires="soap.1_2"/>
+ <binding.ws uri="http://localhost:8085/helloWorldSOAP12" requires="SOAP.1_2"/>
</reference>
</composite>
diff --git a/branches/sca-java-1.3.2/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/soap12/questionmark-wsdl.composite b/branches/sca-java-1.3.2/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/soap12/questionmark-wsdl.composite index d2e2fd3e09..033a77eea6 100644 --- a/branches/sca-java-1.3.2/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/soap12/questionmark-wsdl.composite +++ b/branches/sca-java-1.3.2/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/soap12/questionmark-wsdl.composite @@ -26,11 +26,11 @@ </service>
<service name="ep2" promote="HelloWorldService">
- <binding.ws requires="soap.1_1" uri="http://localhost:8085/ep2"/>
+ <binding.ws requires="SOAP.1_1" uri="http://localhost:8085/ep2"/>
</service>
<service name="ep3" promote="HelloWorldService">
- <binding.ws requires="soap.1_2" uri="http://localhost:8085/ep3"/>
+ <binding.ws requires="SOAP.1_2" uri="http://localhost:8085/ep3"/>
</service>
<component name="HelloWorldService">
diff --git a/branches/sca-java-1.3.2/modules/binding-ws-wsdlgen/src/main/java/org/apache/tuscany/sca/binding/ws/wsdlgen/BindingWSDLGenerator.java b/branches/sca-java-1.3.2/modules/binding-ws-wsdlgen/src/main/java/org/apache/tuscany/sca/binding/ws/wsdlgen/BindingWSDLGenerator.java index d94ed30c34..de1cab15d8 100644 --- a/branches/sca-java-1.3.2/modules/binding-ws-wsdlgen/src/main/java/org/apache/tuscany/sca/binding/ws/wsdlgen/BindingWSDLGenerator.java +++ b/branches/sca-java-1.3.2/modules/binding-ws-wsdlgen/src/main/java/org/apache/tuscany/sca/binding/ws/wsdlgen/BindingWSDLGenerator.java @@ -61,7 +61,7 @@ import org.apache.tuscany.sca.xsd.XSDFactory; */ public class BindingWSDLGenerator { private static final Logger logger = Logger.getLogger(BindingWSDLGenerator.class.getName()); - private static final QName SOAP12_INTENT = new QName("http://www.osoa.org/xmlns/sca/1.0", "soap.1_2"); + private static final QName SOAP12_INTENT = new QName("http://www.osoa.org/xmlns/sca/1.0", "SOAP.1_2"); public static boolean printWSDL; // external code sets this to print generated WSDL diff --git a/branches/sca-java-1.3.2/modules/binding-ws-wsdlgen/src/main/java/org/apache/tuscany/sca/binding/ws/wsdlgen/Interface2WSDLGenerator.java b/branches/sca-java-1.3.2/modules/binding-ws-wsdlgen/src/main/java/org/apache/tuscany/sca/binding/ws/wsdlgen/Interface2WSDLGenerator.java index 1047331924..b8f5b356dd 100644 --- a/branches/sca-java-1.3.2/modules/binding-ws-wsdlgen/src/main/java/org/apache/tuscany/sca/binding/ws/wsdlgen/Interface2WSDLGenerator.java +++ b/branches/sca-java-1.3.2/modules/binding-ws-wsdlgen/src/main/java/org/apache/tuscany/sca/binding/ws/wsdlgen/Interface2WSDLGenerator.java @@ -215,9 +215,9 @@ public class Interface2WSDLGenerator { QName name = getQName(iface); Definition definition = factory.newDefinition(); if (requiresSOAP12) { - definition.addNamespace("soap12", "http://schemas.xmlsoap.org/wsdl/soap12/"); + definition.addNamespace("SOAP12", "http://schemas.xmlsoap.org/wsdl/soap12/"); } else { - definition.addNamespace("soap", "http://schemas.xmlsoap.org/wsdl/soap/"); + definition.addNamespace("SOAP", "http://schemas.xmlsoap.org/wsdl/soap/"); } definition.addNamespace("wsdl", "http://schemas.xmlsoap.org/wsdl/"); definition.addNamespace("xs", SCHEMA_NS); diff --git a/branches/sca-java-1.3.2/modules/binding-ws-wsdlgen/src/main/java/org/apache/tuscany/sca/binding/ws/wsdlgen/WSDLServiceGenerator.java b/branches/sca-java-1.3.2/modules/binding-ws-wsdlgen/src/main/java/org/apache/tuscany/sca/binding/ws/wsdlgen/WSDLServiceGenerator.java index d2e2e9eb34..ebfbdc509a 100644 --- a/branches/sca-java-1.3.2/modules/binding-ws-wsdlgen/src/main/java/org/apache/tuscany/sca/binding/ws/wsdlgen/WSDLServiceGenerator.java +++ b/branches/sca-java-1.3.2/modules/binding-ws-wsdlgen/src/main/java/org/apache/tuscany/sca/binding/ws/wsdlgen/WSDLServiceGenerator.java @@ -280,9 +280,9 @@ public class WSDLServiceGenerator { if (wsBinding.getBinding() == null && ports.size() == 0) { Binding binding = helper.createBinding(def, portType); if (BindingWSDLGenerator.requiresSOAP12(wsBinding)) { - def.addNamespace("soap12", "http://schemas.xmlsoap.org/wsdl/soap12/"); + def.addNamespace("SOAP12", "http://schemas.xmlsoap.org/wsdl/soap12/"); } else { - def.addNamespace("soap11", "http://schemas.xmlsoap.org/wsdl/soap/"); + def.addNamespace("SOAP11", "http://schemas.xmlsoap.org/wsdl/soap/"); } helper.createBindingOperations(def, binding, portType); binding.setUndefined(false); @@ -310,9 +310,9 @@ public class WSDLServiceGenerator { String endpointURI = computeActualURI(wsBinding, null); Port port = helper.createPort(def, wsBinding.getBinding(), service, endpointURI); if (BindingWSDLGenerator.requiresSOAP12(wsBinding)) { - def.addNamespace("soap12", "http://schemas.xmlsoap.org/wsdl/soap12/"); + def.addNamespace("SOAP12", "http://schemas.xmlsoap.org/wsdl/soap12/"); } else { - def.addNamespace("soap11", "http://schemas.xmlsoap.org/wsdl/soap/"); + def.addNamespace("SOAP11", "http://schemas.xmlsoap.org/wsdl/soap/"); } wsBinding.setPort(port); } @@ -349,10 +349,10 @@ public class WSDLServiceGenerator { List bindingExtensions = binding.getExtensibilityElements(); for (final Object extension : bindingExtensions) { if (extension instanceof SOAPBinding) { - newDef.addNamespace("soap11", "http://schemas.xmlsoap.org/wsdl/soap/"); + newDef.addNamespace("SOAP11", "http://schemas.xmlsoap.org/wsdl/soap/"); } if (extension instanceof SOAP12Binding) { - newDef.addNamespace("soap12", "http://schemas.xmlsoap.org/wsdl/soap12/"); + newDef.addNamespace("SOAP12", "http://schemas.xmlsoap.org/wsdl/soap12/"); } } } @@ -412,7 +412,7 @@ public class WSDLServiceGenerator { for (final Object extension : portExtensions) { ExtensibilityElement newExt = null; if (extension instanceof SOAPAddress) { - def.addNamespace("soap11", "http://schemas.xmlsoap.org/wsdl/soap/"); + def.addNamespace("SOAP11", "http://schemas.xmlsoap.org/wsdl/soap/"); try { newExt = def.getExtensionRegistry().createExtension( Port.class, WSDLDefinitionGenerator.SOAP_ADDRESS); @@ -422,7 +422,7 @@ public class WSDLServiceGenerator { ((SOAPAddress)newExt).setLocationURI(uri); newPort.addExtensibilityElement(newExt); } else if (extension instanceof SOAP12Address) { - def.addNamespace("soap12", "http://schemas.xmlsoap.org/wsdl/soap12/"); + def.addNamespace("SOAP12", "http://schemas.xmlsoap.org/wsdl/soap12/"); try { newExt = def.getExtensionRegistry().createExtension( Port.class, WSDLDefinitionGenerator.SOAP12_ADDRESS); diff --git a/branches/sca-java-1.3.2/vtest/wsbinding/nowsdl/defaultbinding/src/main/resources/nowsdl.composite b/branches/sca-java-1.3.2/vtest/wsbinding/nowsdl/defaultbinding/src/main/resources/nowsdl.composite index d8ef16316a..39d66fa365 100644 --- a/branches/sca-java-1.3.2/vtest/wsbinding/nowsdl/defaultbinding/src/main/resources/nowsdl.composite +++ b/branches/sca-java-1.3.2/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/branches/sca-java-1.3.2/vtest/wsbinding/nowsdl/multisoapbindings/src/main/resources/nowsdlmultisoapbindings.composite b/branches/sca-java-1.3.2/vtest/wsbinding/nowsdl/multisoapbindings/src/main/resources/nowsdlmultisoapbindings.composite index 8da87d88fc..8cd599354a 100644 --- a/branches/sca-java-1.3.2/vtest/wsbinding/nowsdl/multisoapbindings/src/main/resources/nowsdlmultisoapbindings.composite +++ b/branches/sca-java-1.3.2/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> @@ -52,7 +52,7 @@ <implementation.java class="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.multisoapbindings.impl.AServiceImpl"/> <reference name="b1" target="BComponent/BService"> <interface.java interface="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.multisoapbindings.BService"/> - <binding.ws requires="soap"/> + <binding.ws requires="SOAP"/> </reference> </component> @@ -60,7 +60,7 @@ <implementation.java class="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.multisoapbindings.impl.AServiceImpl"/> <reference name="b1" target="BComponent/BService"> <interface.java interface="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.multisoapbindings.BService"/> - <binding.ws requires="soap.1_1"/> + <binding.ws requires="SOAP.1_1"/> </reference> </component> @@ -68,7 +68,7 @@ <implementation.java class="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.multisoapbindings.impl.AServiceImpl"/> <reference name="b1" target="BComponent/BService"> <interface.java interface="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.multisoapbindings.BService"/> - <binding.ws requires="soap.1_2"/> + <binding.ws requires="SOAP.1_2"/> </reference> </component> @@ -76,11 +76,11 @@ <implementation.java class="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.multisoapbindings.impl.DServiceImpl"/> <reference name="b1" target="BComponent/BService"> <interface.java interface="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.multisoapbindings.BService"/> - <binding.ws requires="soap.1_1"/> + <binding.ws requires="SOAP.1_1"/> </reference> <reference name="c1" target="CComponent/CService"> <interface.java interface="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.multisoapbindings.CService"/> - <binding.ws requires="soap.1_2"/> + <binding.ws requires="SOAP.1_2"/> </reference> </component> @@ -88,24 +88,24 @@ <implementation.java class="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.multisoapbindings.impl.DServiceImpl"/> <reference name="b1" target="BComponent/BService"> <interface.java interface="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.multisoapbindings.BService"/> - <binding.ws requires="soap.1_2"/> + <binding.ws requires="SOAP.1_2"/> </reference> <reference name="c1" target="CComponent/CService"> <interface.java interface="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.multisoapbindings.CService"/> - <binding.ws requires="soap.1_1"/> + <binding.ws requires="SOAP.1_1"/> </reference> </component> <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/branches/sca-java-1.3.2/vtest/wsbinding/nowsdl/promoted/src/main/resources/nowsdlpromoted.composite b/branches/sca-java-1.3.2/vtest/wsbinding/nowsdl/promoted/src/main/resources/nowsdlpromoted.composite index cf47c072a7..f79df5bf8f 100644 --- a/branches/sca-java-1.3.2/vtest/wsbinding/nowsdl/promoted/src/main/resources/nowsdlpromoted.composite +++ b/branches/sca-java-1.3.2/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/branches/sca-java-1.3.2/vtest/wsbinding/nowsdl/soapversion/src/main/resources/nowsdlsoapversion.composite b/branches/sca-java-1.3.2/vtest/wsbinding/nowsdl/soapversion/src/main/resources/nowsdlsoapversion.composite index 464bb4ebf3..61a658ab55 100644 --- a/branches/sca-java-1.3.2/vtest/wsbinding/nowsdl/soapversion/src/main/resources/nowsdlsoapversion.composite +++ b/branches/sca-java-1.3.2/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/branches/sca-java-1.3.2/vtest/wsbinding/service/src/main/resources/aservice.wsdl b/branches/sca-java-1.3.2/vtest/wsbinding/service/src/main/resources/aservice.wsdl index 861ab471ee..e7953eb2b4 100644 --- a/branches/sca-java-1.3.2/vtest/wsbinding/service/src/main/resources/aservice.wsdl +++ b/branches/sca-java-1.3.2/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/branches/sca-java-1.3.2/vtest/wsbinding/service/src/main/resources/endpoint-uri-resolution.composite b/branches/sca-java-1.3.2/vtest/wsbinding/service/src/main/resources/endpoint-uri-resolution.composite index b3ab971c67..0d92174442 100644 --- a/branches/sca-java-1.3.2/vtest/wsbinding/service/src/main/resources/endpoint-uri-resolution.composite +++ b/branches/sca-java-1.3.2/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/branches/sca-java-1.3.2/vtest/wsbinding/service/src/main/resources/endpointreference.composite b/branches/sca-java-1.3.2/vtest/wsbinding/service/src/main/resources/endpointreference.composite index bb3bbef390..3ba152b7b8 100644 --- a/branches/sca-java-1.3.2/vtest/wsbinding/service/src/main/resources/endpointreference.composite +++ b/branches/sca-java-1.3.2/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/branches/sca-java-1.3.2/vtest/wsbinding/service/src/main/resources/wsdlbinding.composite b/branches/sca-java-1.3.2/vtest/wsbinding/service/src/main/resources/wsdlbinding.composite index d24c1ac4af..85c604070a 100644 --- a/branches/sca-java-1.3.2/vtest/wsbinding/service/src/main/resources/wsdlbinding.composite +++ b/branches/sca-java-1.3.2/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/branches/sca-java-1.3.2/vtest/wsbinding/service/src/main/resources/wsdlendpoint.composite b/branches/sca-java-1.3.2/vtest/wsbinding/service/src/main/resources/wsdlendpoint.composite index 92c30e5d90..0c11c79efe 100644 --- a/branches/sca-java-1.3.2/vtest/wsbinding/service/src/main/resources/wsdlendpoint.composite +++ b/branches/sca-java-1.3.2/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/branches/sca-java-1.3.2/vtest/wsbinding/service/src/main/resources/wsdlport.composite b/branches/sca-java-1.3.2/vtest/wsbinding/service/src/main/resources/wsdlport.composite index 961ae28e5a..859b93bec4 100644 --- a/branches/sca-java-1.3.2/vtest/wsbinding/service/src/main/resources/wsdlport.composite +++ b/branches/sca-java-1.3.2/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/branches/sca-java-1.3.2/vtest/wsbinding/service/src/main/resources/wsdlservice.composite b/branches/sca-java-1.3.2/vtest/wsbinding/service/src/main/resources/wsdlservice.composite index 093eb83323..fa96e650de 100644 --- a/branches/sca-java-1.3.2/vtest/wsbinding/service/src/main/resources/wsdlservice.composite +++ b/branches/sca-java-1.3.2/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/branches/sca-java-1.3.2/vtest/wsbinding/service/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/EndpointUriResolutionTestCase.java b/branches/sca-java-1.3.2/vtest/wsbinding/service/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/EndpointUriResolutionTestCase.java index b9f679c9a7..49f9db248f 100644 --- a/branches/sca-java-1.3.2/vtest/wsbinding/service/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/EndpointUriResolutionTestCase.java +++ b/branches/sca-java-1.3.2/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"); |