From 076965bd420d6984d1d6dce70f53b89b1b1d1054 Mon Sep 17 00:00:00 2001
From: antelder <antelder@13f79535-47bb-0310-9956-ffa450edef68>
Date: Wed, 26 Jan 2011 09:57:50 +0000
Subject: Update to as much as possible only use dependencies in the maven
 central repo and for where thats not possible define the other repository in
 the module that uses it not the top level pom.xml

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1063664 13f79535-47bb-0310-9956-ffa450edef68
---
 .../distribution/all/src/main/release/bin/LICENSE  |   4 -
 .../trunk/modules/binding-ws-runtime-jaxws/pom.xml |   2 +-
 .../trunk/modules/databinding-jaxb-axiom/pom.xml   |   2 +-
 .../trunk/modules/databinding-jaxb/pom.xml         |  22 +--
 sca-java-2.x/trunk/modules/databinding-sdo/pom.xml |  19 ---
 .../modules/implementation-bpel-runtime/pom.xml    |  15 ++
 .../trunk/modules/interface-java-jaxws/pom.xml     |  24 +--
 sca-java-2.x/trunk/modules/interface-wsdl/pom.xml  |  15 --
 .../trunk/modules/node-launcher-equinox/pom.xml    |  55 +++++++
 .../trunk/modules/osgi-runtime-pom/pom.xml         |   6 +
 sca-java-2.x/trunk/modules/xsd/pom.xml             |  15 --
 sca-java-2.x/trunk/pom.xml                         | 181 ---------------------
 .../dosgi-dynamic-calculator-operations/pom.xml    |  13 +-
 .../dosgi-calculator-operations/pom.xml            |  13 +-
 .../trunk/testing/itest/async-interactions/pom.xml |   2 +-
 .../trunk/testing/itest/async-services/pom.xml     |   7 -
 .../itest/bpel/helloworld-reference/pom.xml        |   2 +-
 .../trunk/testing/itest/bpel/helloworld/pom.xml    |   2 +-
 .../itest/databindings/jaxb-bottom-up/pom.xml      |  25 ---
 .../itest/databindings/jaxb-top-down/pom.xml       |  25 ---
 .../itest/ws-jaxws/contribution-java-first/pom.xml |   2 +-
 .../itest/ws-jaxws/contribution-wsdl-first/pom.xml |   2 +-
 .../testing/itest/ws-jaxws/external-client/pom.xml |   2 +-
 .../itest/ws-jaxws/external-service/pom.xml        |   2 +-
 .../ws/contribution-callback-forwardspec/pom.xml   |   2 +-
 .../ws/contribution-callback-fullspec/pom.xml      |   2 +-
 .../ws/contribution-callback-promotion/pom.xml     |   2 +-
 .../testing/itest/ws/contribution-callback/pom.xml |   2 +-
 .../itest/ws/contribution-doc-lit-wrapped/pom.xml  |   2 +-
 .../testing/itest/ws/contribution-doc-lit/pom.xml  |   2 +-
 .../itest/ws/contribution-java-first/pom.xml       |   2 +-
 .../testing/itest/ws/contribution-rpc-lit/pom.xml  |   2 +-
 .../itest/ws/contribution-wsdl-first/pom.xml       |   2 +-
 .../trunk/testing/itest/ws/external-client/pom.xml |  16 +-
 .../testing/itest/ws/external-service/pom.xml      |   2 +-
 35 files changed, 136 insertions(+), 357 deletions(-)

(limited to 'sca-java-2.x/trunk')

diff --git a/sca-java-2.x/trunk/distribution/all/src/main/release/bin/LICENSE b/sca-java-2.x/trunk/distribution/all/src/main/release/bin/LICENSE
index cf291b9b80..e6ccd7b6cc 100644
--- a/sca-java-2.x/trunk/distribution/all/src/main/release/bin/LICENSE
+++ b/sca-java-2.x/trunk/distribution/all/src/main/release/bin/LICENSE
@@ -410,11 +410,7 @@ Tuscany SDO dependencies on Eclipse:
     common-2.2.3.jar
     xsd-2.2.3.jar
     runtime-3.4.0-v20080512.jar, 
