You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by na...@apache.org on 2010/03/19 11:20:35 UTC
svn commit: r925161 [1/2] - in
/tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions:
blog-feed/ car/ common/ creditcard-payment-jaxb-policy/
creditcard-payment-jaxb/ creditcard-payment-sdo/ creditcard-payment-webapp/
currency-jms/ currency-...
Author: nash
Date: Fri Mar 19 10:20:34 2010
New Revision: 925161
URL: http://svn.apache.org/viewvc?rev=925161&view=rev
Log:
Fix incorrect pom dependencies in contributions directories (TUSCANY-3506)
Modified:
tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/blog-feed/pom.xml
tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/car/pom.xml
tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/common/pom.xml
tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/creditcard-payment-jaxb-policy/pom.xml
tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/creditcard-payment-jaxb/pom.xml
tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/creditcard-payment-sdo/pom.xml
tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/creditcard-payment-webapp/build.xml
tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/creditcard-payment-webapp/pom.xml
tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/currency-jms/pom.xml
tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/currency-jsp/pom.xml
tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/currency-ws/pom.xml
tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/currency/pom.xml
tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/emailgateway/pom.xml
tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/feed-logger/pom.xml
tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/flight/pom.xml
tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/fullapp-bespoketrip/pom.xml
tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/fullapp-coordination/pom.xml
tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/fullapp-currency/pom.xml
tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/fullapp-packagedtrip/pom.xml
tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/fullapp-shoppingcart/pom.xml
tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/fullapp-ui/pom.xml
tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/help-pages/pom.xml
tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/hotel/pom.xml
tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/interaction-client/pom.xml
tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/interaction-service-remote/pom.xml
tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/introducing-client/pom.xml
tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/notification-corba/pom.xml
tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/notification-ejb/pom.xml
tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/notification-jms/pom.xml
tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/notification-rmi/pom.xml
tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/notification-ws/pom.xml
tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/notification/pom.xml
tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/payment-bpel/pom.xml
tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/payment-groovy/pom.xml
tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/payment-java-policy/pom.xml
tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/payment-java/pom.xml
tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/payment-spring-policy/pom.xml
tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/payment-spring-scatag/pom.xml
tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/payment-spring/pom.xml
tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/scatours/pom.xml
tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/shoppingcart/pom.xml
tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/travelcatalog/pom.xml
tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/trip/pom.xml
tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/tripbooking/pom.xml
Modified: tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/blog-feed/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/blog-feed/pom.xml?rev=925161&r1=925160&r2=925161&view=diff
==============================================================================
--- tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/blog-feed/pom.xml (original)
+++ tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/blog-feed/pom.xml Fri Mar 19 10:20:34 2010
@@ -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>
Modified: tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/car/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/car/pom.xml?rev=925161&r1=925160&r2=925161&view=diff
==============================================================================
--- tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/car/pom.xml (original)
+++ tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/car/pom.xml Fri Mar 19 10:20:34 2010
@@ -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>
Modified: tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/common/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/common/pom.xml?rev=925161&r1=925160&r2=925161&view=diff
==============================================================================
--- tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/common/pom.xml (original)
+++ tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/common/pom.xml Fri Mar 19 10:20:34 2010
@@ -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>
Modified: tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/creditcard-payment-jaxb-policy/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/creditcard-payment-jaxb-policy/pom.xml?rev=925161&r1=925160&r2=925161&view=diff
==============================================================================
--- tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/creditcard-payment-jaxb-policy/pom.xml (original)
+++ tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/creditcard-payment-jaxb-policy/pom.xml Fri Mar 19 10:20:34 2010
@@ -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>
Modified: tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/creditcard-payment-jaxb/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/creditcard-payment-jaxb/pom.xml?rev=925161&r1=925160&r2=925161&view=diff
==============================================================================
--- tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/creditcard-payment-jaxb/pom.xml (original)
+++ tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/creditcard-payment-jaxb/pom.xml Fri Mar 19 10:20:34 2010
@@ -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>
Modified: tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/creditcard-payment-sdo/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/creditcard-payment-sdo/pom.xml?rev=925161&r1=925160&r2=925161&view=diff
==============================================================================
--- tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/creditcard-payment-sdo/pom.xml (original)
+++ tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/creditcard-payment-sdo/pom.xml Fri Mar 19 10:20:34 2010
@@ -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>
Modified: tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/creditcard-payment-webapp/build.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/creditcard-payment-webapp/build.xml?rev=925161&r1=925160&r2=925161&view=diff
==============================================================================
--- tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/creditcard-payment-webapp/build.xml (original)
+++ tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/creditcard-payment-webapp/build.xml Fri Mar 19 10:20:34 2010
@@ -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"/>
Modified: tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/creditcard-payment-webapp/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/creditcard-payment-webapp/pom.xml?rev=925161&r1=925160&r2=925161&view=diff
==============================================================================
--- tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/creditcard-payment-webapp/pom.xml (original)
+++ tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/creditcard-payment-webapp/pom.xml Fri Mar 19 10:20:34 2010
@@ -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>
Modified: tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/currency-jms/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/currency-jms/pom.xml?rev=925161&r1=925160&r2=925161&view=diff
==============================================================================
--- tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/currency-jms/pom.xml (original)
+++ tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/currency-jms/pom.xml Fri Mar 19 10:20:34 2010
@@ -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>
Modified: tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/currency-jsp/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/currency-jsp/pom.xml?rev=925161&r1=925160&r2=925161&view=diff
==============================================================================
--- tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/currency-jsp/pom.xml (original)
+++ tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/currency-jsp/pom.xml Fri Mar 19 10:20:34 2010
@@ -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>
Modified: tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/currency-ws/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/currency-ws/pom.xml?rev=925161&r1=925160&r2=925161&view=diff
==============================================================================
--- tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/currency-ws/pom.xml (original)
+++ tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/currency-ws/pom.xml Fri Mar 19 10:20:34 2010
@@ -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>
Modified: tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/currency/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/currency/pom.xml?rev=925161&r1=925160&r2=925161&view=diff
==============================================================================
--- tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/currency/pom.xml (original)
+++ tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/currency/pom.xml Fri Mar 19 10:20:34 2010
@@ -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>
Modified: tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/emailgateway/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/emailgateway/pom.xml?rev=925161&r1=925160&r2=925161&view=diff
==============================================================================
--- tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/emailgateway/pom.xml (original)
+++ tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/emailgateway/pom.xml Fri Mar 19 10:20:34 2010
@@ -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>
Modified: tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/feed-logger/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/feed-logger/pom.xml?rev=925161&r1=925160&r2=925161&view=diff
==============================================================================
--- tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/feed-logger/pom.xml (original)
+++ tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/feed-logger/pom.xml Fri Mar 19 10:20:34 2010
@@ -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>
Modified: tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/flight/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/flight/pom.xml?rev=925161&r1=925160&r2=925161&view=diff
==============================================================================
--- tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/flight/pom.xml (original)
+++ tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/flight/pom.xml Fri Mar 19 10:20:34 2010
@@ -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>
Modified: tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/fullapp-bespoketrip/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/fullapp-bespoketrip/pom.xml?rev=925161&r1=925160&r2=925161&view=diff
==============================================================================
--- tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/fullapp-bespoketrip/pom.xml (original)
+++ tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/fullapp-bespoketrip/pom.xml Fri Mar 19 10:20:34 2010
@@ -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>
Modified: tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/fullapp-coordination/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/fullapp-coordination/pom.xml?rev=925161&r1=925160&r2=925161&view=diff
==============================================================================
--- tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/fullapp-coordination/pom.xml (original)
+++ tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/fullapp-coordination/pom.xml Fri Mar 19 10:20:34 2010
@@ -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>
Modified: tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/fullapp-currency/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/fullapp-currency/pom.xml?rev=925161&r1=925160&r2=925161&view=diff
==============================================================================
--- tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/fullapp-currency/pom.xml (original)
+++ tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/fullapp-currency/pom.xml Fri Mar 19 10:20:34 2010
@@ -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>
Modified: tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/fullapp-packagedtrip/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/fullapp-packagedtrip/pom.xml?rev=925161&r1=925160&r2=925161&view=diff
==============================================================================
--- tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/fullapp-packagedtrip/pom.xml (original)
+++ tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/fullapp-packagedtrip/pom.xml Fri Mar 19 10:20:34 2010
@@ -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>
Modified: tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/fullapp-shoppingcart/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/fullapp-shoppingcart/pom.xml?rev=925161&r1=925160&r2=925161&view=diff
==============================================================================
--- tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/fullapp-shoppingcart/pom.xml (original)
+++ tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/fullapp-shoppingcart/pom.xml Fri Mar 19 10:20:34 2010
@@ -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>
Modified: tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/fullapp-ui/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/fullapp-ui/pom.xml?rev=925161&r1=925160&r2=925161&view=diff
==============================================================================
--- tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/fullapp-ui/pom.xml (original)
+++ tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/fullapp-ui/pom.xml Fri Mar 19 10:20:34 2010
@@ -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>
Modified: tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/help-pages/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/help-pages/pom.xml?rev=925161&r1=925160&r2=925161&view=diff
==============================================================================
--- tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/help-pages/pom.xml (original)
+++ tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/help-pages/pom.xml Fri Mar 19 10:20:34 2010
@@ -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>
Modified: tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/hotel/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/hotel/pom.xml?rev=925161&r1=925160&r2=925161&view=diff
==============================================================================
--- tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/hotel/pom.xml (original)
+++ tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/hotel/pom.xml Fri Mar 19 10:20:34 2010
@@ -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>
Modified: tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/interaction-client/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/interaction-client/pom.xml?rev=925161&r1=925160&r2=925161&view=diff
==============================================================================
--- tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/interaction-client/pom.xml (original)
+++ tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/interaction-client/pom.xml Fri Mar 19 10:20:34 2010
@@ -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>
Modified: tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/interaction-service-remote/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/interaction-service-remote/pom.xml?rev=925161&r1=925160&r2=925161&view=diff
==============================================================================
--- tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/interaction-service-remote/pom.xml (original)
+++ tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/interaction-service-remote/pom.xml Fri Mar 19 10:20:34 2010
@@ -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>
Modified: tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/introducing-client/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/introducing-client/pom.xml?rev=925161&r1=925160&r2=925161&view=diff
==============================================================================
--- tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/introducing-client/pom.xml (original)
+++ tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/introducing-client/pom.xml Fri Mar 19 10:20:34 2010
@@ -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>
Modified: tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/notification-corba/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/notification-corba/pom.xml?rev=925161&r1=925160&r2=925161&view=diff
==============================================================================
--- tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/notification-corba/pom.xml (original)
+++ tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/notification-corba/pom.xml Fri Mar 19 10:20:34 2010
@@ -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>
Modified: tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/notification-ejb/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/notification-ejb/pom.xml?rev=925161&r1=925160&r2=925161&view=diff
==============================================================================
--- tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/notification-ejb/pom.xml (original)
+++ tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/notification-ejb/pom.xml Fri Mar 19 10:20:34 2010
@@ -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>
Modified: tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/notification-jms/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/notification-jms/pom.xml?rev=925161&r1=925160&r2=925161&view=diff
==============================================================================
--- tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/notification-jms/pom.xml (original)
+++ tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/notification-jms/pom.xml Fri Mar 19 10:20:34 2010
@@ -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>
Modified: tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/notification-rmi/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/notification-rmi/pom.xml?rev=925161&r1=925160&r2=925161&view=diff
==============================================================================
--- tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/notification-rmi/pom.xml (original)
+++ tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/notification-rmi/pom.xml Fri Mar 19 10:20:34 2010
@@ -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>
Modified: tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/notification-ws/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/notification-ws/pom.xml?rev=925161&r1=925160&r2=925161&view=diff
==============================================================================
--- tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/notification-ws/pom.xml (original)
+++ tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/notification-ws/pom.xml Fri Mar 19 10:20:34 2010
@@ -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>
Modified: tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/notification/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/notification/pom.xml?rev=925161&r1=925160&r2=925161&view=diff
==============================================================================
--- tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/notification/pom.xml (original)
+++ tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/notification/pom.xml Fri Mar 19 10:20:34 2010
@@ -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>
Modified: tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/payment-bpel/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/payment-bpel/pom.xml?rev=925161&r1=925160&r2=925161&view=diff
==============================================================================
--- tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/payment-bpel/pom.xml (original)
+++ tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/payment-bpel/pom.xml Fri Mar 19 10:20:34 2010
@@ -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>
Modified: tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/payment-groovy/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/payment-groovy/pom.xml?rev=925161&r1=925160&r2=925161&view=diff
==============================================================================
--- tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/payment-groovy/pom.xml (original)
+++ tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/payment-groovy/pom.xml Fri Mar 19 10:20:34 2010
@@ -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>
Modified: tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/payment-java-policy/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/payment-java-policy/pom.xml?rev=925161&r1=925160&r2=925161&view=diff
==============================================================================
--- tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/payment-java-policy/pom.xml (original)
+++ tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/payment-java-policy/pom.xml Fri Mar 19 10:20:34 2010
@@ -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>
Modified: tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/payment-java/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/payment-java/pom.xml?rev=925161&r1=925160&r2=925161&view=diff
==============================================================================
--- tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/payment-java/pom.xml (original)
+++ tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/payment-java/pom.xml Fri Mar 19 10:20:34 2010
@@ -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>
Modified: tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/payment-spring-policy/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/payment-spring-policy/pom.xml?rev=925161&r1=925160&r2=925161&view=diff
==============================================================================
--- tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/payment-spring-policy/pom.xml (original)
+++ tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/payment-spring-policy/pom.xml Fri Mar 19 10:20:34 2010
@@ -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>
Modified: tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/payment-spring-scatag/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/payment-spring-scatag/pom.xml?rev=925161&r1=925160&r2=925161&view=diff
==============================================================================
--- tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/payment-spring-scatag/pom.xml (original)
+++ tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/payment-spring-scatag/pom.xml Fri Mar 19 10:20:34 2010
@@ -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>
Modified: tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/payment-spring/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/payment-spring/pom.xml?rev=925161&r1=925160&r2=925161&view=diff
==============================================================================
--- tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/payment-spring/pom.xml (original)
+++ tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/payment-spring/pom.xml Fri Mar 19 10:20:34 2010
@@ -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>
Modified: tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/scatours/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/scatours/pom.xml?rev=925161&r1=925160&r2=925161&view=diff
==============================================================================
--- tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/scatours/pom.xml (original)
+++ tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/scatours/pom.xml Fri Mar 19 10:20:34 2010
@@ -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>
Modified: tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/shoppingcart/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/shoppingcart/pom.xml?rev=925161&r1=925160&r2=925161&view=diff
==============================================================================
--- tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/shoppingcart/pom.xml (original)
+++ tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/shoppingcart/pom.xml Fri Mar 19 10:20:34 2010
@@ -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>
Modified: tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/travelcatalog/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/travelcatalog/pom.xml?rev=925161&r1=925160&r2=925161&view=diff
==============================================================================
--- tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/travelcatalog/pom.xml (original)
+++ tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/travelcatalog/pom.xml Fri Mar 19 10:20:34 2010
@@ -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>
Modified: tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/trip/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/trip/pom.xml?rev=925161&r1=925160&r2=925161&view=diff
==============================================================================
--- tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/trip/pom.xml (original)
+++ tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/trip/pom.xml Fri Mar 19 10:20:34 2010
@@ -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>