diff options
31 files changed, 111 insertions, 583 deletions
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 bcfb8911d0..ee83f4f533 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 @@ -32,19 +32,12 @@ <dependencies> <dependency> <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-base-runtime-pom</artifactId> - <type>pom</type> + <artifactId>tuscany-base-runtime</artifactId> <version>2.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-binding-jms</artifactId> - <version>2.0-SNAPSHOT</version> - <scope>runtime</scope> - </dependency> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> <artifactId>tuscany-binding-jms-runtime</artifactId> <version>2.0-SNAPSHOT</version> <scope>runtime</scope> 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 2e01bee7c2..1d86415f5f 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 @@ -39,36 +39,17 @@ <dependencies> <dependency> <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-node-impl</artifactId> + <artifactId>tuscany-base-runtime</artifactId> <version>2.0-SNAPSHOT</version> </dependency> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-implementation-java-runtime</artifactId> - <version>2.0-SNAPSHOT</version> - <scope>runtime</scope> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-implementation-bpel-runtime</artifactId> - <version>2.0-SNAPSHOT</version> - <scope>runtime</scope> - </dependency> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-binding-ws-wsdlgen</artifactId> - <version>2.0-SNAPSHOT</version> - </dependency> - - <dependency> - <groupId>xerces</groupId> - <artifactId>xercesImpl</artifactId> - <version>2.8.1</version> - </dependency> - + <groupId>org.apache.tuscany.sca</groupId> + <artifactId>tuscany-implementation-bpel-runtime</artifactId> + <version>2.0-SNAPSHOT</version> + <scope>runtime</scope> + </dependency> + </dependencies> <build> diff --git a/sca-java-2.x/trunk/testing/itest/builder/pom.xml b/sca-java-2.x/trunk/testing/itest/builder/pom.xml index 1aa9bac007..b4851dacc2 100644 --- a/sca-java-2.x/trunk/testing/itest/builder/pom.xml +++ b/sca-java-2.x/trunk/testing/itest/builder/pom.xml @@ -31,8 +31,7 @@ <dependencies> <dependency> <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-base-runtime-pom</artifactId> - <type>pom</type> + <artifactId>tuscany-base-runtime</artifactId> <version>2.0-SNAPSHOT</version> </dependency> @@ -42,18 +41,12 @@ <version>2.0-SNAPSHOT</version> </dependency> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-host-jetty</artifactId> - <version>2.0-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>xerces</groupId> - <artifactId>xercesImpl</artifactId> - <version>2.8.1</version> - <scope>test</scope> - </dependency> + <groupId>org.mortbay.jetty</groupId> + <artifactId>jetty</artifactId> + <version>6.1.19</version> + </dependency> + </dependencies> <build> diff --git a/sca-java-2.x/trunk/testing/itest/callback-api/pom.xml b/sca-java-2.x/trunk/testing/itest/callback-api/pom.xml index 87ca4b67a0..93d48ac5db 100644 --- a/sca-java-2.x/trunk/testing/itest/callback-api/pom.xml +++ b/sca-java-2.x/trunk/testing/itest/callback-api/pom.xml @@ -29,25 +29,11 @@ <name>Apache Tuscany SCA iTest Callback API</name> <dependencies> - <dependency> + <dependency> <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-node-api</artifactId> + <artifactId>tuscany-base-runtime</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> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-implementation-java-runtime</artifactId> - <version>2.0-SNAPSHOT</version> - <scope>test</scope> - </dependency> </dependencies> diff --git a/sca-java-2.x/trunk/testing/itest/callback-basic/pom.xml b/sca-java-2.x/trunk/testing/itest/callback-basic/pom.xml index 029bb56247..7f0f3b5e54 100644 --- a/sca-java-2.x/trunk/testing/itest/callback-basic/pom.xml +++ b/sca-java-2.x/trunk/testing/itest/callback-basic/pom.xml @@ -29,25 +29,11 @@ <name>Apache Tuscany SCA iTest Callback Basic</name> <dependencies> - <dependency> + <dependency> <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-node-api</artifactId> + <artifactId>tuscany-base-runtime</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> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-implementation-java-runtime</artifactId> - <version>2.0-SNAPSHOT</version> - <scope>test</scope> - </dependency> </dependencies> diff --git a/sca-java-2.x/trunk/testing/itest/callback-complex-type/pom.xml b/sca-java-2.x/trunk/testing/itest/callback-complex-type/pom.xml index 726465f2b9..3cdbbb05aa 100644 --- a/sca-java-2.x/trunk/testing/itest/callback-complex-type/pom.xml +++ b/sca-java-2.x/trunk/testing/itest/callback-complex-type/pom.xml @@ -29,25 +29,11 @@ <name>Apache Tuscany SCA iTest Callback Complex Type</name> <dependencies> - <dependency> + <dependency> <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-node-api</artifactId> + <artifactId>tuscany-base-runtime</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> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-implementation-java-runtime</artifactId> - <version>2.0-SNAPSHOT</version> - <scope>test</scope> - </dependency> </dependencies> </project> diff --git a/sca-java-2.x/trunk/testing/itest/callback-multiple-wires/pom.xml b/sca-java-2.x/trunk/testing/itest/callback-multiple-wires/pom.xml index b29900c6ef..634e035039 100644 --- a/sca-java-2.x/trunk/testing/itest/callback-multiple-wires/pom.xml +++ b/sca-java-2.x/trunk/testing/itest/callback-multiple-wires/pom.xml @@ -29,25 +29,10 @@ <name>Apache Tuscany SCA iTest Callback With Mutiple Wires</name> <dependencies> - <dependency> + <dependency> <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-node-api</artifactId> + <artifactId>tuscany-base-runtime</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> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-implementation-java-runtime</artifactId> - <version>2.0-SNAPSHOT</version> - <scope>test</scope> - </dependency> - </dependencies> </project> diff --git a/sca-java-2.x/trunk/testing/itest/callback-separatethread/pom.xml b/sca-java-2.x/trunk/testing/itest/callback-separatethread/pom.xml index 99ecf2e312..993c7b8302 100644 --- a/sca-java-2.x/trunk/testing/itest/callback-separatethread/pom.xml +++ b/sca-java-2.x/trunk/testing/itest/callback-separatethread/pom.xml @@ -29,25 +29,10 @@ <name>Apache Tuscany SCA iTest Callback Using Separate Thread</name> <dependencies> - <dependency> + <dependency> <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-node-api</artifactId> + <artifactId>tuscany-base-runtime</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> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-implementation-java-runtime</artifactId> - <version>2.0-SNAPSHOT</version> - <scope>test</scope> - </dependency> - </dependencies> </project> 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 f077f6911c..08ab03471c 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 @@ -29,35 +29,23 @@ <name>Apache Tuscany SCA iTest Callback Two Composites</name> <dependencies> - <dependency> + <dependency> <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-core-runtime-pom</artifactId> + <artifactId>tuscany-base-runtime</artifactId> <version>2.0-SNAPSHOT</version> - <type>pom</type> </dependency> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-base-runtime-pom</artifactId> - <version>2.0-SNAPSHOT</version> - <type>pom</type> - <scope>test</scope> - </dependency> - - <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> - <artifactId>tuscany-host-jetty</artifactId> - <version>2.0-SNAPSHOT</version> - <scope>test</scope> + <groupId>org.mortbay.jetty</groupId> + <artifactId>jetty</artifactId> + <version>6.1.19</version> </dependency> - </dependencies> <properties> 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 fe09d799c2..a20ab12476 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 @@ -29,35 +29,23 @@ <name>Apache Tuscany SCA iTest Callback Two Nodes</name> <dependencies> - <dependency> + <dependency> <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-core-runtime-pom</artifactId> + <artifactId>tuscany-base-runtime</artifactId> <version>2.0-SNAPSHOT</version> - <type>pom</type> </dependency> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-base-runtime-pom</artifactId> - <version>2.0-SNAPSHOT</version> - <type>pom</type> - <scope>test</scope> - </dependency> - - <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> - <artifactId>tuscany-host-jetty</artifactId> - <version>2.0-SNAPSHOT</version> - <scope>test</scope> + <groupId>org.mortbay.jetty</groupId> + <artifactId>jetty</artifactId> + <version>6.1.19</version> </dependency> - <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>tuscany-domain-hazelcast</artifactId> diff --git a/sca-java-2.x/trunk/testing/itest/component-type/pom.xml b/sca-java-2.x/trunk/testing/itest/component-type/pom.xml index 4dc05305af..416f0067aa 100644 --- a/sca-java-2.x/trunk/testing/itest/component-type/pom.xml +++ b/sca-java-2.x/trunk/testing/itest/component-type/pom.xml @@ -31,23 +31,10 @@ <dependencies> <dependency> <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-node-api</artifactId> + <artifactId>tuscany-base-runtime</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>runtime</scope> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-implementation-java-runtime</artifactId> - <version>2.0-SNAPSHOT</version> - <scope>runtime</scope> - </dependency> </dependencies> </project> diff --git a/sca-java-2.x/trunk/testing/itest/contribution-folder/pom.xml b/sca-java-2.x/trunk/testing/itest/contribution-folder/pom.xml index 35e7bb03ae..fa44acc36f 100644 --- a/sca-java-2.x/trunk/testing/itest/contribution-folder/pom.xml +++ b/sca-java-2.x/trunk/testing/itest/contribution-folder/pom.xml @@ -29,18 +29,10 @@ <name>Apache Tuscany SCA iTest Contribution Folder</name> <dependencies> - <dependency> + <dependency> <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-node-impl</artifactId> + <artifactId>tuscany-base-runtime</artifactId> <version>2.0-SNAPSHOT</version> </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-implementation-java-runtime</artifactId> - <version>2.0-SNAPSHOT</version> - <scope>runtime</scope> - </dependency> - </dependencies> </project> diff --git a/sca-java-2.x/trunk/testing/itest/contribution-import-export/pom.xml b/sca-java-2.x/trunk/testing/itest/contribution-import-export/pom.xml index e64ff002e1..f9bced0907 100644 --- a/sca-java-2.x/trunk/testing/itest/contribution-import-export/pom.xml +++ b/sca-java-2.x/trunk/testing/itest/contribution-import-export/pom.xml @@ -41,16 +41,10 @@ </modules> <dependencies> - <dependency> + <dependency> <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-host-embedded</artifactId> - <version>1.6-SNAPSHOT</version> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-contribution-impl</artifactId> - <version>1.6-SNAPSHOT</version> + <artifactId>tuscany-base-runtime</artifactId> + <version>2.0-SNAPSHOT</version> </dependency> </dependencies> </project> diff --git a/sca-java-2.x/trunk/testing/itest/contribution-zip/pom.xml b/sca-java-2.x/trunk/testing/itest/contribution-zip/pom.xml index ecffbc155a..1957564c58 100644 --- a/sca-java-2.x/trunk/testing/itest/contribution-zip/pom.xml +++ b/sca-java-2.x/trunk/testing/itest/contribution-zip/pom.xml @@ -29,17 +29,10 @@ <name>Apache Tuscany SCA iTest Contribution ZIP</name> <dependencies> - <dependency> + <dependency> <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-node-impl</artifactId> + <artifactId>tuscany-base-runtime</artifactId> <version>2.0-SNAPSHOT</version> </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-implementation-java-runtime</artifactId> - <version>2.0-SNAPSHOT</version> - <scope>runtime</scope> - </dependency> </dependencies> </project> 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 c31c4a5be6..2749152253 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 @@ -57,51 +57,22 @@ </pluginRepositories> <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-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>test</scope> - </dependency> - <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-databinding-jaxb</artifactId> - <version>${pom.version}</version> - <scope>runtime</scope> + <artifactId>tuscany-base-runtime</artifactId> + <version>2.0-SNAPSHOT</version> </dependency> - <dependency> + <dependency> <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-databinding-axiom</artifactId> - <version>${pom.version}</version> - <scope>compile</scope> - </dependency> - + <artifactId>tuscany-binding-ws-runtime-axis2</artifactId> + <version>2.0-SNAPSHOT</version> + </dependency> + <dependency> - <groupId>javax.xml.bind</groupId> - <artifactId>jaxb-api</artifactId> - <version>2.1</version> - <scope>compile</scope> + <groupId>org.mortbay.jetty</groupId> + <artifactId>jetty</artifactId> + <version>6.1.19</version> </dependency> <dependency> @@ -110,19 +81,6 @@ <version>2.1.3</version> </dependency> - <!-- Added by Simon Nash --> - <dependency> - <groupId>commons-collections</groupId> - <artifactId>commons-collections</artifactId> - <version>3.1</version> - </dependency> - <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - <version>1.2.12</version> - <scope>provided</scope> - </dependency> - <!-- End of addition --> </dependencies> <build> 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 7d21f02682..42f0228c90 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 @@ -58,57 +58,22 @@ </pluginRepositories> <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-base-runtime-pom</artifactId> - <version>${pom.version}</version> - <type>pom</type> - <scope>test</scope> - </dependency> - - <dependency> + <dependency> <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-binding-ws-runtime-axis2</artifactId> + <artifactId>tuscany-base-runtime</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> - </dependency> - <dependency> + <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>tuscany-binding-ws-runtime-axis2</artifactId> <version>2.0-SNAPSHOT</version> - <scope>runtime</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-axiom</artifactId> - <version>2.0-SNAPSHOT</version> - <scope>compile</scope> - </dependency> + </dependency> <dependency> - <groupId>javax.xml.bind</groupId> - <artifactId>jaxb-api</artifactId> - <version>2.1</version> - <scope>compile</scope> + <groupId>org.mortbay.jetty</groupId> + <artifactId>jetty</artifactId> + <version>6.1.19</version> </dependency> <dependency> @@ -116,19 +81,7 @@ <artifactId>jaxws-rt</artifactId> <version>2.1.3</version> </dependency> - <!-- Added by Simon Nash --> - <dependency> - <groupId>commons-collections</groupId> - <artifactId>commons-collections</artifactId> - <version>3.1</version> - </dependency> - <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - <version>1.2.12</version> - <scope>provided</scope> - </dependency> - <!-- End of addition --> + </dependencies> <build> diff --git a/sca-java-2.x/trunk/testing/itest/exceptions/pom.xml b/sca-java-2.x/trunk/testing/itest/exceptions/pom.xml index 41dd198009..9c2be5113a 100644 --- a/sca-java-2.x/trunk/testing/itest/exceptions/pom.xml +++ b/sca-java-2.x/trunk/testing/itest/exceptions/pom.xml @@ -29,25 +29,11 @@ <name>Apache Tuscany SCA iTest Exceptions</name> <dependencies> - <dependency> + <dependency> <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-node-api</artifactId> + <artifactId>tuscany-base-runtime</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> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-implementation-java-runtime</artifactId> - <version>2.0-SNAPSHOT</version> - <scope>test</scope> - </dependency> </dependencies> </project> diff --git a/sca-java-2.x/trunk/testing/itest/interfaces/pom.xml b/sca-java-2.x/trunk/testing/itest/interfaces/pom.xml index 09a969d146..00c2e503b3 100644 --- a/sca-java-2.x/trunk/testing/itest/interfaces/pom.xml +++ b/sca-java-2.x/trunk/testing/itest/interfaces/pom.xml @@ -31,23 +31,8 @@ <dependencies> <dependency> <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-node-api</artifactId> + <artifactId>tuscany-base-runtime</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> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-implementation-java-runtime</artifactId> - <version>2.0-SNAPSHOT</version> - <scope>test</scope> - </dependency> - </dependencies> </project> 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 1d1c63085d..15297d7968 100644 --- a/sca-java-2.x/trunk/testing/itest/oneway/pom.xml +++ b/sca-java-2.x/trunk/testing/itest/oneway/pom.xml @@ -31,38 +31,21 @@ <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-core-runtime-pom</artifactId> - <version>${pom.version}</version> - <type>pom</type> + <artifactId>tuscany-base-runtime</artifactId> + <version>2.0-SNAPSHOT</version> </dependency> - <dependency> + <dependency> <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-base-runtime-pom</artifactId> - <version>${pom.version}</version> - <type>pom</type> - <scope>test</scope> - </dependency> + <artifactId>tuscany-binding-ws-runtime-axis2</artifactId> + <version>2.0-SNAPSHOT</version> + </dependency> <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-binding-ws-runtime-axis2</artifactId> - <version>${pom.version}</version> - <scope>test</scope> + <groupId>org.mortbay.jetty</groupId> + <artifactId>jetty</artifactId> + <version>6.1.19</version> </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-host-jetty</artifactId> - <version>${pom.version}</version> - <scope>test</scope> - </dependency> </dependencies> </project> diff --git a/sca-java-2.x/trunk/testing/itest/policies/pom.xml b/sca-java-2.x/trunk/testing/itest/policies/pom.xml index daa3e395f5..c15d9422d5 100644 --- a/sca-java-2.x/trunk/testing/itest/policies/pom.xml +++ b/sca-java-2.x/trunk/testing/itest/policies/pom.xml @@ -31,29 +31,23 @@ <dependencies> <dependency> <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-node-api</artifactId> + <artifactId>tuscany-base-runtime</artifactId> <version>2.0-SNAPSHOT</version> </dependency> - <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>tuscany-policy-logging</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> - </dependency> - + <!-- TODO: this test requires woodtox as it fails with the JDK parser which + presumably means Tuscany doesn't work properly without woodstox --> <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-implementation-java-runtime</artifactId> - <version>2.0-SNAPSHOT</version> - <scope>test</scope> + <groupId>org.codehaus.woodstox</groupId> + <artifactId>wstx-asl</artifactId> + <version>3.2.6</version> + <scope>runtime</scope> </dependency> + </dependencies> </project> diff --git a/sca-java-2.x/trunk/testing/itest/policy-transaction/pom.xml b/sca-java-2.x/trunk/testing/itest/policy-transaction/pom.xml index d18e19e957..25ec35ff12 100644 --- a/sca-java-2.x/trunk/testing/itest/policy-transaction/pom.xml +++ b/sca-java-2.x/trunk/testing/itest/policy-transaction/pom.xml @@ -31,30 +31,14 @@ <dependencies> <dependency> <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-node-api</artifactId> + <artifactId>tuscany-base-runtime</artifactId> <version>2.0-SNAPSHOT</version> </dependency> - <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>tuscany-policy-transaction-runtime-geronimo</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> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-implementation-java-runtime</artifactId> - <version>2.0-SNAPSHOT</version> - <scope>test</scope> - </dependency> - <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> diff --git a/sca-java-2.x/trunk/testing/itest/recursive-multi-level/pom.xml b/sca-java-2.x/trunk/testing/itest/recursive-multi-level/pom.xml index 3130da271c..954e531ba3 100644 --- a/sca-java-2.x/trunk/testing/itest/recursive-multi-level/pom.xml +++ b/sca-java-2.x/trunk/testing/itest/recursive-multi-level/pom.xml @@ -29,33 +29,10 @@ <name>Apache Tuscany SCA iTest Builder Recusive Multi-Level</name> <dependencies> - <dependency> + <dependency> <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-node-api</artifactId> + <artifactId>tuscany-base-runtime</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> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-implementation-java-runtime</artifactId> - <version>2.0-SNAPSHOT</version> - <scope>test</scope> - </dependency> - - <!-- XPathFactory --> - <dependency> - <groupId>xalan</groupId> - <artifactId>xalan</artifactId> - <version>2.7.1</version> - <scope>test</scope> - </dependency> - </dependencies> </project> diff --git a/sca-java-2.x/trunk/testing/itest/references/pom.xml b/sca-java-2.x/trunk/testing/itest/references/pom.xml index 9da71f2ee8..c9869383a2 100644 --- a/sca-java-2.x/trunk/testing/itest/references/pom.xml +++ b/sca-java-2.x/trunk/testing/itest/references/pom.xml @@ -31,22 +31,8 @@ <dependencies> <dependency> <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-node-api</artifactId> + <artifactId>tuscany-base-runtime</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> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-implementation-java-runtime</artifactId> - <version>2.0-SNAPSHOT</version> - <scope>test</scope> - </dependency> </dependencies> </project> diff --git a/sca-java-2.x/trunk/testing/itest/scaclient-api/pom.xml b/sca-java-2.x/trunk/testing/itest/scaclient-api/pom.xml index 795221292c..0ab8951521 100644 --- a/sca-java-2.x/trunk/testing/itest/scaclient-api/pom.xml +++ b/sca-java-2.x/trunk/testing/itest/scaclient-api/pom.xml @@ -29,18 +29,10 @@ <name>Apache Tuscany SCA iTest SCAClient API</name> <dependencies> - <dependency> + <dependency> <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-sca-client-impl</artifactId> + <artifactId>tuscany-base-runtime</artifactId> <version>2.0-SNAPSHOT</version> </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-implementation-java-runtime</artifactId> - <version>2.0-SNAPSHOT</version> - <scope>runtime</scope> - </dependency> - </dependencies> </project> diff --git a/sca-java-2.x/trunk/testing/itest/scdl/pom.xml b/sca-java-2.x/trunk/testing/itest/scdl/pom.xml index 54e1c132ec..a1f86c8171 100644 --- a/sca-java-2.x/trunk/testing/itest/scdl/pom.xml +++ b/sca-java-2.x/trunk/testing/itest/scdl/pom.xml @@ -30,31 +30,11 @@ <name>Apache Tuscany SCA iTest SCDL</name>
<dependencies>
- <dependency>
+ <dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-deployment</artifactId>
+ <artifactId>tuscany-base-runtime</artifactId>
<version>2.0-SNAPSHOT</version>
</dependency>
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-implementation-java</artifactId>
- <version>2.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-binding-jsonp</artifactId>
- <version>2.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-binding-rmi</artifactId>
- <version>2.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-binding-jms</artifactId>
- <version>2.0-SNAPSHOT</version>
- </dependency>
</dependencies>
<build>
diff --git a/sca-java-2.x/trunk/testing/itest/scdl/src/test/java/org/apache/tuscany/sca/itest/scdl/ValidateDependenciesTestCase.java b/sca-java-2.x/trunk/testing/itest/scdl/src/test/java/org/apache/tuscany/sca/itest/scdl/ValidateDependenciesTestCase.java index 7923492776..82b3706bc5 100644 --- a/sca-java-2.x/trunk/testing/itest/scdl/src/test/java/org/apache/tuscany/sca/itest/scdl/ValidateDependenciesTestCase.java +++ b/sca-java-2.x/trunk/testing/itest/scdl/src/test/java/org/apache/tuscany/sca/itest/scdl/ValidateDependenciesTestCase.java @@ -32,44 +32,13 @@ import org.junit.Test; *
* Current required jars are:
*
- * activation-1.1.jar
* asm-3.1.jar
- * geronimo-stax-api_1.0_spec-1.0.1.jar
- * jaxb-api-2.1.jar
- * jaxb-impl-2.1.12.jar
- * jaxws-api-2.1.jar
- * jsr181-api-1.0-MR1.jar
- * jsr250-api-1.0.jar
+ * cglib-2.2.jar
* junit-4.8.1.jar
- * tuscany-assembly-2.0-SNAPSHOT.jar
- * tuscany-assembly-xml-2.0-SNAPSHOT.jar
- * tuscany-assembly-xsd-2.0-SNAPSHOT.jar
- * tuscany-binding-http-2.0-SNAPSHOT.jar
- * tuscany-binding-jms-2.0-SNAPSHOT.jar
- * tuscany-binding-jsonp-2.0-SNAPSHOT.jar
- * tuscany-binding-rmi-2.0-SNAPSHOT.jar
- * tuscany-binding-ws-2.0-SNAPSHOT.jar
- * tuscany-builder-2.0-SNAPSHOT.jar
- * tuscany-common-java-2.0-SNAPSHOT.jar
- * tuscany-common-xml-2.0-SNAPSHOT.jar
- * tuscany-contribution-2.0-SNAPSHOT.jar
- * tuscany-core-spi-2.0-SNAPSHOT.jar
- * tuscany-databinding-2.0-SNAPSHOT.jar
- * tuscany-databinding-jaxb-2.0-SNAPSHOT.jar
- * tuscany-deployment-2.0-SNAPSHOT.jar
- * tuscany-extensibility-2.0-SNAPSHOT.jar
- * tuscany-implementation-java-2.0-SNAPSHOT.jar
- * tuscany-interface-java-2.0-SNAPSHOT.jar
- * tuscany-interface-java-jaxws-2.0-SNAPSHOT.jar
- * tuscany-interface-wsdl-2.0-SNAPSHOT.jar
- * tuscany-monitor-2.0-SNAPSHOT.jar
- * tuscany-sca-api-2.0-SNAPSHOT.jar
- * tuscany-xsd-2.0-SNAPSHOT.jar
+ * tuscany-base-runtime-2.0-SNAPSHOT.jar
* wsdl4j-1.6.2.jar
- * wstx-asl-3.2.4.jar
* XmlSchema-1.4.3.jar
*
- * TODO: WS binding drags in all runtime
*/
public class ValidateDependenciesTestCase {
@@ -80,6 +49,6 @@ public class ValidateDependenciesTestCase { Assert.assertTrue(dependenciesDir.exists());
File[] dependencyFiles = dependenciesDir.listFiles();
- Assert.assertEquals(36, dependencyFiles.length);
+ Assert.assertEquals(6, dependencyFiles.length);
}
}
diff --git a/sca-java-2.x/trunk/testing/itest/scdl/src/test/resources/test.composite b/sca-java-2.x/trunk/testing/itest/scdl/src/test/resources/test.composite index c0bb2bbc40..6fa81b6e47 100644 --- a/sca-java-2.x/trunk/testing/itest/scdl/src/test/resources/test.composite +++ b/sca-java-2.x/trunk/testing/itest/scdl/src/test/resources/test.composite @@ -43,9 +43,8 @@ <tuscany:binding.rmi/>
</service>
-<!-- TODO: leave out WS binding for now as it drags in entire runtime
<service name="WSService" promote="JavaComponent">
<binding.ws/>
</service>
--->
+
</composite>
diff --git a/sca-java-2.x/trunk/testing/itest/scopes/pom.xml b/sca-java-2.x/trunk/testing/itest/scopes/pom.xml index 4ba97f3062..f0f7e0e33d 100644 --- a/sca-java-2.x/trunk/testing/itest/scopes/pom.xml +++ b/sca-java-2.x/trunk/testing/itest/scopes/pom.xml @@ -31,24 +31,9 @@ <dependencies> <dependency> <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-node-api</artifactId> + <artifactId>tuscany-base-runtime</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> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-implementation-java-runtime</artifactId> - <version>2.0-SNAPSHOT</version> - <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 a0fe27ebed..03fa8c106b 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 @@ -29,33 +29,22 @@ <name>Apache Tuscany SCA iTest ServiceReference</name> <dependencies> - <dependency> + <dependency> <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-core-runtime-pom</artifactId> + <artifactId>tuscany-base-runtime</artifactId> <version>2.0-SNAPSHOT</version> - <type>pom</type> </dependency> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-base-runtime-pom</artifactId> - <version>2.0-SNAPSHOT</version> - <type>pom</type> - <scope>test</scope> - </dependency> - - <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> - <artifactId>tuscany-host-jetty</artifactId> - <version>2.0-SNAPSHOT</version> - <scope>test</scope> + <groupId>org.mortbay.jetty</groupId> + <artifactId>jetty</artifactId> + <version>6.1.19</version> </dependency> </dependencies> </project> diff --git a/sca-java-2.x/trunk/testing/itest/services/pom.xml b/sca-java-2.x/trunk/testing/itest/services/pom.xml index 7564ee1c9a..e2cef5f11b 100644 --- a/sca-java-2.x/trunk/testing/itest/services/pom.xml +++ b/sca-java-2.x/trunk/testing/itest/services/pom.xml @@ -31,23 +31,9 @@ <dependencies> <dependency> <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-node-api</artifactId> + <artifactId>tuscany-base-runtime</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> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-implementation-java-runtime</artifactId> - <version>2.0-SNAPSHOT</version> - <scope>test</scope> - </dependency> </dependencies> </project> diff --git a/sca-java-2.x/trunk/testing/itest/wires/pom.xml b/sca-java-2.x/trunk/testing/itest/wires/pom.xml index 73868c649e..29be85bdff 100644 --- a/sca-java-2.x/trunk/testing/itest/wires/pom.xml +++ b/sca-java-2.x/trunk/testing/itest/wires/pom.xml @@ -29,25 +29,10 @@ <name>Apache Tuscany SCA iTest Wires Basic</name> <dependencies> - <dependency> + <dependency> <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-node-api</artifactId> + <artifactId>tuscany-base-runtime</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> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-implementation-java-runtime</artifactId> - <version>2.0-SNAPSHOT</version> - <scope>test</scope> - </dependency> - </dependencies> </project> |