-    app-1.2.0-v20090520-1800.jar
     contenttype-3.3.0-v20080604-1400.jar
-    jobs-3.4.0-v20080512.jar 
-    preferences-3.2.300-v20090520-1800.jar
-    registry-3.4.100-v20090520-1800.jar
 
 Eclipse Public License - v 1.0
 
diff --git a/sca-java-2.x/trunk/modules/binding-ws-runtime-jaxws/pom.xml b/sca-java-2.x/trunk/modules/binding-ws-runtime-jaxws/pom.xml
index 129d1e4641..2241d67853 100644
--- a/sca-java-2.x/trunk/modules/binding-ws-runtime-jaxws/pom.xml
+++ b/sca-java-2.x/trunk/modules/binding-ws-runtime-jaxws/pom.xml
@@ -145,7 +145,7 @@
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>jaxws-maven-plugin</artifactId>
-                <version>1.12</version>
+                <version>1.10</version>
 -->
                 <!-- Explicitly add the transitive dependencies for jaxws-api
                      http://jira.codehaus.org/browse/MEV-498
diff --git a/sca-java-2.x/trunk/modules/databinding-jaxb-axiom/pom.xml b/sca-java-2.x/trunk/modules/databinding-jaxb-axiom/pom.xml
index 7bfaa760c1..8d1d31bcce 100644
--- a/sca-java-2.x/trunk/modules/databinding-jaxb-axiom/pom.xml
+++ b/sca-java-2.x/trunk/modules/databinding-jaxb-axiom/pom.xml
@@ -102,7 +102,7 @@
             <plugin>
                 <groupId>org.jvnet.jaxb2.maven2</groupId>
                 <artifactId>maven-jaxb2-plugin</artifactId>
-                <version>0.7.1</version>
+                <version>0.7.4</version>
                 <executions>
                     <execution>
                         <id>generate-jaxb</id>
diff --git a/sca-java-2.x/trunk/modules/databinding-jaxb/pom.xml b/sca-java-2.x/trunk/modules/databinding-jaxb/pom.xml
index 71216663e0..855356d341 100644
--- a/sca-java-2.x/trunk/modules/databinding-jaxb/pom.xml
+++ b/sca-java-2.x/trunk/modules/databinding-jaxb/pom.xml
@@ -47,26 +47,6 @@
 
     </dependencies>
 
-    <repositories>
-        <repository>
-            <snapshots>
-                <enabled>true</enabled>
-            </snapshots>
-            <id>java.net</id>
-            <name>java.net Maven 1.x Repository</name>
-            <url>http://download.java.net/maven/1</url>
-            <layout>legacy</layout>
-        </repository>
-    </repositories>
-
-    <pluginRepositories>
-        <pluginRepository>
-            <id>java.net2</id>
-            <name>java.net Maven 2.x Repository</name>
-            <url>http://download.java.net/maven/2</url>
-        </pluginRepository>
-    </pluginRepositories>
-
     <build>
         <plugins>
             <plugin>
@@ -99,7 +79,7 @@
             <plugin>
                 <groupId>org.jvnet.jaxb2.maven2</groupId>
                 <artifactId>maven-jaxb2-plugin</artifactId>
-                <version>0.7.1</version>
+                <version>0.7.4</version>
                 <executions>
                     <execution>
                         <id>generate-jaxb</id>
diff --git a/sca-java-2.x/trunk/modules/databinding-sdo/pom.xml b/sca-java-2.x/trunk/modules/databinding-sdo/pom.xml
index 7b2bfab812..222baf5c8e 100644
--- a/sca-java-2.x/trunk/modules/databinding-sdo/pom.xml
+++ b/sca-java-2.x/trunk/modules/databinding-sdo/pom.xml
@@ -72,25 +72,6 @@
                 </exclusion>
             </exclusions>
         </dependency>
