From e04ddf410cfac4cf5da4c28165ecaa1d27638d40 Mon Sep 17 00:00:00 2001 From: ramkumar Date: Fri, 6 Feb 2009 11:46:22 +0000 Subject: Fixes for TUSCANY-2451 git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@741544 13f79535-47bb-0310-9956-ffa450edef68 --- .../src/main/resources/doclitbarewsdl.composite | 4 ++-- .../src/main/resources/generics-service.composite | 4 ++-- .../jaxb-bottom-up/src/main/resources/helloservice.composite | 4 ++-- .../src/main/resources/primitivesservice.composite | 4 ++-- .../src/main/resources/standard-types-service.composite | 4 ++-- .../databindings/jaxb/StandardTypesDatabindingTestCase.java | 5 +++-- .../src/main/resources/wsdl/wrapped/helloservice.composite | 10 +++++----- .../main/resources/wsdl/wrapped/primitivesservice.composite | 10 +++++----- .../resources/wsdl/wrapped/standard-types-service.composite | 10 +++++----- .../jaxb/topdown/StandardTypesDatabindingTestCase.java | 11 +++-------- 10 files changed, 31 insertions(+), 35 deletions(-) (limited to 'branches/sca-java-1.x') 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 @@ - + @@ -31,7 +31,7 @@ - + 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 @@ - + @@ -58,7 +58,7 @@ - + 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 @@ - + @@ -55,7 +55,7 @@ - + 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 @@ - + @@ -55,7 +55,7 @@ - + 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 @@ - + @@ -55,7 +55,7 @@ - + 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); 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 @@ - + @@ -44,7 +44,7 @@ - + @@ -55,7 +55,7 @@ - + @@ -65,7 +65,7 @@ - + @@ -74,7 +74,7 @@ - + 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 @@ - + @@ -44,7 +44,7 @@ - + @@ -55,7 +55,7 @@ - + @@ -65,7 +65,7 @@ - + @@ -74,7 +74,7 @@ - + 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 @@ - + @@ -44,7 +44,7 @@ - + @@ -55,7 +55,7 @@ - + @@ -65,7 +65,7 @@ - + @@ -74,7 +74,7 @@ - + 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); -- cgit v1.2.3