diff options
Diffstat (limited to '')
6 files changed, 60 insertions, 114 deletions
diff --git a/sca-java-2.x/trunk/testing/itest/callback-two-composites/pom.xml b/sca-java-2.x/trunk/testing/itest/callback-two-composites/pom.xml index 339b2179a5..f077f6911c 100644 --- a/sca-java-2.x/trunk/testing/itest/callback-two-composites/pom.xml +++ b/sca-java-2.x/trunk/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-SNAPSHOT</version> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-node-impl</artifactId> - <version>2.0-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-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-SNAPSHOT</version> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> <artifactId>tuscany-host-jetty</artifactId> <version>2.0-SNAPSHOT</version> <scope>test</scope> diff --git a/sca-java-2.x/trunk/testing/itest/callback-two-nodes/pom.xml b/sca-java-2.x/trunk/testing/itest/callback-two-nodes/pom.xml index 6413273d55..fe09d799c2 100644 --- a/sca-java-2.x/trunk/testing/itest/callback-two-nodes/pom.xml +++ b/sca-java-2.x/trunk/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-SNAPSHOT</version> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-node-impl</artifactId> - <version>2.0-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-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-SNAPSHOT</version> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> <artifactId>tuscany-host-jetty</artifactId> <version>2.0-SNAPSHOT</version> <scope>test</scope> 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 669c85ca19..c31c4a5be6 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 @@ -59,62 +59,44 @@ <dependencies> <dependency> <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-node-api</artifactId> + <artifactId>tuscany-core-runtime-pom</artifactId> <version>${pom.version}</version> + <type>pom</type> </dependency> <dependency> <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-node-impl</artifactId> + <artifactId>tuscany-base-runtime-pom</artifactId> <version>${pom.version}</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> + <scope>test</scope> </dependency> <dependency> <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-databinding-jaxb</artifactId> - <version>${pom.version}</version> - <scope>runtime</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> + <artifactId>tuscany-host-jetty</artifactId> <version>${pom.version}</version> - <scope>compile</scope> + <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 +109,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/trunk/testing/itest/databindings/jaxb-top-down/pom.xml b/sca-java-2.x/trunk/testing/itest/databindings/jaxb-top-down/pom.xml index be9d12f1e2..7d21f02682 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 @@ -60,62 +60,50 @@ <dependencies> <dependency> <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-node-api</artifactId> + <artifactId>tuscany-core-runtime-pom</artifactId> <version>${pom.version}</version> + <type>pom</type> </dependency> <dependency> <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-node-impl</artifactId> + <artifactId>tuscany-base-runtime-pom</artifactId> <version>${pom.version}</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-SNAPSHOT</version> - <scope>runtime</scope> + <scope>test</scope> </dependency> + <dependency> <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-databinding-jaxb</artifactId> - <version>2.0-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-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-SNAPSHOT</version> - <scope>compile</scope> + <scope>runtime</scope> </dependency> - <!-- dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>itest-databindings-common</artifactId> - <version>2.0-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-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-SNAPSHOT</version> <scope>compile</scope> </dependency> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-host-jetty</artifactId> - <version>2.0-SNAPSHOT</version> - <scope>runtime</scope> - </dependency> + <dependency> <groupId>javax.xml.bind</groupId> <artifactId>jaxb-api</artifactId> diff --git a/sca-java-2.x/trunk/testing/itest/oneway/pom.xml b/sca-java-2.x/trunk/testing/itest/oneway/pom.xml index b0ef9774e7..1d1c63085d 100644 --- a/sca-java-2.x/trunk/testing/itest/oneway/pom.xml +++ b/sca-java-2.x/trunk/testing/itest/oneway/pom.xml @@ -30,35 +30,39 @@ <version>2.0-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> + <artifactId>tuscany-core-runtime-pom</artifactId> <version>${pom.version}</version> + <type>pom</type> </dependency> - + <dependency> <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-node-impl</artifactId> + <artifactId>tuscany-base-runtime-pom</artifactId> <version>${pom.version}</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> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-host-jetty</artifactId> - <version>${pom.version}</version> + <scope>test</scope> </dependency> <dependency> <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-implementation-java-runtime</artifactId> + <artifactId>tuscany-host-jetty</artifactId> <version>${pom.version}</version> - <scope>runtime</scope> + <scope>test</scope> </dependency> </dependencies> </project> diff --git a/sca-java-2.x/trunk/testing/itest/service-reference/pom.xml b/sca-java-2.x/trunk/testing/itest/service-reference/pom.xml index ffd8d14fe6..a0fe27ebed 100644 --- a/sca-java-2.x/trunk/testing/itest/service-reference/pom.xml +++ b/sca-java-2.x/trunk/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-SNAPSHOT</version> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-node-impl</artifactId> - <version>2.0-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-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-SNAPSHOT</version> <scope>test</scope> - </dependency> + </dependency> <dependency> <groupId>org.apache.tuscany.sca</groupId> |