-        <dependency>
-            <groupId>org.eclipse.core</groupId>
-            <artifactId>runtime</artifactId>
-            <version>3.4.0-v20080512</version>
-            <scope>runtime</scope>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.eclipse.core</groupId>
-                    <artifactId>contenttype</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>org.eclipse.core</groupId>
-            <artifactId>contenttype</artifactId>
-            <version>3.3.0-v20080604-1400</version>
-            <scope>runtime</scope>
-        </dependency>
-
         <dependency>
             <groupId>backport-util-concurrent</groupId>
             <artifactId>backport-util-concurrent</artifactId>
diff --git a/sca-java-2.x/trunk/modules/implementation-bpel-runtime/pom.xml b/sca-java-2.x/trunk/modules/implementation-bpel-runtime/pom.xml
index b5a67a2a98..ceff78cc86 100644
--- a/sca-java-2.x/trunk/modules/implementation-bpel-runtime/pom.xml
+++ b/sca-java-2.x/trunk/modules/implementation-bpel-runtime/pom.xml
@@ -27,6 +27,21 @@
     </parent>
     <artifactId>tuscany-implementation-bpel-runtime</artifactId>
     <name>Apache Tuscany SCA BPEL ODE Implementation Extension</name>
+
+    <!-- for Saxon 9.x -->
+    <repositories>
+        <repository>
+            <id>intalio.org</id>
+            <url>http://www.intalio.org/public/maven2</url>
+           <releases>
+               <enabled>true</enabled>
+           </releases>
+           <snapshots>
+               <enabled>false</enabled>
+           </snapshots>
+        </repository>     
+    </repositories>     
+
     <dependencies>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
diff --git a/sca-java-2.x/trunk/modules/interface-java-jaxws/pom.xml b/sca-java-2.x/trunk/modules/interface-java-jaxws/pom.xml
index 87c099c741..4ce3b6bfc3 100644
--- a/sca-java-2.x/trunk/modules/interface-java-jaxws/pom.xml
+++ b/sca-java-2.x/trunk/modules/interface-java-jaxws/pom.xml
@@ -73,28 +73,6 @@
 
     </dependencies>
 
-    <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>
-        </repository>
-    </repositories>
-
-    <pluginRepositories>
-        <pluginRepository>
-            <id>java.net2</id>
-            <name>java.net Maven 2.x Repository</name>
-            <url>http://download.java.net/maven/2</url>
-        </pluginRepository>
-    </pluginRepositories>
-
     <build>
         <plugins>
             <plugin>
@@ -119,7 +97,7 @@
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>jaxws-maven-plugin</artifactId>
-                <version>1.12</version>
+                <version>1.10</version>
                 <!-- Explicitly add the transitive dependencies for jaxws-api
                      http://jira.codehaus.org/browse/MEV-498
                 -->
diff --git a/sca-java-2.x/trunk/modules/interface-wsdl/pom.xml b/sca-java-2.x/trunk/modules/interface-wsdl/pom.xml
index d6f17f03f6..5d025cd4bc 100644
--- a/sca-java-2.x/trunk/modules/interface-wsdl/pom.xml
+++ b/sca-java-2.x/trunk/modules/interface-wsdl/pom.xml
@@ -62,19 +62,4 @@
 
     </dependencies>
 
-    <repositories>
-        <!-- Apache repository for Web Services artifacts -->
-        <repository>
-            <id>apache.ws.zone</id>
-            <name>Apache WS Zone Repository</name>
-            <url>http://ws.zones.apache.org/repository2</url>
-            <releases>
-                <enabled>true</enabled>
-            </releases>
-            <snapshots>
-                <enabled>false</enabled>
-            </snapshots>
-        </repository>
-    </repositories>
-
 </project>
diff --git a/sca-java-2.x/trunk/modules/node-launcher-equinox/pom.xml b/sca-java-2.x/trunk/modules/node-launcher-equinox/pom.xml
index b31d1e6d9f..de19177f81 100644
--- a/sca-java-2.x/trunk/modules/node-launcher-equinox/pom.xml
+++ b/sca-java-2.x/trunk/modules/node-launcher-equinox/pom.xml
@@ -94,7 +94,62 @@
             <scope>test</scope>
         </dependency-->
 
