diff options
author | slaws <slaws@13f79535-47bb-0310-9956-ffa450edef68> | 2010-10-29 14:36:53 +0000 |
---|---|---|
committer | slaws <slaws@13f79535-47bb-0310-9956-ffa450edef68> | 2010-10-29 14:36:53 +0000 |
commit | 05536144996fc3fd6a7b6b6e0e00495b4f1e2bb1 (patch) | |
tree | 45c61fd0527935353ad962ef2624002bbcb42bc4 /sca-java-2.x/branches/2.0-Beta1 | |
parent | db11b14b32f5dbbd9e83cd654ef68d0372695648 (diff) |
TUSCANY-3727 - fix binding-ws which jars so that it doesn't have base Tuscany jars. So we have binding-rmi and binding-ws as examples now. It this works we'll fix the rest for the next release.
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1028772 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'sca-java-2.x/branches/2.0-Beta1')
14 files changed, 126 insertions, 131 deletions
diff --git a/sca-java-2.x/branches/2.0-Beta1/modules/base-runtime-pom/pom.xml b/sca-java-2.x/branches/2.0-Beta1/modules/base-runtime-pom/pom.xml index e56f075f73..74f0ba0c28 100644 --- a/sca-java-2.x/branches/2.0-Beta1/modules/base-runtime-pom/pom.xml +++ b/sca-java-2.x/branches/2.0-Beta1/modules/base-runtime-pom/pom.xml @@ -37,6 +37,13 @@ <dependencies>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-core-runtime-pom</artifactId>
+ <version>${pom.version}</version>
+ <type>pom</type>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-domain-node</artifactId>
<version>${pom.version}</version>
</dependency>
diff --git a/sca-java-2.x/branches/2.0-Beta1/modules/binding-ws-runtime-axis2/pom.xml b/sca-java-2.x/branches/2.0-Beta1/modules/binding-ws-runtime-axis2/pom.xml index 2ae9240d83..bb68c7bfee 100644 --- a/sca-java-2.x/branches/2.0-Beta1/modules/binding-ws-runtime-axis2/pom.xml +++ b/sca-java-2.x/branches/2.0-Beta1/modules/binding-ws-runtime-axis2/pom.xml @@ -39,18 +39,13 @@ <version>2.0-Beta1-SNAPSHOT</version> <type>pom</type> <scope>provided</scope> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-binding-ws-wsdlgen</artifactId> - <version>2.0-Beta1-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>tuscany-policy-security</artifactId> <version>2.0-Beta1-SNAPSHOT</version> + <scope>provided</scope> <!-- it's in base --> </dependency> <dependency> diff --git a/sca-java-2.x/branches/2.0-Beta1/testing/compliance-tests/assembly/pom.xml b/sca-java-2.x/branches/2.0-Beta1/testing/compliance-tests/assembly/pom.xml index 0042402014..827b7b2510 100644 --- a/sca-java-2.x/branches/2.0-Beta1/testing/compliance-tests/assembly/pom.xml +++ b/sca-java-2.x/branches/2.0-Beta1/testing/compliance-tests/assembly/pom.xml @@ -40,6 +40,13 @@ <dependency>
<groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-core-runtime-pom</artifactId>
+ <version>2.0-Beta1-SNAPSHOT</version>
+ <type>pom</type>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-base-runtime-pom</artifactId>
<version>2.0-Beta1-SNAPSHOT</version>
<type>pom</type>
diff --git a/sca-java-2.x/branches/2.0-Beta1/testing/compliance-tests/binding-jms/pom.xml b/sca-java-2.x/branches/2.0-Beta1/testing/compliance-tests/binding-jms/pom.xml index 2a0bdafef5..4a586295d5 100644 --- a/sca-java-2.x/branches/2.0-Beta1/testing/compliance-tests/binding-jms/pom.xml +++ b/sca-java-2.x/branches/2.0-Beta1/testing/compliance-tests/binding-jms/pom.xml @@ -40,8 +40,16 @@ <dependency> <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-base-runtime</artifactId> + <artifactId>tuscany-core-runtime-pom</artifactId> <version>2.0-Beta1-SNAPSHOT</version> + <type>pom</type> + </dependency> + + <dependency> + <groupId>org.apache.tuscany.sca</groupId> + <artifactId>tuscany-base-runtime-pom</artifactId> + <version>2.0-Beta1-SNAPSHOT</version> + <type>pom</type> </dependency> <dependency> diff --git a/sca-java-2.x/branches/2.0-Beta1/testing/compliance-tests/binding-ws/pom.xml b/sca-java-2.x/branches/2.0-Beta1/testing/compliance-tests/binding-ws/pom.xml index 26bb2b6d77..3a19632d75 100644 --- a/sca-java-2.x/branches/2.0-Beta1/testing/compliance-tests/binding-ws/pom.xml +++ b/sca-java-2.x/branches/2.0-Beta1/testing/compliance-tests/binding-ws/pom.xml @@ -38,6 +38,13 @@ <version>2.0-SNAPSHOT</version> </dependency> + <dependency> + <groupId>org.apache.tuscany.sca</groupId> + <artifactId>tuscany-core-runtime-pom</artifactId> + <version>2.0-Beta1-SNAPSHOT</version> + <type>pom</type> + </dependency> + <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>tuscany-base-runtime-pom</artifactId> diff --git a/sca-java-2.x/branches/2.0-Beta1/testing/compliance-tests/java-caa/pom.xml b/sca-java-2.x/branches/2.0-Beta1/testing/compliance-tests/java-caa/pom.xml index 667096444e..3e86b2bc64 100644 --- a/sca-java-2.x/branches/2.0-Beta1/testing/compliance-tests/java-caa/pom.xml +++ b/sca-java-2.x/branches/2.0-Beta1/testing/compliance-tests/java-caa/pom.xml @@ -40,6 +40,13 @@ <dependency>
<groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-core-runtime-pom</artifactId>
+ <version>2.0-Beta1-SNAPSHOT</version>
+ <type>pom</type>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-base-runtime-pom</artifactId>
<version>2.0-Beta1-SNAPSHOT</version>
<type>pom</type>
diff --git a/sca-java-2.x/branches/2.0-Beta1/testing/compliance-tests/java-ci/pom.xml b/sca-java-2.x/branches/2.0-Beta1/testing/compliance-tests/java-ci/pom.xml index 4e5b80e1ad..06e18f388a 100644 --- a/sca-java-2.x/branches/2.0-Beta1/testing/compliance-tests/java-ci/pom.xml +++ b/sca-java-2.x/branches/2.0-Beta1/testing/compliance-tests/java-ci/pom.xml @@ -40,6 +40,13 @@ <dependency>
<groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-core-runtime-pom</artifactId>
+ <version>2.0-Beta1-SNAPSHOT</version>
+ <type>pom</type>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-base-runtime-pom</artifactId>
<version>2.0-Beta1-SNAPSHOT</version>
<type>pom</type>
diff --git a/sca-java-2.x/branches/2.0-Beta1/testing/compliance-tests/policy/pom.xml b/sca-java-2.x/branches/2.0-Beta1/testing/compliance-tests/policy/pom.xml index f1b80e507e..502599015c 100644 --- a/sca-java-2.x/branches/2.0-Beta1/testing/compliance-tests/policy/pom.xml +++ b/sca-java-2.x/branches/2.0-Beta1/testing/compliance-tests/policy/pom.xml @@ -38,6 +38,13 @@ <version>2.0-SNAPSHOT</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-core-runtime-pom</artifactId>
+ <version>2.0-Beta1-SNAPSHOT</version>
+ <type>pom</type>
+ </dependency>
+
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-base-runtime-pom</artifactId>
diff --git a/sca-java-2.x/branches/2.0-Beta1/testing/itest/callback-two-composites/pom.xml b/sca-java-2.x/branches/2.0-Beta1/testing/itest/callback-two-composites/pom.xml index 7e7a5c3c6b..c55cbbf72e 100644 --- a/sca-java-2.x/branches/2.0-Beta1/testing/itest/callback-two-composites/pom.xml +++ b/sca-java-2.x/branches/2.0-Beta1/testing/itest/callback-two-composites/pom.xml @@ -31,21 +31,16 @@ <dependencies> <dependency> <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-node-api</artifactId> + <artifactId>tuscany-core-runtime-pom</artifactId> <version>2.0-Beta1-SNAPSHOT</version> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-node-impl</artifactId> - <version>2.0-Beta1-SNAPSHOT</version> - <scope>test</scope> + <type>pom</type> </dependency> <dependency> <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-implementation-java-runtime</artifactId> + <artifactId>tuscany-base-runtime-pom</artifactId> <version>2.0-Beta1-SNAPSHOT</version> + <type>pom</type> <scope>test</scope> </dependency> @@ -58,13 +53,6 @@ <dependency> <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-host-http</artifactId> - <version>2.0-Beta1-SNAPSHOT</version> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> <artifactId>tuscany-host-jetty</artifactId> <version>2.0-Beta1-SNAPSHOT</version> <scope>test</scope> diff --git a/sca-java-2.x/branches/2.0-Beta1/testing/itest/callback-two-nodes/pom.xml b/sca-java-2.x/branches/2.0-Beta1/testing/itest/callback-two-nodes/pom.xml index 1dc92905b5..69cc0c3538 100644 --- a/sca-java-2.x/branches/2.0-Beta1/testing/itest/callback-two-nodes/pom.xml +++ b/sca-java-2.x/branches/2.0-Beta1/testing/itest/callback-two-nodes/pom.xml @@ -31,21 +31,16 @@ <dependencies> <dependency> <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-node-api</artifactId> + <artifactId>tuscany-core-runtime-pom</artifactId> <version>2.0-Beta1-SNAPSHOT</version> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-node-impl</artifactId> - <version>2.0-Beta1-SNAPSHOT</version> - <scope>test</scope> + <type>pom</type> </dependency> <dependency> <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-implementation-java-runtime</artifactId> + <artifactId>tuscany-base-runtime-pom</artifactId> <version>2.0-Beta1-SNAPSHOT</version> + <type>pom</type> <scope>test</scope> </dependency> @@ -58,13 +53,6 @@ <dependency> <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-host-http</artifactId> - <version>2.0-Beta1-SNAPSHOT</version> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> <artifactId>tuscany-host-jetty</artifactId> <version>2.0-Beta1-SNAPSHOT</version> <scope>test</scope> diff --git a/sca-java-2.x/branches/2.0-Beta1/testing/itest/databindings/jaxb-bottom-up/pom.xml b/sca-java-2.x/branches/2.0-Beta1/testing/itest/databindings/jaxb-bottom-up/pom.xml index 3da82692cc..9e06f0e7ed 100644 --- a/sca-java-2.x/branches/2.0-Beta1/testing/itest/databindings/jaxb-bottom-up/pom.xml +++ b/sca-java-2.x/branches/2.0-Beta1/testing/itest/databindings/jaxb-bottom-up/pom.xml @@ -59,62 +59,47 @@ <dependencies> <dependency> <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-node-api</artifactId> - <version>${pom.version}</version> + <artifactId>tuscany-core-runtime-pom</artifactId> + <version>2.0-Beta1-SNAPSHOT</version> + <type>pom</type> </dependency> + <dependency> <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-node-impl</artifactId> - <version>${pom.version}</version> + <artifactId>tuscany-base-runtime-pom</artifactId> + <version>2.0-Beta1-SNAPSHOT</version> + <type>pom</type> + <scope>test</scope> </dependency> + <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>tuscany-binding-ws-runtime-axis2</artifactId> - <version>${pom.version}</version> - <scope>runtime</scope> - </dependency> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-databinding-jaxb</artifactId> - <version>${pom.version}</version> - <scope>runtime</scope> + <version>2.0-Beta1-SNAPSHOT</version> + <scope>test</scope> </dependency> - <!--dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-databinding-sdo</artifactId> - <version>${pom.version}</version> - <scope>compile</scope> - </dependency--> + <dependency> <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-databinding-axiom</artifactId> - <version>${pom.version}</version> - <scope>compile</scope> + <artifactId>tuscany-host-jetty</artifactId> + <version>2.0-Beta1-SNAPSHOT</version> + <scope>test</scope> </dependency> - <!--dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>itest-databindings-common</artifactId> - <version>${pom.version}</version> - <scope>compile</scope> - </dependency--> + <dependency> <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-implementation-java-runtime</artifactId> + <artifactId>tuscany-databinding-jaxb</artifactId> <version>${pom.version}</version> - <scope>compile</scope> + <scope>runtime</scope> </dependency> + <dependency> <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-interface-java</artifactId> + <artifactId>tuscany-databinding-axiom</artifactId> <version>${pom.version}</version> <scope>compile</scope> </dependency> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-host-jetty</artifactId> - <version>${pom.version}</version> - <scope>runtime</scope> - </dependency> + <dependency> <groupId>javax.xml.bind</groupId> <artifactId>jaxb-api</artifactId> @@ -127,6 +112,7 @@ <artifactId>jaxws-rt</artifactId> <version>2.1.3</version> </dependency> + <!-- Added by Simon Nash --> <dependency> <groupId>commons-collections</groupId> diff --git a/sca-java-2.x/branches/2.0-Beta1/testing/itest/databindings/jaxb-top-down/pom.xml b/sca-java-2.x/branches/2.0-Beta1/testing/itest/databindings/jaxb-top-down/pom.xml index 381410ace8..6d124be30b 100644 --- a/sca-java-2.x/branches/2.0-Beta1/testing/itest/databindings/jaxb-top-down/pom.xml +++ b/sca-java-2.x/branches/2.0-Beta1/testing/itest/databindings/jaxb-top-down/pom.xml @@ -60,62 +60,51 @@ <dependencies> <dependency> <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-node-api</artifactId> - <version>${pom.version}</version> + <artifactId>tuscany-core-runtime-pom</artifactId> + <version>2.0-Beta1-SNAPSHOT</version> + <type>pom</type> </dependency> + <dependency> <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-node-impl</artifactId> - <version>${pom.version}</version> + <artifactId>tuscany-base-runtime-pom</artifactId> + <version>2.0-Beta1-SNAPSHOT</version> + <type>pom</type> + <scope>test</scope> </dependency> + <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>tuscany-binding-ws-runtime-axis2</artifactId> <version>2.0-Beta1-SNAPSHOT</version> - <scope>runtime</scope> + <scope>test</scope> </dependency> + <dependency> <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-databinding-jaxb</artifactId> - <version>2.0-Beta1-SNAPSHOT</version> - <scope>runtime</scope> - </dependency> - <!--dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-databinding-sdo</artifactId> + <artifactId>tuscany-host-jetty</artifactId> <version>2.0-Beta1-SNAPSHOT</version> - <scope>compile</scope> - </dependency--> + <scope>test</scope> + </dependency> <dependency> <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-databinding-axiom</artifactId> + <artifactId>tuscany-binding-ws-runtime-axis2</artifactId> <version>2.0-Beta1-SNAPSHOT</version> - <scope>compile</scope> + <scope>runtime</scope> </dependency> - <!-- dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>itest-databindings-common</artifactId> - <version>2.0-Beta1-SNAPSHOT</version> - <scope>compile</scope> - </dependency --> <dependency> <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-implementation-java-runtime</artifactId> + <artifactId>tuscany-databinding-jaxb</artifactId> <version>2.0-Beta1-SNAPSHOT</version> <scope>runtime</scope> </dependency> <dependency> <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-interface-java</artifactId> + <artifactId>tuscany-databinding-axiom</artifactId> <version>2.0-Beta1-SNAPSHOT</version> <scope>compile</scope> </dependency> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-host-jetty</artifactId> - <version>2.0-Beta1-SNAPSHOT</version> - <scope>runtime</scope> - </dependency> + <dependency> <groupId>javax.xml.bind</groupId> <artifactId>jaxb-api</artifactId> diff --git a/sca-java-2.x/branches/2.0-Beta1/testing/itest/oneway/pom.xml b/sca-java-2.x/branches/2.0-Beta1/testing/itest/oneway/pom.xml index a4d5564cb5..a98846413e 100644 --- a/sca-java-2.x/branches/2.0-Beta1/testing/itest/oneway/pom.xml +++ b/sca-java-2.x/branches/2.0-Beta1/testing/itest/oneway/pom.xml @@ -30,35 +30,39 @@ <version>2.0-Beta1-SNAPSHOT</version> <dependencies> + <dependency> + <groupId>backport-util-concurrent</groupId> + <artifactId>backport-util-concurrent</artifactId> + <version>3.1</version> + </dependency> + <dependency> <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-node-api</artifactId> - <version>${pom.version}</version> + <artifactId>tuscany-core-runtime-pom</artifactId> + <version>2.0-Beta1-SNAPSHOT</version> + <type>pom</type> </dependency> - + <dependency> <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-node-impl</artifactId> - <version>${pom.version}</version> + <artifactId>tuscany-base-runtime-pom</artifactId> + <version>2.0-Beta1-SNAPSHOT</version> + <type>pom</type> + <scope>test</scope> </dependency> <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>tuscany-binding-ws-runtime-axis2</artifactId> - <version>${pom.version}</version> + <version>2.0-Beta1-SNAPSHOT</version> + <scope>test</scope> </dependency> <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>tuscany-host-jetty</artifactId> - <version>${pom.version}</version> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-implementation-java-runtime</artifactId> - <version>${pom.version}</version> - <scope>runtime</scope> - </dependency> + <version>2.0-Beta1-SNAPSHOT</version> + <scope>test</scope> + </dependency> </dependencies> </project> diff --git a/sca-java-2.x/branches/2.0-Beta1/testing/itest/service-reference/pom.xml b/sca-java-2.x/branches/2.0-Beta1/testing/itest/service-reference/pom.xml index 06c8037b58..75de7864a1 100644 --- a/sca-java-2.x/branches/2.0-Beta1/testing/itest/service-reference/pom.xml +++ b/sca-java-2.x/branches/2.0-Beta1/testing/itest/service-reference/pom.xml @@ -31,30 +31,25 @@ <dependencies> <dependency> <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-node-api</artifactId> + <artifactId>tuscany-core-runtime-pom</artifactId> <version>2.0-Beta1-SNAPSHOT</version> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-node-impl</artifactId> - <version>2.0-Beta1-SNAPSHOT</version> - <scope>test</scope> + <type>pom</type> </dependency> <dependency> <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-implementation-java-runtime</artifactId> + <artifactId>tuscany-base-runtime-pom</artifactId> <version>2.0-Beta1-SNAPSHOT</version> + <type>pom</type> <scope>test</scope> </dependency> - + <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>tuscany-binding-ws-runtime-axis2</artifactId> <version>2.0-Beta1-SNAPSHOT</version> <scope>test</scope> - </dependency> + </dependency> <dependency> <groupId>org.apache.tuscany.sca</groupId> |