diff options
author | ramkumar <ramkumar@13f79535-47bb-0310-9956-ffa450edef68> | 2009-02-06 11:46:22 +0000 |
---|---|---|
committer | ramkumar <ramkumar@13f79535-47bb-0310-9956-ffa450edef68> | 2009-02-06 11:46:22 +0000 |
commit | e04ddf410cfac4cf5da4c28165ecaa1d27638d40 (patch) | |
tree | 6f319fa80b79a1679656e88f1546dfe430c6088b /branches/sca-java-1.x/itest/databindings/jaxb-bottom-up/src | |
parent | 2794acf3d9824b28336445026e4a3b437b779f75 (diff) |
Fixes for TUSCANY-2451
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@741544 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'branches/sca-java-1.x/itest/databindings/jaxb-bottom-up/src')
6 files changed, 13 insertions, 12 deletions
diff --git a/branches/sca-java-1.x/itest/databindings/jaxb-bottom-up/src/main/resources/doclitbarewsdl.composite b/branches/sca-java-1.x/itest/databindings/jaxb-bottom-up/src/main/resources/doclitbarewsdl.composite index 5ecbb9edee..b0d3fe7aeb 100644 --- a/branches/sca-java-1.x/itest/databindings/jaxb-bottom-up/src/main/resources/doclitbarewsdl.composite +++ b/branches/sca-java-1.x/itest/databindings/jaxb-bottom-up/src/main/resources/doclitbarewsdl.composite @@ -23,7 +23,7 @@ <implementation.java class="org.apache.tuscany.sca.itest.databindings.jaxb.impl.AServiceImpl"/>
<service name="AService">
<interface.wsdl interface="http://jaxb.databindings.itest.sca.tuscany.apache.org#wsdl.interface(AServicePortType)"/>
- <binding.ws uri="http://localhost:8085/AService/endpointref"/>
+ <binding.ws uri="http://localhost:8085/AService/endpointref" requires="MTOM"/>
</service>
</component>
<component name="AClientComponent">
@@ -31,7 +31,7 @@ <reference name="aService">
<!--interface.wsdl interface="http://jaxb.databindings.itest.sca.tuscany.apache.org#wsdl.interface(AServicePortType)"/-->
<interface.java interface="org.apache.tuscany.sca.itest.databindings.jaxb.AService"/>
- <binding.ws uri="http://localhost:8085/AService/endpointref"/>
+ <binding.ws uri="http://localhost:8085/AService/endpointref" requires="MTOM"/>
</reference>
</component>
</composite>
diff --git a/branches/sca-java-1.x/itest/databindings/jaxb-bottom-up/src/main/resources/generics-service.composite b/branches/sca-java-1.x/itest/databindings/jaxb-bottom-up/src/main/resources/generics-service.composite index 2d47ba7b14..910091cf53 100644 --- a/branches/sca-java-1.x/itest/databindings/jaxb-bottom-up/src/main/resources/generics-service.composite +++ b/branches/sca-java-1.x/itest/databindings/jaxb-bottom-up/src/main/resources/generics-service.composite @@ -30,7 +30,7 @@ <implementation.java class="org.apache.tuscany.sca.itest.databindings.jaxb.impl.GenericsServiceClientImpl" /> <reference name="genericsService"> <interface.java interface="org.apache.tuscany.sca.itest.databindings.jaxb.GenericsService"/> - <binding.ws uri="http://localhost:8085/gs-ep"/> + <binding.ws uri="http://localhost:8085/gs-ep" requires="MTOM"/> </reference> </component> @@ -58,7 +58,7 @@ <implementation.java class="org.apache.tuscany.sca.itest.databindings.jaxb.impl.GenericsServiceImpl"/> <service name="GenericsService"> <interface.java interface="org.apache.tuscany.sca.itest.databindings.jaxb.GenericsService"/> - <binding.ws uri="http://localhost:8085/gs-ep"/> + <binding.ws uri="http://localhost:8085/gs-ep" requires="MTOM"/> <binding.sca/> </service> <service name="GenericsLocalService"> diff --git a/branches/sca-java-1.x/itest/databindings/jaxb-bottom-up/src/main/resources/helloservice.composite b/branches/sca-java-1.x/itest/databindings/jaxb-bottom-up/src/main/resources/helloservice.composite index c39cf21002..2dfcb1327b 100644 --- a/branches/sca-java-1.x/itest/databindings/jaxb-bottom-up/src/main/resources/helloservice.composite +++ b/branches/sca-java-1.x/itest/databindings/jaxb-bottom-up/src/main/resources/helloservice.composite @@ -27,7 +27,7 @@ <implementation.java class="org.apache.tuscany.sca.itest.databindings.jaxb.impl.HelloServiceSimpleClientImpl" />
<reference name="helloServiceSimple">
<interface.java interface="org.apache.tuscany.sca.itest.databindings.jaxb.HelloServiceSimple"/>
- <binding.ws uri="http://localhost:8085/hs-ep0"/>
+ <binding.ws uri="http://localhost:8085/hs-ep0" requires="MTOM"/>
</reference>
</component>
@@ -55,7 +55,7 @@ <implementation.java class="org.apache.tuscany.sca.itest.databindings.jaxb.impl.HelloServiceSimpleImpl"/>
<service name="HelloServiceSimple">
<interface.java interface="org.apache.tuscany.sca.itest.databindings.jaxb.HelloServiceSimple"/>
- <binding.ws uri="http://localhost:8085/hs-ep0"/>
+ <binding.ws uri="http://localhost:8085/hs-ep0" requires="MTOM"/>
<binding.sca/>
</service>
<service name="HelloLocalServiceSimple">
diff --git a/branches/sca-java-1.x/itest/databindings/jaxb-bottom-up/src/main/resources/primitivesservice.composite b/branches/sca-java-1.x/itest/databindings/jaxb-bottom-up/src/main/resources/primitivesservice.composite index 4b0a6e215d..20529e7273 100644 --- a/branches/sca-java-1.x/itest/databindings/jaxb-bottom-up/src/main/resources/primitivesservice.composite +++ b/branches/sca-java-1.x/itest/databindings/jaxb-bottom-up/src/main/resources/primitivesservice.composite @@ -27,7 +27,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"/>
+ <binding.ws uri="http://localhost:8085/ps-ep" requires="MTOM"/>
</reference>
</component>
@@ -55,7 +55,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"/>
+ <binding.ws uri="http://localhost:8085/ps-ep" requires="MTOM"/>
<binding.sca/>
</service>
<service name="PrimitivesLocalService">
diff --git a/branches/sca-java-1.x/itest/databindings/jaxb-bottom-up/src/main/resources/standard-types-service.composite b/branches/sca-java-1.x/itest/databindings/jaxb-bottom-up/src/main/resources/standard-types-service.composite index 13ef73c082..61c8a70a9a 100644 --- a/branches/sca-java-1.x/itest/databindings/jaxb-bottom-up/src/main/resources/standard-types-service.composite +++ b/branches/sca-java-1.x/itest/databindings/jaxb-bottom-up/src/main/resources/standard-types-service.composite @@ -27,7 +27,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"/>
+ <binding.ws uri="http://localhost:8085/sts-ep" requires="MTOM"/>
</reference>
</component>
@@ -55,7 +55,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"/>
+ <binding.ws uri="http://localhost:8085/sts-ep" requires="MTOM"/>
<binding.sca/>
</service>
<service name="StandardTypesLocalService">
diff --git a/branches/sca-java-1.x/itest/databindings/jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesDatabindingTestCase.java b/branches/sca-java-1.x/itest/databindings/jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesDatabindingTestCase.java index 2d023ab448..079e1cdfff 100644 --- a/branches/sca-java-1.x/itest/databindings/jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesDatabindingTestCase.java +++ b/branches/sca-java-1.x/itest/databindings/jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/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; @@ -1279,7 +1280,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) { @@ -1293,7 +1294,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); |