+        <dependency>
+            <groupId>org.eclipse.core</groupId>
+            <artifactId>runtime</artifactId>
+            <version>3.4.0-v20080512</version>
+            <scope>runtime</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.eclipse.core</groupId>
+                    <artifactId>contenttype</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.eclipse.equinox</groupId>
+                    <artifactId>registry</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.eclipse.equinox</groupId>
+                    <artifactId>preferences</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.eclipse.core</groupId>
+                    <artifactId>jobs</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.eclipse.equinox</groupId>
+                    <artifactId>app</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>org.eclipse.core</groupId>
+            <artifactId>contenttype</artifactId>
+            <version>3.3.0-v20080604-1400</version>
+            <scope>runtime</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.eclipse.equinox</groupId>
+                    <artifactId>registry</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.eclipse.equinox</groupId>
+                    <artifactId>preferences</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
     </dependencies>
+    <repositories>
+        <!-- Tuscany repository to hold artifacts that are not published in the public maven repos -->
+        <repository>
+            <id>tuscany.repo</id>
+            <name>Tuscany Maven 2.x Repository</name>
+            <url>http://svn.apache.org/repos/asf/tuscany/maven</url>
+        </repository>
+
+    </repositories>
+
 
     <build>
         <plugins>
diff --git a/sca-java-2.x/trunk/modules/osgi-runtime-pom/pom.xml b/sca-java-2.x/trunk/modules/osgi-runtime-pom/pom.xml
index 36c3d401b8..176d05b2e5 100644
--- a/sca-java-2.x/trunk/modules/osgi-runtime-pom/pom.xml
+++ b/sca-java-2.x/trunk/modules/osgi-runtime-pom/pom.xml
@@ -60,6 +60,12 @@
             <version>${pom.version}</version>
         </dependency>
 
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-implementation-osgi-runtime</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+
     </dependencies>
 
 </project>
diff --git a/sca-java-2.x/trunk/modules/xsd/pom.xml b/sca-java-2.x/trunk/modules/xsd/pom.xml
index e9f6b78c2f..767bab3327 100644
--- a/sca-java-2.x/trunk/modules/xsd/pom.xml
+++ b/sca-java-2.x/trunk/modules/xsd/pom.xml
@@ -47,19 +47,4 @@
         </dependency>
     </dependencies>
 
-    <repositories>
-        <!-- Apache repository for Web Services artifacts -->
-        <repository>
-            <id>apache.ws.zone</id>
-            <name>Apache WS Zone Repository</name>
-            <url>http://ws.zones.apache.org/repository2</url>
-            <releases>
-                <enabled>true</enabled>
-            </releases>
-            <snapshots>
-                <enabled>false</enabled>
-            </snapshots>
-        </repository>
-    </repositories>
-
 </project>
diff --git a/sca-java-2.x/trunk/pom.xml b/sca-java-2.x/trunk/pom.xml
index 3721d961b1..d75c87d1b4 100644
--- a/sca-java-2.x/trunk/pom.xml
+++ b/sca-java-2.x/trunk/pom.xml
@@ -61,38 +61,6 @@
     <!-- Maven Repositories                                                     -->
     <!-- ====================================================================== -->
     <repositories>
-       <repository>
-          <id>maven.central</id>
-          <url>http://repo2.maven.org/maven2</url>
-           <releases>
-               <enabled>true</enabled>
-           </releases>
-           <snapshots>
-               <enabled>false</enabled>
-           </snapshots>
-       </repository>
-       <repository>
-          <id>apache.incubator</id>
-          <url>http://people.apache.org/repo/m2-incubating-repository</url>
-           <releases>
-               <enabled>true</enabled>
-           </releases>
-           <snapshots>
-               <enabled>false</enabled>
-           </snapshots>
-       </repository>
-       <!-- Apache SNAPSHOT repository for unreleased artifacts -->
-       <repository>
-            <id>apache.snapshots</id>
-            <name>Apache SNAPSHOT Repository</name>
-            <url>http://repository.apache.org/snapshots</url>
-            <releases>
-                <enabled>false</enabled>
-            </releases>
-            <snapshots>
-                <enabled>true</enabled>
-            </snapshots>
-        </repository>
         <!-- Tuscany repository to hold artifacts that are not published in the public maven repos -->
         <repository>
             <id>tuscany.repo</id>
