diff options
| author | nash <nash@13f79535-47bb-0310-9956-ffa450edef68> | 2010-03-19 10:20:34 +0000 |
|---|---|---|
| committer | nash <nash@13f79535-47bb-0310-9956-ffa450edef68> | 2010-03-19 10:20:34 +0000 |
| commit | 68880159482ab42f79fde72bf238919c8c643646 (patch) | |
| tree | f106371f2c9c3ec587ce110575f44977417c30f2 /sca-java-1.x/trunk/tutorials/travelsample | |
| parent | fcfed8fce6d28e5cdf8026b876597324364a2b42 (diff) | |
Fix incorrect pom dependencies in contributions directories (TUSCANY-3506)
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@925161 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'sca-java-1.x/trunk/tutorials/travelsample')
44 files changed, 177 insertions, 756 deletions
diff --git a/sca-java-1.x/trunk/tutorials/travelsample/contributions/blog-feed/pom.xml b/sca-java-1.x/trunk/tutorials/travelsample/contributions/blog-feed/pom.xml index c7f90cfba0..a7381b3c14 100644 --- a/sca-java-1.x/trunk/tutorials/travelsample/contributions/blog-feed/pom.xml +++ b/sca-java-1.x/trunk/tutorials/travelsample/contributions/blog-feed/pom.xml @@ -31,39 +31,27 @@ <dependencies>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-node-impl</artifactId>
+ <artifactId>tuscany-data-api</artifactId>
<version>${tuscany.version}</version>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-host-tomcat</artifactId>
- <version>${tuscany.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-implementation-java-runtime</artifactId>
- <version>${tuscany.version}</version>
- <scope>runtime</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-binding-atom</artifactId>
+ <artifactId>tuscany-binding-atom-abdera</artifactId>
<version>${tuscany.version}</version>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-binding-atom-abdera</artifactId>
+ <artifactId>tuscany-binding-rss-rome</artifactId>
<version>${tuscany.version}</version>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-binding-rss-rome</artifactId>
+ <artifactId>tuscany-implementation-java-runtime</artifactId>
<version>${tuscany.version}</version>
+ <scope>runtime</scope>
</dependency>
<dependency>
diff --git a/sca-java-1.x/trunk/tutorials/travelsample/contributions/car/pom.xml b/sca-java-1.x/trunk/tutorials/travelsample/contributions/car/pom.xml index 30ce5d7bb1..6d39e6d7f0 100644 --- a/sca-java-1.x/trunk/tutorials/travelsample/contributions/car/pom.xml +++ b/sca-java-1.x/trunk/tutorials/travelsample/contributions/car/pom.xml @@ -37,14 +37,9 @@ <dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-data-api</artifactId>
- <version>${tuscany.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
<artifactId>scatours-contribution-common</artifactId>
<version>${pom.version}</version>
+ <scope>provided</scope>
</dependency>
<dependency>
diff --git a/sca-java-1.x/trunk/tutorials/travelsample/contributions/common/pom.xml b/sca-java-1.x/trunk/tutorials/travelsample/contributions/common/pom.xml index 48d83ceba8..8956abcff9 100644 --- a/sca-java-1.x/trunk/tutorials/travelsample/contributions/common/pom.xml +++ b/sca-java-1.x/trunk/tutorials/travelsample/contributions/common/pom.xml @@ -36,12 +36,6 @@ </dependency>
<dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-data-api</artifactId>
- <version>${tuscany.version}</version>
- </dependency>
-
- <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.5</version>
diff --git a/sca-java-1.x/trunk/tutorials/travelsample/contributions/creditcard-payment-jaxb-policy/pom.xml b/sca-java-1.x/trunk/tutorials/travelsample/contributions/creditcard-payment-jaxb-policy/pom.xml index 207fab1320..ea0923d8c9 100644 --- a/sca-java-1.x/trunk/tutorials/travelsample/contributions/creditcard-payment-jaxb-policy/pom.xml +++ b/sca-java-1.x/trunk/tutorials/travelsample/contributions/creditcard-payment-jaxb-policy/pom.xml @@ -32,7 +32,7 @@ <dependencies> <dependency> <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-node-api</artifactId> + <artifactId>tuscany-sca-api</artifactId> <version>${tuscany.version}</version> </dependency> @@ -41,40 +41,40 @@ <artifactId>tuscany-interface-java-jaxws</artifactId> <version>${tuscany.version}</version> </dependency> - + <dependency> <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-node-impl</artifactId> + <artifactId>tuscany-implementation-java-runtime</artifactId> <version>${tuscany.version}</version> <scope>runtime</scope> </dependency> <dependency> <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-implementation-java-runtime</artifactId> + <artifactId>tuscany-binding-ws-axis2</artifactId> <version>${tuscany.version}</version> <scope>runtime</scope> </dependency> <dependency> <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-binding-jsonrpc-runtime</artifactId> + <artifactId>tuscany-node-api</artifactId> <version>${tuscany.version}</version> - <scope>runtime</scope> + <scope>test</scope> </dependency> <dependency> <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-binding-ws-axis2</artifactId> + <artifactId>tuscany-node-impl</artifactId> <version>${tuscany.version}</version> - <scope>runtime</scope> + <scope>test</scope> </dependency> <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>tuscany-host-jetty</artifactId> <version>${tuscany.version}</version> - <scope>runtime</scope> + <scope>test</scope> </dependency> <dependency> diff --git a/sca-java-1.x/trunk/tutorials/travelsample/contributions/creditcard-payment-jaxb/pom.xml b/sca-java-1.x/trunk/tutorials/travelsample/contributions/creditcard-payment-jaxb/pom.xml index ee15aae264..4f663e0af2 100644 --- a/sca-java-1.x/trunk/tutorials/travelsample/contributions/creditcard-payment-jaxb/pom.xml +++ b/sca-java-1.x/trunk/tutorials/travelsample/contributions/creditcard-payment-jaxb/pom.xml @@ -32,7 +32,7 @@ <dependencies>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-node-api</artifactId>
+ <artifactId>tuscany-sca-api</artifactId>
<version>${tuscany.version}</version>
</dependency>
@@ -41,40 +41,40 @@ <artifactId>tuscany-interface-java-jaxws</artifactId>
<version>${tuscany.version}</version>
</dependency>
-
+
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-node-impl</artifactId>
+ <artifactId>tuscany-implementation-java-runtime</artifactId>
<version>${tuscany.version}</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-implementation-java-runtime</artifactId>
+ <artifactId>tuscany-binding-ws-axis2</artifactId>
<version>${tuscany.version}</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-binding-jsonrpc-runtime</artifactId>
+ <artifactId>tuscany-node-api</artifactId>
<version>${tuscany.version}</version>
- <scope>runtime</scope>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-binding-ws-axis2</artifactId>
+ <artifactId>tuscany-node-impl</artifactId>
<version>${tuscany.version}</version>
- <scope>runtime</scope>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-host-jetty</artifactId>
<version>${tuscany.version}</version>
- <scope>runtime</scope>
+ <scope>test</scope>
</dependency>
<dependency>
diff --git a/sca-java-1.x/trunk/tutorials/travelsample/contributions/creditcard-payment-sdo/pom.xml b/sca-java-1.x/trunk/tutorials/travelsample/contributions/creditcard-payment-sdo/pom.xml index 56eafd7c07..ff894aee12 100644 --- a/sca-java-1.x/trunk/tutorials/travelsample/contributions/creditcard-payment-sdo/pom.xml +++ b/sca-java-1.x/trunk/tutorials/travelsample/contributions/creditcard-payment-sdo/pom.xml @@ -31,7 +31,7 @@ <dependencies> <dependency> <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-node-api</artifactId> + <artifactId>tuscany-sca-api</artifactId> <version>${tuscany.version}</version> </dependency> @@ -49,9 +49,8 @@ <dependency> <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-node-impl</artifactId> + <artifactId>tuscany-databinding-sdo</artifactId> <version>${tuscany.version}</version> - <scope>runtime</scope> </dependency> <dependency> @@ -63,22 +62,30 @@ <dependency> <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-databinding-sdo</artifactId> + <artifactId>tuscany-binding-ws-axis2</artifactId> <version>${tuscany.version}</version> + <scope>runtime</scope> </dependency> <dependency> <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-binding-ws-axis2</artifactId> + <artifactId>tuscany-node-api</artifactId> <version>${tuscany.version}</version> - <scope>runtime</scope> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>org.apache.tuscany.sca</groupId> + <artifactId>tuscany-node-impl</artifactId> + <version>${tuscany.version}</version> + <scope>test</scope> </dependency> <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>tuscany-host-jetty</artifactId> <version>${tuscany.version}</version> - <scope>runtime</scope> + <scope>test</scope> </dependency> <dependency> diff --git a/sca-java-1.x/trunk/tutorials/travelsample/contributions/creditcard-payment-webapp/build.xml b/sca-java-1.x/trunk/tutorials/travelsample/contributions/creditcard-payment-webapp/build.xml index 7c3a55c530..0b3926e913 100644 --- a/sca-java-1.x/trunk/tutorials/travelsample/contributions/creditcard-payment-webapp/build.xml +++ b/sca-java-1.x/trunk/tutorials/travelsample/contributions/creditcard-payment-webapp/build.xml @@ -41,8 +41,6 @@ <include name="tuscany-assembly-1.*.jar"/>
<include name="tuscany-assembly-xml-1.*.jar"/>
<include name="tuscany-assembly-xsd-1.*.jar"/>
- <include name="tuscany-binding-jsonrpc-1.*.jar"/>
- <include name="tuscany-binding-jsonrpc-runtime-1.*.jar"/>
<include name="tuscany-binding-sca-1.*.jar"/>
<include name="tuscany-binding-sca-xml-1.*.jar"/>
<include name="tuscany-binding-ws-1.*.jar"/>
@@ -63,14 +61,12 @@ <include name="tuscany-databinding-axiom-1.*.jar"/>
<include name="tuscany-databinding-jaxb-1.*.jar"/>
<include name="tuscany-databinding-jaxb-axiom-1.*.jar"/>
- <include name="tuscany-databinding-json-1.*.jar"/>
<include name="tuscany-definitions-1.*.jar"/>
<include name="tuscany-definitions-xml-1.*.jar"/>
<include name="tuscany-endpoint-1.*.jar"/>
<include name="tuscany-extensibility-1.*.jar"/>
<include name="tuscany-host-embedded-1.*.jar"/>
<include name="tuscany-host-http-1.*.jar"/>
- <include name="tuscany-host-jetty-1.*.jar"/>
<include name="tuscany-host-webapp-1.*.jar"/>
<include name="tuscany-implementation-java-1.*.jar"/>
<include name="tuscany-implementation-java-runtime-1.*.jar"/>
@@ -132,13 +128,8 @@ <include name="jaxen-1.1.1.jar"/>
<include name="jaxws-api-2.1.jar"/>
<include name="jdom-1.0.jar"/>
- <include name="jettison-1.0.1.jar"/>
- <include name="jetty-6.1.7.jar"/>
- <include name="jetty-util-6.1.7.jar"/>
- <include name="json-rpc-1.0.jar"/>
<include name="jsr181-api-1.0-MR1.jar"/>
<include name="jsr250-api-1.0.jar"/>
- <include name="junit-4.5.jar"/>
<include name="log4j-1.2.15.jar"/>
<include name="mail-1.4.jar"/>
<include name="mex-1.41-impl.jar"/>
diff --git a/sca-java-1.x/trunk/tutorials/travelsample/contributions/creditcard-payment-webapp/pom.xml b/sca-java-1.x/trunk/tutorials/travelsample/contributions/creditcard-payment-webapp/pom.xml index 46ed51704b..88b9cec19c 100644 --- a/sca-java-1.x/trunk/tutorials/travelsample/contributions/creditcard-payment-webapp/pom.xml +++ b/sca-java-1.x/trunk/tutorials/travelsample/contributions/creditcard-payment-webapp/pom.xml @@ -57,6 +57,7 @@ <groupId>org.apache.tuscany.sca</groupId>
<artifactId>scatours-contribution-creditcard-payment-jaxb</artifactId>
<version>${pom.version}</version>
+ <scope>runtime</scope>
</dependency>
</dependencies>
diff --git a/sca-java-1.x/trunk/tutorials/travelsample/contributions/currency-jms/pom.xml b/sca-java-1.x/trunk/tutorials/travelsample/contributions/currency-jms/pom.xml index ef1aa9fd3a..d2890508b2 100644 --- a/sca-java-1.x/trunk/tutorials/travelsample/contributions/currency-jms/pom.xml +++ b/sca-java-1.x/trunk/tutorials/travelsample/contributions/currency-jms/pom.xml @@ -31,12 +31,6 @@ <dependencies>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-node-impl</artifactId>
- <version>${tuscany.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-implementation-java-runtime</artifactId>
<version>${tuscany.version}</version>
<scope>runtime</scope>
@@ -50,12 +44,6 @@ </dependency>
<dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-host-jms-asf</artifactId>
- <version>${tuscany.version}</version>
- </dependency>
-
- <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.5</version>
diff --git a/sca-java-1.x/trunk/tutorials/travelsample/contributions/currency-jsp/pom.xml b/sca-java-1.x/trunk/tutorials/travelsample/contributions/currency-jsp/pom.xml index 5942d4f911..91fc29c370 100644 --- a/sca-java-1.x/trunk/tutorials/travelsample/contributions/currency-jsp/pom.xml +++ b/sca-java-1.x/trunk/tutorials/travelsample/contributions/currency-jsp/pom.xml @@ -30,14 +30,6 @@ <name>Apache Tuscany SCA Tours Currency Converter JSP Contribution</name>
<dependencies>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-sca-api</artifactId>
- <version>${tuscany.version}</version>
- <scope>compile</scope>
- </dependency>
-
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-implementation-web-runtime</artifactId>
@@ -56,6 +48,7 @@ <groupId>org.apache.tuscany.sca</groupId>
<artifactId>scatours-contribution-currency</artifactId>
<version>${pom.version}</version>
+ <scope>runtime</scope>
</dependency>
</dependencies>
diff --git a/sca-java-1.x/trunk/tutorials/travelsample/contributions/currency-ws/pom.xml b/sca-java-1.x/trunk/tutorials/travelsample/contributions/currency-ws/pom.xml index 5d309faa85..4a50cd4f43 100644 --- a/sca-java-1.x/trunk/tutorials/travelsample/contributions/currency-ws/pom.xml +++ b/sca-java-1.x/trunk/tutorials/travelsample/contributions/currency-ws/pom.xml @@ -31,12 +31,6 @@ <dependencies>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-node-impl</artifactId>
- <version>${tuscany.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-implementation-java-runtime</artifactId>
<version>${tuscany.version}</version>
<scope>runtime</scope>
diff --git a/sca-java-1.x/trunk/tutorials/travelsample/contributions/currency/pom.xml b/sca-java-1.x/trunk/tutorials/travelsample/contributions/currency/pom.xml index 0b35063efa..bd99e15850 100644 --- a/sca-java-1.x/trunk/tutorials/travelsample/contributions/currency/pom.xml +++ b/sca-java-1.x/trunk/tutorials/travelsample/contributions/currency/pom.xml @@ -31,7 +31,7 @@ <dependencies>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-node-impl</artifactId>
+ <artifactId>tuscany-sca-api</artifactId>
<version>${tuscany.version}</version>
</dependency>
diff --git a/sca-java-1.x/trunk/tutorials/travelsample/contributions/emailgateway/pom.xml b/sca-java-1.x/trunk/tutorials/travelsample/contributions/emailgateway/pom.xml index 3f0ade6681..789edbe475 100644 --- a/sca-java-1.x/trunk/tutorials/travelsample/contributions/emailgateway/pom.xml +++ b/sca-java-1.x/trunk/tutorials/travelsample/contributions/emailgateway/pom.xml @@ -32,7 +32,7 @@ <dependencies>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-node-impl</artifactId>
+ <artifactId>tuscany-sca-api</artifactId>
<version>${tuscany.version}</version>
</dependency>
@@ -45,23 +45,23 @@ <dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-binding-jsonrpc-runtime</artifactId>
+ <artifactId>tuscany-binding-ws-axis2</artifactId>
<version>${tuscany.version}</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-binding-ws-axis2</artifactId>
+ <artifactId>tuscany-host-jetty</artifactId>
<version>${tuscany.version}</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-host-jetty</artifactId>
+ <artifactId>tuscany-node-impl</artifactId>
<version>${tuscany.version}</version>
- <scope>runtime</scope>
+ <scope>test</scope>
</dependency>
<dependency>
diff --git a/sca-java-1.x/trunk/tutorials/travelsample/contributions/feed-logger/pom.xml b/sca-java-1.x/trunk/tutorials/travelsample/contributions/feed-logger/pom.xml index 71c287d873..7f7db730bc 100644 --- a/sca-java-1.x/trunk/tutorials/travelsample/contributions/feed-logger/pom.xml +++ b/sca-java-1.x/trunk/tutorials/travelsample/contributions/feed-logger/pom.xml @@ -31,39 +31,27 @@ <dependencies>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-node-impl</artifactId>
+ <artifactId>tuscany-sca-api</artifactId>
<version>${tuscany.version}</version>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-host-tomcat</artifactId>
- <version>${tuscany.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-implementation-java-runtime</artifactId>
- <version>${tuscany.version}</version>
- <scope>runtime</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-binding-atom</artifactId>
+ <artifactId>tuscany-binding-atom-abdera</artifactId>
<version>${tuscany.version}</version>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-binding-atom-abdera</artifactId>
+ <artifactId>tuscany-binding-rss-rome</artifactId>
<version>${tuscany.version}</version>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-binding-rss-rome</artifactId>
+ <artifactId>tuscany-implementation-java-runtime</artifactId>
<version>${tuscany.version}</version>
+ <scope>runtime</scope>
</dependency>
<dependency>
diff --git a/sca-java-1.x/trunk/tutorials/travelsample/contributions/flight/pom.xml b/sca-java-1.x/trunk/tutorials/travelsample/contributions/flight/pom.xml index 07659add09..53008cd555 100644 --- a/sca-java-1.x/trunk/tutorials/travelsample/contributions/flight/pom.xml +++ b/sca-java-1.x/trunk/tutorials/travelsample/contributions/flight/pom.xml @@ -37,14 +37,9 @@ <dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-data-api</artifactId>
- <version>${tuscany.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
<artifactId>scatours-contribution-common</artifactId>
<version>${pom.version}</version>
+ <scope>provided</scope>
</dependency>
<dependency>
diff --git a/sca-java-1.x/trunk/tutorials/travelsample/contributions/fullapp-bespoketrip/pom.xml b/sca-java-1.x/trunk/tutorials/travelsample/contributions/fullapp-bespoketrip/pom.xml index 19057cd8ca..6563d6c782 100644 --- a/sca-java-1.x/trunk/tutorials/travelsample/contributions/fullapp-bespoketrip/pom.xml +++ b/sca-java-1.x/trunk/tutorials/travelsample/contributions/fullapp-bespoketrip/pom.xml @@ -28,63 +28,7 @@ <artifactId>scatours-contribution-fullapp-bespoketrip</artifactId> <name>Apache Tuscany SCA Tours Full Application Bespoke Contribution</name> - <dependencies> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-node-impl</artifactId> - <version>${tuscany.version}</version> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-implementation-java-runtime</artifactId> - <version>${tuscany.version}</version> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-binding-ws-axis2</artifactId> - <version>${tuscany.version}</version> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-host-tomcat</artifactId> - <version>${tuscany.version}</version> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>4.5</version> - <scope>test</scope> - </dependency> - - </dependencies> - <build> - <finalName>${artifactId}</finalName> - <!-- - <plugins> - <plugin> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-maven-ant-generator</artifactId> - <version>${tuscany.version}</version> - <executions> - <execution> - <configuration> - <mainClass>scatours.LaunchNode</mainClass> - </configuration> - <goals> - <goal>generate</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - --> + <finalName>${artifactId}</finalName> </build> </project> diff --git a/sca-java-1.x/trunk/tutorials/travelsample/contributions/fullapp-coordination/pom.xml b/sca-java-1.x/trunk/tutorials/travelsample/contributions/fullapp-coordination/pom.xml index 3d802afef3..5ddadf2521 100644 --- a/sca-java-1.x/trunk/tutorials/travelsample/contributions/fullapp-coordination/pom.xml +++ b/sca-java-1.x/trunk/tutorials/travelsample/contributions/fullapp-coordination/pom.xml @@ -28,63 +28,7 @@ <artifactId>scatours-contribution-fullapp-coordination</artifactId> <name>Apache Tuscany SCA Tours Full Application Coordination Contribution</name> - <dependencies> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-node-impl</artifactId> - <version>${tuscany.version}</version> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-implementation-java-runtime</artifactId> - <version>${tuscany.version}</version> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-binding-ws-axis2</artifactId> - <version>${tuscany.version}</version> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-host-tomcat</artifactId> - <version>${tuscany.version}</version> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>4.5</version> - <scope>test</scope> - </dependency> - - </dependencies> - <build> - <finalName>${artifactId}</finalName> - <!-- - <plugins> - <plugin> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-maven-ant-generator</artifactId> - <version>${tuscany.version}</version> - <executions> - <execution> - <configuration> - <mainClass>scatours.LaunchNode</mainClass> - </configuration> - <goals> - <goal>generate</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - --> + <finalName>${artifactId}</finalName> </build> </project> diff --git a/sca-java-1.x/trunk/tutorials/travelsample/contributions/fullapp-currency/pom.xml b/sca-java-1.x/trunk/tutorials/travelsample/contributions/fullapp-currency/pom.xml index 3d80feca3b..076018b274 100644 --- a/sca-java-1.x/trunk/tutorials/travelsample/contributions/fullapp-currency/pom.xml +++ b/sca-java-1.x/trunk/tutorials/travelsample/contributions/fullapp-currency/pom.xml @@ -28,63 +28,7 @@ <artifactId>scatours-contribution-fullapp-currency</artifactId> <name>Apache Tuscany SCA Tours Full Application Currency Contribution</name> - <dependencies> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-node-impl</artifactId> - <version>${tuscany.version}</version> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-implementation-java-runtime</artifactId> - <version>${tuscany.version}</version> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-binding-ws-axis2</artifactId> - <version>${tuscany.version}</version> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-host-tomcat</artifactId> - <version>${tuscany.version}</version> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>4.5</version> - <scope>test</scope> - </dependency> - - </dependencies> - <build> - <finalName>${artifactId}</finalName> - <!-- - <plugins> - <plugin> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-maven-ant-generator</artifactId> - <version>${tuscany.version}</version> - <executions> - <execution> - <configuration> - <mainClass>scatours.LaunchNode</mainClass> - </configuration> - <goals> - <goal>generate</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - --> + <finalName>${artifactId}</finalName> </build> </project> diff --git a/sca-java-1.x/trunk/tutorials/travelsample/contributions/fullapp-packagedtrip/pom.xml b/sca-java-1.x/trunk/tutorials/travelsample/contributions/fullapp-packagedtrip/pom.xml index da1619db56..a1aa8e7913 100644 --- a/sca-java-1.x/trunk/tutorials/travelsample/contributions/fullapp-packagedtrip/pom.xml +++ b/sca-java-1.x/trunk/tutorials/travelsample/contributions/fullapp-packagedtrip/pom.xml @@ -28,63 +28,7 @@ <artifactId>scatours-contribution-fullapp-packagedtrip</artifactId> <name>Apache Tuscany SCA Tours Full Application Packaged Trip Contribution</name> - <dependencies> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-node-impl</artifactId> - <version>${tuscany.version}</version> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-implementation-java-runtime</artifactId> - <version>${tuscany.version}</version> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-binding-ws-axis2</artifactId> - <version>${tuscany.version}</version> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-host-tomcat</artifactId> - <version>${tuscany.version}</version> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>4.5</version> - <scope>test</scope> - </dependency> - - </dependencies> - <build> - <finalName>${artifactId}</finalName> - <!-- - <plugins> - <plugin> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-maven-ant-generator</artifactId> - <version>${tuscany.version}</version> - <executions> - <execution> - <configuration> - <mainClass>scatours.LaunchNode</mainClass> - </configuration> - <goals> - <goal>generate</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - --> + <finalName>${artifactId}</finalName> </build> </project> diff --git a/sca-java-1.x/trunk/tutorials/travelsample/contributions/fullapp-shoppingcart/pom.xml b/sca-java-1.x/trunk/tutorials/travelsample/contributions/fullapp-shoppingcart/pom.xml index 4be01a61e2..f2f02a2143 100644 --- a/sca-java-1.x/trunk/tutorials/travelsample/contributions/fullapp-shoppingcart/pom.xml +++ b/sca-java-1.x/trunk/tutorials/travelsample/contributions/fullapp-shoppingcart/pom.xml @@ -28,63 +28,7 @@ <artifactId>scatours-contribution-fullapp-shoppingcart</artifactId> <name>Apache Tuscany SCA Tours Full Application Shopping Cart Contribution</name> - <dependencies> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-node-impl</artifactId> - <version>${tuscany.version}</version> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-implementation-java-runtime</artifactId> - <version>${tuscany.version}</version> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-binding-ws-axis2</artifactId> - <version>${tuscany.version}</version> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-host-tomcat</artifactId> - <version>${tuscany.version}</version> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>4.5</version> - <scope>test</scope> - </dependency> - - </dependencies> - <build> - <finalName>${artifactId}</finalName> - <!-- - <plugins> - <plugin> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-maven-ant-generator</artifactId> - <version>${tuscany.version}</version> - <executions> - <execution> - <configuration> - <mainClass>scatours.LaunchNode</mainClass> - </configuration> - <goals> - <goal>generate</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - --> + <finalName>${artifactId}</finalName> </build> </project> diff --git a/sca-java-1.x/trunk/tutorials/travelsample/contributions/fullapp-ui/pom.xml b/sca-java-1.x/trunk/tutorials/travelsample/contributions/fullapp-ui/pom.xml index 36fdea630f..d7acb41d94 100644 --- a/sca-java-1.x/trunk/tutorials/travelsample/contributions/fullapp-ui/pom.xml +++ b/sca-java-1.x/trunk/tutorials/travelsample/contributions/fullapp-ui/pom.xml @@ -28,63 +28,7 @@ <artifactId>scatours-contribution-fullapp-ui</artifactId> <name>Apache Tuscany SCA Tours Full Application User Interface Contribution</name> - <dependencies> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-node-impl</artifactId> - <version>${tuscany.version}</version> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-implementation-java-runtime</artifactId> - <version>${tuscany.version}</version> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-binding-ws-axis2</artifactId> - <version>${tuscany.version}</version> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-host-tomcat</artifactId> - <version>${tuscany.version}</version> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>4.5</version> - <scope>test</scope> - </dependency> - - </dependencies> - <build> - <finalName>${artifactId}</finalName> - <!-- - <plugins> - <plugin> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-maven-ant-generator</artifactId> - <version>${tuscany.version}</version> - <executions> - <execution> - <configuration> - <mainClass>scatours.LaunchNode</mainClass> - </configuration> - <goals> - <goal>generate</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - --> + <finalName>${artifactId}</finalName> </build> </project> diff --git a/sca-java-1.x/trunk/tutorials/travelsample/contributions/help-pages/pom.xml b/sca-java-1.x/trunk/tutorials/travelsample/contributions/help-pages/pom.xml index cf8985ffe7..91360b9594 100644 --- a/sca-java-1.x/trunk/tutorials/travelsample/contributions/help-pages/pom.xml +++ b/sca-java-1.x/trunk/tutorials/travelsample/contributions/help-pages/pom.xml @@ -31,12 +31,6 @@ <dependencies>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-node-impl</artifactId>
- <version>${tuscany.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-implementation-resource-runtime</artifactId>
<version>${tuscany.version}</version>
<scope>runtime</scope>
@@ -48,24 +42,9 @@ <version>${tuscany.version}</version>
<scope>runtime</scope>
</dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-host-tomcat</artifactId>
- <version>${tuscany.version}</version>
- <scope>runtime</scope>
- </dependency>
-
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.5</version>
- <scope>test</scope>
- </dependency>
-
</dependencies>
<build>
- <finalName>${artifactId}</finalName>
+ <finalName>${artifactId}</finalName>
</build>
</project>
diff --git a/sca-java-1.x/trunk/tutorials/travelsample/contributions/hotel/pom.xml b/sca-java-1.x/trunk/tutorials/travelsample/contributions/hotel/pom.xml index edba61164c..55b3bc193d 100644 --- a/sca-java-1.x/trunk/tutorials/travelsample/contributions/hotel/pom.xml +++ b/sca-java-1.x/trunk/tutorials/travelsample/contributions/hotel/pom.xml @@ -37,23 +37,10 @@ <dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-data-api</artifactId>
- <version>${tuscany.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
<artifactId>scatours-contribution-common</artifactId>
<version>${pom.version}</version>
+ <scope>provided</scope>
</dependency>
-
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.5</version>
- <scope>test</scope>
- </dependency>
-
</dependencies>
<build>
diff --git a/sca-java-1.x/trunk/tutorials/travelsample/contributions/interaction-client/pom.xml b/sca-java-1.x/trunk/tutorials/travelsample/contributions/interaction-client/pom.xml index 3005f3512c..59025a3a54 100644 --- a/sca-java-1.x/trunk/tutorials/travelsample/contributions/interaction-client/pom.xml +++ b/sca-java-1.x/trunk/tutorials/travelsample/contributions/interaction-client/pom.xml @@ -39,34 +39,39 @@ <groupId>org.apache.tuscany.sca</groupId> <artifactId>scatours-contribution-common</artifactId> <version>${pom.version}</version> + <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>scatours-contribution-calendar</artifactId> <version>${pom.version}</version> + <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>scatours-contribution-hotel</artifactId> <version>${pom.version}</version> + <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>scatours-contribution-currency</artifactId> <version>${pom.version}</version> + <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>scatours-contribution-shoppingcart</artifactId> <version>${pom.version}</version> + <scope>provided</scope> </dependency> </dependencies> <build> - <finalName>${artifactId}</finalName> + <finalName>${artifactId}</finalName> </build> </project> diff --git a/sca-java-1.x/trunk/tutorials/travelsample/contributions/interaction-service-remote/pom.xml b/sca-java-1.x/trunk/tutorials/travelsample/contributions/interaction-service-remote/pom.xml index 42febd7986..417557f0ae 100644 --- a/sca-java-1.x/trunk/tutorials/travelsample/contributions/interaction-service-remote/pom.xml +++ b/sca-java-1.x/trunk/tutorials/travelsample/contributions/interaction-service-remote/pom.xml @@ -28,30 +28,7 @@ <artifactId>scatours-contribution-interaction-service-remote</artifactId> <name>Apache Tuscany SCA Tours Interaction Service Remote Contribution</name> - <dependencies> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>scatours-contribution-common</artifactId> - <version>${pom.version}</version> - <scope>runtime</scope> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>scatours-contribution-flight</artifactId> - <version>${pom.version}</version> - <scope>runtime</scope> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>scatours-contribution-hotel</artifactId> - <version>${pom.version}</version> - <scope>runtime</scope> - </dependency> - </dependencies> - <build> - <finalName>${artifactId}</finalName> + <finalName>${artifactId}</finalName> </build> </project> diff --git a/sca-java-1.x/trunk/tutorials/travelsample/contributions/introducing-client/pom.xml b/sca-java-1.x/trunk/tutorials/travelsample/contributions/introducing-client/pom.xml index 6abf8cd0c0..efbfec8179 100644 --- a/sca-java-1.x/trunk/tutorials/travelsample/contributions/introducing-client/pom.xml +++ b/sca-java-1.x/trunk/tutorials/travelsample/contributions/introducing-client/pom.xml @@ -39,10 +39,11 @@ <groupId>org.apache.tuscany.sca</groupId>
<artifactId>scatours-contribution-introducing-tours</artifactId>
<version>${pom.version}</version>
+ <scope>provided</scope>
</dependency>
</dependencies>
<build>
- <finalName>${artifactId}</finalName>
+ <finalName>${artifactId}</finalName>
</build>
</project>
diff --git a/sca-java-1.x/trunk/tutorials/travelsample/contributions/notification-corba/pom.xml b/sca-java-1.x/trunk/tutorials/travelsample/contributions/notification-corba/pom.xml index 97270535fc..2cc112c887 100644 --- a/sca-java-1.x/trunk/tutorials/travelsample/contributions/notification-corba/pom.xml +++ b/sca-java-1.x/trunk/tutorials/travelsample/contributions/notification-corba/pom.xml @@ -31,27 +31,13 @@ <dependencies>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-node-impl</artifactId>
- <version>${tuscany.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-implementation-java-runtime</artifactId>
+ <artifactId>tuscany-binding-corba-runtime</artifactId>
<version>${tuscany.version}</version>
<scope>runtime</scope>
</dependency>
-
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.5</version>
- <scope>test</scope>
- </dependency>
-
</dependencies>
<build>
- <finalName>${artifactId}</finalName>
+ <finalName>${artifactId}</finalName>
</build>
</project>
diff --git a/sca-java-1.x/trunk/tutorials/travelsample/contributions/notification-ejb/pom.xml b/sca-java-1.x/trunk/tutorials/travelsample/contributions/notification-ejb/pom.xml index 4838978d1c..4a51f1d27f 100644 --- a/sca-java-1.x/trunk/tutorials/travelsample/contributions/notification-ejb/pom.xml +++ b/sca-java-1.x/trunk/tutorials/travelsample/contributions/notification-ejb/pom.xml @@ -31,26 +31,13 @@ <dependencies>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-node-impl</artifactId>
- <version>${tuscany.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-implementation-java-runtime</artifactId>
+ <artifactId>tuscany-binding-ejb-runtime</artifactId>
<version>${tuscany.version}</version>
<scope>runtime</scope>
- </dependency>
-
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.5</version>
- <scope>test</scope>
- </dependency>
+ </dependency>
</dependencies>
<build>
- <finalName>${artifactId}</finalName>
+ <finalName>${artifactId}</finalName>
</build>
</project>
diff --git a/sca-java-1.x/trunk/tutorials/travelsample/contributions/notification-jms/pom.xml b/sca-java-1.x/trunk/tutorials/travelsample/contributions/notification-jms/pom.xml index 51c70da9b0..bd4740eec7 100644 --- a/sca-java-1.x/trunk/tutorials/travelsample/contributions/notification-jms/pom.xml +++ b/sca-java-1.x/trunk/tutorials/travelsample/contributions/notification-jms/pom.xml @@ -31,27 +31,13 @@ <dependencies>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-node-impl</artifactId>
- <version>${tuscany.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-implementation-java-runtime</artifactId>
+ <artifactId>tuscany-binding-jms-runtime</artifactId>
<version>${tuscany.version}</version>
<scope>runtime</scope>
- </dependency>
-
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.5</version>
- <scope>test</scope>
- </dependency>
-
+ </dependency>
</dependencies>
<build>
- <finalName>${artifactId}</finalName>
+ <finalName>${artifactId}</finalName>
</build>
</project>
diff --git a/sca-java-1.x/trunk/tutorials/travelsample/contributions/notification-rmi/pom.xml b/sca-java-1.x/trunk/tutorials/travelsample/contributions/notification-rmi/pom.xml index 2d9761ad29..ba86efbecf 100644 --- a/sca-java-1.x/trunk/tutorials/travelsample/contributions/notification-rmi/pom.xml +++ b/sca-java-1.x/trunk/tutorials/travelsample/contributions/notification-rmi/pom.xml @@ -31,27 +31,13 @@ <dependencies>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-node-impl</artifactId>
- <version>${tuscany.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-implementation-java-runtime</artifactId>
+ <artifactId>tuscany-binding-rmi-runtime</artifactId>
<version>${tuscany.version}</version>
<scope>runtime</scope>
- </dependency>
-
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.5</version>
- <scope>test</scope>
- </dependency>
-
+ </dependency>
</dependencies>
<build>
- <finalName>${artifactId}</finalName>
+ <finalName>${artifactId}</finalName>
</build>
</project>
diff --git a/sca-java-1.x/trunk/tutorials/travelsample/contributions/notification-ws/pom.xml b/sca-java-1.x/trunk/tutorials/travelsample/contributions/notification-ws/pom.xml index 6d4bf325d3..95dc266d38 100644 --- a/sca-java-1.x/trunk/tutorials/travelsample/contributions/notification-ws/pom.xml +++ b/sca-java-1.x/trunk/tutorials/travelsample/contributions/notification-ws/pom.xml @@ -31,24 +31,10 @@ <dependencies>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-node-impl</artifactId>
- <version>${tuscany.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-implementation-java-runtime</artifactId>
+ <artifactId>tuscany-binding-ws-axis2</artifactId>
<version>${tuscany.version}</version>
<scope>runtime</scope>
- </dependency>
-
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.5</version>
- <scope>test</scope>
- </dependency>
-
+ </dependency>
</dependencies>
<build>
diff --git a/sca-java-1.x/trunk/tutorials/travelsample/contributions/notification/pom.xml b/sca-java-1.x/trunk/tutorials/travelsample/contributions/notification/pom.xml index e8d93e1697..0f4e682e24 100644 --- a/sca-java-1.x/trunk/tutorials/travelsample/contributions/notification/pom.xml +++ b/sca-java-1.x/trunk/tutorials/travelsample/contributions/notification/pom.xml @@ -31,7 +31,7 @@ <dependencies>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-node-impl</artifactId>
+ <artifactId>tuscany-sca-api</artifactId>
<version>${tuscany.version}</version>
</dependency>
@@ -41,17 +41,9 @@ <version>${tuscany.version}</version>
<scope>runtime</scope>
</dependency>
-
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.5</version>
- <scope>test</scope>
- </dependency>
-
</dependencies>
<build>
- <finalName>${artifactId}</finalName>
+ <finalName>${artifactId}</finalName>
</build>
</project>
diff --git a/sca-java-1.x/trunk/tutorials/travelsample/contributions/payment-bpel/pom.xml b/sca-java-1.x/trunk/tutorials/travelsample/contributions/payment-bpel/pom.xml index 3cf859b5eb..5ac4da779c 100644 --- a/sca-java-1.x/trunk/tutorials/travelsample/contributions/payment-bpel/pom.xml +++ b/sca-java-1.x/trunk/tutorials/travelsample/contributions/payment-bpel/pom.xml @@ -31,12 +31,6 @@ <dependencies> <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-node-api</artifactId> - <version>${tuscany.version}</version> - </dependency> - - <dependency> <groupId>javax.xml.bind</groupId> <artifactId>jaxb-api</artifactId> <version>2.1</version> @@ -56,37 +50,37 @@ <dependency> <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-node-impl</artifactId> + <artifactId>tuscany-implementation-java-runtime</artifactId> <version>${tuscany.version}</version> <scope>runtime</scope> </dependency> <dependency> <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-implementation-java-runtime</artifactId> + <artifactId>tuscany-implementation-bpel-ode</artifactId> <version>${tuscany.version}</version> <scope>runtime</scope> </dependency> <dependency> <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-implementation-bpel-ode</artifactId> + <artifactId>tuscany-binding-ws-axis2</artifactId> <version>${tuscany.version}</version> <scope>runtime</scope> </dependency> <dependency> <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-binding-ws-axis2</artifactId> + <artifactId>tuscany-host-jetty</artifactId> <version>${tuscany.version}</version> - <scope>runtime</scope> + <scope>test</scope> </dependency> <dependency> <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-host-jetty</artifactId> + <artifactId>tuscany-node-impl</artifactId> <version>${tuscany.version}</version> - <scope>runtime</scope> + <scope>test</scope> </dependency> <dependency> diff --git a/sca-java-1.x/trunk/tutorials/travelsample/contributions/payment-groovy/pom.xml b/sca-java-1.x/trunk/tutorials/travelsample/contributions/payment-groovy/pom.xml index bd33f12b75..523e1a8c24 100644 --- a/sca-java-1.x/trunk/tutorials/travelsample/contributions/payment-groovy/pom.xml +++ b/sca-java-1.x/trunk/tutorials/travelsample/contributions/payment-groovy/pom.xml @@ -30,47 +30,42 @@ <name>Apache Tuscany SCA Tours Payment Groovy Contribution</name> <dependencies> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-node-impl</artifactId> - <version>${tuscany.version}</version> - </dependency> <dependency> <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-implementation-java-runtime</artifactId> + <artifactId>tuscany-implementation-script</artifactId> <version>${tuscany.version}</version> <scope>runtime</scope> </dependency> <dependency> <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-implementation-script</artifactId> + <artifactId>tuscany-binding-ws-axis2</artifactId> <version>${tuscany.version}</version> <scope>runtime</scope> </dependency> <dependency> <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-binding-jsonrpc-runtime</artifactId> + <artifactId>tuscany-implementation-java-runtime</artifactId> <version>${tuscany.version}</version> - <scope>runtime</scope> + <scope>test</scope> </dependency> <dependency> <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-binding-ws-axis2</artifactId> + <artifactId>tuscany-host-jetty</artifactId> <version>${tuscany.version}</version> - <scope>runtime</scope> + <scope>test</scope> </dependency> - + <dependency> <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-host-jetty</artifactId> + <artifactId>tuscany-node-impl</artifactId> <version>${tuscany.version}</version> - <scope>runtime</scope> + <scope>test</scope> </dependency> - + <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> diff --git a/sca-java-1.x/trunk/tutorials/travelsample/contributions/payment-java-policy/pom.xml b/sca-java-1.x/trunk/tutorials/travelsample/contributions/payment-java-policy/pom.xml index e4d416fee2..69bf9229db 100644 --- a/sca-java-1.x/trunk/tutorials/travelsample/contributions/payment-java-policy/pom.xml +++ b/sca-java-1.x/trunk/tutorials/travelsample/contributions/payment-java-policy/pom.xml @@ -32,20 +32,21 @@ <dependencies> <dependency> <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-node-impl</artifactId> + <artifactId>tuscany-sca-api</artifactId> <version>${tuscany.version}</version> </dependency> +<!-- <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-implementation-java-runtime</artifactId> - <version>${tuscany.version}</version> - <scope>runtime</scope> + <groupId>javax.annotation</groupId> + <artifactId>jsr250-api</artifactId> + <version>1.0</version> </dependency> +--> <dependency> <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-binding-jsonrpc-runtime</artifactId> + <artifactId>tuscany-implementation-java-runtime</artifactId> <version>${tuscany.version}</version> <scope>runtime</scope> </dependency> @@ -59,31 +60,32 @@ <dependency> <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-host-jetty</artifactId> + <artifactId>tuscany-policy-security</artifactId> <version>${tuscany.version}</version> <scope>runtime</scope> </dependency> +<!-- <dependency> <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-policy-security</artifactId> + <artifactId>tuscany-policy-transaction</artifactId> <version>${tuscany.version}</version> <scope>runtime</scope> </dependency> +--> -<!-- <dependency> <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-policy-transaction</artifactId> + <artifactId>tuscany-host-jetty</artifactId> <version>${tuscany.version}</version> - <scope>runtime</scope> + <scope>test</scope> </dependency> ---> <dependency> - <groupId>javax.annotation</groupId> - <artifactId>jsr250-api</artifactId> - <version>1.0</version> + <groupId>org.apache.tuscany.sca</groupId> + <artifactId>tuscany-node-impl</artifactId> + <version>${tuscany.version}</version> + <scope>test</scope> </dependency> <dependency> diff --git a/sca-java-1.x/trunk/tutorials/travelsample/contributions/payment-java/pom.xml b/sca-java-1.x/trunk/tutorials/travelsample/contributions/payment-java/pom.xml index a8a873e132..5e81879131 100644 --- a/sca-java-1.x/trunk/tutorials/travelsample/contributions/payment-java/pom.xml +++ b/sca-java-1.x/trunk/tutorials/travelsample/contributions/payment-java/pom.xml @@ -32,7 +32,7 @@ <dependencies> <dependency> <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-node-impl</artifactId> + <artifactId>tuscany-sca-api</artifactId> <version>${tuscany.version}</version> </dependency> @@ -45,13 +45,6 @@ <dependency> <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-binding-jsonrpc-runtime</artifactId> - <version>${tuscany.version}</version> - <scope>runtime</scope> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> <artifactId>tuscany-binding-ws-axis2</artifactId> <version>${tuscany.version}</version> <scope>runtime</scope> @@ -59,22 +52,16 @@ <dependency> <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-host-jetty</artifactId> + <artifactId>tuscany-node-impl</artifactId> <version>${tuscany.version}</version> - <scope>runtime</scope> + <scope>test</scope> </dependency> <dependency> <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-policy-security</artifactId> + <artifactId>tuscany-host-jetty</artifactId> <version>${tuscany.version}</version> - <scope>runtime</scope> - </dependency> - - <dependency> - <groupId>javax.annotation</groupId> - <artifactId>jsr250-api</artifactId> - <version>1.0</version> + <scope>test</scope> </dependency> <dependency> diff --git a/sca-java-1.x/trunk/tutorials/travelsample/contributions/payment-spring-policy/pom.xml b/sca-java-1.x/trunk/tutorials/travelsample/contributions/payment-spring-policy/pom.xml index ff241a81b8..92c169b68a 100644 --- a/sca-java-1.x/trunk/tutorials/travelsample/contributions/payment-spring-policy/pom.xml +++ b/sca-java-1.x/trunk/tutorials/travelsample/contributions/payment-spring-policy/pom.xml @@ -32,7 +32,7 @@ <dependencies> <dependency> <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-node-impl</artifactId> + <artifactId>tuscany-sca-api</artifactId> <version>${tuscany.version}</version> </dependency> @@ -45,40 +45,40 @@ <dependency> <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-binding-jsonrpc-runtime</artifactId> + <artifactId>tuscany-binding-ws-axis2</artifactId> <version>${tuscany.version}</version> <scope>runtime</scope> </dependency> + <!-- + https://issues.apache.org/jira/browse/TUSCANY-3069 + --> <dependency> <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-binding-ws-axis2</artifactId> + <artifactId>tuscany-implementation-spring</artifactId> <version>${tuscany.version}</version> <scope>runtime</scope> </dependency> <dependency> <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-host-jetty</artifactId> + <artifactId>tuscany-implementation-spring-runtime</artifactId> <version>${tuscany.version}</version> <scope>runtime</scope> </dependency> - <!-- - https://issues.apache.org/jira/browse/TUSCANY-3069 - --> <dependency> <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-implementation-spring</artifactId> + <artifactId>tuscany-host-jetty</artifactId> <version>${tuscany.version}</version> - <scope>runtime</scope> + <scope>test</scope> </dependency> <dependency> <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-implementation-spring-runtime</artifactId> + <artifactId>tuscany-node-impl</artifactId> <version>${tuscany.version}</version> - <scope>runtime</scope> + <scope>test</scope> </dependency> <dependency> diff --git a/sca-java-1.x/trunk/tutorials/travelsample/contributions/payment-spring-scatag/pom.xml b/sca-java-1.x/trunk/tutorials/travelsample/contributions/payment-spring-scatag/pom.xml index d5cd4905a1..f1ab200d64 100644 --- a/sca-java-1.x/trunk/tutorials/travelsample/contributions/payment-spring-scatag/pom.xml +++ b/sca-java-1.x/trunk/tutorials/travelsample/contributions/payment-spring-scatag/pom.xml @@ -32,7 +32,7 @@ <dependencies> <dependency> <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-node-impl</artifactId> + <artifactId>tuscany-sca-api</artifactId> <version>${tuscany.version}</version> </dependency> @@ -45,40 +45,40 @@ <dependency> <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-binding-jsonrpc-runtime</artifactId> + <artifactId>tuscany-binding-ws-axis2</artifactId> <version>${tuscany.version}</version> <scope>runtime</scope> </dependency> + <!-- + https://issues.apache.org/jira/browse/TUSCANY-3069 + --> <dependency> <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-binding-ws-axis2</artifactId> + <artifactId>tuscany-implementation-spring</artifactId> <version>${tuscany.version}</version> <scope>runtime</scope> </dependency> <dependency> <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-host-jetty</artifactId> + <artifactId>tuscany-implementation-spring-runtime</artifactId> <version>${tuscany.version}</version> <scope>runtime</scope> </dependency> - <!-- - https://issues.apache.org/jira/browse/TUSCANY-3069 - --> <dependency> <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-implementation-spring</artifactId> + <artifactId>tuscany-host-jetty</artifactId> <version>${tuscany.version}</version> - <scope>runtime</scope> + <scope>test</scope> </dependency> <dependency> <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-implementation-spring-runtime</artifactId> + <artifactId>tuscany-node-impl</artifactId> <version>${tuscany.version}</version> - <scope>runtime</scope> + <scope>test</scope> </dependency> <dependency> diff --git a/sca-java-1.x/trunk/tutorials/travelsample/contributions/payment-spring/pom.xml b/sca-java-1.x/trunk/tutorials/travelsample/contributions/payment-spring/pom.xml index 9be05ec4de..4c963f4b99 100644 --- a/sca-java-1.x/trunk/tutorials/travelsample/contributions/payment-spring/pom.xml +++ b/sca-java-1.x/trunk/tutorials/travelsample/contributions/payment-spring/pom.xml @@ -32,7 +32,7 @@ <dependencies> <dependency> <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-node-impl</artifactId> + <artifactId>tuscany-sca-api</artifactId> <version>${tuscany.version}</version> </dependency> @@ -45,40 +45,40 @@ <dependency> <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-binding-jsonrpc-runtime</artifactId> + <artifactId>tuscany-binding-ws-axis2</artifactId> <version>${tuscany.version}</version> <scope>runtime</scope> </dependency> + <!-- + https://issues.apache.org/jira/browse/TUSCANY-3069 + --> <dependency> <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-binding-ws-axis2</artifactId> + <artifactId>tuscany-implementation-spring</artifactId> <version>${tuscany.version}</version> <scope>runtime</scope> </dependency> <dependency> <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-host-jetty</artifactId> + <artifactId>tuscany-implementation-spring-runtime</artifactId> <version>${tuscany.version}</version> <scope>runtime</scope> </dependency> - <!-- - https://issues.apache.org/jira/browse/TUSCANY-3069 - --> <dependency> <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-implementation-spring</artifactId> + <artifactId>tuscany-host-jetty</artifactId> <version>${tuscany.version}</version> - <scope>runtime</scope> + <scope>test</scope> </dependency> <dependency> <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-implementation-spring-runtime</artifactId> + <artifactId>tuscany-node-impl</artifactId> <version>${tuscany.version}</version> - <scope>runtime</scope> + <scope>test</scope> </dependency> <dependency> diff --git a/sca-java-1.x/trunk/tutorials/travelsample/contributions/scatours/pom.xml b/sca-java-1.x/trunk/tutorials/travelsample/contributions/scatours/pom.xml index 436be14602..8f291690df 100644 --- a/sca-java-1.x/trunk/tutorials/travelsample/contributions/scatours/pom.xml +++ b/sca-java-1.x/trunk/tutorials/travelsample/contributions/scatours/pom.xml @@ -37,32 +37,30 @@ <dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-data-api</artifactId>
- <version>${tuscany.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
<artifactId>scatours-contribution-common</artifactId>
<version>${pom.version}</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>scatours-contribution-travelcatalog</artifactId>
<version>${pom.version}</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>scatours-contribution-tripbooking</artifactId>
<version>${pom.version}</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>scatours-contribution-shoppingcart</artifactId>
<version>${pom.version}</version>
+ <scope>provided</scope>
</dependency>
<dependency>
diff --git a/sca-java-1.x/trunk/tutorials/travelsample/contributions/shoppingcart/pom.xml b/sca-java-1.x/trunk/tutorials/travelsample/contributions/shoppingcart/pom.xml index d7c97af652..30d317a90c 100644 --- a/sca-java-1.x/trunk/tutorials/travelsample/contributions/shoppingcart/pom.xml +++ b/sca-java-1.x/trunk/tutorials/travelsample/contributions/shoppingcart/pom.xml @@ -38,14 +38,9 @@ <dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-data-api</artifactId>
- <version>${tuscany.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
<artifactId>scatours-contribution-common</artifactId>
<version>${pom.version}</version>
+ <scope>provided</scope>
</dependency>
<dependency>
diff --git a/sca-java-1.x/trunk/tutorials/travelsample/contributions/travelcatalog/pom.xml b/sca-java-1.x/trunk/tutorials/travelsample/contributions/travelcatalog/pom.xml index f02f8dffe1..d2f8f1278c 100644 --- a/sca-java-1.x/trunk/tutorials/travelsample/contributions/travelcatalog/pom.xml +++ b/sca-java-1.x/trunk/tutorials/travelsample/contributions/travelcatalog/pom.xml @@ -37,20 +37,16 @@ <dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-data-api</artifactId>
- <version>${tuscany.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
<artifactId>scatours-contribution-common</artifactId>
<version>${pom.version}</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>scatours-contribution-currency</artifactId>
<version>${pom.version}</version>
+ <scope>provided</scope>
</dependency>
<dependency>
@@ -63,6 +59,6 @@ </dependencies>
<build>
- <finalName>${artifactId}</finalName>
+ <finalName>${artifactId}</finalName>
</build>
</project>
diff --git a/sca-java-1.x/trunk/tutorials/travelsample/contributions/trip/pom.xml b/sca-java-1.x/trunk/tutorials/travelsample/contributions/trip/pom.xml index b2eba45a6b..2cadc55c4e 100644 --- a/sca-java-1.x/trunk/tutorials/travelsample/contributions/trip/pom.xml +++ b/sca-java-1.x/trunk/tutorials/travelsample/contributions/trip/pom.xml @@ -34,23 +34,17 @@ <artifactId>tuscany-sca-api</artifactId>
<version>${tuscany.version}</version>
</dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-data-api</artifactId>
- <version>${tuscany.version}</version>
- </dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-implementation-java-runtime</artifactId>
- <version>${tuscany.version}</version>
- <scope>runtime</scope>
- </dependency>
+ <artifactId>scatours-contribution-common</artifactId>
+ <version>${pom.version}</version>
+ <scope>provided</scope>
+ </dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-node-impl</artifactId>
+ <artifactId>tuscany-implementation-java-runtime</artifactId>
<version>${tuscany.version}</version>
<scope>runtime</scope>
</dependency>
@@ -64,9 +58,10 @@ <dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>scatours-contribution-common</artifactId>
- <version>${pom.version}</version>
- </dependency>
+ <artifactId>tuscany-node-impl</artifactId>
+ <version>${tuscany.version}</version>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>junit</groupId>
diff --git a/sca-java-1.x/trunk/tutorials/travelsample/contributions/tripbooking/pom.xml b/sca-java-1.x/trunk/tutorials/travelsample/contributions/tripbooking/pom.xml index 42fca6278f..8527a8c7c3 100644 --- a/sca-java-1.x/trunk/tutorials/travelsample/contributions/tripbooking/pom.xml +++ b/sca-java-1.x/trunk/tutorials/travelsample/contributions/tripbooking/pom.xml @@ -37,38 +37,27 @@ <dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-data-api</artifactId>
- <version>${tuscany.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
<artifactId>scatours-contribution-common</artifactId>
<version>${pom.version}</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>scatours-contribution-currency</artifactId>
<version>${pom.version}</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>scatours-contribution-shoppingcart</artifactId>
<version>${pom.version}</version>
+ <scope>provided</scope>
</dependency>
-
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.5</version>
- <scope>test</scope>
- </dependency>
-
</dependencies>
<build>
- <finalName>${artifactId}</finalName>
+ <finalName>${artifactId}</finalName>
</build>
</project>
|