summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--sca-java-2.x/trunk/distribution/aggregations/base-runtime-nodep/pom.xml2
-rw-r--r--sca-java-2.x/trunk/distribution/all/pom.xml30
-rw-r--r--sca-java-2.x/trunk/distribution/tomcat/pom.xml2
-rw-r--r--sca-java-2.x/trunk/distribution/tomcat/tomcat-hook/pom.xml2
-rw-r--r--sca-java-2.x/trunk/distribution/tomcat/tomcat-servlet/pom.xml2
-rw-r--r--sca-java-2.x/trunk/distribution/tomcat/tomcat-war/pom.xml2
-rw-r--r--sca-java-2.x/trunk/maven/archetypes/binding/pom.xml2
-rw-r--r--sca-java-2.x/trunk/maven/archetypes/contribution-jar/pom.xml2
-rw-r--r--sca-java-2.x/trunk/maven/archetypes/contribution-zip-discriptor/pom.xml2
-rw-r--r--sca-java-2.x/trunk/maven/archetypes/contribution-zip/pom.xml2
-rw-r--r--sca-java-2.x/trunk/maven/archetypes/pom.xml2
-rw-r--r--sca-java-2.x/trunk/maven/archetypes/quickstart-bpel/pom.xml2
-rw-r--r--sca-java-2.x/trunk/maven/archetypes/quickstart-jsf/pom.xml2
-rw-r--r--sca-java-2.x/trunk/maven/archetypes/quickstart-stripes/pom.xml2
-rw-r--r--sca-java-2.x/trunk/maven/archetypes/quickstart/pom.xml2
-rw-r--r--sca-java-2.x/trunk/samples/running-tuscany/maven-osgi-junit/calculator-osgi/pom.xml2
-rw-r--r--sca-java-2.x/trunk/samples/running-tuscany/maven-osgi-junit/calculator-rest-osgi/pom.xml2
-rw-r--r--sca-java-2.x/trunk/samples/running-tuscany/maven-osgi-junit/pom.xml2
-rw-r--r--sca-java-2.x/trunk/testing/itest/base/dependencies/pom.xml2
-rw-r--r--sca-java-2.x/trunk/testing/itest/bpel/helloworld/pom.xml2
-rw-r--r--sca-java-2.x/trunk/testing/itest/databindings/jaxb-bottom-up/pom.xml10
-rw-r--r--sca-java-2.x/trunk/testing/itest/databindings/jaxb-top-down/pom.xml10
-rw-r--r--sca-java-2.x/trunk/testing/itest/import-export/exports/pom.xml2
-rw-r--r--sca-java-2.x/trunk/testing/itest/import-export/imports/pom.xml2
-rw-r--r--sca-java-2.x/trunk/testing/itest/import-export/tests/pom.xml2
-rw-r--r--sca-java-2.x/trunk/testing/itest/nodes/binding-sca-hazelcast/pom.xml2
-rw-r--r--sca-java-2.x/trunk/testing/itest/nodes/helloworld-client/pom.xml2
-rw-r--r--sca-java-2.x/trunk/testing/itest/nodes/helloworld-iface/pom.xml2
-rw-r--r--sca-java-2.x/trunk/testing/itest/nodes/helloworld-service-and-client/pom.xml2
-rw-r--r--sca-java-2.x/trunk/testing/itest/nodes/helloworld-service/pom.xml2
-rw-r--r--sca-java-2.x/trunk/testing/itest/nodes/one-jvm-hazelcast-client/pom.xml2
-rw-r--r--sca-java-2.x/trunk/testing/itest/nodes/one-jvm-hazelcast/pom.xml2
-rw-r--r--sca-java-2.x/trunk/testing/itest/nodes/one-jvm-tribes/pom.xml2
-rw-r--r--sca-java-2.x/trunk/testing/itest/nodes/one-jvm/pom.xml2
-rw-r--r--sca-java-2.x/trunk/testing/itest/nodes/one-node-test/pom.xml2
-rw-r--r--sca-java-2.x/trunk/testing/itest/policy/matching/pom.xml2
-rw-r--r--sca-java-2.x/trunk/testing/itest/policy/wspolicy/pom.xml2
-rw-r--r--sca-java-2.x/trunk/testing/itest/ws-jaxws/contribution-java-first/pom.xml2
-rw-r--r--sca-java-2.x/trunk/testing/itest/ws-jaxws/contribution-wsdl-first/pom.xml2
-rw-r--r--sca-java-2.x/trunk/testing/itest/ws-jaxws/external-client/pom.xml2
-rw-r--r--sca-java-2.x/trunk/testing/itest/ws-jaxws/external-service/pom.xml2
-rw-r--r--sca-java-2.x/trunk/testing/itest/ws-jaxws/launcher-ri/pom.xml2
-rw-r--r--sca-java-2.x/trunk/testing/itest/ws/authentication-basic/pom.xml2
-rw-r--r--sca-java-2.x/trunk/testing/itest/ws/contribution-callback-forwardspec/pom.xml2
-rw-r--r--sca-java-2.x/trunk/testing/itest/ws/contribution-callback-fullspec/pom.xml2
-rw-r--r--sca-java-2.x/trunk/testing/itest/ws/contribution-callback-promotion/pom.xml2
-rw-r--r--sca-java-2.x/trunk/testing/itest/ws/contribution-callback/pom.xml2
-rw-r--r--sca-java-2.x/trunk/testing/itest/ws/contribution-doc-lit-wrapped/pom.xml2
-rw-r--r--sca-java-2.x/trunk/testing/itest/ws/contribution-doc-lit/pom.xml2
-rw-r--r--sca-java-2.x/trunk/testing/itest/ws/contribution-java-first/pom.xml2
-rw-r--r--sca-java-2.x/trunk/testing/itest/ws/contribution-rpc-lit/pom.xml2
-rw-r--r--sca-java-2.x/trunk/testing/itest/ws/contribution-wsdl-first/pom.xml2
-rw-r--r--sca-java-2.x/trunk/testing/itest/ws/defaults/pom.xml2
-rw-r--r--sca-java-2.x/trunk/testing/itest/ws/endpoint-references/pom.xml2
-rw-r--r--sca-java-2.x/trunk/testing/itest/ws/endpoints/pom.xml2
-rw-r--r--sca-java-2.x/trunk/testing/itest/ws/external-client/pom.xml10
-rw-r--r--sca-java-2.x/trunk/testing/itest/ws/external-service/pom.xml2
-rw-r--r--sca-java-2.x/trunk/testing/itest/ws/holder-ws-service-multiple-outputs/pom.xml2
-rw-r--r--sca-java-2.x/trunk/testing/itest/ws/http-ssl/pom.xml2
-rw-r--r--sca-java-2.x/trunk/testing/itest/ws/launcher-axis2/pom.xml2
-rw-r--r--sca-java-2.x/trunk/testing/itest/ws/wsdl/pom.xml2
61 files changed, 107 insertions, 67 deletions
diff --git a/sca-java-2.x/trunk/distribution/aggregations/base-runtime-nodep/pom.xml b/sca-java-2.x/trunk/distribution/aggregations/base-runtime-nodep/pom.xml
index 9c611984d8..1765df5bea 100644
--- a/sca-java-2.x/trunk/distribution/aggregations/base-runtime-nodep/pom.xml
+++ b/sca-java-2.x/trunk/distribution/aggregations/base-runtime-nodep/pom.xml
@@ -23,7 +23,7 @@
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-distribution</artifactId>
<version>2.0-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
+ <relativePath>../../pom.xml</relativePath>
</parent>
<groupId>org.apache.tuscany.sca</groupId>
diff --git a/sca-java-2.x/trunk/distribution/all/pom.xml b/sca-java-2.x/trunk/distribution/all/pom.xml
index 97a0e8fed9..92801a9a3c 100644
--- a/sca-java-2.x/trunk/distribution/all/pom.xml
+++ b/sca-java-2.x/trunk/distribution/all/pom.xml
@@ -30,6 +30,36 @@
<name>Apache Tuscany SCA All-in-one Distribution</name>
<packaging>pom</packaging>
+ <repositories>
+ <repository>
+ <id>java.net2</id>
+ <name>java.net Maven 2.x Repository</name>
+ <url>http://download.java.net/maven/2</url>
+ </repository>
+ <repository>
+ <id>intalio.org</id>
+ <url>http://www.intalio.org/public/maven2</url>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </repository>
+ <repository>
+ <id>openejb-repository</id>
+ <name>OpenEJB Repository</name>
+ <url>http://svn.apache.org/repos/asf/openejb/repo</url>
+ <layout>default</layout>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ </repository>
+ </repositories>
+
<dependencies>
<!-- module jars for modules directory -->
diff --git a/sca-java-2.x/trunk/distribution/tomcat/pom.xml b/sca-java-2.x/trunk/distribution/tomcat/pom.xml
index 7164f45ac7..8a05b0372e 100644
--- a/sca-java-2.x/trunk/distribution/tomcat/pom.xml
+++ b/sca-java-2.x/trunk/distribution/tomcat/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-sca</artifactId>
- <relativePath>../pom.xml</relativePath>
+ <relativePath>../../pom.xml</relativePath>
<version>2.0-SNAPSHOT</version>
</parent>
<groupId>org.apache.tuscany.sca</groupId>
diff --git a/sca-java-2.x/trunk/distribution/tomcat/tomcat-hook/pom.xml b/sca-java-2.x/trunk/distribution/tomcat/tomcat-hook/pom.xml
index 8b792960ad..592a3848c3 100644
--- a/sca-java-2.x/trunk/distribution/tomcat/tomcat-hook/pom.xml
+++ b/sca-java-2.x/trunk/distribution/tomcat/tomcat-hook/pom.xml
@@ -21,7 +21,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-modules</artifactId>
+ <artifactId>tuscany-distribution-tomcat</artifactId>
<version>2.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/sca-java-2.x/trunk/distribution/tomcat/tomcat-servlet/pom.xml b/sca-java-2.x/trunk/distribution/tomcat/tomcat-servlet/pom.xml
index 83b68dad0c..560703da0c 100644
--- a/sca-java-2.x/trunk/distribution/tomcat/tomcat-servlet/pom.xml
+++ b/sca-java-2.x/trunk/distribution/tomcat/tomcat-servlet/pom.xml
@@ -21,7 +21,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-modules</artifactId>
+ <artifactId>tuscany-distribution-tomcat</artifactId>
<version>2.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/sca-java-2.x/trunk/distribution/tomcat/tomcat-war/pom.xml b/sca-java-2.x/trunk/distribution/tomcat/tomcat-war/pom.xml
index 9491507338..3f37559e87 100644
--- a/sca-java-2.x/trunk/distribution/tomcat/tomcat-war/pom.xml
+++ b/sca-java-2.x/trunk/distribution/tomcat/tomcat-war/pom.xml
@@ -21,7 +21,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-distribution</artifactId>
+ <artifactId>tuscany-distribution-tomcat</artifactId>
<version>2.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/sca-java-2.x/trunk/maven/archetypes/binding/pom.xml b/sca-java-2.x/trunk/maven/archetypes/binding/pom.xml
index 7f38f83b6c..d406d857d6 100644
--- a/sca-java-2.x/trunk/maven/archetypes/binding/pom.xml
+++ b/sca-java-2.x/trunk/maven/archetypes/binding/pom.xml
@@ -23,7 +23,7 @@
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-sca</artifactId>
<version>2.0-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
+ <relativePath>../../../pom.xml</relativePath>
</parent>
<artifactId>tuscany-binding-archetype</artifactId>
diff --git a/sca-java-2.x/trunk/maven/archetypes/contribution-jar/pom.xml b/sca-java-2.x/trunk/maven/archetypes/contribution-jar/pom.xml
index 0b568cb425..9e9a4f9c75 100644
--- a/sca-java-2.x/trunk/maven/archetypes/contribution-jar/pom.xml
+++ b/sca-java-2.x/trunk/maven/archetypes/contribution-jar/pom.xml
@@ -23,7 +23,7 @@
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-sca</artifactId>
<version>2.0-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
+ <relativePath>../../../pom.xml</relativePath>
</parent>
<artifactId>tuscany-contribution-jar</artifactId>
diff --git a/sca-java-2.x/trunk/maven/archetypes/contribution-zip-discriptor/pom.xml b/sca-java-2.x/trunk/maven/archetypes/contribution-zip-discriptor/pom.xml
index c3a1f9bb5f..f1bbe79e2f 100644
--- a/sca-java-2.x/trunk/maven/archetypes/contribution-zip-discriptor/pom.xml
+++ b/sca-java-2.x/trunk/maven/archetypes/contribution-zip-discriptor/pom.xml
@@ -23,7 +23,7 @@
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-sca</artifactId>
<version>2.0-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
+ <relativePath>../../../pom.xml</relativePath>
</parent>
<artifactId>tuscany-zip-contribution-descriptor</artifactId>
diff --git a/sca-java-2.x/trunk/maven/archetypes/contribution-zip/pom.xml b/sca-java-2.x/trunk/maven/archetypes/contribution-zip/pom.xml
index 012bac379f..64a67cd009 100644
--- a/sca-java-2.x/trunk/maven/archetypes/contribution-zip/pom.xml
+++ b/sca-java-2.x/trunk/maven/archetypes/contribution-zip/pom.xml
@@ -23,7 +23,7 @@
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-sca</artifactId>
<version>2.0-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
+ <relativePath>../../../pom.xml</relativePath>
</parent>
<artifactId>tuscany-contribution-zip</artifactId>
diff --git a/sca-java-2.x/trunk/maven/archetypes/pom.xml b/sca-java-2.x/trunk/maven/archetypes/pom.xml
index 0fcd66a6fb..10d498ad1b 100644
--- a/sca-java-2.x/trunk/maven/archetypes/pom.xml
+++ b/sca-java-2.x/trunk/maven/archetypes/pom.xml
@@ -23,7 +23,7 @@
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-sca</artifactId>
<version>2.0-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
+ <relativePath>../../pom.xml</relativePath>
</parent>
<artifactId>tuscany-archetype</artifactId>
<packaging>pom</packaging>
diff --git a/sca-java-2.x/trunk/maven/archetypes/quickstart-bpel/pom.xml b/sca-java-2.x/trunk/maven/archetypes/quickstart-bpel/pom.xml
index f2821d98bd..78bcb91dc8 100644
--- a/sca-java-2.x/trunk/maven/archetypes/quickstart-bpel/pom.xml
+++ b/sca-java-2.x/trunk/maven/archetypes/quickstart-bpel/pom.xml
@@ -23,7 +23,7 @@
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-sca</artifactId>
<version>2.0-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
+ <relativePath>../../../pom.xml</relativePath>
</parent>
<artifactId>tuscany-quickstart-bpel</artifactId>
diff --git a/sca-java-2.x/trunk/maven/archetypes/quickstart-jsf/pom.xml b/sca-java-2.x/trunk/maven/archetypes/quickstart-jsf/pom.xml
index 09436e86ab..ec01b5effa 100644
--- a/sca-java-2.x/trunk/maven/archetypes/quickstart-jsf/pom.xml
+++ b/sca-java-2.x/trunk/maven/archetypes/quickstart-jsf/pom.xml
@@ -23,7 +23,7 @@
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-sca</artifactId>
<version>2.0-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
+ <relativePath>../../../pom.xml</relativePath>
</parent>
<artifactId>tuscany-quickstart-jsf</artifactId>
diff --git a/sca-java-2.x/trunk/maven/archetypes/quickstart-stripes/pom.xml b/sca-java-2.x/trunk/maven/archetypes/quickstart-stripes/pom.xml
index 635333eb31..bfa288cdee 100644
--- a/sca-java-2.x/trunk/maven/archetypes/quickstart-stripes/pom.xml
+++ b/sca-java-2.x/trunk/maven/archetypes/quickstart-stripes/pom.xml
@@ -23,7 +23,7 @@
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-sca</artifactId>
<version>2.0-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
+ <relativePath>../../../pom.xml</relativePath>
</parent>
<artifactId>tuscany-quickstart-stripes</artifactId>
diff --git a/sca-java-2.x/trunk/maven/archetypes/quickstart/pom.xml b/sca-java-2.x/trunk/maven/archetypes/quickstart/pom.xml
index 0ad98af2f3..629003b13e 100644
--- a/sca-java-2.x/trunk/maven/archetypes/quickstart/pom.xml
+++ b/sca-java-2.x/trunk/maven/archetypes/quickstart/pom.xml
@@ -23,7 +23,7 @@
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-sca</artifactId>
<version>2.0-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
+ <relativePath>../../../pom.xml</relativePath>
</parent>
<artifactId>tuscany-quickstart</artifactId>
diff --git a/sca-java-2.x/trunk/samples/running-tuscany/maven-osgi-junit/calculator-osgi/pom.xml b/sca-java-2.x/trunk/samples/running-tuscany/maven-osgi-junit/calculator-osgi/pom.xml
index 924d9f7c3b..d4e149f5a6 100644
--- a/sca-java-2.x/trunk/samples/running-tuscany/maven-osgi-junit/calculator-osgi/pom.xml
+++ b/sca-java-2.x/trunk/samples/running-tuscany/maven-osgi-junit/calculator-osgi/pom.xml
@@ -21,7 +21,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-samples</artifactId>
+ <artifactId>sample-maven-osgi-junit</artifactId>
<version>2.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/sca-java-2.x/trunk/samples/running-tuscany/maven-osgi-junit/calculator-rest-osgi/pom.xml b/sca-java-2.x/trunk/samples/running-tuscany/maven-osgi-junit/calculator-rest-osgi/pom.xml
index b13e4fc678..99af50b3eb 100644
--- a/sca-java-2.x/trunk/samples/running-tuscany/maven-osgi-junit/calculator-rest-osgi/pom.xml
+++ b/sca-java-2.x/trunk/samples/running-tuscany/maven-osgi-junit/calculator-rest-osgi/pom.xml
@@ -21,7 +21,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-samples</artifactId>
+ <artifactId>sample-maven-osgi-junit</artifactId>
<version>2.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/sca-java-2.x/trunk/samples/running-tuscany/maven-osgi-junit/pom.xml b/sca-java-2.x/trunk/samples/running-tuscany/maven-osgi-junit/pom.xml
index b2e096c145..e6d8631cb3 100644
--- a/sca-java-2.x/trunk/samples/running-tuscany/maven-osgi-junit/pom.xml
+++ b/sca-java-2.x/trunk/samples/running-tuscany/maven-osgi-junit/pom.xml
@@ -21,7 +21,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-samples</artifactId>
+ <artifactId>tuscany-samples-running-tuscany</artifactId>
<version>2.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/sca-java-2.x/trunk/testing/itest/base/dependencies/pom.xml b/sca-java-2.x/trunk/testing/itest/base/dependencies/pom.xml
index fd2e5cee31..1d69f8540b 100644
--- a/sca-java-2.x/trunk/testing/itest/base/dependencies/pom.xml
+++ b/sca-java-2.x/trunk/testing/itest/base/dependencies/pom.xml
@@ -21,7 +21,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-itest</artifactId>
+ <artifactId>itest-base</artifactId>
<version>2.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/sca-java-2.x/trunk/testing/itest/bpel/helloworld/pom.xml b/sca-java-2.x/trunk/testing/itest/bpel/helloworld/pom.xml
index 182e561704..ad5b69ec69 100644
--- a/sca-java-2.x/trunk/testing/itest/bpel/helloworld/pom.xml
+++ b/sca-java-2.x/trunk/testing/itest/bpel/helloworld/pom.xml
@@ -23,7 +23,7 @@
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>itest-bpel</artifactId>
<version>2.0-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
+ <relativePath>../pom.xml</relativePath>
</parent>
<artifactId>itest-bpel-helloworld</artifactId>
<name>Apache Tuscany SCA iTest BPEL HelloWorld</name>
diff --git a/sca-java-2.x/trunk/testing/itest/databindings/jaxb-bottom-up/pom.xml b/sca-java-2.x/trunk/testing/itest/databindings/jaxb-bottom-up/pom.xml
index 20310a0f1c..012eccaacf 100644
--- a/sca-java-2.x/trunk/testing/itest/databindings/jaxb-bottom-up/pom.xml
+++ b/sca-java-2.x/trunk/testing/itest/databindings/jaxb-bottom-up/pom.xml
@@ -31,6 +31,14 @@
<version>2.0-SNAPSHOT</version>
<name>Apache Tuscany SCA iTest Databinding - JAXB Bottom Up</name>
+ <repositories>
+ <repository>
+ <id>java.net2</id>
+ <name>java.net Maven 2.x Repository</name>
+ <url>http://download.java.net/maven/2</url>
+ </repository>
+ </repositories>
+
<dependencies>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
@@ -54,7 +62,7 @@
<dependency>
<groupId>com.sun.xml.ws</groupId>
<artifactId>jaxws-rt</artifactId>
- <version>2.1.3</version>
+ <version>2.2.1</version>
</dependency>
</dependencies>
diff --git a/sca-java-2.x/trunk/testing/itest/databindings/jaxb-top-down/pom.xml b/sca-java-2.x/trunk/testing/itest/databindings/jaxb-top-down/pom.xml
index 9bfb2f74b2..8578951712 100644
--- a/sca-java-2.x/trunk/testing/itest/databindings/jaxb-top-down/pom.xml
+++ b/sca-java-2.x/trunk/testing/itest/databindings/jaxb-top-down/pom.xml
@@ -32,6 +32,14 @@
<version>2.0-SNAPSHOT</version>
<name>Apache Tuscany SCA iTest Databinding - JAXB Top Down</name>
+ <repositories>
+ <repository>
+ <id>java.net2</id>
+ <name>java.net Maven 2.x Repository</name>
+ <url>http://download.java.net/maven/2</url>
+ </repository>
+ </repositories>
+
<dependencies>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
@@ -55,7 +63,7 @@
<dependency>
<groupId>com.sun.xml.ws</groupId>
<artifactId>jaxws-rt</artifactId>
- <version>2.1.3</version>
+ <version>2.2.1</version>
</dependency>
</dependencies>
diff --git a/sca-java-2.x/trunk/testing/itest/import-export/exports/pom.xml b/sca-java-2.x/trunk/testing/itest/import-export/exports/pom.xml
index e83be7145f..22f7070bce 100644
--- a/sca-java-2.x/trunk/testing/itest/import-export/exports/pom.xml
+++ b/sca-java-2.x/trunk/testing/itest/import-export/exports/pom.xml
@@ -21,7 +21,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-itest</artifactId>
+ <artifactId>itest-import-export</artifactId>
<version>2.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/sca-java-2.x/trunk/testing/itest/import-export/imports/pom.xml b/sca-java-2.x/trunk/testing/itest/import-export/imports/pom.xml
index 73da8052b5..83abd2f3a6 100644
--- a/sca-java-2.x/trunk/testing/itest/import-export/imports/pom.xml
+++ b/sca-java-2.x/trunk/testing/itest/import-export/imports/pom.xml
@@ -21,7 +21,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-itest</artifactId>
+ <artifactId>itest-import-export</artifactId>
<version>2.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/sca-java-2.x/trunk/testing/itest/import-export/tests/pom.xml b/sca-java-2.x/trunk/testing/itest/import-export/tests/pom.xml
index e6f96c6bbc..4d33c78765 100644
--- a/sca-java-2.x/trunk/testing/itest/import-export/tests/pom.xml
+++ b/sca-java-2.x/trunk/testing/itest/import-export/tests/pom.xml
@@ -21,7 +21,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-itest</artifactId>
+ <artifactId>itest-import-export</artifactId>
<version>2.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/sca-java-2.x/trunk/testing/itest/nodes/binding-sca-hazelcast/pom.xml b/sca-java-2.x/trunk/testing/itest/nodes/binding-sca-hazelcast/pom.xml
index 31bff9a388..4107ef2b41 100644
--- a/sca-java-2.x/trunk/testing/itest/nodes/binding-sca-hazelcast/pom.xml
+++ b/sca-java-2.x/trunk/testing/itest/nodes/binding-sca-hazelcast/pom.xml
@@ -21,7 +21,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-itest</artifactId>
+ <artifactId>itest-nodes</artifactId>
<version>2.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/sca-java-2.x/trunk/testing/itest/nodes/helloworld-client/pom.xml b/sca-java-2.x/trunk/testing/itest/nodes/helloworld-client/pom.xml
index 8367550f5a..a74826b11b 100644
--- a/sca-java-2.x/trunk/testing/itest/nodes/helloworld-client/pom.xml
+++ b/sca-java-2.x/trunk/testing/itest/nodes/helloworld-client/pom.xml
@@ -21,7 +21,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-itest</artifactId>
+ <artifactId>itest-nodes</artifactId>
<version>2.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/sca-java-2.x/trunk/testing/itest/nodes/helloworld-iface/pom.xml b/sca-java-2.x/trunk/testing/itest/nodes/helloworld-iface/pom.xml
index 87b6a4fc51..bd081db9b6 100644
--- a/sca-java-2.x/trunk/testing/itest/nodes/helloworld-iface/pom.xml
+++ b/sca-java-2.x/trunk/testing/itest/nodes/helloworld-iface/pom.xml
@@ -21,7 +21,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-itest</artifactId>
+ <artifactId>itest-nodes</artifactId>
<version>2.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/sca-java-2.x/trunk/testing/itest/nodes/helloworld-service-and-client/pom.xml b/sca-java-2.x/trunk/testing/itest/nodes/helloworld-service-and-client/pom.xml
index 862475b534..edf7c25e8c 100644
--- a/sca-java-2.x/trunk/testing/itest/nodes/helloworld-service-and-client/pom.xml
+++ b/sca-java-2.x/trunk/testing/itest/nodes/helloworld-service-and-client/pom.xml
@@ -21,7 +21,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-itest</artifactId>
+ <artifactId>itest-nodes</artifactId>
<version>2.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/sca-java-2.x/trunk/testing/itest/nodes/helloworld-service/pom.xml b/sca-java-2.x/trunk/testing/itest/nodes/helloworld-service/pom.xml
index e5e84571cd..4d74565f7b 100644
--- a/sca-java-2.x/trunk/testing/itest/nodes/helloworld-service/pom.xml
+++ b/sca-java-2.x/trunk/testing/itest/nodes/helloworld-service/pom.xml
@@ -21,7 +21,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-itest</artifactId>
+ <artifactId>itest-nodes</artifactId>
<version>2.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/sca-java-2.x/trunk/testing/itest/nodes/one-jvm-hazelcast-client/pom.xml b/sca-java-2.x/trunk/testing/itest/nodes/one-jvm-hazelcast-client/pom.xml
index 2eb8acfbaa..e6c235406f 100644
--- a/sca-java-2.x/trunk/testing/itest/nodes/one-jvm-hazelcast-client/pom.xml
+++ b/sca-java-2.x/trunk/testing/itest/nodes/one-jvm-hazelcast-client/pom.xml
@@ -21,7 +21,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-itest</artifactId>
+ <artifactId>itest-nodes</artifactId>
<version>2.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/sca-java-2.x/trunk/testing/itest/nodes/one-jvm-hazelcast/pom.xml b/sca-java-2.x/trunk/testing/itest/nodes/one-jvm-hazelcast/pom.xml
index 49d18bf3b4..b2dbc8bea1 100644
--- a/sca-java-2.x/trunk/testing/itest/nodes/one-jvm-hazelcast/pom.xml
+++ b/sca-java-2.x/trunk/testing/itest/nodes/one-jvm-hazelcast/pom.xml
@@ -21,7 +21,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-itest</artifactId>
+ <artifactId>itest-nodes</artifactId>
<version>2.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/sca-java-2.x/trunk/testing/itest/nodes/one-jvm-tribes/pom.xml b/sca-java-2.x/trunk/testing/itest/nodes/one-jvm-tribes/pom.xml
index ff52b60103..f222b4ec6e 100644
--- a/sca-java-2.x/trunk/testing/itest/nodes/one-jvm-tribes/pom.xml
+++ b/sca-java-2.x/trunk/testing/itest/nodes/one-jvm-tribes/pom.xml
@@ -21,7 +21,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-itest</artifactId>
+ <artifactId>itest-nodes</artifactId>
<version>2.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/sca-java-2.x/trunk/testing/itest/nodes/one-jvm/pom.xml b/sca-java-2.x/trunk/testing/itest/nodes/one-jvm/pom.xml
index 1edbfc3b99..156d92b29d 100644
--- a/sca-java-2.x/trunk/testing/itest/nodes/one-jvm/pom.xml
+++ b/sca-java-2.x/trunk/testing/itest/nodes/one-jvm/pom.xml
@@ -21,7 +21,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-itest</artifactId>
+ <artifactId>itest-nodes</artifactId>
<version>2.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/sca-java-2.x/trunk/testing/itest/nodes/one-node-test/pom.xml b/sca-java-2.x/trunk/testing/itest/nodes/one-node-test/pom.xml
index d35761bc88..c4a98a8ca2 100644
--- a/sca-java-2.x/trunk/testing/itest/nodes/one-node-test/pom.xml
+++ b/sca-java-2.x/trunk/testing/itest/nodes/one-node-test/pom.xml
@@ -21,7 +21,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-itest</artifactId>
+ <artifactId>itest-nodes</artifactId>
<version>2.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/sca-java-2.x/trunk/testing/itest/policy/matching/pom.xml b/sca-java-2.x/trunk/testing/itest/policy/matching/pom.xml
index 7ef3edbb77..318942d21f 100644
--- a/sca-java-2.x/trunk/testing/itest/policy/matching/pom.xml
+++ b/sca-java-2.x/trunk/testing/itest/policy/matching/pom.xml
@@ -21,7 +21,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-itest</artifactId>
+ <artifactId>itest-policy</artifactId>
<version>2.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/sca-java-2.x/trunk/testing/itest/policy/wspolicy/pom.xml b/sca-java-2.x/trunk/testing/itest/policy/wspolicy/pom.xml
index d6f692d00f..73526d0200 100644
--- a/sca-java-2.x/trunk/testing/itest/policy/wspolicy/pom.xml
+++ b/sca-java-2.x/trunk/testing/itest/policy/wspolicy/pom.xml
@@ -21,7 +21,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-itest</artifactId>
+ <artifactId>itest-policy</artifactId>
<version>2.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/sca-java-2.x/trunk/testing/itest/ws-jaxws/contribution-java-first/pom.xml b/sca-java-2.x/trunk/testing/itest/ws-jaxws/contribution-java-first/pom.xml
index e9a3602f5d..05be037e27 100644
--- a/sca-java-2.x/trunk/testing/itest/ws-jaxws/contribution-java-first/pom.xml
+++ b/sca-java-2.x/trunk/testing/itest/ws-jaxws/contribution-java-first/pom.xml
@@ -21,7 +21,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-itest</artifactId>
+ <artifactId>itest-ws-jaxws</artifactId>
<version>2.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/sca-java-2.x/trunk/testing/itest/ws-jaxws/contribution-wsdl-first/pom.xml b/sca-java-2.x/trunk/testing/itest/ws-jaxws/contribution-wsdl-first/pom.xml
index f43eadc3b5..7fa5daf66e 100644
--- a/sca-java-2.x/trunk/testing/itest/ws-jaxws/contribution-wsdl-first/pom.xml
+++ b/sca-java-2.x/trunk/testing/itest/ws-jaxws/contribution-wsdl-first/pom.xml
@@ -21,7 +21,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-itest</artifactId>
+ <artifactId>itest-ws-jaxws</artifactId>
<version>2.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/sca-java-2.x/trunk/testing/itest/ws-jaxws/external-client/pom.xml b/sca-java-2.x/trunk/testing/itest/ws-jaxws/external-client/pom.xml
index f005e9ec30..915b17e1fe 100644
--- a/sca-java-2.x/trunk/testing/itest/ws-jaxws/external-client/pom.xml
+++ b/sca-java-2.x/trunk/testing/itest/ws-jaxws/external-client/pom.xml
@@ -21,7 +21,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-itest</artifactId>
+ <artifactId>itest-ws-jaxws</artifactId>
<version>2.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/sca-java-2.x/trunk/testing/itest/ws-jaxws/external-service/pom.xml b/sca-java-2.x/trunk/testing/itest/ws-jaxws/external-service/pom.xml
index 6b705e9041..d00b8168d2 100644
--- a/sca-java-2.x/trunk/testing/itest/ws-jaxws/external-service/pom.xml
+++ b/sca-java-2.x/trunk/testing/itest/ws-jaxws/external-service/pom.xml
@@ -21,7 +21,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-itest</artifactId>
+ <artifactId>itest-ws-jaxws</artifactId>
<version>2.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/sca-java-2.x/trunk/testing/itest/ws-jaxws/launcher-ri/pom.xml b/sca-java-2.x/trunk/testing/itest/ws-jaxws/launcher-ri/pom.xml
index c8e7ca8fbf..2ed9ff1742 100644
--- a/sca-java-2.x/trunk/testing/itest/ws-jaxws/launcher-ri/pom.xml
+++ b/sca-java-2.x/trunk/testing/itest/ws-jaxws/launcher-ri/pom.xml
@@ -21,7 +21,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-itest</artifactId>
+ <artifactId>itest-ws-jaxws</artifactId>
<version>2.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/sca-java-2.x/trunk/testing/itest/ws/authentication-basic/pom.xml b/sca-java-2.x/trunk/testing/itest/ws/authentication-basic/pom.xml
index 277648687d..dbf22ae810 100644
--- a/sca-java-2.x/trunk/testing/itest/ws/authentication-basic/pom.xml
+++ b/sca-java-2.x/trunk/testing/itest/ws/authentication-basic/pom.xml
@@ -21,7 +21,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-itest</artifactId>
+ <artifactId>itest-ws</artifactId>
<version>2.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/sca-java-2.x/trunk/testing/itest/ws/contribution-callback-forwardspec/pom.xml b/sca-java-2.x/trunk/testing/itest/ws/contribution-callback-forwardspec/pom.xml
index a29f22c5e9..ad26d7cac5 100644
--- a/sca-java-2.x/trunk/testing/itest/ws/contribution-callback-forwardspec/pom.xml
+++ b/sca-java-2.x/trunk/testing/itest/ws/contribution-callback-forwardspec/pom.xml
@@ -21,7 +21,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-itest</artifactId>
+ <artifactId>itest-ws</artifactId>
<version>2.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/sca-java-2.x/trunk/testing/itest/ws/contribution-callback-fullspec/pom.xml b/sca-java-2.x/trunk/testing/itest/ws/contribution-callback-fullspec/pom.xml
index f296cd301c..24c4982f6b 100644
--- a/sca-java-2.x/trunk/testing/itest/ws/contribution-callback-fullspec/pom.xml
+++ b/sca-java-2.x/trunk/testing/itest/ws/contribution-callback-fullspec/pom.xml
@@ -21,7 +21,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-itest</artifactId>
+ <artifactId>itest-ws</artifactId>
<version>2.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/sca-java-2.x/trunk/testing/itest/ws/contribution-callback-promotion/pom.xml b/sca-java-2.x/trunk/testing/itest/ws/contribution-callback-promotion/pom.xml
index 4e36da2cf2..3e4afac711 100644
--- a/sca-java-2.x/trunk/testing/itest/ws/contribution-callback-promotion/pom.xml
+++ b/sca-java-2.x/trunk/testing/itest/ws/contribution-callback-promotion/pom.xml
@@ -21,7 +21,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-itest</artifactId>
+ <artifactId>itest-ws</artifactId>
<version>2.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/sca-java-2.x/trunk/testing/itest/ws/contribution-callback/pom.xml b/sca-java-2.x/trunk/testing/itest/ws/contribution-callback/pom.xml
index 4ef6e1513b..44e9465e3b 100644
--- a/sca-java-2.x/trunk/testing/itest/ws/contribution-callback/pom.xml
+++ b/sca-java-2.x/trunk/testing/itest/ws/contribution-callback/pom.xml
@@ -21,7 +21,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-itest</artifactId>
+ <artifactId>itest-ws</artifactId>
<version>2.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/sca-java-2.x/trunk/testing/itest/ws/contribution-doc-lit-wrapped/pom.xml b/sca-java-2.x/trunk/testing/itest/ws/contribution-doc-lit-wrapped/pom.xml
index 6682e1486a..fd0d1aa7ee 100644
--- a/sca-java-2.x/trunk/testing/itest/ws/contribution-doc-lit-wrapped/pom.xml
+++ b/sca-java-2.x/trunk/testing/itest/ws/contribution-doc-lit-wrapped/pom.xml
@@ -21,7 +21,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-itest</artifactId>
+ <artifactId>itest-ws</artifactId>
<version>2.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/sca-java-2.x/trunk/testing/itest/ws/contribution-doc-lit/pom.xml b/sca-java-2.x/trunk/testing/itest/ws/contribution-doc-lit/pom.xml
index 059a2c77fd..681230b82a 100644
--- a/sca-java-2.x/trunk/testing/itest/ws/contribution-doc-lit/pom.xml
+++ b/sca-java-2.x/trunk/testing/itest/ws/contribution-doc-lit/pom.xml
@@ -21,7 +21,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-itest</artifactId>
+ <artifactId>itest-ws</artifactId>
<version>2.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/sca-java-2.x/trunk/testing/itest/ws/contribution-java-first/pom.xml b/sca-java-2.x/trunk/testing/itest/ws/contribution-java-first/pom.xml
index 503d366e75..ee9ebe2dd2 100644
--- a/sca-java-2.x/trunk/testing/itest/ws/contribution-java-first/pom.xml
+++ b/sca-java-2.x/trunk/testing/itest/ws/contribution-java-first/pom.xml
@@ -21,7 +21,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-itest</artifactId>
+ <artifactId>itest-ws</artifactId>
<version>2.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/sca-java-2.x/trunk/testing/itest/ws/contribution-rpc-lit/pom.xml b/sca-java-2.x/trunk/testing/itest/ws/contribution-rpc-lit/pom.xml
index 5de77cd8f3..ca6a18d3d4 100644
--- a/sca-java-2.x/trunk/testing/itest/ws/contribution-rpc-lit/pom.xml
+++ b/sca-java-2.x/trunk/testing/itest/ws/contribution-rpc-lit/pom.xml
@@ -21,7 +21,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-itest</artifactId>
+ <artifactId>itest-ws</artifactId>
<version>2.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/sca-java-2.x/trunk/testing/itest/ws/contribution-wsdl-first/pom.xml b/sca-java-2.x/trunk/testing/itest/ws/contribution-wsdl-first/pom.xml
index 054ea6fdad..5d56c5cae3 100644
--- a/sca-java-2.x/trunk/testing/itest/ws/contribution-wsdl-first/pom.xml
+++ b/sca-java-2.x/trunk/testing/itest/ws/contribution-wsdl-first/pom.xml
@@ -21,7 +21,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-itest</artifactId>
+ <artifactId>itest-ws</artifactId>
<version>2.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/sca-java-2.x/trunk/testing/itest/ws/defaults/pom.xml b/sca-java-2.x/trunk/testing/itest/ws/defaults/pom.xml
index 5ee464b519..fc9c228371 100644
--- a/sca-java-2.x/trunk/testing/itest/ws/defaults/pom.xml
+++ b/sca-java-2.x/trunk/testing/itest/ws/defaults/pom.xml
@@ -21,7 +21,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-itest</artifactId>
+ <artifactId>itest-ws</artifactId>
<version>2.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/sca-java-2.x/trunk/testing/itest/ws/endpoint-references/pom.xml b/sca-java-2.x/trunk/testing/itest/ws/endpoint-references/pom.xml
index 09dc74a4fa..095a20f797 100644
--- a/sca-java-2.x/trunk/testing/itest/ws/endpoint-references/pom.xml
+++ b/sca-java-2.x/trunk/testing/itest/ws/endpoint-references/pom.xml
@@ -21,7 +21,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-itest</artifactId>
+ <artifactId>itest-ws</artifactId>
<version>2.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/sca-java-2.x/trunk/testing/itest/ws/endpoints/pom.xml b/sca-java-2.x/trunk/testing/itest/ws/endpoints/pom.xml
index 16aaf26e46..d2c922e8aa 100644
--- a/sca-java-2.x/trunk/testing/itest/ws/endpoints/pom.xml
+++ b/sca-java-2.x/trunk/testing/itest/ws/endpoints/pom.xml
@@ -21,7 +21,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-itest</artifactId>
+ <artifactId>itest-ws</artifactId>
<version>2.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/sca-java-2.x/trunk/testing/itest/ws/external-client/pom.xml b/sca-java-2.x/trunk/testing/itest/ws/external-client/pom.xml
index a62921603f..5fad448463 100644
--- a/sca-java-2.x/trunk/testing/itest/ws/external-client/pom.xml
+++ b/sca-java-2.x/trunk/testing/itest/ws/external-client/pom.xml
@@ -21,7 +21,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-itest</artifactId>
+ <artifactId>itest-ws</artifactId>
<version>2.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -31,12 +31,6 @@
<repositories>
<repository>
- <id>java.net</id>
- <name>java.net Maven 1.x Repository</name>
- <url>http://download.java.net/maven/1</url>
- <layout>legacy</layout>
- </repository>
- <repository>
<id>java.net2</id>
<name>java.net Maven 2.x Repository</name>
<url>http://download.java.net/maven/2</url>
@@ -48,7 +42,7 @@
<dependency>
<groupId>com.sun.xml.ws</groupId>
<artifactId>jaxws-rt</artifactId>
- <version>2.1.7</version>
+ <version>2.2.1</version>
</dependency>
</dependencies>
diff --git a/sca-java-2.x/trunk/testing/itest/ws/external-service/pom.xml b/sca-java-2.x/trunk/testing/itest/ws/external-service/pom.xml
index 0634b52345..cf161681ba 100644
--- a/sca-java-2.x/trunk/testing/itest/ws/external-service/pom.xml
+++ b/sca-java-2.x/trunk/testing/itest/ws/external-service/pom.xml
@@ -21,7 +21,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-itest</artifactId>
+ <artifactId>itest-ws</artifactId>
<version>2.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/sca-java-2.x/trunk/testing/itest/ws/holder-ws-service-multiple-outputs/pom.xml b/sca-java-2.x/trunk/testing/itest/ws/holder-ws-service-multiple-outputs/pom.xml
index 0c240d9096..e26b81edfb 100644
--- a/sca-java-2.x/trunk/testing/itest/ws/holder-ws-service-multiple-outputs/pom.xml
+++ b/sca-java-2.x/trunk/testing/itest/ws/holder-ws-service-multiple-outputs/pom.xml
@@ -21,7 +21,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-itest</artifactId>
+ <artifactId>itest-ws</artifactId>
<version>2.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/sca-java-2.x/trunk/testing/itest/ws/http-ssl/pom.xml b/sca-java-2.x/trunk/testing/itest/ws/http-ssl/pom.xml
index 8aae935732..0fd407ec66 100644
--- a/sca-java-2.x/trunk/testing/itest/ws/http-ssl/pom.xml
+++ b/sca-java-2.x/trunk/testing/itest/ws/http-ssl/pom.xml
@@ -21,7 +21,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-itest</artifactId>
+ <artifactId>itest-ws</artifactId>
<version>2.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/sca-java-2.x/trunk/testing/itest/ws/launcher-axis2/pom.xml b/sca-java-2.x/trunk/testing/itest/ws/launcher-axis2/pom.xml
index 6689781d26..9458ba7f0b 100644
--- a/sca-java-2.x/trunk/testing/itest/ws/launcher-axis2/pom.xml
+++ b/sca-java-2.x/trunk/testing/itest/ws/launcher-axis2/pom.xml
@@ -21,7 +21,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-itest</artifactId>
+ <artifactId>itest-ws</artifactId>
<version>2.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/sca-java-2.x/trunk/testing/itest/ws/wsdl/pom.xml b/sca-java-2.x/trunk/testing/itest/ws/wsdl/pom.xml
index 72375853e3..75ce482a4b 100644
--- a/sca-java-2.x/trunk/testing/itest/ws/wsdl/pom.xml
+++ b/sca-java-2.x/trunk/testing/itest/ws/wsdl/pom.xml
@@ -21,7 +21,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-itest</artifactId>
+ <artifactId>itest-ws</artifactId>
<version>2.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>