@@ -105,158 +73,9 @@
                 <enabled>false</enabled>
             </snapshots>
         </repository>
-  	  <!-- Material for the OASIS SVN repo which holds the standard versions of some JARs -->
-        <repository>
-           <id>oasis.svn</id>
-           <url>http://tools.oasis-open.org/version-control/svn/sca-j/Release/</url>
-           <releases>
-               <enabled>true</enabled>
-           </releases>
-           <snapshots>
-               <enabled>true</enabled>
-           </snapshots>
-       </repository>
-       <!-- End of material for OASIS SVN repo -->
-        <repository>
-            <id>apache.ws.zone</id>
-            <name>Apache WS Zone Repository</name>
-            <url>http://ws.zones.apache.org/repository2</url>
-            <releases>
-                <enabled>true</enabled>
-            </releases>
-            <snapshots>
-                <enabled>false</enabled>
-            </snapshots>
-        </repository>
-        <repository>
-            <id>indiana</id>
-            <url>http://ftp.ussg.iu.edu/eclipse/modeling/emf/emf/maven2/</url>
-            <releases>
-                <enabled>true</enabled>
-            </releases>
-            <snapshots>
-                <enabled>false</enabled>
-            </snapshots>
-        </repository>
-        <repository>
-            <id>osuosl.org</id>
-            <url>http://ftp.osuosl.org/pub/eclipse/tools/emf/maven2</url>
-           <releases>
-               <enabled>true</enabled>
-           </releases>
-           <snapshots>
-               <enabled>false</enabled>
-           </snapshots>
-        </repository> 
-
-        <!-- for Saxon 9.x -->
-        <repository>
-            <id>intalio.org</id>
-            <url>http://www.intalio.org/public/maven2</url>
-           <releases>
-               <enabled>true</enabled>
-           </releases>
-           <snapshots>
-               <enabled>false</enabled>
-           </snapshots>
-        </repository>     
-
-        <!-- for java.net -->
-        <repository>
-            <snapshots>
-                <enabled>false</enabled>
-            </snapshots>
-            <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>
-            <snapshots>
-              <enabled>false</enabled>
-            </snapshots>
-        </repository>
     </repositories>
 
-    <!-- ====================================================================== -->
-    <!-- Maven Plugin-Repositories                                              -->
-    <!-- ====================================================================== -->
-    <pluginRepositories>
-        <!-- Apache repository for artifacts released by Apache TLP projects -->
-        <pluginRepository>
-            <id>apache</id>
-            <name>Apache Repository</name>
-            <url>http://people.apache.org/repo/m2-ibiblio-rsync-repository</url>
-            <releases>
-                <enabled>true</enabled>
-            </releases>
-            <snapshots>
-                <enabled>false</enabled>
-            </snapshots>
-        </pluginRepository>
-
-        <!-- Apache Incubator repository for artifacts released by Incubator projects -->
-        <pluginRepository>
-            <id>apache.incubator</id>
-            <name>Apache Incubator Repository</name>
-            <url>http://people.apache.org/repo/m2-incubating-repository</url>
-            <releases>
-                <enabled>true</enabled>
-            </releases>
-            <snapshots>
-                <enabled>false</enabled>
-            </snapshots>
-        </pluginRepository>
-
-        <!-- Apache SNAPSHOT repository for unreleased artifacts -->
-        <pluginRepository>
-            <id>apache.snapshots</id>
-            <name>Apache SNAPSHOT Repository</name>
-            <url>http://repository.apache.org/snapshots</url>
-            <snapshots>
-                <enabled>true</enabled>
-            </snapshots>
-        </pluginRepository>
-
-        <!-- Codehaus SNAPSHOT repository -->
-        <!--
-        <pluginRepository>
-            <id>codehaus-snapshot</id>
-            <name>Codehaus Snapshot Repository</name>
-            <url>http://snapshots.repository.codehaus.org</url>
-            <snapshots>
-                <enabled>true</enabled>
-            </snapshots>
-        </pluginRepository>
-        -->
-
-       <!-- Maven central repository -->
-       <pluginRepository>
-          <id>maven.central</id>
-          <name>Maven Central Repository</name>
-          <url>http://repo2.maven.org/maven2</url>
-          <releases>
-              <enabled>true</enabled>
-          </releases>
-          <snapshots>
-              <enabled>false</enabled>
-          </snapshots>
-       </pluginRepository>
-
-        <pluginRepository>
-            <id>java.net2</id>
-            <name>java.net Maven 2.x Repository</name>
-            <url>http://download.java.net/maven/2</url>
-            <snapshots>
-              <enabled>false</enabled>
-            </snapshots>
-        </pluginRepository>
-    </pluginRepositories>
-    
     <!-- ====================================================================== -->
     <!-- Distribution Management configuration                                  -->
     <!-- ====================================================================== -->
