diff options
Diffstat (limited to 'branches/sca-java-1.x/itest/databindings/jaxb-top-down/src')
4 files changed, 18 insertions, 23 deletions
diff --git a/branches/sca-java-1.x/itest/databindings/jaxb-top-down/src/main/resources/wsdl/wrapped/helloservice.composite b/branches/sca-java-1.x/itest/databindings/jaxb-top-down/src/main/resources/wsdl/wrapped/helloservice.composite index 63151f6a2d..afde4b7de9 100644 --- a/branches/sca-java-1.x/itest/databindings/jaxb-top-down/src/main/resources/wsdl/wrapped/helloservice.composite +++ b/branches/sca-java-1.x/itest/databindings/jaxb-top-down/src/main/resources/wsdl/wrapped/helloservice.composite @@ -33,7 +33,7 @@ <implementation.java class="org.apache.tuscany.sca.itest.databindings.jaxb.impl.HelloServiceClientImpl" /> <reference name="helloService"> <interface.wsdl interface="http://jaxb.databindings.itest.sca.tuscany.apache.org/#wsdl.interface(HelloService)"/> - <binding.ws uri="http://localhost:8085/hs-ep-w"/> + <binding.ws uri="http://localhost:8085/hs-ep-w" requires="MTOM"/> </reference> </component> @@ -44,7 +44,7 @@ <implementation.java class="org.apache.tuscany.sca.itest.databindings.jaxb.impl.HelloServiceClientImpl" /> <reference name="helloService"> <interface.java interface="org.apache.tuscany.sca.itest.databindings.jaxb.HelloService"/> - <binding.ws uri="http://localhost:8085/hs-ep-w"/> + <binding.ws uri="http://localhost:8085/hs-ep-w" requires="MTOM"/> </reference> </component> @@ -55,7 +55,7 @@ <implementation.java class="org.apache.tuscany.sca.itest.databindings.jaxb.impl.HelloServiceClientImpl" /> <reference name="helloService"> <interface.wsdl interface="http://jaxb.databindings.itest.sca.tuscany.apache.org/#wsdl.interface(HelloService)"/> - <binding.ws uri="http://localhost:8085/hs-ep-j"/> + <binding.ws uri="http://localhost:8085/hs-ep-j" requires="MTOM"/> </reference> </component> @@ -65,7 +65,7 @@ <implementation.java class="org.apache.tuscany.sca.itest.databindings.jaxb.impl.HelloServiceImpl"/> <service name="HelloService"> <interface.wsdl interface="http://jaxb.databindings.itest.sca.tuscany.apache.org/#wsdl.interface(HelloService)"/> - <binding.ws uri="http://localhost:8085/hs-ep-w"/> + <binding.ws uri="http://localhost:8085/hs-ep-w" requires="MTOM"/> </service> </component> @@ -74,7 +74,7 @@ <implementation.java class="org.apache.tuscany.sca.itest.databindings.jaxb.impl.HelloServiceImpl"/> <service name="HelloService"> <interface.java interface="org.apache.tuscany.sca.itest.databindings.jaxb.HelloService"/> - <binding.ws uri="http://localhost:8085/hs-ep-j"/> + <binding.ws uri="http://localhost:8085/hs-ep-j" requires="MTOM"/> </service> </component> </composite> diff --git a/branches/sca-java-1.x/itest/databindings/jaxb-top-down/src/main/resources/wsdl/wrapped/primitivesservice.composite b/branches/sca-java-1.x/itest/databindings/jaxb-top-down/src/main/resources/wsdl/wrapped/primitivesservice.composite index 85ca6d0789..f218419f45 100644 --- a/branches/sca-java-1.x/itest/databindings/jaxb-top-down/src/main/resources/wsdl/wrapped/primitivesservice.composite +++ b/branches/sca-java-1.x/itest/databindings/jaxb-top-down/src/main/resources/wsdl/wrapped/primitivesservice.composite @@ -33,7 +33,7 @@ <implementation.java class="org.apache.tuscany.sca.itest.databindings.jaxb.impl.PrimitivesServiceClientImpl" /> <reference name="primitivesService"> <interface.wsdl interface="http://jaxb.databindings.itest.sca.tuscany.apache.org/#wsdl.interface(PrimitivesService)"/> - <binding.ws uri="http://localhost:8085/ps-ep-w"/> + <binding.ws uri="http://localhost:8085/ps-ep-w" requires="MTOM"/> </reference> </component> @@ -44,7 +44,7 @@ <implementation.java class="org.apache.tuscany.sca.itest.databindings.jaxb.impl.PrimitivesServiceClientImpl" /> <reference name="primitivesService"> <interface.java interface="org.apache.tuscany.sca.itest.databindings.jaxb.PrimitivesService"/> - <binding.ws uri="http://localhost:8085/ps-ep-w"/> + <binding.ws uri="http://localhost:8085/ps-ep-w" requires="MTOM"/> </reference> </component> @@ -55,7 +55,7 @@ <implementation.java class="org.apache.tuscany.sca.itest.databindings.jaxb.impl.PrimitivesServiceClientImpl" /> <reference name="primitivesService"> <interface.wsdl interface="http://jaxb.databindings.itest.sca.tuscany.apache.org/#wsdl.interface(PrimitivesService)"/> - <binding.ws uri="http://localhost:8085/ps-ep-j"/> + <binding.ws uri="http://localhost:8085/ps-ep-j" requires="MTOM"/> </reference> </component> @@ -65,7 +65,7 @@ <implementation.java class="org.apache.tuscany.sca.itest.databindings.jaxb.impl.PrimitivesServiceImpl"/> <service name="PrimitivesService"> <interface.java interface="org.apache.tuscany.sca.itest.databindings.jaxb.PrimitivesService"/> - <binding.ws uri="http://localhost:8085/ps-ep-j"/> + <binding.ws uri="http://localhost:8085/ps-ep-j" requires="MTOM"/> </service> </component> @@ -74,7 +74,7 @@ <implementation.java class="org.apache.tuscany.sca.itest.databindings.jaxb.impl.PrimitivesServiceImpl"/> <service name="PrimitivesService"> <interface.wsdl interface="http://jaxb.databindings.itest.sca.tuscany.apache.org/#wsdl.interface(PrimitivesService)"/> - <binding.ws uri="http://localhost:8085/ps-ep-w"/> + <binding.ws uri="http://localhost:8085/ps-ep-w" requires="MTOM"/> </service> </component> </composite> diff --git a/branches/sca-java-1.x/itest/databindings/jaxb-top-down/src/main/resources/wsdl/wrapped/standard-types-service.composite b/branches/sca-java-1.x/itest/databindings/jaxb-top-down/src/main/resources/wsdl/wrapped/standard-types-service.composite index 4788df78e0..59e30dc801 100644 --- a/branches/sca-java-1.x/itest/databindings/jaxb-top-down/src/main/resources/wsdl/wrapped/standard-types-service.composite +++ b/branches/sca-java-1.x/itest/databindings/jaxb-top-down/src/main/resources/wsdl/wrapped/standard-types-service.composite @@ -33,7 +33,7 @@ <implementation.java class="org.apache.tuscany.sca.itest.databindings.jaxb.impl.StandardTypesServiceClientImpl" /> <reference name="standardTypesService"> <interface.wsdl interface="http://jaxb.databindings.itest.sca.tuscany.apache.org/#wsdl.interface(StandardTypesService)"/> - <binding.ws uri="http://localhost:8085/sts-ep-w"/> + <binding.ws uri="http://localhost:8085/sts-ep-w" requires="MTOM"/> </reference> </component> @@ -44,7 +44,7 @@ <implementation.java class="org.apache.tuscany.sca.itest.databindings.jaxb.impl.StandardTypesServiceClientImpl" /> <reference name="standardTypesService"> <interface.java interface="org.apache.tuscany.sca.itest.databindings.jaxb.StandardTypesService"/> - <binding.ws uri="http://localhost:8085/sts-ep-w"/> + <binding.ws uri="http://localhost:8085/sts-ep-w" requires="MTOM"/> </reference> </component> @@ -55,7 +55,7 @@ <implementation.java class="org.apache.tuscany.sca.itest.databindings.jaxb.impl.StandardTypesServiceClientImpl" /> <reference name="standardTypesService"> <interface.wsdl interface="http://jaxb.databindings.itest.sca.tuscany.apache.org/#wsdl.interface(StandardTypesService)"/> - <binding.ws uri="http://localhost:8085/sts-ep-j"/> + <binding.ws uri="http://localhost:8085/sts-ep-j" requires="MTOM"/> </reference> </component> @@ -65,7 +65,7 @@ <implementation.java class="org.apache.tuscany.sca.itest.databindings.jaxb.impl.StandardTypesServiceImpl"/> <service name="StandardTypesService"> <interface.java interface="org.apache.tuscany.sca.itest.databindings.jaxb.StandardTypesService"/> - <binding.ws uri="http://localhost:8085/sts-ep-j"/> + <binding.ws uri="http://localhost:8085/sts-ep-j" requires="MTOM"/> </service> </component> @@ -74,7 +74,7 @@ <implementation.java class="org.apache.tuscany.sca.itest.databindings.jaxb.impl.StandardTypesServiceImpl"/> <service name="StandardTypesService"> <interface.wsdl interface="http://jaxb.databindings.itest.sca.tuscany.apache.org/#wsdl.interface(StandardTypesService)"/> - <binding.ws uri="http://localhost:8085/sts-ep-w"/> + <binding.ws uri="http://localhost:8085/sts-ep-w" requires="MTOM"/> </service> </component> </composite> diff --git a/branches/sca-java-1.x/itest/databindings/jaxb-top-down/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/topdown/StandardTypesDatabindingTestCase.java b/branches/sca-java-1.x/itest/databindings/jaxb-top-down/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/topdown/StandardTypesDatabindingTestCase.java index 6ed9026089..3a65017842 100644 --- a/branches/sca-java-1.x/itest/databindings/jaxb-top-down/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/topdown/StandardTypesDatabindingTestCase.java +++ b/branches/sca-java-1.x/itest/databindings/jaxb-top-down/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/topdown/StandardTypesDatabindingTestCase.java @@ -29,6 +29,7 @@ import java.io.StringWriter; import java.math.BigDecimal; import java.math.BigInteger; import java.net.URI; +import java.net.URL; import java.util.Calendar; import java.util.Date; import java.util.GregorianCalendar; @@ -316,7 +317,6 @@ public class StandardTypesDatabindingTestCase { * Service method invoked is getNewDataHandler. */ @Test - @Ignore("TUSCANY-2451") public void testW2WNewDataHandler() throws Exception { StandardTypesServiceClient serviceClient = domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2WComponent"); @@ -328,7 +328,6 @@ public class StandardTypesDatabindingTestCase { * Service method invoked is getNewDataHandlerArray. */ @Test - @Ignore("TUSCANY-2451") public void testW2WNewDataHandlerArray() throws Exception { StandardTypesServiceClient serviceClient = domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2WComponent"); @@ -606,7 +605,6 @@ public class StandardTypesDatabindingTestCase { * Service method invoked is getNewDataHandler. */ @Test - @Ignore("TUSCANY-2451") public void testJ2WNewDataHandler() throws Exception { StandardTypesServiceClient serviceClient = domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientJ2WComponent"); @@ -618,7 +616,6 @@ public class StandardTypesDatabindingTestCase { * Service method invoked is getNewDataHandlerArray. */ @Test - @Ignore("TUSCANY-2451") public void testJ2WNewDataHandlerArray() throws Exception { StandardTypesServiceClient serviceClient = domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientJ2WComponent"); @@ -896,7 +893,6 @@ public class StandardTypesDatabindingTestCase { * Service method invoked is getNewDataHandler. */ @Test - @Ignore("TUSCANY-2451") public void testW2JNewDataHandler() throws Exception { StandardTypesServiceClient serviceClient = domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2JComponent"); @@ -908,7 +904,6 @@ public class StandardTypesDatabindingTestCase { * Service method invoked is getNewDataHandlerArray. */ @Test - @Ignore("TUSCANY-2451") public void testW2JNewDataHandlerArray() throws Exception { StandardTypesServiceClient serviceClient = domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2JComponent"); @@ -1291,7 +1286,7 @@ public class StandardTypesDatabindingTestCase { private void performTestNewDataHandler(StandardTypesServiceClient serviceClient) throws IOException { DataHandler[] dha = new DataHandler[3]; dha[0] = new DataHandler("Some data", "text/plain"); - dha[1] = new DataHandler(this.getClass().getClassLoader().getResource("standard-types-service.composite")); + dha[1] = new DataHandler(new URL("http://tuscany.apache.org/home.html")); dha[2] = new DataHandler(new ByteArrayDataSource("Some data2".getBytes())); for (int i = 0; i < dha.length; ++i) { @@ -1305,7 +1300,7 @@ public class StandardTypesDatabindingTestCase { private void performTestNewDataHandlerArray(StandardTypesServiceClient serviceClient) throws IOException { DataHandler[] dha = new DataHandler[3]; dha[0] = new DataHandler("Some data", "text/plain"); - dha[1] = new DataHandler(this.getClass().getClassLoader().getResource("standard-types-service.composite")); + dha[1] = new DataHandler(new URL("http://tuscany.apache.org/home.html")); dha[2] = new DataHandler(new ByteArrayDataSource("Some data2".getBytes())); DataHandler[] actual = serviceClient.getNewDataHandlerArrayForward(dha); |