diff options
165 files changed, 335 insertions, 512 deletions
diff --git a/branches/sca-equinox/demos/alert-aggregator-webapp/pom.xml b/branches/sca-equinox/demos/alert-aggregator-webapp/pom.xml index 1856bee4c1..71c59ae984 100644 --- a/branches/sca-equinox/demos/alert-aggregator-webapp/pom.xml +++ b/branches/sca-equinox/demos/alert-aggregator-webapp/pom.xml @@ -39,7 +39,7 @@ <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>4.2</version> + <version>4.5</version> <scope>test</scope> </dependency> <dependency> diff --git a/branches/sca-equinox/demos/bigbank-calculator/pom.xml b/branches/sca-equinox/demos/bigbank-calculator/pom.xml index 64f6a9d0ba..ab4b0cd539 100644 --- a/branches/sca-equinox/demos/bigbank-calculator/pom.xml +++ b/branches/sca-equinox/demos/bigbank-calculator/pom.xml @@ -66,7 +66,7 @@ <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>4.2</version> + <version>4.5</version> <scope>test</scope> </dependency> diff --git a/branches/sca-equinox/demos/bigbank-stockquote/pom.xml b/branches/sca-equinox/demos/bigbank-stockquote/pom.xml index 4749c73c26..b0aee7620e 100644 --- a/branches/sca-equinox/demos/bigbank-stockquote/pom.xml +++ b/branches/sca-equinox/demos/bigbank-stockquote/pom.xml @@ -72,7 +72,7 @@ <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>4.2</version> + <version>4.5</version> <scope>test</scope> </dependency> diff --git a/branches/sca-equinox/demos/bigbank/pom.xml b/branches/sca-equinox/demos/bigbank/pom.xml index 9432c9d6a0..c4d49c57bc 100644 --- a/branches/sca-equinox/demos/bigbank/pom.xml +++ b/branches/sca-equinox/demos/bigbank/pom.xml @@ -127,7 +127,7 @@ <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>4.2</version> + <version>4.5</version> <scope>test</scope> </dependency> diff --git a/branches/sca-equinox/demos/mortgage-creditcheck/pom.xml b/branches/sca-equinox/demos/mortgage-creditcheck/pom.xml index 153fc1fc3c..44d27b6d2c 100644 --- a/branches/sca-equinox/demos/mortgage-creditcheck/pom.xml +++ b/branches/sca-equinox/demos/mortgage-creditcheck/pom.xml @@ -61,7 +61,7 @@ <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>4.2</version> + <version>4.5</version> <scope>test</scope> </dependency> diff --git a/branches/sca-equinox/demos/xml-bigbank/pom.xml b/branches/sca-equinox/demos/xml-bigbank/pom.xml index b6a8b82f3e..dfa93a2f82 100644 --- a/branches/sca-equinox/demos/xml-bigbank/pom.xml +++ b/branches/sca-equinox/demos/xml-bigbank/pom.xml @@ -83,7 +83,7 @@ <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>4.2</version> + <version>4.5</version> <scope>test</scope> </dependency> diff --git a/branches/sca-equinox/itest/bpel/helloworld-reference/pom.xml b/branches/sca-equinox/itest/bpel/helloworld-reference/pom.xml index 946486b2e7..6af821f34f 100644 --- a/branches/sca-equinox/itest/bpel/helloworld-reference/pom.xml +++ b/branches/sca-equinox/itest/bpel/helloworld-reference/pom.xml @@ -92,7 +92,7 @@ <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>4.2</version> + <version>4.5</version> <scope>test</scope> </dependency> </dependencies> diff --git a/branches/sca-equinox/itest/bpel/helloworld-ws/pom.xml b/branches/sca-equinox/itest/bpel/helloworld-ws/pom.xml index 40646822a6..b678b7bc65 100644 --- a/branches/sca-equinox/itest/bpel/helloworld-ws/pom.xml +++ b/branches/sca-equinox/itest/bpel/helloworld-ws/pom.xml @@ -85,7 +85,7 @@ <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>4.2</version> + <version>4.5</version> <scope>test</scope> </dependency> </dependencies> diff --git a/branches/sca-equinox/itest/bpel/helloworld/pom.xml b/branches/sca-equinox/itest/bpel/helloworld/pom.xml index 9b7786c270..dbabb8a283 100644 --- a/branches/sca-equinox/itest/bpel/helloworld/pom.xml +++ b/branches/sca-equinox/itest/bpel/helloworld/pom.xml @@ -71,7 +71,7 @@ <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>4.2</version> + <version>4.5</version> <scope>test</scope> </dependency> </dependencies> diff --git a/branches/sca-equinox/itest/builder/pom.xml b/branches/sca-equinox/itest/builder/pom.xml index 4855b0cfe6..5eda64fdd8 100644 --- a/branches/sca-equinox/itest/builder/pom.xml +++ b/branches/sca-equinox/itest/builder/pom.xml @@ -94,7 +94,7 @@ <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.2</version>
+ <version>4.5</version>
<scope>test</scope>
</dependency>
diff --git a/branches/sca-equinox/itest/contribution-classloader/contribution-classes/pom.xml b/branches/sca-equinox/itest/contribution-classloader/contribution-classes/pom.xml index 53416eb338..f74b493c8e 100644 --- a/branches/sca-equinox/itest/contribution-classloader/contribution-classes/pom.xml +++ b/branches/sca-equinox/itest/contribution-classloader/contribution-classes/pom.xml @@ -45,7 +45,7 @@ <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>4.2</version> + <version>4.5</version> <scope>test</scope> </dependency> diff --git a/branches/sca-equinox/itest/contribution-classloader/contribution-test/pom.xml b/branches/sca-equinox/itest/contribution-classloader/contribution-test/pom.xml index 5c22d215be..b417012edd 100644 --- a/branches/sca-equinox/itest/contribution-classloader/contribution-test/pom.xml +++ b/branches/sca-equinox/itest/contribution-classloader/contribution-test/pom.xml @@ -52,7 +52,7 @@ <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>4.2</version> + <version>4.5</version> <scope>test</scope> </dependency> diff --git a/branches/sca-equinox/itest/contribution-import-export/export-composite/pom.xml b/branches/sca-equinox/itest/contribution-import-export/export-composite/pom.xml index 60d1b3af0c..17b2866b4c 100644 --- a/branches/sca-equinox/itest/contribution-import-export/export-composite/pom.xml +++ b/branches/sca-equinox/itest/contribution-import-export/export-composite/pom.xml @@ -59,7 +59,7 @@ <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.2</version>
+ <version>4.5</version>
<scope>test</scope>
</dependency>
diff --git a/branches/sca-equinox/itest/contribution-import-export/export-java/pom.xml b/branches/sca-equinox/itest/contribution-import-export/export-java/pom.xml index 4a855334b8..1f4a062cdf 100644 --- a/branches/sca-equinox/itest/contribution-import-export/export-java/pom.xml +++ b/branches/sca-equinox/itest/contribution-import-export/export-java/pom.xml @@ -59,7 +59,7 @@ <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.2</version>
+ <version>4.5</version>
<scope>test</scope>
</dependency>
diff --git a/branches/sca-equinox/itest/contribution-import-export/import-composite/pom.xml b/branches/sca-equinox/itest/contribution-import-export/import-composite/pom.xml index 5f4e1bfd5e..860536cba2 100644 --- a/branches/sca-equinox/itest/contribution-import-export/import-composite/pom.xml +++ b/branches/sca-equinox/itest/contribution-import-export/import-composite/pom.xml @@ -65,7 +65,7 @@ <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.2</version>
+ <version>4.5</version>
<scope>test</scope>
</dependency>
diff --git a/branches/sca-equinox/itest/contribution-import-export/import-java/pom.xml b/branches/sca-equinox/itest/contribution-import-export/import-java/pom.xml index ca5edde5d0..fff4b6a894 100644 --- a/branches/sca-equinox/itest/contribution-import-export/import-java/pom.xml +++ b/branches/sca-equinox/itest/contribution-import-export/import-java/pom.xml @@ -65,7 +65,7 @@ <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.2</version>
+ <version>4.5</version>
<scope>test</scope>
</dependency>
diff --git a/branches/sca-equinox/itest/contribution-import-export/import-resource/pom.xml b/branches/sca-equinox/itest/contribution-import-export/import-resource/pom.xml index 428e3279ba..5ce827a5e7 100644 --- a/branches/sca-equinox/itest/contribution-import-export/import-resource/pom.xml +++ b/branches/sca-equinox/itest/contribution-import-export/import-resource/pom.xml @@ -94,7 +94,7 @@ <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>4.2</version> + <version>4.5</version> <scope>test</scope> </dependency> diff --git a/branches/sca-equinox/itest/contribution-import-export/import-wsdl/pom.xml b/branches/sca-equinox/itest/contribution-import-export/import-wsdl/pom.xml index 22e3913dd8..711f9eac04 100644 --- a/branches/sca-equinox/itest/contribution-import-export/import-wsdl/pom.xml +++ b/branches/sca-equinox/itest/contribution-import-export/import-wsdl/pom.xml @@ -65,7 +65,7 @@ <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.2</version>
+ <version>4.5</version>
<scope>test</scope>
</dependency>
diff --git a/branches/sca-equinox/itest/corba/pom.xml b/branches/sca-equinox/itest/corba/pom.xml index 9670e8059f..b7b7f26b22 100644 --- a/branches/sca-equinox/itest/corba/pom.xml +++ b/branches/sca-equinox/itest/corba/pom.xml @@ -112,7 +112,7 @@ <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>4.2</version> + <version>4.5</version> <scope>compile</scope> </dependency> diff --git a/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioSixTestCase.java b/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioSixTestCase.java index 3c12bf1b8c..b7309d68a0 100644 --- a/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioSixTestCase.java +++ b/branches/sca-equinox/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioSixTestCase.java @@ -180,7 +180,7 @@ public class ScenarioSixTestCase { inner.setY(10f); arg.setIu(inner); TRichUnion result = ref.passRichUnion(arg); - assertEquals(arg.getIu().getY(), result.getIu().getY()); + assertEquals(arg.getIu().getY(), result.getIu().getY(), 0.0f); } catch (Exception e) { e.printStackTrace(); fail(); @@ -190,7 +190,7 @@ public class ScenarioSixTestCase { TRichUnion arg = new TRichUnion(); arg.setY(15f); TRichUnion result = ref.passRichUnion(arg); - assertEquals(arg.getY(), result.getY()); + assertEquals(arg.getY(), result.getY(), 0.0f); } catch (Exception e) { e.printStackTrace(); fail(); @@ -214,11 +214,11 @@ public class ScenarioSixTestCase { inner.y(20f); arg.iu(inner); RichUnion result = ref.passRichUnion(arg); - assertEquals(arg.iu().y(), result.iu().y()); + assertEquals(arg.iu().y(), result.iu().y(), 0.0f); arg = new RichUnion(); arg.y(15f); result = ref.passRichUnion(arg); - assertEquals(arg.y(), result.y()); + assertEquals(arg.y(), result.y(), 0.0f); } catch (Exception e) { e.printStackTrace(); fail(); diff --git a/branches/sca-equinox/itest/databindings/jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesDatabindingTestCase.java b/branches/sca-equinox/itest/databindings/jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesDatabindingTestCase.java index 4977baa84c..c71a5875f4 100644 --- a/branches/sca-equinox/itest/databindings/jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesDatabindingTestCase.java +++ b/branches/sca-equinox/itest/databindings/jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesDatabindingTestCase.java @@ -622,7 +622,7 @@ public class StandardTypesDatabindingTestCase { * Service method invoked is getNewSource. */ @Test - @Ignore("junit.framework.ComparisonFailure: null expected:<... encoding=\"UTF-8\"?><[a>A</a]>> but was:<... encoding=\"UTF-8\"?><[return xmlns=\"http://jaxb.databindings.itest.sca.tuscany.apache.org/\">A</return]>>") + // @Ignore("junit.framework.ComparisonFailure: null expected:<... encoding=\"UTF-8\"?><[a>A</a]>> but was:<... encoding=\"UTF-8\"?><[return xmlns=\"http://jaxb.databindings.itest.sca.tuscany.apache.org/\">A</return]>>") public void testWSNewSource() throws Exception { StandardTypesServiceClient serviceClient = domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientWSComponent"); diff --git a/branches/sca-equinox/itest/databindings/jaxb-top-down/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/topdown/DatabindingTestCase.java b/branches/sca-equinox/itest/databindings/jaxb-top-down/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/topdown/DatabindingTestCase.java index 37a521b1bd..da2fc8b108 100644 --- a/branches/sca-equinox/itest/databindings/jaxb-top-down/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/topdown/DatabindingTestCase.java +++ b/branches/sca-equinox/itest/databindings/jaxb-top-down/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/topdown/DatabindingTestCase.java @@ -47,10 +47,14 @@ public class DatabindingTestCase { */ @BeforeClass public static void setUp() throws Exception { + try { SCANodeFactory nodeFactory = SCANodeFactory.newInstance(); node = nodeFactory.createSCANodeFromClassLoader("wsdl/wrapped/helloservice.composite", null); node.start(); client = (SCAClient)node; + }catch(Throwable e) { + e.printStackTrace(); + } } /** diff --git a/branches/sca-equinox/itest/exceptions-cross-binding-ws/pom.xml b/branches/sca-equinox/itest/exceptions-cross-binding-ws/pom.xml index bdb3784be3..e7ecb604dc 100644 --- a/branches/sca-equinox/itest/exceptions-cross-binding-ws/pom.xml +++ b/branches/sca-equinox/itest/exceptions-cross-binding-ws/pom.xml @@ -40,7 +40,7 @@ <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>4.2</version> + <version>4.5</version> <scope>test</scope> </dependency> diff --git a/branches/sca-equinox/itest/jms-args/pom.xml b/branches/sca-equinox/itest/jms-args/pom.xml index 32ad3099c6..eae5792e70 100644 --- a/branches/sca-equinox/itest/jms-args/pom.xml +++ b/branches/sca-equinox/itest/jms-args/pom.xml @@ -65,7 +65,7 @@ <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.2</version>
+ <version>4.5</version>
<scope>test</scope>
</dependency>
diff --git a/branches/sca-equinox/itest/jms-callbacks/pom.xml b/branches/sca-equinox/itest/jms-callbacks/pom.xml index 1dd26c7a41..a495a8309a 100644 --- a/branches/sca-equinox/itest/jms-callbacks/pom.xml +++ b/branches/sca-equinox/itest/jms-callbacks/pom.xml @@ -66,7 +66,7 @@ <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.2</version>
+ <version>4.5</version>
<scope>test</scope>
</dependency>
diff --git a/branches/sca-equinox/itest/jms-definitions/pom.xml b/branches/sca-equinox/itest/jms-definitions/pom.xml index a142978fde..78a7c64e8f 100644 --- a/branches/sca-equinox/itest/jms-definitions/pom.xml +++ b/branches/sca-equinox/itest/jms-definitions/pom.xml @@ -66,7 +66,7 @@ <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.2</version>
+ <version>4.5</version>
<scope>test</scope>
</dependency>
diff --git a/branches/sca-equinox/itest/jms-selectors/pom.xml b/branches/sca-equinox/itest/jms-selectors/pom.xml index 2a39634927..fe28f449d1 100644 --- a/branches/sca-equinox/itest/jms-selectors/pom.xml +++ b/branches/sca-equinox/itest/jms-selectors/pom.xml @@ -66,7 +66,7 @@ <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.2</version>
+ <version>4.5</version>
<scope>test</scope>
</dependency>
diff --git a/branches/sca-equinox/itest/jms/pom.xml b/branches/sca-equinox/itest/jms/pom.xml index 0630174ace..1bed1c9f3c 100644 --- a/branches/sca-equinox/itest/jms/pom.xml +++ b/branches/sca-equinox/itest/jms/pom.xml @@ -66,7 +66,7 @@ <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>4.2</version> + <version>4.5</version> <scope>test</scope> </dependency> diff --git a/branches/sca-equinox/itest/large-sdo-ws/pom.xml b/branches/sca-equinox/itest/large-sdo-ws/pom.xml index 23ee346ea9..0854d13098 100644 --- a/branches/sca-equinox/itest/large-sdo-ws/pom.xml +++ b/branches/sca-equinox/itest/large-sdo-ws/pom.xml @@ -67,7 +67,7 @@ <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>4.2</version> + <version>4.5</version> <scope>test</scope> </dependency> diff --git a/branches/sca-equinox/itest/late-reference-resolution/pom.xml b/branches/sca-equinox/itest/late-reference-resolution/pom.xml index 3b3a41db41..83b67c4a72 100644 --- a/branches/sca-equinox/itest/late-reference-resolution/pom.xml +++ b/branches/sca-equinox/itest/late-reference-resolution/pom.xml @@ -114,7 +114,7 @@ <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>4.2</version> + <version>4.5</version> <scope>test</scope> </dependency> diff --git a/branches/sca-equinox/itest/osgi-contribution/contribution-classes-v2/pom.xml b/branches/sca-equinox/itest/osgi-contribution/contribution-classes-v2/pom.xml index edbb66ab09..f2ec045a5c 100644 --- a/branches/sca-equinox/itest/osgi-contribution/contribution-classes-v2/pom.xml +++ b/branches/sca-equinox/itest/osgi-contribution/contribution-classes-v2/pom.xml @@ -73,7 +73,7 @@ <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>4.2</version> + <version>4.5</version> <scope>test</scope> </dependency> diff --git a/branches/sca-equinox/itest/osgi-contribution/contribution-classes/pom.xml b/branches/sca-equinox/itest/osgi-contribution/contribution-classes/pom.xml index 0a95927b7f..f70760a5fe 100644 --- a/branches/sca-equinox/itest/osgi-contribution/contribution-classes/pom.xml +++ b/branches/sca-equinox/itest/osgi-contribution/contribution-classes/pom.xml @@ -72,7 +72,7 @@ <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>4.2</version> + <version>4.5</version> <scope>test</scope> </dependency> diff --git a/branches/sca-equinox/itest/osgi-contribution/contribution-test/pom.xml b/branches/sca-equinox/itest/osgi-contribution/contribution-test/pom.xml index 6853aba2d1..505452c4df 100644 --- a/branches/sca-equinox/itest/osgi-contribution/contribution-test/pom.xml +++ b/branches/sca-equinox/itest/osgi-contribution/contribution-test/pom.xml @@ -84,7 +84,7 @@ <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>4.2</version> + <version>4.5</version> <scope>test</scope> </dependency> diff --git a/branches/sca-equinox/itest/osgi-implementation/pom.xml b/branches/sca-equinox/itest/osgi-implementation/pom.xml index d9249b6b9f..3ccab0fd8a 100644 --- a/branches/sca-equinox/itest/osgi-implementation/pom.xml +++ b/branches/sca-equinox/itest/osgi-implementation/pom.xml @@ -131,7 +131,7 @@ <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>4.2</version> + <version>4.5</version> </dependency> </dependencies> diff --git a/branches/sca-equinox/itest/osgi-tuscany/osgi-tuscany-test/pom.xml b/branches/sca-equinox/itest/osgi-tuscany/osgi-tuscany-test/pom.xml index fa1ace68ac..d879d9c200 100644 --- a/branches/sca-equinox/itest/osgi-tuscany/osgi-tuscany-test/pom.xml +++ b/branches/sca-equinox/itest/osgi-tuscany/osgi-tuscany-test/pom.xml @@ -68,7 +68,7 @@ End Felix dependencies --> <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.2</version>
+ <version>4.5</version>
<scope>test</scope>
</dependency>
diff --git a/branches/sca-equinox/itest/policy-security-basicauth/pom.xml b/branches/sca-equinox/itest/policy-security-basicauth/pom.xml index 6550e2f1dc..728ad3b72f 100644 --- a/branches/sca-equinox/itest/policy-security-basicauth/pom.xml +++ b/branches/sca-equinox/itest/policy-security-basicauth/pom.xml @@ -99,7 +99,7 @@ <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>4.2</version> + <version>4.5</version> </dependency> <dependency> diff --git a/branches/sca-equinox/itest/policy-security-jsr250/pom.xml b/branches/sca-equinox/itest/policy-security-jsr250/pom.xml index da0e3a0fce..032fe9cdcb 100644 --- a/branches/sca-equinox/itest/policy-security-jsr250/pom.xml +++ b/branches/sca-equinox/itest/policy-security-jsr250/pom.xml @@ -67,7 +67,7 @@ <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>4.2</version> + <version>4.5</version> </dependency> diff --git a/branches/sca-equinox/itest/policy-security/pom.xml b/branches/sca-equinox/itest/policy-security/pom.xml index ba079444e1..5a8da9a702 100644 --- a/branches/sca-equinox/itest/policy-security/pom.xml +++ b/branches/sca-equinox/itest/policy-security/pom.xml @@ -60,7 +60,7 @@ <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>4.2</version> + <version>4.5</version> </dependency> diff --git a/branches/sca-equinox/itest/policy/pom.xml b/branches/sca-equinox/itest/policy/pom.xml index d889b904a3..32578331af 100644 --- a/branches/sca-equinox/itest/policy/pom.xml +++ b/branches/sca-equinox/itest/policy/pom.xml @@ -60,7 +60,7 @@ <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>4.2</version> + <version>4.5</version> </dependency> diff --git a/branches/sca-equinox/itest/pom.xml b/branches/sca-equinox/itest/pom.xml index 594a0a70e8..c137b9a2a6 100644 --- a/branches/sca-equinox/itest/pom.xml +++ b/branches/sca-equinox/itest/pom.xml @@ -33,14 +33,14 @@ <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>4.2</version> + <version>4.5</version> <scope>compile</scope> </dependency> <dependency> <groupId>org.easymock</groupId> <artifactId>easymock</artifactId> - <version>2.2</version> + <version>2.4</version> <scope>test</scope> </dependency> </dependencies> diff --git a/branches/sca-equinox/itest/validation/pom.xml b/branches/sca-equinox/itest/validation/pom.xml index deb8a90f23..77e6a18ce9 100644 --- a/branches/sca-equinox/itest/validation/pom.xml +++ b/branches/sca-equinox/itest/validation/pom.xml @@ -136,7 +136,7 @@ <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>4.2</version> + <version>4.5</version> <scope>test</scope> </dependency> </dependencies> diff --git a/branches/sca-equinox/modules/assembly-xml/pom.xml b/branches/sca-equinox/modules/assembly-xml/pom.xml index cd439d3216..246f89619b 100644 --- a/branches/sca-equinox/modules/assembly-xml/pom.xml +++ b/branches/sca-equinox/modules/assembly-xml/pom.xml @@ -74,7 +74,7 @@ <dependency> <groupId>org.codehaus.woodstox</groupId> <artifactId>wstx-asl</artifactId> - <version>3.2.1</version> + <version>3.2.4</version> <scope>runtime</scope> <exclusions> <exclusion> diff --git a/branches/sca-equinox/modules/binding-atom-abdera/pom.xml b/branches/sca-equinox/modules/binding-atom-abdera/pom.xml index 42a484bde6..be9b94b6a6 100644 --- a/branches/sca-equinox/modules/binding-atom-abdera/pom.xml +++ b/branches/sca-equinox/modules/binding-atom-abdera/pom.xml @@ -160,7 +160,7 @@ <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>4.2</version> + <version>4.5</version> <scope>test</scope> </dependency> @@ -179,7 +179,7 @@ <dependency> <groupId>commons-logging</groupId> <artifactId>commons-logging</artifactId> - <version>1.1</version> + <version>1.1.1</version> <exclusions> <exclusion> <groupId>javax.servlet</groupId> diff --git a/branches/sca-equinox/modules/binding-atom/pom.xml b/branches/sca-equinox/modules/binding-atom/pom.xml index 8c8aad875a..f687828ba5 100644 --- a/branches/sca-equinox/modules/binding-atom/pom.xml +++ b/branches/sca-equinox/modules/binding-atom/pom.xml @@ -53,7 +53,7 @@ <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>4.2</version> + <version>4.5</version> <scope>test</scope> </dependency> diff --git a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/CorbaServantTestCase.java b/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/CorbaServantTestCase.java index b431ba0303..38891340f9 100644 --- a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/CorbaServantTestCase.java +++ b/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/CorbaServantTestCase.java @@ -551,7 +551,7 @@ public class CorbaServantTestCase { for (int i = 0; i < struct.threeDimArray.length; i++) { for (int j = 0; j < struct.threeDimArray[i].length; j++) { for (int k = 0; k < struct.threeDimArray[i][j].length; k++) { - assertEquals(struct.threeDimArray[i][j][k], structResult.threeDimArray[i][j][k]); + assertEquals(struct.threeDimArray[i][j][k], structResult.threeDimArray[i][j][k], 0.0); } } } diff --git a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/CorbaTypesTestCase.java b/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/CorbaTypesTestCase.java index 3a22f86d9e..1b1754f347 100644 --- a/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/CorbaTypesTestCase.java +++ b/branches/sca-equinox/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/CorbaTypesTestCase.java @@ -713,7 +713,7 @@ public class CorbaTypesTestCase { for (int i = 0; i < arg.field2.length; i++) { for (int j = 0; j < arg.field2[i].length; j++) { for (int k = 0; k < arg.field3[i][j].length; k++) { - assertEquals(arg.field3[i][j][k], result.field3[i][j][k]); + assertEquals(arg.field3[i][j][k], result.field3[i][j][k], 0.0); } } } diff --git a/branches/sca-equinox/modules/binding-ejb-runtime/pom.xml b/branches/sca-equinox/modules/binding-ejb-runtime/pom.xml index 38a6d9b19d..c89585c95c 100644 --- a/branches/sca-equinox/modules/binding-ejb-runtime/pom.xml +++ b/branches/sca-equinox/modules/binding-ejb-runtime/pom.xml @@ -60,7 +60,7 @@ <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>4.2</version> + <version>4.5</version> <scope>test</scope> </dependency> diff --git a/branches/sca-equinox/modules/binding-ejb/pom.xml b/branches/sca-equinox/modules/binding-ejb/pom.xml index 0a3b0c5967..be8ca05164 100644 --- a/branches/sca-equinox/modules/binding-ejb/pom.xml +++ b/branches/sca-equinox/modules/binding-ejb/pom.xml @@ -58,7 +58,7 @@ <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>4.2</version> + <version>4.5</version> <scope>test</scope> </dependency> </dependencies> diff --git a/branches/sca-equinox/modules/binding-gdata-gsoc/pom.xml b/branches/sca-equinox/modules/binding-gdata-gsoc/pom.xml index 173dcbe0b8..f09f835f8e 100644 --- a/branches/sca-equinox/modules/binding-gdata-gsoc/pom.xml +++ b/branches/sca-equinox/modules/binding-gdata-gsoc/pom.xml @@ -51,7 +51,7 @@ <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>4.2</version> + <version>4.5</version> <scope>test</scope> </dependency> diff --git a/branches/sca-equinox/modules/binding-gdata-runtime-gsoc/pom.xml b/branches/sca-equinox/modules/binding-gdata-runtime-gsoc/pom.xml index 85506087e5..fef1854daf 100644 --- a/branches/sca-equinox/modules/binding-gdata-runtime-gsoc/pom.xml +++ b/branches/sca-equinox/modules/binding-gdata-runtime-gsoc/pom.xml @@ -88,7 +88,7 @@ <dependency> <groupId>commons-httpclient</groupId> <artifactId>commons-httpclient</artifactId> - <version>3.0.1</version> + <version>3.1</version> </dependency> <dependency> @@ -145,7 +145,7 @@ <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>4.2</version> + <version>4.5</version> <scope>test</scope> </dependency> @@ -164,7 +164,7 @@ <dependency> <groupId>commons-logging</groupId> <artifactId>commons-logging</artifactId> - <version>1.1</version> + <version>1.1.1</version> <exclusions> <exclusion> <groupId>javax.servlet</groupId> diff --git a/branches/sca-equinox/modules/binding-gdata-runtime/pom.xml b/branches/sca-equinox/modules/binding-gdata-runtime/pom.xml index b5d4ac94fd..d40351d722 100644 --- a/branches/sca-equinox/modules/binding-gdata-runtime/pom.xml +++ b/branches/sca-equinox/modules/binding-gdata-runtime/pom.xml @@ -81,7 +81,7 @@ <dependency> <groupId>commons-httpclient</groupId> <artifactId>commons-httpclient</artifactId> - <version>3.0.1</version> + <version>3.1</version> </dependency> <dependency> @@ -138,7 +138,7 @@ <dependency> <groupId>commons-logging</groupId> <artifactId>commons-logging</artifactId> - <version>1.1</version> + <version>1.1.1</version> <exclusions> <exclusion> <artifactId>servlet-api</artifactId> @@ -154,7 +154,7 @@ <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>4.2</version> + <version>4.5</version> <scope>test</scope> </dependency> diff --git a/branches/sca-equinox/modules/binding-gdata/pom.xml b/branches/sca-equinox/modules/binding-gdata/pom.xml index 96f43ffeb0..cf918652a6 100644 --- a/branches/sca-equinox/modules/binding-gdata/pom.xml +++ b/branches/sca-equinox/modules/binding-gdata/pom.xml @@ -45,7 +45,7 @@ <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>4.2</version> + <version>4.5</version> <scope>test</scope> </dependency> diff --git a/branches/sca-equinox/modules/binding-http-runtime/pom.xml b/branches/sca-equinox/modules/binding-http-runtime/pom.xml index bb6f671dd1..7174cf44a0 100644 --- a/branches/sca-equinox/modules/binding-http-runtime/pom.xml +++ b/branches/sca-equinox/modules/binding-http-runtime/pom.xml @@ -85,7 +85,7 @@ <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>4.2</version> + <version>4.5</version> <scope>test</scope> </dependency> diff --git a/branches/sca-equinox/modules/binding-http/pom.xml b/branches/sca-equinox/modules/binding-http/pom.xml index 1ad2168669..ddeedfe249 100644 --- a/branches/sca-equinox/modules/binding-http/pom.xml +++ b/branches/sca-equinox/modules/binding-http/pom.xml @@ -57,7 +57,7 @@ <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>4.2</version> + <version>4.5</version> <scope>test</scope> </dependency> diff --git a/branches/sca-equinox/modules/binding-jms-runtime/pom.xml b/branches/sca-equinox/modules/binding-jms-runtime/pom.xml index 62eb3de60d..d3db03d1df 100644 --- a/branches/sca-equinox/modules/binding-jms-runtime/pom.xml +++ b/branches/sca-equinox/modules/binding-jms-runtime/pom.xml @@ -108,7 +108,7 @@ <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>4.2</version> + <version>4.5</version> <scope>test</scope> </dependency> diff --git a/branches/sca-equinox/modules/binding-jms/pom.xml b/branches/sca-equinox/modules/binding-jms/pom.xml index 21535235fb..e7dd413a78 100644 --- a/branches/sca-equinox/modules/binding-jms/pom.xml +++ b/branches/sca-equinox/modules/binding-jms/pom.xml @@ -39,7 +39,7 @@ <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>4.2</version> + <version>4.5</version> <scope>test</scope> </dependency> diff --git a/branches/sca-equinox/modules/binding-jsonrpc-runtime/pom.xml b/branches/sca-equinox/modules/binding-jsonrpc-runtime/pom.xml index 598f92f324..8ec5e52a0f 100644 --- a/branches/sca-equinox/modules/binding-jsonrpc-runtime/pom.xml +++ b/branches/sca-equinox/modules/binding-jsonrpc-runtime/pom.xml @@ -89,7 +89,7 @@ <dependency> <groupId>commons-logging</groupId> <artifactId>commons-logging</artifactId> - <version>1.1</version> + <version>1.1.1</version> <exclusions> <exclusion> <groupId>commons-logging</groupId> @@ -121,7 +121,7 @@ <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>4.2</version> + <version>4.5</version> <scope>test</scope> </dependency> diff --git a/branches/sca-equinox/modules/binding-jsonrpc/pom.xml b/branches/sca-equinox/modules/binding-jsonrpc/pom.xml index 3790e5bb3f..4b3e2c3788 100644 --- a/branches/sca-equinox/modules/binding-jsonrpc/pom.xml +++ b/branches/sca-equinox/modules/binding-jsonrpc/pom.xml @@ -45,7 +45,7 @@ <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>4.2</version> + <version>4.5</version> <scope>test</scope> </dependency> </dependencies> diff --git a/branches/sca-equinox/modules/binding-rss-rome/pom.xml b/branches/sca-equinox/modules/binding-rss-rome/pom.xml index 9babfb8cb7..3fa097cfb4 100644 --- a/branches/sca-equinox/modules/binding-rss-rome/pom.xml +++ b/branches/sca-equinox/modules/binding-rss-rome/pom.xml @@ -75,7 +75,7 @@ <dependency> <groupId>commons-httpclient</groupId> <artifactId>commons-httpclient</artifactId> - <version>3.0.1</version> + <version>3.1</version> </dependency> <dependency> @@ -114,7 +114,7 @@ <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>4.2</version> + <version>4.5</version> <scope>test</scope> </dependency> @@ -133,7 +133,7 @@ <dependency> <groupId>commons-logging</groupId> <artifactId>commons-logging</artifactId> - <version>1.1</version> + <version>1.1.1</version> <exclusions> <exclusion> <groupId>javax.servlet</groupId> diff --git a/branches/sca-equinox/modules/binding-rss/pom.xml b/branches/sca-equinox/modules/binding-rss/pom.xml index aeed176e8a..cd51de1088 100644 --- a/branches/sca-equinox/modules/binding-rss/pom.xml +++ b/branches/sca-equinox/modules/binding-rss/pom.xml @@ -71,7 +71,7 @@ <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>4.2</version> + <version>4.5</version> <scope>test</scope> </dependency> </dependencies> diff --git a/branches/sca-equinox/modules/binding-sca-axis2/pom.xml b/branches/sca-equinox/modules/binding-sca-axis2/pom.xml index 9f4fbc6c9e..807a4add70 100644 --- a/branches/sca-equinox/modules/binding-sca-axis2/pom.xml +++ b/branches/sca-equinox/modules/binding-sca-axis2/pom.xml @@ -51,13 +51,6 @@ </dependency>
<dependency>
- <groupId>org.easymock</groupId>
- <artifactId>easymock</artifactId>
- <version>2.2</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-host-jetty</artifactId>
<version>1.4-SNAPSHOT</version>
diff --git a/branches/sca-equinox/modules/binding-sca-corba/src/main/java/org/apache/tuscany/sca/binding/sca/corba/impl/CorbaSCAInvocationProxy.java b/branches/sca-equinox/modules/binding-sca-corba/src/main/java/org/apache/tuscany/sca/binding/sca/corba/impl/CorbaSCAInvocationProxy.java index ed0c170b0d..6c742e3e00 100644 --- a/branches/sca-equinox/modules/binding-sca-corba/src/main/java/org/apache/tuscany/sca/binding/sca/corba/impl/CorbaSCAInvocationProxy.java +++ b/branches/sca-equinox/modules/binding-sca-corba/src/main/java/org/apache/tuscany/sca/binding/sca/corba/impl/CorbaSCAInvocationProxy.java @@ -69,7 +69,7 @@ public class CorbaSCAInvocationProxy implements InvocationProxy { public Object invoke(String operationName, List<Object> arguments) throws InvocationException { try { - OMElement omContent = AXIOMUtil.stringToOM((String)arguments.get(0)); + OMElement omContent = CorbaSCAInvoker.stringToOM((String)arguments.get(0)); String componentOperationName = omContent.getQName().getLocalPart(); Operation componentOperation = null; for (Operation operation : componentInterface.getOperations()) { diff --git a/branches/sca-equinox/modules/binding-sca-corba/src/main/java/org/apache/tuscany/sca/binding/sca/corba/impl/CorbaSCAInvoker.java b/branches/sca-equinox/modules/binding-sca-corba/src/main/java/org/apache/tuscany/sca/binding/sca/corba/impl/CorbaSCAInvoker.java index 26b1c9e5d6..9132c5d3c8 100644 --- a/branches/sca-equinox/modules/binding-sca-corba/src/main/java/org/apache/tuscany/sca/binding/sca/corba/impl/CorbaSCAInvoker.java +++ b/branches/sca-equinox/modules/binding-sca-corba/src/main/java/org/apache/tuscany/sca/binding/sca/corba/impl/CorbaSCAInvoker.java @@ -19,13 +19,14 @@ package org.apache.tuscany.sca.binding.sca.corba.impl; +import java.io.ByteArrayInputStream; import java.lang.reflect.Method; import java.util.Map; import javax.xml.stream.XMLStreamException; import org.apache.axiom.om.OMElement; -import org.apache.axiom.om.impl.llom.util.AXIOMUtil; +import org.apache.axiom.om.impl.builder.StAXOMBuilder; import org.apache.tuscany.sca.binding.corba.provider.exceptions.RequestConfigurationException; import org.apache.tuscany.sca.binding.corba.provider.reference.DynaCorbaRequest; import org.apache.tuscany.sca.binding.corba.provider.reference.DynaCorbaResponse; @@ -62,11 +63,11 @@ public class CorbaSCAInvoker implements Invoker { String arg = omElement.toStringWithConsume(); request.addArgument(arg); DynaCorbaResponse response = request.invoke(); - OMElement responseOM = AXIOMUtil.stringToOM((String)response.getContent()); + OMElement responseOM = stringToOM((String)response.getContent()); msg.setBody(responseOM); } catch (WrappedSCAException e) { try { - OMElement exceptionOM = AXIOMUtil.stringToOM(e.getFault()); + OMElement exceptionOM = stringToOM(e.getFault()); FaultException f = new FaultException(e.getMessage(), exceptionOM, e); f.setFaultName(exceptionOM.getQName()); msg.setFaultBody(f); @@ -79,4 +80,18 @@ public class CorbaSCAInvoker implements Invoker { } return msg; } + + /** + * This will help you to create an OMElement from an xml fragment which you have as a string. + * + * @param xmlFragment - the well-formed xml fragment + * @return The OMElement created out of the string xml fragment. + * @throws XMLStreamException + */ + static OMElement stringToOM(String xmlFragment) throws XMLStreamException { + if (xmlFragment != null) { + return new StAXOMBuilder(new ByteArrayInputStream(xmlFragment.getBytes())).getDocumentElement(); + } + return null; + } } diff --git a/branches/sca-equinox/modules/binding-ws-axis2-policy/pom.xml b/branches/sca-equinox/modules/binding-ws-axis2-policy/pom.xml index a98e5519f7..3e156f99d0 100644 --- a/branches/sca-equinox/modules/binding-ws-axis2-policy/pom.xml +++ b/branches/sca-equinox/modules/binding-ws-axis2-policy/pom.xml @@ -68,19 +68,19 @@ <artifactId>xml-apis</artifactId> </exclusion> </exclusions> - <version>1.2.5</version> + <version>1.2.7</version> </dependency> <dependency> <groupId>org.apache.ws.commons.axiom</groupId> <artifactId>axiom-impl</artifactId> - <version>1.2.5</version> + <version>1.2.7</version> </dependency> <dependency> <groupId>org.apache.axis2</groupId> <artifactId>axis2-kernel</artifactId> - <version>1.3</version> + <version>1.4.1</version> <exclusions> <exclusion> <groupId>backport-util-concurrent</groupId> @@ -100,14 +100,14 @@ <dependency> <groupId>backport-util-concurrent</groupId> <artifactId>backport-util-concurrent</artifactId> - <version>3.0</version> + <version>3.1</version> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.neethi</groupId> <artifactId>neethi</artifactId> - <version>2.0.2</version> + <version>2.0.4</version> <exclusions> <exclusion> <groupId>wsdl4j</groupId> diff --git a/branches/sca-equinox/modules/binding-ws-axis2/pom.xml b/branches/sca-equinox/modules/binding-ws-axis2/pom.xml index 87e675e16f..5935bf26c1 100644 --- a/branches/sca-equinox/modules/binding-ws-axis2/pom.xml +++ b/branches/sca-equinox/modules/binding-ws-axis2/pom.xml @@ -104,7 +104,7 @@ <dependency> <groupId>org.apache.axis2</groupId> <artifactId>axis2-kernel</artifactId> - <version>1.3</version> + <version>1.4.1</version> <exclusions> <exclusion> <groupId>org.apache.ant</groupId> @@ -128,7 +128,7 @@ <dependency> <groupId>org.apache.axis2</groupId> <artifactId>axis2-java2wsdl</artifactId> - <version>1.3</version> + <version>1.4.1</version> <exclusions> <exclusion> <groupId>org.apache.ant</groupId> @@ -160,7 +160,7 @@ <dependency> <groupId>org.apache.axis2</groupId> <artifactId>axis2-adb</artifactId> - <version>1.3</version> + <version>1.4.1</version> <scope>runtime</scope> <exclusions> <exclusion> @@ -177,7 +177,7 @@ <dependency> <groupId>org.apache.axis2</groupId> <artifactId>axis2-codegen</artifactId> - <version>1.3</version> + <version>1.4.1</version> <scope>runtime</scope> <exclusions> <exclusion> @@ -212,13 +212,13 @@ <artifactId>xml-apis</artifactId> </exclusion> </exclusions> - <version>1.2.5</version> + <version>1.2.7</version> </dependency> <dependency> <groupId>org.apache.ws.commons.axiom</groupId> <artifactId>axiom-impl</artifactId> - <version>1.2.5</version> + <version>1.2.7</version> <exclusions> <exclusion> <groupId>stax</groupId> @@ -227,17 +227,17 @@ </exclusions> </dependency> - <dependency> + <!--dependency> <groupId>org.apache.woden</groupId> <artifactId>woden</artifactId> <version>1.0-incubating-M7b</version> <scope>runtime</scope> - </dependency> + </dependency--> <dependency> <groupId>commons-logging</groupId> <artifactId>commons-logging</artifactId> - <version>1.1</version> + <version>1.1.1</version> <exclusions> <exclusion> <groupId>javax.servlet</groupId> @@ -255,7 +255,7 @@ <dependency> <groupId>org.apache.neethi</groupId> <artifactId>neethi</artifactId> - <version>2.0.2</version> + <version>2.0.4</version> <exclusions> <exclusion> <groupId>wsdl4j</groupId> @@ -271,13 +271,13 @@ <dependency> <groupId>org.apache.ws.commons.schema</groupId> <artifactId>XmlSchema</artifactId> - <version>1.3.2</version> + <version>1.4.2</version> </dependency> <dependency> <groupId>commons-httpclient</groupId> <artifactId>commons-httpclient</artifactId> - <version>3.0.1</version> + <version>3.1</version> </dependency> <dependency> @@ -289,7 +289,7 @@ <dependency> <groupId>backport-util-concurrent</groupId> <artifactId>backport-util-concurrent</artifactId> - <version>2.2</version> + <version>3.1</version> <scope>runtime</scope> </dependency> @@ -323,7 +323,7 @@ <dependency> <groupId>org.apache.axis2</groupId> <artifactId>axis2-mtompolicy</artifactId> - <version>1.3</version> + <version>1.4.1</version> <exclusions> <exclusion> <groupId>xalan</groupId> @@ -364,143 +364,49 @@ <dependency> <groupId>org.apache.rampart</groupId> <artifactId>rampart-core</artifactId> - <version>1.3</version> + <version>1.4</version> <exclusions> <exclusion> <groupId>org.apache.ant</groupId> <artifactId>ant-nodeps</artifactId> </exclusion> + <exclusion> + <groupId>org.apache.axis2</groupId> + <artifactId>axis2-kernel</artifactId> + </exclusion> <exclusion> <groupId>org.apache.axis2</groupId> <artifactId>axis2-xmlbeans</artifactId> </exclusion> - <exclusion> - <groupId>xmlbeans</groupId> - <artifactId>xbean</artifactId> - </exclusion> - <exclusion> - <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> + <exclusion> + <groupId>org.apache.axis2</groupId> + <artifactId>axis2-codegen</artifactId> </exclusion> - <!-- Exclude XmlSchema 1.3.1 --> - <exclusion> - <groupId>org.apache.ws.commons.schema</groupId> - <artifactId>XmlSchema</artifactId> - </exclusion> - <exclusion> - <groupId>stax</groupId> - <artifactId>stax-api</artifactId> - </exclusion> - <exclusion> - <groupId>xalan</groupId> - <artifactId>xalan</artifactId> - </exclusion> - <exclusion> - <groupId>xml-apis</groupId> - <artifactId>xml-apis</artifactId> - </exclusion> - <exclusion> - <groupId>xerces</groupId> - <artifactId>xercesImpl</artifactId> - </exclusion> - </exclusions> - </dependency> - - <dependency> - <groupId>org.apache.rampart</groupId> - <artifactId>rampart-policy</artifactId> - <version>1.3</version> - <exclusions> + <exclusion> + <groupId>org.apache.axis2</groupId> + <artifactId>axis2-mex</artifactId> + </exclusion> <exclusion> - <groupId>org.apache.ant</groupId> - <artifactId>ant-nodeps</artifactId> + <groupId>org.apache.axis2</groupId> + <artifactId>axis2-adb-codegen</artifactId> </exclusion> <exclusion> - <groupId>org.apache.axis2</groupId> - <artifactId>axis2-xmlbeans</artifactId> + <groupId>xmlbeans</groupId> + <artifactId>xbean</artifactId> </exclusion> - <exclusion> - <groupId>xmlbeans</groupId> - <artifactId>xbean</artifactId> - </exclusion> <exclusion> <groupId>javax.servlet</groupId> <artifactId>servlet-api</artifactId> </exclusion> - <exclusion> - <groupId>backport-util-concurrent</groupId> - <artifactId>backport-util-concurrent</artifactId> - </exclusion> - <exclusion> - <groupId>stax</groupId> - <artifactId>stax-api</artifactId> - </exclusion> <!-- Exclude XmlSchema 1.3.1 --> <exclusion> <groupId>org.apache.ws.commons.schema</groupId> <artifactId>XmlSchema</artifactId> </exclusion> - - <exclusion> - <groupId>xalan</groupId> - <artifactId>xalan</artifactId> - </exclusion> - <exclusion> - <groupId>xml-apis</groupId> - <artifactId>xml-apis</artifactId> - </exclusion> - <exclusion> - <groupId>xerces</groupId> - <artifactId>xercesImpl</artifactId> - </exclusion> - - </exclusions> - </dependency> - - <dependency> - <groupId>org.apache.rampart</groupId> - <artifactId>rampart-trust</artifactId> - <version>1.3</version> - <exclusions> - <exclusion> - <groupId>org.apache.ant</groupId> - <artifactId>ant-nodeps</artifactId> - </exclusion> - <exclusion> - <groupId>org.apache.axis2</groupId> - <artifactId>axis2-xmlbeans</artifactId> - </exclusion> - <exclusion> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - </exclusion> - <exclusion> - <groupId>wsdl4j</groupId> - <artifactId>wsdl4j</artifactId> - </exclusion> - <exclusion> - <groupId>xmlbeans</groupId> - <artifactId>xbean</artifactId> - </exclusion> - <exclusion> - <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - </exclusion> - <exclusion> - <groupId>backport-util-concurrent</groupId> - <artifactId>backport-util-concurrent</artifactId> - </exclusion> <exclusion> <groupId>stax</groupId> <artifactId>stax-api</artifactId> </exclusion> - - - <!-- Exclude XmlSchema 1.3.1 --> - <exclusion> - <groupId>org.apache.ws.commons.schema</groupId> - <artifactId>XmlSchema</artifactId> - </exclusion> <exclusion> <groupId>xalan</groupId> <artifactId>xalan</artifactId> @@ -513,19 +419,21 @@ <groupId>xerces</groupId> <artifactId>xercesImpl</artifactId> </exclusion> - </exclusions> </dependency> + +<!-- <dependency> <groupId>backport-util-concurrent</groupId> <artifactId>backport-util-concurrent</artifactId> - <version>3.0</version> + <version>3.1</version> </dependency> <dependency> <groupId>log4j</groupId> <artifactId>log4j</artifactId> <version>1.2.12</version> - </dependency> + </dependency> +--> <dependency> <groupId>javax.servlet</groupId> <artifactId>servlet-api</artifactId> diff --git a/branches/sca-equinox/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/AbstractHelloWorldOMTestCase.java b/branches/sca-equinox/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/AbstractHelloWorldOMTestCase.java index 395cfe28d6..458a472479 100644 --- a/branches/sca-equinox/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/AbstractHelloWorldOMTestCase.java +++ b/branches/sca-equinox/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/mixed/AbstractHelloWorldOMTestCase.java @@ -20,7 +20,6 @@ package org.apache.tuscany.sca.binding.ws.axis2.itests.policy.mixed; import junit.framework.Assert; -import junit.framework.TestCase; import org.apache.axiom.om.OMAbstractFactory; import org.apache.axiom.om.OMElement; @@ -28,12 +27,16 @@ import org.apache.axiom.om.OMFactory; import org.apache.axiom.om.OMText; import org.apache.tuscany.sca.binding.ws.axis2.itests.HelloWorldOM; import org.apache.tuscany.sca.host.embedded.SCADomain; +import org.junit.After; +import org.junit.Before; +import org.junit.Test; -public abstract class AbstractHelloWorldOMTestCase extends TestCase { +public abstract class AbstractHelloWorldOMTestCase { private SCADomain domain; private HelloWorldOM helloWorld; + @Test public void testHelloWorld() throws Exception { OMFactory fac = OMAbstractFactory.getOMFactory(); OMElement requestOM = fac.createOMElement("getGreetings", "http://helloworld-om", "helloworld"); @@ -45,14 +48,14 @@ public abstract class AbstractHelloWorldOMTestCase extends TestCase { Assert.assertEquals("Hello petra", ((OMText)child.getFirstOMChild()).getText()); } - @Override - protected void setUp() throws Exception { + @Before + public void setUp() throws Exception { domain = SCADomain.newInstance(getCompositeName()); helloWorld = domain.getService(HelloWorldOM.class, "HelloWorldComponent"); } - @Override - protected void tearDown() throws Exception { + @After + public void tearDown() throws Exception { domain.close(); } diff --git a/branches/sca-equinox/modules/binding-ws-wsdlgen/pom.xml b/branches/sca-equinox/modules/binding-ws-wsdlgen/pom.xml index a06039d1b4..012076b3b5 100644 --- a/branches/sca-equinox/modules/binding-ws-wsdlgen/pom.xml +++ b/branches/sca-equinox/modules/binding-ws-wsdlgen/pom.xml @@ -79,7 +79,7 @@ <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>4.2</version> + <version>4.5</version> <scope>test</scope> </dependency> <dependency> diff --git a/branches/sca-equinox/modules/contribution-impl/pom.xml b/branches/sca-equinox/modules/contribution-impl/pom.xml index ff83cff49c..c971f1390d 100644 --- a/branches/sca-equinox/modules/contribution-impl/pom.xml +++ b/branches/sca-equinox/modules/contribution-impl/pom.xml @@ -44,7 +44,7 @@ <dependency> <groupId>org.codehaus.woodstox</groupId> <artifactId>wstx-asl</artifactId> - <version>3.2.1</version> + <version>3.2.4</version> <scope>runtime</scope> <exclusions> <exclusion> diff --git a/branches/sca-equinox/modules/contribution-java/pom.xml b/branches/sca-equinox/modules/contribution-java/pom.xml index 153a4f7c5e..8e57661a84 100644 --- a/branches/sca-equinox/modules/contribution-java/pom.xml +++ b/branches/sca-equinox/modules/contribution-java/pom.xml @@ -44,7 +44,7 @@ <dependency> <groupId>org.codehaus.woodstox</groupId> <artifactId>wstx-asl</artifactId> - <version>3.2.1</version> + <version>3.2.4</version> <scope>runtime</scope> <exclusions> <exclusion> diff --git a/branches/sca-equinox/modules/contribution-namespace/pom.xml b/branches/sca-equinox/modules/contribution-namespace/pom.xml index 39e011dbe2..c2c4c51bfb 100644 --- a/branches/sca-equinox/modules/contribution-namespace/pom.xml +++ b/branches/sca-equinox/modules/contribution-namespace/pom.xml @@ -44,7 +44,7 @@ <dependency> <groupId>org.codehaus.woodstox</groupId> <artifactId>wstx-asl</artifactId> - <version>3.2.1</version> + <version>3.2.4</version> <scope>runtime</scope> <exclusions> <exclusion> diff --git a/branches/sca-equinox/modules/contribution-osgi/pom.xml b/branches/sca-equinox/modules/contribution-osgi/pom.xml index 5622978bd9..284d70ca21 100644 --- a/branches/sca-equinox/modules/contribution-osgi/pom.xml +++ b/branches/sca-equinox/modules/contribution-osgi/pom.xml @@ -64,7 +64,7 @@ <dependency> <groupId>org.codehaus.woodstox</groupId> <artifactId>wstx-asl</artifactId> - <version>3.2.1</version> + <version>3.2.4</version> <scope>runtime</scope> <exclusions> <exclusion> diff --git a/branches/sca-equinox/modules/contribution-resource/pom.xml b/branches/sca-equinox/modules/contribution-resource/pom.xml index da19a5249c..5a2422ed4c 100644 --- a/branches/sca-equinox/modules/contribution-resource/pom.xml +++ b/branches/sca-equinox/modules/contribution-resource/pom.xml @@ -44,7 +44,7 @@ <dependency> <groupId>org.codehaus.woodstox</groupId> <artifactId>wstx-asl</artifactId> - <version>3.2.1</version> + <version>3.2.4</version> <scope>runtime</scope> <exclusions> <exclusion> diff --git a/branches/sca-equinox/modules/contribution-xml/pom.xml b/branches/sca-equinox/modules/contribution-xml/pom.xml index b1a06c2d11..4fb3e06a57 100644 --- a/branches/sca-equinox/modules/contribution-xml/pom.xml +++ b/branches/sca-equinox/modules/contribution-xml/pom.xml @@ -38,7 +38,7 @@ <dependency> <groupId>org.codehaus.woodstox</groupId> <artifactId>wstx-asl</artifactId> - <version>3.2.1</version> + <version>3.2.4</version> <scope>runtime</scope> <exclusions> <exclusion> diff --git a/branches/sca-equinox/modules/core-databinding/pom.xml b/branches/sca-equinox/modules/core-databinding/pom.xml index cb88bcd176..b665593aca 100644 --- a/branches/sca-equinox/modules/core-databinding/pom.xml +++ b/branches/sca-equinox/modules/core-databinding/pom.xml @@ -77,7 +77,7 @@ <groupId>org.codehaus.woodstox</groupId> <artifactId>wstx-asl</artifactId> <scope>runtime</scope> - <version>3.2.1</version> + <version>3.2.4</version> <exclusions> <exclusion> <groupId>stax</groupId> diff --git a/branches/sca-equinox/modules/core-spi/pom.xml b/branches/sca-equinox/modules/core-spi/pom.xml index 02cb36dc8b..9d077c0594 100644 --- a/branches/sca-equinox/modules/core-spi/pom.xml +++ b/branches/sca-equinox/modules/core-spi/pom.xml @@ -81,7 +81,7 @@ <dependency> <groupId>org.codehaus.woodstox</groupId> <artifactId>wstx-asl</artifactId> - <version>3.2.1</version> + <version>3.2.4</version> <scope>runtime</scope> <exclusions> <exclusion> diff --git a/branches/sca-equinox/modules/core/pom.xml b/branches/sca-equinox/modules/core/pom.xml index b71f001d06..17da5a4d2b 100644 --- a/branches/sca-equinox/modules/core/pom.xml +++ b/branches/sca-equinox/modules/core/pom.xml @@ -68,7 +68,7 @@ <dependency> <groupId>org.codehaus.woodstox</groupId> <artifactId>wstx-asl</artifactId> - <version>3.2.1</version> + <version>3.2.4</version> <scope>runtime</scope> <exclusions> <exclusion> diff --git a/branches/sca-equinox/modules/databinding-axiom/pom.xml b/branches/sca-equinox/modules/databinding-axiom/pom.xml index f602ad3519..6e0d634419 100644 --- a/branches/sca-equinox/modules/databinding-axiom/pom.xml +++ b/branches/sca-equinox/modules/databinding-axiom/pom.xml @@ -49,7 +49,7 @@ <dependency> <groupId>org.apache.ws.commons.axiom</groupId> <artifactId>axiom-api</artifactId> - <version>1.2.5</version> + <version>1.2.7</version> <exclusions> <exclusion> <groupId>xerces</groupId> @@ -69,7 +69,7 @@ <dependency> <groupId>org.apache.ws.commons.axiom</groupId> <artifactId>axiom-impl</artifactId> - <version>1.2.5</version> + <version>1.2.7</version> <scope>runtime</scope> <exclusions> <exclusion> @@ -82,14 +82,14 @@ <dependency> <groupId>commons-logging</groupId> <artifactId>commons-logging</artifactId> - <version>1.1</version> + <version>1.1.1</version> <scope>runtime</scope> </dependency> <dependency> <groupId>org.codehaus.woodstox</groupId> <artifactId>wstx-asl</artifactId> - <version>3.2.1</version> + <version>3.2.4</version> <scope>runtime</scope> <exclusions> <exclusion> diff --git a/branches/sca-equinox/modules/databinding-jaxb-axiom/pom.xml b/branches/sca-equinox/modules/databinding-jaxb-axiom/pom.xml index 12150abb7e..c4dd61571a 100644 --- a/branches/sca-equinox/modules/databinding-jaxb-axiom/pom.xml +++ b/branches/sca-equinox/modules/databinding-jaxb-axiom/pom.xml @@ -42,7 +42,7 @@ <dependency> <groupId>org.apache.ws.commons.axiom</groupId> <artifactId>axiom-api</artifactId> - <version>1.2.5</version> + <version>1.2.7</version> <exclusions> <exclusion> <groupId>xerces</groupId> @@ -66,7 +66,7 @@ <dependency> <groupId>org.apache.ws.commons.axiom</groupId> <artifactId>axiom-impl</artifactId> - <version>1.2.5</version> + <version>1.2.7</version> <scope>runtime</scope> </dependency> </dependencies> diff --git a/branches/sca-equinox/modules/databinding-json/pom.xml b/branches/sca-equinox/modules/databinding-json/pom.xml index bc4a149b91..7609df06aa 100644 --- a/branches/sca-equinox/modules/databinding-json/pom.xml +++ b/branches/sca-equinox/modules/databinding-json/pom.xml @@ -63,7 +63,7 @@ <dependency> <groupId>org.apache.ws.commons.axiom</groupId> <artifactId>axiom-api</artifactId> - <version>1.2.5</version> + <version>1.2.7</version> <exclusions> <exclusion> <groupId>xerces</groupId> @@ -87,20 +87,20 @@ <dependency> <groupId>org.apache.ws.commons.axiom</groupId> <artifactId>axiom-impl</artifactId> - <version>1.2.5</version> + <version>1.2.7</version> <scope>runtime</scope> </dependency> <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>4.2</version> + <version>4.5</version> </dependency> <dependency> <groupId>commons-logging</groupId> <artifactId>commons-logging</artifactId> - <version>1.1</version> + <version>1.1.1</version> <exclusions> <exclusion> <groupId>commons-logging</groupId> diff --git a/branches/sca-equinox/modules/databinding-sdo-axiom/pom.xml b/branches/sca-equinox/modules/databinding-sdo-axiom/pom.xml index b63e362616..e64e99fa9f 100644 --- a/branches/sca-equinox/modules/databinding-sdo-axiom/pom.xml +++ b/branches/sca-equinox/modules/databinding-sdo-axiom/pom.xml @@ -44,7 +44,7 @@ <dependency> <groupId>org.apache.ws.commons.axiom</groupId> <artifactId>axiom-api</artifactId> - <version>1.2.5</version> + <version>1.2.7</version> <exclusions> <exclusion> <groupId>xerces</groupId> @@ -68,14 +68,14 @@ <dependency> <groupId>org.apache.ws.commons.axiom</groupId> <artifactId>axiom-impl</artifactId> - <version>1.2.5</version> + <version>1.2.7</version> <scope>runtime</scope> </dependency> <dependency> <groupId>commons-logging</groupId> <artifactId>commons-logging</artifactId> - <version>1.1</version> + <version>1.1.1</version> <exclusions> <exclusion> <groupId>commons-logging</groupId> diff --git a/branches/sca-equinox/modules/databinding-xmlbeans/pom.xml b/branches/sca-equinox/modules/databinding-xmlbeans/pom.xml index 3e92649675..29f215641a 100644 --- a/branches/sca-equinox/modules/databinding-xmlbeans/pom.xml +++ b/branches/sca-equinox/modules/databinding-xmlbeans/pom.xml @@ -49,7 +49,7 @@ <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>4.2</version> + <version>4.5</version> </dependency> </dependencies> diff --git a/branches/sca-equinox/modules/databinding/pom.xml b/branches/sca-equinox/modules/databinding/pom.xml index 890abcc2ea..8021c62970 100644 --- a/branches/sca-equinox/modules/databinding/pom.xml +++ b/branches/sca-equinox/modules/databinding/pom.xml @@ -68,7 +68,7 @@ <dependency> <groupId>org.codehaus.woodstox</groupId> <artifactId>wstx-asl</artifactId> - <version>3.2.1</version> + <version>3.2.4</version> <scope>runtime</scope> <exclusions> <exclusion> diff --git a/branches/sca-equinox/modules/extension-helper/pom.xml b/branches/sca-equinox/modules/extension-helper/pom.xml index e35504caab..a54e9e43a3 100644 --- a/branches/sca-equinox/modules/extension-helper/pom.xml +++ b/branches/sca-equinox/modules/extension-helper/pom.xml @@ -59,7 +59,7 @@ <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>4.2</version> + <version>4.5</version> <scope>test</scope> </dependency> diff --git a/branches/sca-equinox/modules/host-webapp-junit/pom.xml b/branches/sca-equinox/modules/host-webapp-junit/pom.xml index 97defa3377..59bb88aa04 100644 --- a/branches/sca-equinox/modules/host-webapp-junit/pom.xml +++ b/branches/sca-equinox/modules/host-webapp-junit/pom.xml @@ -34,7 +34,7 @@ <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>4.2</version> + <version>4.5</version> </dependency> <dependency> diff --git a/branches/sca-equinox/modules/implementation-ejb/pom.xml b/branches/sca-equinox/modules/implementation-ejb/pom.xml index ef77f2df2b..31da4af3c2 100644 --- a/branches/sca-equinox/modules/implementation-ejb/pom.xml +++ b/branches/sca-equinox/modules/implementation-ejb/pom.xml @@ -53,7 +53,7 @@ <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>4.2</version> + <version>4.5</version> <scope>test</scope> </dependency> diff --git a/branches/sca-equinox/modules/implementation-node-runtime/pom.xml b/branches/sca-equinox/modules/implementation-node-runtime/pom.xml index ddd26bf2e8..01c2d4ac3a 100644 --- a/branches/sca-equinox/modules/implementation-node-runtime/pom.xml +++ b/branches/sca-equinox/modules/implementation-node-runtime/pom.xml @@ -76,7 +76,7 @@ <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>4.2</version> + <version>4.5</version> <scope>test</scope> </dependency> </dependencies> diff --git a/branches/sca-equinox/modules/implementation-node/pom.xml b/branches/sca-equinox/modules/implementation-node/pom.xml index 2027eb7e30..69488e1fc9 100644 --- a/branches/sca-equinox/modules/implementation-node/pom.xml +++ b/branches/sca-equinox/modules/implementation-node/pom.xml @@ -65,7 +65,7 @@ <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>4.2</version> + <version>4.5</version> <scope>test</scope> </dependency> diff --git a/branches/sca-equinox/modules/implementation-osgi/pom.xml b/branches/sca-equinox/modules/implementation-osgi/pom.xml index 55e61fda93..c3615148a9 100644 --- a/branches/sca-equinox/modules/implementation-osgi/pom.xml +++ b/branches/sca-equinox/modules/implementation-osgi/pom.xml @@ -122,7 +122,7 @@ <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>4.2</version> + <version>4.5</version> <scope>test</scope> </dependency> diff --git a/branches/sca-equinox/modules/implementation-resource-runtime/pom.xml b/branches/sca-equinox/modules/implementation-resource-runtime/pom.xml index cf63fd5766..33270149b5 100644 --- a/branches/sca-equinox/modules/implementation-resource-runtime/pom.xml +++ b/branches/sca-equinox/modules/implementation-resource-runtime/pom.xml @@ -58,7 +58,7 @@ <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>4.2</version> + <version>4.5</version> <scope>test</scope> </dependency> diff --git a/branches/sca-equinox/modules/implementation-resource/pom.xml b/branches/sca-equinox/modules/implementation-resource/pom.xml index ec8c6638ac..a68a08cd18 100644 --- a/branches/sca-equinox/modules/implementation-resource/pom.xml +++ b/branches/sca-equinox/modules/implementation-resource/pom.xml @@ -51,7 +51,7 @@ <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>4.2</version> + <version>4.5</version> <scope>test</scope> </dependency> diff --git a/branches/sca-equinox/modules/implementation-script-runtime/pom.xml b/branches/sca-equinox/modules/implementation-script-runtime/pom.xml index 354a01d4bf..5e5c78ced4 100644 --- a/branches/sca-equinox/modules/implementation-script-runtime/pom.xml +++ b/branches/sca-equinox/modules/implementation-script-runtime/pom.xml @@ -88,20 +88,20 @@ <artifactId>xml-apis</artifactId>
</exclusion>
</exclusions>
- <version>1.2.5</version>
+ <version>1.2.7</version>
</dependency>
<dependency>
<groupId>org.apache.ws.commons.axiom</groupId>
<artifactId>axiom-impl</artifactId>
- <version>1.2.5</version>
+ <version>1.2.7</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.2</version>
+ <version>4.5</version>
<scope>test</scope>
</dependency>
@@ -136,7 +136,7 @@ <dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
- <version>1.1</version>
+ <version>1.1.1</version>
<exclusions>
<exclusion>
<groupId>commons-logging</groupId>
diff --git a/branches/sca-equinox/modules/implementation-widget-runtime/pom.xml b/branches/sca-equinox/modules/implementation-widget-runtime/pom.xml index f2703e59c4..43ae9aa3ef 100644 --- a/branches/sca-equinox/modules/implementation-widget-runtime/pom.xml +++ b/branches/sca-equinox/modules/implementation-widget-runtime/pom.xml @@ -93,7 +93,7 @@ <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>4.2</version> + <version>4.5</version> <scope>test</scope> </dependency> diff --git a/branches/sca-equinox/modules/implementation-widget/pom.xml b/branches/sca-equinox/modules/implementation-widget/pom.xml index ec717b9b35..f9aca74872 100644 --- a/branches/sca-equinox/modules/implementation-widget/pom.xml +++ b/branches/sca-equinox/modules/implementation-widget/pom.xml @@ -51,7 +51,7 @@ <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>4.2</version> + <version>4.5</version> <scope>test</scope> </dependency> diff --git a/branches/sca-equinox/modules/implementation-xquery/pom.xml b/branches/sca-equinox/modules/implementation-xquery/pom.xml index c094de3c7e..10a35783e7 100644 --- a/branches/sca-equinox/modules/implementation-xquery/pom.xml +++ b/branches/sca-equinox/modules/implementation-xquery/pom.xml @@ -77,7 +77,7 @@ <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>4.2</version> + <version>4.5</version> <scope>test</scope> </dependency> diff --git a/branches/sca-equinox/modules/interface-java-jaxws/pom.xml b/branches/sca-equinox/modules/interface-java-jaxws/pom.xml index 1a738e0f16..e3a72f6fec 100644 --- a/branches/sca-equinox/modules/interface-java-jaxws/pom.xml +++ b/branches/sca-equinox/modules/interface-java-jaxws/pom.xml @@ -48,7 +48,7 @@ <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>4.2</version> + <version>4.5</version> <scope>test</scope> </dependency> diff --git a/branches/sca-equinox/modules/interface-wsdl/pom.xml b/branches/sca-equinox/modules/interface-wsdl/pom.xml index 4d39d9e6f7..bb1e630b0a 100644 --- a/branches/sca-equinox/modules/interface-wsdl/pom.xml +++ b/branches/sca-equinox/modules/interface-wsdl/pom.xml @@ -56,7 +56,7 @@ <dependency> <groupId>org.apache.ws.commons.schema</groupId> <artifactId>XmlSchema</artifactId> - <version>1.3.2</version> + <version>1.4.2</version> </dependency> <dependency> diff --git a/branches/sca-equinox/modules/node-manager/pom.xml b/branches/sca-equinox/modules/node-manager/pom.xml index 346a6554c4..b5c1e085f4 100644 --- a/branches/sca-equinox/modules/node-manager/pom.xml +++ b/branches/sca-equinox/modules/node-manager/pom.xml @@ -109,7 +109,7 @@ <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>4.2</version> + <version>4.5</version> <scope>test</scope> </dependency> diff --git a/branches/sca-equinox/modules/policy-security-ws/pom.xml b/branches/sca-equinox/modules/policy-security-ws/pom.xml index f733f7f4c6..580e649ccf 100644 --- a/branches/sca-equinox/modules/policy-security-ws/pom.xml +++ b/branches/sca-equinox/modules/policy-security-ws/pom.xml @@ -68,19 +68,19 @@ <artifactId>xml-apis</artifactId>
</exclusion>
</exclusions>
- <version>1.2.5</version>
+ <version>1.2.7</version>
</dependency>
<dependency>
<groupId>org.apache.ws.commons.axiom</groupId>
<artifactId>axiom-impl</artifactId>
- <version>1.2.5</version>
+ <version>1.2.7</version>
</dependency>
<dependency>
<groupId>org.apache.axis2</groupId>
<artifactId>axis2-kernel</artifactId>
- <version>1.3</version>
+ <version>1.4.1</version>
<exclusions>
<exclusion>
<groupId>backport-util-concurrent</groupId>
@@ -100,14 +100,14 @@ <dependency>
<groupId>backport-util-concurrent</groupId>
<artifactId>backport-util-concurrent</artifactId>
- <version>3.0</version>
+ <version>3.1</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.neethi</groupId>
<artifactId>neethi</artifactId>
- <version>2.0.2</version>
+ <version>2.0.4</version>
<exclusions>
<exclusion>
<groupId>wsdl4j</groupId>
diff --git a/branches/sca-equinox/modules/policy-xml-ws/pom.xml b/branches/sca-equinox/modules/policy-xml-ws/pom.xml index f6d8a884ec..039dc83538 100644 --- a/branches/sca-equinox/modules/policy-xml-ws/pom.xml +++ b/branches/sca-equinox/modules/policy-xml-ws/pom.xml @@ -50,7 +50,7 @@ <dependency> <groupId>org.apache.ws.commons.axiom</groupId> <artifactId>axiom-api</artifactId> - <version>1.2.5</version> + <version>1.2.7</version> <exclusions> <exclusion> <groupId>xerces</groupId> @@ -74,7 +74,7 @@ <dependency> <groupId>org.apache.neethi</groupId> <artifactId>neethi</artifactId> - <version>2.0.2</version> + <version>2.0.4</version> <exclusions> <exclusion> <groupId>wsdl4j</groupId> @@ -90,7 +90,7 @@ <dependency> <groupId>org.apache.ws.commons.axiom</groupId> <artifactId>axiom-impl</artifactId> - <version>1.2.5</version> + <version>1.2.7</version> <scope>runtime</scope> <exclusions> <exclusion> @@ -103,14 +103,14 @@ <dependency> <groupId>org.codehaus.woodstox</groupId> <artifactId>wstx-asl</artifactId> - <version>3.2.1</version> + <version>3.2.4</version> <scope>runtime</scope> </dependency> <dependency> <groupId>commons-logging</groupId> <artifactId>commons-logging</artifactId> - <version>1.1</version> + <version>1.1.1</version> <scope>runtime</scope> <exclusions> <exclusion> diff --git a/branches/sca-equinox/modules/policy-xml/pom.xml b/branches/sca-equinox/modules/policy-xml/pom.xml index 178648c7a3..0934c768df 100644 --- a/branches/sca-equinox/modules/policy-xml/pom.xml +++ b/branches/sca-equinox/modules/policy-xml/pom.xml @@ -44,7 +44,7 @@ <dependency>
<groupId>org.codehaus.woodstox</groupId>
<artifactId>wstx-asl</artifactId>
- <version>3.2.1</version>
+ <version>3.2.4</version>
<scope>runtime</scope>
<exclusions>
<exclusion>
diff --git a/branches/sca-equinox/modules/pom.xml b/branches/sca-equinox/modules/pom.xml index 2ee9c9c9c2..f404c65fa5 100644 --- a/branches/sca-equinox/modules/pom.xml +++ b/branches/sca-equinox/modules/pom.xml @@ -173,14 +173,14 @@ <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>4.2</version> + <version>4.5</version> <scope>test</scope> </dependency> <dependency> <groupId>org.easymock</groupId> <artifactId>easymock</artifactId> - <version>2.2</version> + <version>2.4</version> <scope>test</scope> </dependency> </dependencies> diff --git a/branches/sca-equinox/modules/workspace-xml/pom.xml b/branches/sca-equinox/modules/workspace-xml/pom.xml index 21024de0d3..0fce4fa60e 100644 --- a/branches/sca-equinox/modules/workspace-xml/pom.xml +++ b/branches/sca-equinox/modules/workspace-xml/pom.xml @@ -38,7 +38,7 @@ <dependency> <groupId>org.codehaus.woodstox</groupId> <artifactId>wstx-asl</artifactId> - <version>3.2.1</version> + <version>3.2.4</version> <scope>runtime</scope> <exclusions> <exclusion> diff --git a/branches/sca-equinox/modules/xsd-xml/src/main/java/org/apache/tuscany/sca/xsd/xml/XSDModelResolver.java b/branches/sca-equinox/modules/xsd-xml/src/main/java/org/apache/tuscany/sca/xsd/xml/XSDModelResolver.java index 652d9e8d83..3e22b49d31 100644 --- a/branches/sca-equinox/modules/xsd-xml/src/main/java/org/apache/tuscany/sca/xsd/xml/XSDModelResolver.java +++ b/branches/sca-equinox/modules/xsd-xml/src/main/java/org/apache/tuscany/sca/xsd/xml/XSDModelResolver.java @@ -49,6 +49,7 @@ import org.xml.sax.InputSource; * @version $Rev$ $Date$ */ public class XSDModelResolver implements ModelResolver { + private static final String AGGREGATED_XSD = "http://tuscany.apache.org/aggregated.xsd"; private XSDFactory factory; private Contribution contribution; private Map<String, List<XSDefinition>> map = new HashMap<String, List<XSDefinition>>(); @@ -166,6 +167,12 @@ public class XSDModelResolver implements ModelResolver { } // Read an XSD document InputSource xsd = XMLDocumentHelper.getInputSource(definition.getLocation().toURL()); + for (XmlSchema d : schemaCollection.getXmlSchemas()) { + if (d.getTargetNamespace().equals(definition.getNamespace())) { + if (d.getSourceURI().equals(definition.getLocation().toString())) + return; + } + } XmlSchema schema = schemaCollection.read(xsd, null); definition.setSchemaCollection(schemaCollection); definition.setSchema(schema); @@ -193,10 +200,25 @@ public class XSDModelResolver implements ModelResolver { loadOnDemand(d); } String ns = definitions.get(0).getNamespace(); - XmlSchema facade = new XmlSchema(ns, schemaCollection); + + XmlSchema facade = null; + // Check if the facade XSD is already in the collection + for (XmlSchema s : schemaCollection.getXmlSchema(AGGREGATED_XSD)) { + if (ns.equals(s.getTargetNamespace())) { + facade = s; + break; + } + } + if (facade == null) { + // This will add the facade into the collection + facade = new XmlSchema(ns, AGGREGATED_XSD, schemaCollection); + } for (XmlSchema d : schemaCollection.getXmlSchemas()) { if (ns.equals(d.getTargetNamespace())) { + if (d == facade) { + continue; + } XmlSchemaInclude include = new XmlSchemaInclude(); include.setSchema(d); include.setSourceURI(d.getSourceURI()); diff --git a/branches/sca-equinox/modules/xsd/pom.xml b/branches/sca-equinox/modules/xsd/pom.xml index 0ef1e7ed99..c8a9e21576 100644 --- a/branches/sca-equinox/modules/xsd/pom.xml +++ b/branches/sca-equinox/modules/xsd/pom.xml @@ -38,7 +38,7 @@ <dependency>
<groupId>org.apache.ws.commons.schema</groupId>
<artifactId>XmlSchema</artifactId>
- <version>1.3.2</version>
+ <version>1.4.2</version>
</dependency>
</dependencies>
diff --git a/branches/sca-equinox/samples/binding-echo-extension/pom.xml b/branches/sca-equinox/samples/binding-echo-extension/pom.xml index 2d516f2101..7f22540507 100644 --- a/branches/sca-equinox/samples/binding-echo-extension/pom.xml +++ b/branches/sca-equinox/samples/binding-echo-extension/pom.xml @@ -65,7 +65,7 @@ <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>4.2</version> + <version>4.5</version> <scope>test</scope> </dependency> diff --git a/branches/sca-equinox/samples/binding-echo/pom.xml b/branches/sca-equinox/samples/binding-echo/pom.xml index 9c14b5d4c3..1959dd9cd0 100644 --- a/branches/sca-equinox/samples/binding-echo/pom.xml +++ b/branches/sca-equinox/samples/binding-echo/pom.xml @@ -58,7 +58,7 @@ <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>4.2</version> + <version>4.5</version> <scope>test</scope> </dependency> diff --git a/branches/sca-equinox/samples/calculator-distributed/pom.xml b/branches/sca-equinox/samples/calculator-distributed/pom.xml index c517625300..569fb37f14 100644 --- a/branches/sca-equinox/samples/calculator-distributed/pom.xml +++ b/branches/sca-equinox/samples/calculator-distributed/pom.xml @@ -107,7 +107,7 @@ <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>4.2</version> + <version>4.5</version> <scope>test</scope> </dependency> diff --git a/branches/sca-equinox/samples/calculator-implementation-policies/pom.xml b/branches/sca-equinox/samples/calculator-implementation-policies/pom.xml index e5ccc076a5..9456bbf35e 100644 --- a/branches/sca-equinox/samples/calculator-implementation-policies/pom.xml +++ b/branches/sca-equinox/samples/calculator-implementation-policies/pom.xml @@ -52,7 +52,7 @@ <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.2</version>
+ <version>4.5</version>
<scope>test</scope>
</dependency>
diff --git a/branches/sca-equinox/samples/calculator-lean/pom.xml b/branches/sca-equinox/samples/calculator-lean/pom.xml index 10f4ae110f..6fc55d3160 100644 --- a/branches/sca-equinox/samples/calculator-lean/pom.xml +++ b/branches/sca-equinox/samples/calculator-lean/pom.xml @@ -59,7 +59,7 @@ <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>4.2</version> + <version>4.5</version> <scope>test</scope> </dependency> diff --git a/branches/sca-equinox/samples/calculator-rcp/pom.xml b/branches/sca-equinox/samples/calculator-rcp/pom.xml index 1f25539c37..91f820f03c 100644 --- a/branches/sca-equinox/samples/calculator-rcp/pom.xml +++ b/branches/sca-equinox/samples/calculator-rcp/pom.xml @@ -152,7 +152,7 @@ <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>4.2</version> + <version>4.5</version> <scope>test</scope> </dependency> </dependencies> diff --git a/branches/sca-equinox/samples/calculator-rmi-reference/pom.xml b/branches/sca-equinox/samples/calculator-rmi-reference/pom.xml index 452662e7aa..f643897bae 100644 --- a/branches/sca-equinox/samples/calculator-rmi-reference/pom.xml +++ b/branches/sca-equinox/samples/calculator-rmi-reference/pom.xml @@ -56,7 +56,7 @@ <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.2</version>
+ <version>4.5</version>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/branches/sca-equinox/samples/calculator-rmi-service/pom.xml b/branches/sca-equinox/samples/calculator-rmi-service/pom.xml index 5294cced21..6e8925fede 100644 --- a/branches/sca-equinox/samples/calculator-rmi-service/pom.xml +++ b/branches/sca-equinox/samples/calculator-rmi-service/pom.xml @@ -56,7 +56,7 @@ <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.2</version>
+ <version>4.5</version>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/branches/sca-equinox/samples/calculator-script/pom.xml b/branches/sca-equinox/samples/calculator-script/pom.xml index c76f3ea580..ef0859901b 100644 --- a/branches/sca-equinox/samples/calculator-script/pom.xml +++ b/branches/sca-equinox/samples/calculator-script/pom.xml @@ -66,7 +66,7 @@ <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>4.2</version> + <version>4.5</version> <scope>test</scope> </dependency> diff --git a/branches/sca-equinox/samples/calculator-webapp/pom.xml b/branches/sca-equinox/samples/calculator-webapp/pom.xml index cccbd6aefa..6d7c2eb8aa 100644 --- a/branches/sca-equinox/samples/calculator-webapp/pom.xml +++ b/branches/sca-equinox/samples/calculator-webapp/pom.xml @@ -69,7 +69,7 @@ <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.2</version>
+ <version>4.5</version>
<scope>test</scope>
</dependency>
diff --git a/branches/sca-equinox/samples/calculator-ws-secure-webapp/pom.xml b/branches/sca-equinox/samples/calculator-ws-secure-webapp/pom.xml index 76753eee39..b9ddcdbeeb 100644 --- a/branches/sca-equinox/samples/calculator-ws-secure-webapp/pom.xml +++ b/branches/sca-equinox/samples/calculator-ws-secure-webapp/pom.xml @@ -76,7 +76,7 @@ WS Security and in a WebApp</name> <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.2</version>
+ <version>4.5</version>
<scope>test</scope>
</dependency>
diff --git a/branches/sca-equinox/samples/calculator-ws-webapp/pom.xml b/branches/sca-equinox/samples/calculator-ws-webapp/pom.xml index 167ddbfc63..66a9d24aeb 100644 --- a/branches/sca-equinox/samples/calculator-ws-webapp/pom.xml +++ b/branches/sca-equinox/samples/calculator-ws-webapp/pom.xml @@ -76,7 +76,7 @@ <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.2</version>
+ <version>4.5</version>
<scope>test</scope>
</dependency>
diff --git a/branches/sca-equinox/samples/calculator/pom.xml b/branches/sca-equinox/samples/calculator/pom.xml index 4a2216c2e9..45ac5c7810 100644 --- a/branches/sca-equinox/samples/calculator/pom.xml +++ b/branches/sca-equinox/samples/calculator/pom.xml @@ -59,7 +59,7 @@ <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>4.2</version> + <version>4.5</version> <scope>test</scope> </dependency> diff --git a/branches/sca-equinox/samples/callback-ws-client/pom.xml b/branches/sca-equinox/samples/callback-ws-client/pom.xml index 1fae308598..483b10768a 100644 --- a/branches/sca-equinox/samples/callback-ws-client/pom.xml +++ b/branches/sca-equinox/samples/callback-ws-client/pom.xml @@ -66,7 +66,7 @@ <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.2</version>
+ <version>4.5</version>
<scope>test</scope>
</dependency>
diff --git a/branches/sca-equinox/samples/callback-ws-service/pom.xml b/branches/sca-equinox/samples/callback-ws-service/pom.xml index 7094c848c6..85eabd0b48 100644 --- a/branches/sca-equinox/samples/callback-ws-service/pom.xml +++ b/branches/sca-equinox/samples/callback-ws-service/pom.xml @@ -66,7 +66,7 @@ <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.2</version>
+ <version>4.5</version>
<scope>test</scope>
</dependency>
diff --git a/branches/sca-equinox/samples/customer-dojo/pom.xml b/branches/sca-equinox/samples/customer-dojo/pom.xml index 305ca8ada0..950b580c87 100644 --- a/branches/sca-equinox/samples/customer-dojo/pom.xml +++ b/branches/sca-equinox/samples/customer-dojo/pom.xml @@ -109,7 +109,7 @@ <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>4.2</version> + <version>4.5</version> <scope>test</scope> </dependency> diff --git a/branches/sca-equinox/samples/databinding-echo/pom.xml b/branches/sca-equinox/samples/databinding-echo/pom.xml index 3ef0bcfbf5..ecb491f718 100644 --- a/branches/sca-equinox/samples/databinding-echo/pom.xml +++ b/branches/sca-equinox/samples/databinding-echo/pom.xml @@ -70,7 +70,7 @@ <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>4.2</version> + <version>4.5</version> <scope>test</scope> </dependency> </dependencies> diff --git a/branches/sca-equinox/samples/domain-management/pom.xml b/branches/sca-equinox/samples/domain-management/pom.xml index 781f77285a..0dff72408a 100644 --- a/branches/sca-equinox/samples/domain-management/pom.xml +++ b/branches/sca-equinox/samples/domain-management/pom.xml @@ -172,7 +172,7 @@ <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>4.2</version> + <version>4.5</version> <scope>test</scope> </dependency> diff --git a/branches/sca-equinox/samples/feed-aggregator-webapp/pom.xml b/branches/sca-equinox/samples/feed-aggregator-webapp/pom.xml index e6a51241df..b226df2ad2 100644 --- a/branches/sca-equinox/samples/feed-aggregator-webapp/pom.xml +++ b/branches/sca-equinox/samples/feed-aggregator-webapp/pom.xml @@ -81,7 +81,7 @@ <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>4.2</version> + <version>4.5</version> <scope>test</scope> </dependency> diff --git a/branches/sca-equinox/samples/feed-aggregator/pom.xml b/branches/sca-equinox/samples/feed-aggregator/pom.xml index c20c79440e..e1908d54fd 100644 --- a/branches/sca-equinox/samples/feed-aggregator/pom.xml +++ b/branches/sca-equinox/samples/feed-aggregator/pom.xml @@ -71,7 +71,7 @@ <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>4.2</version> + <version>4.5</version> <scope>test</scope> </dependency> diff --git a/branches/sca-equinox/samples/helloworld-bpel/pom.xml b/branches/sca-equinox/samples/helloworld-bpel/pom.xml index e606edb2e5..b864ada85f 100644 --- a/branches/sca-equinox/samples/helloworld-bpel/pom.xml +++ b/branches/sca-equinox/samples/helloworld-bpel/pom.xml @@ -71,7 +71,7 @@ <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>4.2</version> + <version>4.5</version> <scope>test</scope> </dependency> <!-- dependencies that must be present in order that the build scripts work --> diff --git a/branches/sca-equinox/samples/helloworld-dojo-webapp/pom.xml b/branches/sca-equinox/samples/helloworld-dojo-webapp/pom.xml index 4fc75e1baa..6d22e4fa4a 100644 --- a/branches/sca-equinox/samples/helloworld-dojo-webapp/pom.xml +++ b/branches/sca-equinox/samples/helloworld-dojo-webapp/pom.xml @@ -76,7 +76,7 @@ <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>4.2</version> + <version>4.5</version> <scope>test</scope> </dependency> diff --git a/branches/sca-equinox/samples/helloworld-jsonrpc-webapp/pom.xml b/branches/sca-equinox/samples/helloworld-jsonrpc-webapp/pom.xml index d3999835c5..8ba38d82a0 100644 --- a/branches/sca-equinox/samples/helloworld-jsonrpc-webapp/pom.xml +++ b/branches/sca-equinox/samples/helloworld-jsonrpc-webapp/pom.xml @@ -76,7 +76,7 @@ <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>4.2</version> + <version>4.5</version> <scope>test</scope> </dependency> diff --git a/branches/sca-equinox/samples/helloworld-reference-jms/pom.xml b/branches/sca-equinox/samples/helloworld-reference-jms/pom.xml index 21ed69d7e9..8c9b704c49 100644 --- a/branches/sca-equinox/samples/helloworld-reference-jms/pom.xml +++ b/branches/sca-equinox/samples/helloworld-reference-jms/pom.xml @@ -66,7 +66,7 @@ <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.2</version>
+ <version>4.5</version>
<scope>test</scope>
</dependency>
diff --git a/branches/sca-equinox/samples/helloworld-service-jms/pom.xml b/branches/sca-equinox/samples/helloworld-service-jms/pom.xml index 87c981b5c5..a80a32fc08 100644 --- a/branches/sca-equinox/samples/helloworld-service-jms/pom.xml +++ b/branches/sca-equinox/samples/helloworld-service-jms/pom.xml @@ -60,7 +60,7 @@ <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.2</version>
+ <version>4.5</version>
<scope>test</scope>
</dependency>
diff --git a/branches/sca-equinox/samples/helloworld-ws-reference-jms/pom.xml b/branches/sca-equinox/samples/helloworld-ws-reference-jms/pom.xml index 8015eddca9..9ff43d8816 100644 --- a/branches/sca-equinox/samples/helloworld-ws-reference-jms/pom.xml +++ b/branches/sca-equinox/samples/helloworld-ws-reference-jms/pom.xml @@ -66,7 +66,7 @@ <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>4.2</version> + <version>4.5</version> <scope>test</scope> </dependency> diff --git a/branches/sca-equinox/samples/helloworld-ws-reference-lean/pom.xml b/branches/sca-equinox/samples/helloworld-ws-reference-lean/pom.xml index 6f672b5054..f92f468ab2 100644 --- a/branches/sca-equinox/samples/helloworld-ws-reference-lean/pom.xml +++ b/branches/sca-equinox/samples/helloworld-ws-reference-lean/pom.xml @@ -66,7 +66,7 @@ <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>4.2</version> + <version>4.5</version> <scope>test</scope> </dependency> diff --git a/branches/sca-equinox/samples/helloworld-ws-reference-secure/pom.xml b/branches/sca-equinox/samples/helloworld-ws-reference-secure/pom.xml index 8c624a72b3..25dbc97a5d 100644 --- a/branches/sca-equinox/samples/helloworld-ws-reference-secure/pom.xml +++ b/branches/sca-equinox/samples/helloworld-ws-reference-secure/pom.xml @@ -72,7 +72,7 @@ <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.2</version>
+ <version>4.5</version>
<scope>test</scope>
</dependency>
diff --git a/branches/sca-equinox/samples/helloworld-ws-reference/pom.xml b/branches/sca-equinox/samples/helloworld-ws-reference/pom.xml index f8da8ad6e0..35436414fb 100644 --- a/branches/sca-equinox/samples/helloworld-ws-reference/pom.xml +++ b/branches/sca-equinox/samples/helloworld-ws-reference/pom.xml @@ -66,7 +66,7 @@ <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>4.2</version> + <version>4.5</version> <scope>test</scope> </dependency> diff --git a/branches/sca-equinox/samples/helloworld-ws-sdo-webapp/pom.xml b/branches/sca-equinox/samples/helloworld-ws-sdo-webapp/pom.xml index 7b85337332..7ddf18b3e5 100644 --- a/branches/sca-equinox/samples/helloworld-ws-sdo-webapp/pom.xml +++ b/branches/sca-equinox/samples/helloworld-ws-sdo-webapp/pom.xml @@ -114,7 +114,7 @@ <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>4.2</version> + <version>4.5</version> <scope>test</scope> </dependency> diff --git a/branches/sca-equinox/samples/helloworld-ws-sdo/pom.xml b/branches/sca-equinox/samples/helloworld-ws-sdo/pom.xml index c1a8def8de..63d9df2169 100644 --- a/branches/sca-equinox/samples/helloworld-ws-sdo/pom.xml +++ b/branches/sca-equinox/samples/helloworld-ws-sdo/pom.xml @@ -83,7 +83,7 @@ <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>4.2</version> + <version>4.5</version> <scope>test</scope> </dependency> diff --git a/branches/sca-equinox/samples/helloworld-ws-service-jms/pom.xml b/branches/sca-equinox/samples/helloworld-ws-service-jms/pom.xml index d3e376bd3d..a640cda312 100644 --- a/branches/sca-equinox/samples/helloworld-ws-service-jms/pom.xml +++ b/branches/sca-equinox/samples/helloworld-ws-service-jms/pom.xml @@ -74,7 +74,7 @@ <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.2</version>
+ <version>4.5</version>
<scope>test</scope>
</dependency>
diff --git a/branches/sca-equinox/samples/helloworld-ws-service-secure/pom.xml b/branches/sca-equinox/samples/helloworld-ws-service-secure/pom.xml index 4ceb6bceca..d4f254e55a 100644 --- a/branches/sca-equinox/samples/helloworld-ws-service-secure/pom.xml +++ b/branches/sca-equinox/samples/helloworld-ws-service-secure/pom.xml @@ -72,7 +72,7 @@ <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.2</version>
+ <version>4.5</version>
<scope>test</scope>
</dependency>
diff --git a/branches/sca-equinox/samples/helloworld-ws-service/pom.xml b/branches/sca-equinox/samples/helloworld-ws-service/pom.xml index 3b65eb860b..691d50b456 100644 --- a/branches/sca-equinox/samples/helloworld-ws-service/pom.xml +++ b/branches/sca-equinox/samples/helloworld-ws-service/pom.xml @@ -67,7 +67,7 @@ <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>4.2</version> + <version>4.5</version> <scope>test</scope> </dependency> </dependencies> diff --git a/branches/sca-equinox/samples/implementation-composite/pom.xml b/branches/sca-equinox/samples/implementation-composite/pom.xml index 229061acb1..0ab5bdecc5 100644 --- a/branches/sca-equinox/samples/implementation-composite/pom.xml +++ b/branches/sca-equinox/samples/implementation-composite/pom.xml @@ -59,7 +59,7 @@ <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>4.2</version> + <version>4.5</version> <scope>test</scope> </dependency> diff --git a/branches/sca-equinox/samples/implementation-crud-extension/pom.xml b/branches/sca-equinox/samples/implementation-crud-extension/pom.xml index c11953f0ac..6a7bade0f1 100644 --- a/branches/sca-equinox/samples/implementation-crud-extension/pom.xml +++ b/branches/sca-equinox/samples/implementation-crud-extension/pom.xml @@ -64,7 +64,7 @@ <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>4.2</version> + <version>4.5</version> <scope>test</scope> </dependency> diff --git a/branches/sca-equinox/samples/implementation-crud/pom.xml b/branches/sca-equinox/samples/implementation-crud/pom.xml index 3cc75a6f7d..20f489bb2a 100644 --- a/branches/sca-equinox/samples/implementation-crud/pom.xml +++ b/branches/sca-equinox/samples/implementation-crud/pom.xml @@ -51,7 +51,7 @@ <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>4.2</version> + <version>4.5</version> <scope>test</scope> </dependency> diff --git a/branches/sca-equinox/samples/implementation-pojo-extension/pom.xml b/branches/sca-equinox/samples/implementation-pojo-extension/pom.xml index d7bb120e93..d397ee7d3e 100644 --- a/branches/sca-equinox/samples/implementation-pojo-extension/pom.xml +++ b/branches/sca-equinox/samples/implementation-pojo-extension/pom.xml @@ -64,7 +64,7 @@ <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>4.2</version> + <version>4.5</version> <scope>test</scope> </dependency> diff --git a/branches/sca-equinox/samples/loanapplication/pom.xml b/branches/sca-equinox/samples/loanapplication/pom.xml index e2551fd7dc..0b528371a4 100644 --- a/branches/sca-equinox/samples/loanapplication/pom.xml +++ b/branches/sca-equinox/samples/loanapplication/pom.xml @@ -52,7 +52,7 @@ <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.2</version>
+ <version>4.5</version>
<scope>test</scope>
</dependency>
diff --git a/branches/sca-equinox/samples/osgi-supplychain/pom.xml b/branches/sca-equinox/samples/osgi-supplychain/pom.xml index e2a2e0574e..c01e16627b 100644 --- a/branches/sca-equinox/samples/osgi-supplychain/pom.xml +++ b/branches/sca-equinox/samples/osgi-supplychain/pom.xml @@ -59,7 +59,7 @@ <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>4.2</version> + <version>4.5</version> <scope>test</scope> </dependency> </dependencies> diff --git a/branches/sca-equinox/samples/photo-gallery/pom.xml b/branches/sca-equinox/samples/photo-gallery/pom.xml index 1c258b47c8..2a92482241 100644 --- a/branches/sca-equinox/samples/photo-gallery/pom.xml +++ b/branches/sca-equinox/samples/photo-gallery/pom.xml @@ -135,7 +135,7 @@ <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>4.2</version> + <version>4.5</version> <scope>test</scope> </dependency> diff --git a/branches/sca-equinox/samples/quote-xquery/pom.xml b/branches/sca-equinox/samples/quote-xquery/pom.xml index b8a294de08..1d26893f6e 100644 --- a/branches/sca-equinox/samples/quote-xquery/pom.xml +++ b/branches/sca-equinox/samples/quote-xquery/pom.xml @@ -103,7 +103,7 @@ <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>4.2</version> + <version>4.5</version> <scope>compile</scope> </dependency> diff --git a/branches/sca-equinox/samples/simple-bigbank-spring/pom.xml b/branches/sca-equinox/samples/simple-bigbank-spring/pom.xml index 00a8c97304..a9e9f33fb4 100644 --- a/branches/sca-equinox/samples/simple-bigbank-spring/pom.xml +++ b/branches/sca-equinox/samples/simple-bigbank-spring/pom.xml @@ -178,7 +178,7 @@ <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>4.2</version> + <version>4.5</version> <scope>test</scope> </dependency> diff --git a/branches/sca-equinox/samples/simple-bigbank/pom.xml b/branches/sca-equinox/samples/simple-bigbank/pom.xml index bb99d5cd6c..87b5cc33d5 100644 --- a/branches/sca-equinox/samples/simple-bigbank/pom.xml +++ b/branches/sca-equinox/samples/simple-bigbank/pom.xml @@ -52,7 +52,7 @@ <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>4.2</version> + <version>4.5</version> <scope>test</scope> </dependency> diff --git a/branches/sca-equinox/samples/simple-callback-ws/pom.xml b/branches/sca-equinox/samples/simple-callback-ws/pom.xml index 1c3b4101cc..c04bdc8bb9 100644 --- a/branches/sca-equinox/samples/simple-callback-ws/pom.xml +++ b/branches/sca-equinox/samples/simple-callback-ws/pom.xml @@ -66,7 +66,7 @@ <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>4.2</version> + <version>4.5</version> <scope>test</scope> </dependency> diff --git a/branches/sca-equinox/samples/simple-callback/pom.xml b/branches/sca-equinox/samples/simple-callback/pom.xml index 3a449dade9..7849657cd9 100644 --- a/branches/sca-equinox/samples/simple-callback/pom.xml +++ b/branches/sca-equinox/samples/simple-callback/pom.xml @@ -52,7 +52,7 @@ <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>4.2</version> + <version>4.5</version> <scope>test</scope> </dependency> diff --git a/branches/sca-equinox/samples/spring-bigbank-calculator/pom.xml b/branches/sca-equinox/samples/spring-bigbank-calculator/pom.xml index 45117a03de..5b54cf545b 100644 --- a/branches/sca-equinox/samples/spring-bigbank-calculator/pom.xml +++ b/branches/sca-equinox/samples/spring-bigbank-calculator/pom.xml @@ -80,7 +80,7 @@ <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>4.2</version> + <version>4.5</version> <scope>test</scope> </dependency> diff --git a/branches/sca-equinox/samples/spring-bigbank-checkaccount/pom.xml b/branches/sca-equinox/samples/spring-bigbank-checkaccount/pom.xml index 19321adbb6..1b336f622a 100644 --- a/branches/sca-equinox/samples/spring-bigbank-checkaccount/pom.xml +++ b/branches/sca-equinox/samples/spring-bigbank-checkaccount/pom.xml @@ -85,7 +85,7 @@ <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>4.2</version> + <version>4.5</version> <scope>test</scope> </dependency> diff --git a/branches/sca-equinox/samples/spring-bigbank-stockquote/pom.xml b/branches/sca-equinox/samples/spring-bigbank-stockquote/pom.xml index 15786039e8..4f307d6dc4 100644 --- a/branches/sca-equinox/samples/spring-bigbank-stockquote/pom.xml +++ b/branches/sca-equinox/samples/spring-bigbank-stockquote/pom.xml @@ -80,7 +80,7 @@ <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>4.2</version> + <version>4.5</version> <scope>test</scope> </dependency> diff --git a/branches/sca-equinox/samples/store-distributed/pom.xml b/branches/sca-equinox/samples/store-distributed/pom.xml index 57f8cc5f98..3ff58ac026 100644 --- a/branches/sca-equinox/samples/store-distributed/pom.xml +++ b/branches/sca-equinox/samples/store-distributed/pom.xml @@ -106,7 +106,7 @@ <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>4.2</version> + <version>4.5</version> <scope>test</scope> </dependency> diff --git a/branches/sca-equinox/samples/store/pom.xml b/branches/sca-equinox/samples/store/pom.xml index ad5709116e..17de1c9cea 100644 --- a/branches/sca-equinox/samples/store/pom.xml +++ b/branches/sca-equinox/samples/store/pom.xml @@ -93,7 +93,7 @@ <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>4.2</version> + <version>4.5</version> <scope>test</scope> </dependency> diff --git a/branches/sca-equinox/samples/supplychain/pom.xml b/branches/sca-equinox/samples/supplychain/pom.xml index 0b5a76be4c..58866ce1b4 100644 --- a/branches/sca-equinox/samples/supplychain/pom.xml +++ b/branches/sca-equinox/samples/supplychain/pom.xml @@ -52,7 +52,7 @@ <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>4.2</version> + <version>4.5</version> <scope>test</scope> </dependency> diff --git a/branches/sca-equinox/samples/web-resource/pom.xml b/branches/sca-equinox/samples/web-resource/pom.xml index 25d0153aef..fdd04e1be7 100644 --- a/branches/sca-equinox/samples/web-resource/pom.xml +++ b/branches/sca-equinox/samples/web-resource/pom.xml @@ -66,7 +66,7 @@ <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>4.2</version> + <version>4.5</version> <scope>test</scope> </dependency> diff --git a/branches/sca-equinox/samples/zipcode-jaxws/pom.xml b/branches/sca-equinox/samples/zipcode-jaxws/pom.xml index eace7b1bfe..18023f1cf2 100644 --- a/branches/sca-equinox/samples/zipcode-jaxws/pom.xml +++ b/branches/sca-equinox/samples/zipcode-jaxws/pom.xml @@ -61,7 +61,7 @@ <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>4.2</version> + <version>4.5</version> <scope>test</scope> </dependency> diff --git a/branches/sca-equinox/tools/java2wsdl/pom.xml b/branches/sca-equinox/tools/java2wsdl/pom.xml index a760c26d1b..e9c97b283c 100644 --- a/branches/sca-equinox/tools/java2wsdl/pom.xml +++ b/branches/sca-equinox/tools/java2wsdl/pom.xml @@ -27,42 +27,42 @@ </parent> <artifactId>tuscany-java2wsdl</artifactId> <name>Apache Tuscany SCA Java2WSDL Tool</name> - <dependencies> <dependency> <groupId>org.apache.tuscany.sdo</groupId> <artifactId>tuscany-sdo-impl</artifactId> <version>1.1.1</version> + <exclusions> + <exclusion> + <groupId>stax</groupId> + <artifactId>stax-api</artifactId> + </exclusion> + </exclusions> </dependency> - <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>tuscany-sca-api</artifactId> <version>1.4-SNAPSHOT</version> </dependency> - <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>tuscany-databinding</artifactId> <version>1.4-SNAPSHOT</version> </dependency> - <dependency> <groupId>javax.xml.stream</groupId> <artifactId>stax-api</artifactId> <version>1.0-2</version> </dependency> - <dependency> <groupId>wsdl4j</groupId> <artifactId>wsdl4j</artifactId> <version>1.6.2</version> </dependency> - <dependency> <groupId>org.apache.neethi</groupId> <artifactId>neethi</artifactId> - <version>2.0.2</version> + <version>2.0.4</version> <exclusions> <exclusion> <groupId>wsdl4j</groupId> @@ -74,51 +74,11 @@ </exclusion> </exclusions> </dependency> - - <dependency> - <groupId>org.apache.ws.commons.schema</groupId> - <artifactId>XmlSchema</artifactId> - <version>1.3.2</version> - </dependency> - - <dependency> - <groupId>org.apache.ws.commons.axiom</groupId> - <artifactId>axiom-api</artifactId> - <exclusions> - <exclusion> - <groupId>xerces</groupId> - <artifactId>xercesImpl</artifactId> - </exclusion> - <exclusion> - <groupId>xml-apis</groupId> - <artifactId>xml-apis</artifactId> - </exclusion> - </exclusions> - <version>1.2.5</version> - </dependency> - - <dependency> - <groupId>org.apache.ws.commons.axiom</groupId> - <artifactId>axiom-impl</artifactId> - <version>1.2.5</version> - </dependency> - - <dependency> - <groupId>org.apache.axis2</groupId> - <artifactId>axis2-kernel</artifactId> - <version>1.3</version> - <exclusions> - <exclusion> - <groupId>org.codehaus.woodstox</groupId> - <artifactId>wstx-asl</artifactId> - </exclusion> - </exclusions> - </dependency> - + <dependency> <groupId>org.apache.axis2</groupId> <artifactId>axis2-java2wsdl</artifactId> - <version>1.3</version> + <version>1.4.1</version> <exclusions> <exclusion> <groupId>org.apache.ant</groupId> @@ -126,11 +86,10 @@ </exclusion> </exclusions> </dependency> - <dependency> <groupId>org.apache.axis2</groupId> <artifactId>axis2-codegen</artifactId> - <version>1.3</version> + <version>1.4.1</version> <exclusions> <exclusion> <groupId>org.apache.geronimo.specs</groupId> @@ -138,13 +97,11 @@ </exclusion> </exclusions> </dependency> - <dependency> <groupId>org.eclipse.emf</groupId> <artifactId>codegen</artifactId> <version>2.2.3</version> </dependency> - <dependency> <groupId>org.eclipse.emf</groupId> <artifactId>codegen-ecore</artifactId> @@ -152,26 +109,12 @@ </dependency> <dependency> - <groupId>annogen</groupId> - <artifactId>annogen</artifactId> - <version>0.1.0</version> - </dependency> - - <dependency> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - <version>1.1</version> - </dependency> - - <dependency> - <groupId>org.codehaus.woodstox</groupId> - <artifactId>wstx-asl</artifactId> - <version>3.2.1</version> - <scope>runtime</scope> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>4.5</version> + <scope>test</scope> </dependency> - </dependencies> - <build> <plugins> <plugin> @@ -192,7 +135,7 @@ </configuration> </execution> </executions> - </plugin> + </plugin> <plugin> <groupId>org.apache.tuscany.sdo</groupId> <artifactId>tuscany-sdo-plugin</artifactId> @@ -202,7 +145,8 @@ <id>generate-sdo</id> <phase>generate-sources</phase> <configuration> - <schemaFile>${basedir}/src/test/resources/CreditScoreDocLit.wsdl</schemaFile> + <schemaFile>${basedir}/src/test/resources/CreditScoreDocLit.wsdl + </schemaFile> <javaPackage>org.example.creditscore.doclit</javaPackage> <noNotification>true</noNotification> <noContainer>true</noContainer> @@ -216,20 +160,15 @@ </plugin> </plugins> </build> - <repositories> <repository> - <!-- <id>eclipse.emf</id> - <url>http://download.eclipse.org/tools/emf/maven2</url> --> - <!-- <id>osuosl.org</id> - <url>http://ftp.osuosl.org/pub/eclipse/tools/emf/maven2</url> --> <!-- temporarily using indiana state univ as eclipse site diesnt have 2.2.2 at the moment --> <id>indiana</id> - <url>http://ftp.ussg.iu.edu/eclipse/modeling/emf/emf/maven2/</url> + <url>http://ftp.ussg.iu.edu/eclipse/modeling/emf/emf/maven2/ + </url> <snapshots> - <enabled>true</enabled> + <enabled>false</enabled> </snapshots> </repository> </repositories> - -</project> +</project>
\ No newline at end of file diff --git a/branches/sca-equinox/tools/maven/maven-osgi-junit/pom.xml b/branches/sca-equinox/tools/maven/maven-osgi-junit/pom.xml index 278ef80f71..2df4e01909 100644 --- a/branches/sca-equinox/tools/maven/maven-osgi-junit/pom.xml +++ b/branches/sca-equinox/tools/maven/maven-osgi-junit/pom.xml @@ -52,7 +52,7 @@ <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>4.2</version> + <version>4.5</version> <scope>compile</scope> </dependency> diff --git a/branches/sca-equinox/tools/wsdl2java/pom.xml b/branches/sca-equinox/tools/wsdl2java/pom.xml index c47f096dee..6f13c6ca5e 100644 --- a/branches/sca-equinox/tools/wsdl2java/pom.xml +++ b/branches/sca-equinox/tools/wsdl2java/pom.xml @@ -27,7 +27,6 @@ </parent> <artifactId>tuscany-wsdl2java</artifactId> <name>Apache Tuscany SCA WSDL2Java Tool</name> - <dependencies> <dependency> <groupId>org.apache.tuscany.sca</groupId> @@ -35,31 +34,36 @@ <version>1.4-SNAPSHOT</version> <scope>test</scope> </dependency> - <dependency> <groupId>org.apache.tuscany.sdo</groupId> <artifactId>tuscany-sdo-impl</artifactId> <version>1.1.1</version> + <exclusions> + <exclusion> + <groupId>org.codehaus.woodstox</groupId> + <artifactId>wstx-asl</artifactId> + </exclusion> + <exclusion> + <groupId>stax</groupId> + <artifactId>stax-api</artifactId> + </exclusion> + </exclusions> </dependency> - <dependency> <groupId>org.apache.tuscany.sdo</groupId> <artifactId>tuscany-sdo-tools</artifactId> <version>1.1.1</version> </dependency> - <dependency> <groupId>com.sun.xml.bind</groupId> <artifactId>jaxb-xjc</artifactId> <version>2.1.7</version> </dependency> - <dependency> <groupId>javax.xml.bind</groupId> <artifactId>jaxb-api</artifactId> <version>2.1</version> </dependency> - <dependency> <groupId>com.sun.xml.bind</groupId> <artifactId>jaxb-impl</artifactId> @@ -72,23 +76,20 @@ </exclusion> </exclusions> </dependency> - <dependency> <groupId>javax.xml.stream</groupId> <artifactId>stax-api</artifactId> <version>1.0-2</version> </dependency> - <dependency> <groupId>wsdl4j</groupId> <artifactId>wsdl4j</artifactId> <version>1.6.2</version> </dependency> - <dependency> <groupId>org.apache.neethi</groupId> <artifactId>neethi</artifactId> - <version>2.0.2</version> + <version>2.0.4</version> <exclusions> <exclusion> <groupId>wsdl4j</groupId> @@ -100,51 +101,11 @@ </exclusion> </exclusions> </dependency> - - <dependency> - <groupId>org.apache.ws.commons.schema</groupId> - <artifactId>XmlSchema</artifactId> - <version>1.3.2</version> - </dependency> - - <dependency> - <groupId>org.apache.ws.commons.axiom</groupId> - <artifactId>axiom-api</artifactId> - <exclusions> - <exclusion> - <groupId>xerces</groupId> - <artifactId>xercesImpl</artifactId> - </exclusion> - <exclusion> - <groupId>xml-apis</groupId> - <artifactId>xml-apis</artifactId> - </exclusion> - </exclusions> - <version>1.2.5</version> - </dependency> - - <dependency> - <groupId>org.apache.ws.commons.axiom</groupId> - <artifactId>axiom-impl</artifactId> - <version>1.2.5</version> - </dependency> - - <dependency> - <groupId>org.apache.axis2</groupId> - <artifactId>axis2-kernel</artifactId> - <version>1.3</version> - <exclusions> - <exclusion> - <groupId>org.codehaus.woodstox</groupId> - <artifactId>wstx-asl</artifactId> - </exclusion> - </exclusions> - </dependency> - + <dependency> <groupId>org.apache.axis2</groupId> <artifactId>axis2-java2wsdl</artifactId> - <version>1.3</version> + <version>1.4.1</version> <exclusions> <exclusion> <groupId>org.apache.ant</groupId> @@ -152,11 +113,10 @@ </exclusion> </exclusions> </dependency> - <dependency> <groupId>org.apache.axis2</groupId> <artifactId>axis2-codegen</artifactId> - <version>1.3</version> + <version>1.4.1</version> <exclusions> <exclusion> <groupId>org.apache.geronimo.specs</groupId> @@ -164,42 +124,24 @@ </exclusion> </exclusions> </dependency> - <dependency> <groupId>org.eclipse.emf</groupId> <artifactId>codegen</artifactId> <version>2.2.3</version> </dependency> - <dependency> <groupId>org.eclipse.emf</groupId> <artifactId>codegen-ecore</artifactId> <version>2.2.3</version> </dependency> - + <dependency> - <groupId>annogen</groupId> - <artifactId>annogen</artifactId> - <version>0.1.0</version> - </dependency> - - <dependency> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - <version>1.1</version> - </dependency> - - <dependency> - <groupId>org.codehaus.woodstox</groupId> - <artifactId>wstx-asl</artifactId> - <version>3.2.1</version> - <scope>runtime</scope> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>4.5</version> + <scope>test</scope> </dependency> - - - </dependencies> - <build> <plugins> <plugin> @@ -230,7 +172,8 @@ <id>generate-sdo</id> <phase>generate-test-sources</phase> <configuration> - <schemaFile>${basedir}/src/test/resources/CreditScoreDocLit.wsdl</schemaFile> + <schemaFile>${basedir}/src/test/resources/CreditScoreDocLit.wsdl + </schemaFile> <javaPackage>org.example.creditscore.doclit</javaPackage> <noNotification>true</noNotification> <noContainer>true</noContainer> @@ -244,7 +187,6 @@ </plugin> </plugins> </build> - <repositories> <repository> <snapshots> @@ -256,17 +198,13 @@ <layout>legacy</layout> </repository> <repository> - <!-- <id>eclipse.emf</id> - <url>http://download.eclipse.org/tools/emf/maven2</url> --> - <!-- <id>osuosl.org</id> - <url>http://ftp.osuosl.org/pub/eclipse/tools/emf/maven2</url> --> <!-- temporarily using indiana state univ as eclipse site diesnt have 2.2.2 at the moment --> <id>indiana</id> - <url>http://ftp.ussg.iu.edu/eclipse/modeling/emf/emf/maven2/</url> + <url>http://ftp.ussg.iu.edu/eclipse/modeling/emf/emf/maven2/ + </url> <snapshots> - <enabled>true</enabled> + <enabled>false</enabled> </snapshots> </repository> </repositories> - -</project> +</project>
\ No newline at end of file diff --git a/branches/sca-equinox/tools/wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/JavaInterfaceEmitter.java b/branches/sca-equinox/tools/wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/JavaInterfaceEmitter.java index a2220abe55..08c7131208 100644 --- a/branches/sca-equinox/tools/wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/JavaInterfaceEmitter.java +++ b/branches/sca-equinox/tools/wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/JavaInterfaceEmitter.java @@ -26,6 +26,7 @@ import java.util.List; import javax.xml.namespace.QName; +import org.apache.axis2.description.AxisBindingOperation; import org.apache.axis2.description.AxisMessage; import org.apache.axis2.description.AxisOperation; import org.apache.axis2.util.FileWriter; @@ -129,20 +130,20 @@ public class JavaInterfaceEmitter extends JavaEmitter { } @Override - protected Element getInputElement(Document doc, AxisOperation operation, List headerParameterQNameList) { + protected Element getInputElement(Document doc, AxisBindingOperation operation, List headerParameterQNameList) { return getElement(doc, "input", - operation.getMessage(WSDLConstants.MESSAGE_LABEL_IN_VALUE), - operation.getMessage(WSDLConstants.MESSAGE_LABEL_IN_VALUE).isWrapped(), + operation.getAxisOperation().getMessage(WSDLConstants.MESSAGE_LABEL_IN_VALUE), + operation.getAxisOperation().getMessage(WSDLConstants.MESSAGE_LABEL_IN_VALUE).isWrapped(), headerParameterQNameList); } @Override - protected Element getOutputElement(Document doc, AxisOperation operation, List headerParameterQNameList) { + protected Element getOutputElement(Document doc, AxisBindingOperation operation, List headerParameterQNameList) { return getElement(doc, "output", - operation.getMessage(WSDLConstants.MESSAGE_LABEL_OUT_VALUE), - operation.getMessage(WSDLConstants.MESSAGE_LABEL_OUT_VALUE).isWrapped(), + operation.getAxisOperation().getMessage(WSDLConstants.MESSAGE_LABEL_OUT_VALUE), + operation.getAxisOperation().getMessage(WSDLConstants.MESSAGE_LABEL_OUT_VALUE).isWrapped(), headerParameterQNameList); } diff --git a/branches/sca-equinox/tutorials/store/catalog-ejb/pom.xml b/branches/sca-equinox/tutorials/store/catalog-ejb/pom.xml index 3636220631..a71c71a708 100644 --- a/branches/sca-equinox/tutorials/store/catalog-ejb/pom.xml +++ b/branches/sca-equinox/tutorials/store/catalog-ejb/pom.xml @@ -42,7 +42,7 @@ <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.2</version>
+ <version>4.5</version>
<scope>test</scope>
</dependency>
diff --git a/branches/sca-equinox/tutorials/store/store-test/pom.xml b/branches/sca-equinox/tutorials/store/store-test/pom.xml index 7eb320a804..e3ea3e6ec4 100644 --- a/branches/sca-equinox/tutorials/store/store-test/pom.xml +++ b/branches/sca-equinox/tutorials/store/store-test/pom.xml @@ -154,7 +154,7 @@ <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>4.2</version> + <version>4.5</version> <scope>test</scope> </dependency> diff --git a/branches/sca-equinox/vtest/pom.xml b/branches/sca-equinox/vtest/pom.xml index 866b0bd144..f4a2ebd05d 100644 --- a/branches/sca-equinox/vtest/pom.xml +++ b/branches/sca-equinox/vtest/pom.xml @@ -33,7 +33,7 @@ <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>4.2</version> + <version>4.5</version> <scope>compile</scope> </dependency> </dependencies> |