diff --git a/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dosgi-dynamic-calculator-operations/pom.xml b/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dosgi-dynamic-calculator-operations/pom.xml
index 3f06c2665f..1de7aff7a5 100644
--- a/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dosgi-dynamic-calculator-operations/pom.xml
+++ b/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dosgi-dynamic-calculator-operations/pom.xml
@@ -32,10 +32,21 @@
     <dependencies>
        <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-feature-all</artifactId>
+            <artifactId>tuscany-base-runtime-pom</artifactId>
             <version>2.0-SNAPSHOT</version>
             <type>pom</type>
         </dependency>
+       <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-osgi-runtime-pom</artifactId>
+            <version>2.0-SNAPSHOT</version>
+            <type>pom</type>
+        </dependency>
+       <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-binding-rmi-runtime</artifactId>
+            <version>2.0-SNAPSHOT</version>
+        </dependency>
 
        <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator-operations/pom.xml b/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator-operations/pom.xml
index 770a20b58f..8aee7b735d 100644
--- a/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator-operations/pom.xml
+++ b/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator-operations/pom.xml
@@ -32,10 +32,21 @@
     <dependencies>
        <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-feature-all</artifactId>
+            <artifactId>tuscany-base-runtime-pom</artifactId>
             <version>2.0-SNAPSHOT</version>
             <type>pom</type>
         </dependency>
+       <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-osgi-runtime-pom</artifactId>
+            <version>2.0-SNAPSHOT</version>
+            <type>pom</type>
+        </dependency>
+       <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-binding-rmi-runtime</artifactId>
+            <version>2.0-SNAPSHOT</version>
+        </dependency>
 
        <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
diff --git a/sca-java-2.x/trunk/testing/itest/async-interactions/pom.xml b/sca-java-2.x/trunk/testing/itest/async-interactions/pom.xml
index c61bf5dc7b..3de6afffc6 100644
--- a/sca-java-2.x/trunk/testing/itest/async-interactions/pom.xml
+++ b/sca-java-2.x/trunk/testing/itest/async-interactions/pom.xml
@@ -82,7 +82,7 @@
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>jaxws-maven-plugin</artifactId>
-                <version>1.12</version>
+                <version>1.10</version>
                 <!-- Explicitly add the transitive dependencies for jaxws-api http://jira.codehaus.org/browse/MEV-498 -->
                 <dependencies>
                     <dependency>
diff --git a/sca-java-2.x/trunk/testing/itest/async-services/pom.xml b/sca-java-2.x/trunk/testing/itest/async-services/pom.xml
index 0e5ac16fcb..f7e5463b6d 100644
--- a/sca-java-2.x/trunk/testing/itest/async-services/pom.xml
+++ b/sca-java-2.x/trunk/testing/itest/async-services/pom.xml
@@ -33,13 +33,6 @@
 
     <dependencies>
     
-        <!-- This is the SCA API bundle: published by OASIS -->
-        <dependency>
-            <groupId>org.oasis-open.sca.j</groupId>
-            <artifactId>sca-caa-apis</artifactId>
-            <version>1.1-CD04</version>
-        </dependency>
-
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-base-runtime-pom</artifactId>
diff --git a/sca-java-2.x/trunk/testing/itest/bpel/helloworld-reference/pom.xml b/sca-java-2.x/trunk/testing/itest/bpel/helloworld-reference/pom.xml
index 75856a4c74..cc2ea3676f 100644
--- a/sca-java-2.x/trunk/testing/itest/bpel/helloworld-reference/pom.xml
+++ b/sca-java-2.x/trunk/testing/itest/bpel/helloworld-reference/pom.xml
@@ -189,7 +189,7 @@
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>jaxws-maven-plugin</artifactId>
-                <version>1.12</version>
+                <version>1.10</version>
                 <!-- 
                      Explicitly add the transitive dependencies for jaxws-api
                      http://jira.codehaus.org/browse/MEV-498
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 56f27c3c0d..182e561704 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
@@ -154,7 +154,7 @@
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>jaxws-maven-plugin</artifactId>
-                <version>1.12</version>
+                <version>1.10</version>
                 <!-- 
                      Explicitly add the transitive dependencies for jaxws-api
                      http://jira.codehaus.org/browse/MEV-498
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 df9036fbe7..20310a0f1c 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,31 +31,6 @@
     <version>2.0-SNAPSHOT</version>
     <name>Apache Tuscany SCA iTest Databinding - JAXB Bottom Up</name>
 
-    <repositories>
-        <repository>
-            <snapshots>
-                <enabled>true</enabled>
-            </snapshots>
-            <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>
-        </repository>
-    </repositories>
-
-    <pluginRepositories>
-        <pluginRepository>
-            <id>java.net2</id>
-            <name>java.net Maven 2.x Repository</name>
-            <url>http://download.java.net/maven/2</url>
-        </pluginRepository>
-    </pluginRepositories>
-
     <dependencies>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
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 1138b5c6ec..9bfb2f74b2 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,31 +32,6 @@
     <version>2.0-SNAPSHOT</version>
     <name>Apache Tuscany SCA iTest Databinding - JAXB Top Down</name>
 
-    <repositories>
-        <repository>
-            <snapshots>
-                <enabled>true</enabled>
-            </snapshots>
-            <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>
-        </repository>
-    </repositories>
-
-    <pluginRepositories>
-        <pluginRepository>
-            <id>java.net2</id>
-            <name>java.net Maven 2.x Repository</name>
-            <url>http://download.java.net/maven/2</url>
-        </pluginRepository>
-    </pluginRepositories>
-
     <dependencies>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
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 e584372593..e9a3602f5d 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
@@ -77,7 +77,7 @@
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>jaxws-maven-plugin</artifactId>
-                <version>1.12</version>
+                <version>1.10</version>
                 <!-- Explicitly add the transitive dependencies for jaxws-api
                      http://jira.codehaus.org/browse/MEV-498
                 -->
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 77c83f27c6..f43eadc3b5 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
@@ -77,7 +77,7 @@
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>jaxws-maven-plugin</artifactId>
-                <version>1.12</version>
+                <version>1.10</version>
                 <!-- Explicitly add the transitive dependencies for jaxws-api
                      http://jira.codehaus.org/browse/MEV-498
                 -->
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 356fb26193..f005e9ec30 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
@@ -78,7 +78,7 @@
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>jaxws-maven-plugin</artifactId>
-                <version>1.12</version>
+                <version>1.10</version>
                 <!-- Explicitly add the transitive dependencies for jaxws-api
                      http://jira.codehaus.org/browse/MEV-498
                 -->
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 e64f40273f..6b705e9041 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
@@ -60,7 +60,7 @@
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>jaxws-maven-plugin</artifactId>
-                <version>1.12</version>
+                <version>1.10</version>
                 <!-- Explicitly add the transitive dependencies for jaxws-api
                      http://jira.codehaus.org/browse/MEV-498
                 -->
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 7274efeb3c..a29f22c5e9 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
@@ -77,7 +77,7 @@
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>jaxws-maven-plugin</artifactId>
-                <version>1.12</version>
+                <version>1.10</version>
                 <!-- Explicitly add the transitive dependencies for jaxws-api
                      http://jira.codehaus.org/browse/MEV-498
                 -->
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 57fbf5f5f9..f296cd301c 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
@@ -77,7 +77,7 @@
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>jaxws-maven-plugin</artifactId>
-                <version>1.12</version>
+                <version>1.10</version>
                 <!-- Explicitly add the transitive dependencies for jaxws-api
                      http://jira.codehaus.org/browse/MEV-498
                 -->
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 4b1b4b5e77..4e36da2cf2 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
@@ -77,7 +77,7 @@
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>jaxws-maven-plugin</artifactId>
-                <version>1.12</version>
+                <version>1.10</version>
                 <!-- Explicitly add the transitive dependencies for jaxws-api
                      http://jira.codehaus.org/browse/MEV-498
                 -->
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 5a1d0b9780..4ef6e1513b 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
@@ -77,7 +77,7 @@
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>jaxws-maven-plugin</artifactId>
-                <version>1.12</version>
+                <version>1.10</version>
                 <!-- Explicitly add the transitive dependencies for jaxws-api
                      http://jira.codehaus.org/browse/MEV-498
                 -->
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 bcf322afcc..6682e1486a 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
@@ -77,7 +77,7 @@
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>jaxws-maven-plugin</artifactId>
-                <version>1.12</version>
+                <version>1.10</version>
                 <!-- Explicitly add the transitive dependencies for jaxws-api
                      http://jira.codehaus.org/browse/MEV-498
                 -->
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 8c800cae47..059a2c77fd 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
@@ -77,7 +77,7 @@
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>jaxws-maven-plugin</artifactId>
-                <version>1.12</version>
+                <version>1.10</version>
                 <!-- Explicitly add the transitive dependencies for jaxws-api
                      http://jira.codehaus.org/browse/MEV-498
                 -->
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 0711bd3ca0..503d366e75 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
@@ -77,7 +77,7 @@
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>jaxws-maven-plugin</artifactId>
-                <version>1.12</version>
+                <version>1.10</version>
                 <!-- Explicitly add the transitive dependencies for jaxws-api
                      http://jira.codehaus.org/browse/MEV-498
                 -->
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 3acc03c10f..5de77cd8f3 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
@@ -77,7 +77,7 @@
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>jaxws-maven-plugin</artifactId>
-                <version>1.12</version>
+                <version>1.10</version>
                 <!-- Explicitly add the transitive dependencies for jaxws-api
                      http://jira.codehaus.org/browse/MEV-498
                 -->
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 8eb95dddef..054ea6fdad 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
@@ -77,7 +77,7 @@
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>jaxws-maven-plugin</artifactId>
-                <version>1.12</version>
+                <version>1.10</version>
                 <!-- Explicitly add the transitive dependencies for jaxws-api
                      http://jira.codehaus.org/browse/MEV-498
                 -->
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 1a75336754..a62921603f 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
@@ -29,6 +29,20 @@
     <artifactId>itest-ws-external-client</artifactId>
     <name>Apache Tuscany SCA iTest WS External Client</name>
 
+    <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>
+        </repository>
+    </repositories>
+
     <dependencies>
 
         <dependency>
@@ -65,7 +79,7 @@
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>jaxws-maven-plugin</artifactId>
-                <version>1.12</version>
+                <version>1.10</version>
                 <!-- Explicitly add the transitive dependencies for jaxws-api
                      http://jira.codehaus.org/browse/MEV-498
                 -->
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 f789844419..0634b52345 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
@@ -60,7 +60,7 @@
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>jaxws-maven-plugin</artifactId>
-                <version>1.12</version>
+                <version>1.10</version>
                 <!-- Explicitly add the transitive dependencies for jaxws-api
                      http://jira.codehaus.org/browse/MEV-498
                 -->
-- 
cgit v1.2.3