Author: nash
Date: Mon Feb 9 10:18:38 2009
New Revision: 742374
URL: http://svn.apache.org/viewvc?rev=742374&view=rev
Log:
Reorganize code directories and update pom versions
Added:
tuscany/sandbox/travelsample/chapter-09/node/src/main/
tuscany/sandbox/travelsample/chapter-09/node/src/main/java/
tuscany/sandbox/travelsample/chapter-09/node/src/main/java/scatours/
tuscany/sandbox/travelsample/chapter-09/node/src/main/java/scatours/LaunchNode.java
- copied unchanged from r742189,
tuscany/sandbox/travelsample/chapter-09/node/src/scatours/LaunchNode.java
tuscany/sandbox/travelsample/chapter-09/payment-contribution/src/main/
tuscany/sandbox/travelsample/chapter-09/payment-contribution/src/main/java/
tuscany/sandbox/travelsample/chapter-09/payment-contribution/src/main/java/payment/
tuscany/sandbox/travelsample/chapter-09/payment-contribution/src/main/java/payment/Payment.java
- copied unchanged from r742189,
tuscany/sandbox/travelsample/chapter-09/payment-contribution/src/payment/Payment.java
tuscany/sandbox/travelsample/chapter-09/payment-contribution/src/main/java/payment/PaymentImpl.java
- copied unchanged from r742189,
tuscany/sandbox/travelsample/chapter-09/payment-contribution/src/payment/PaymentImpl.java
tuscany/sandbox/travelsample/chapter-09/payment-contribution/src/main/resources/
tuscany/sandbox/travelsample/chapter-09/payment-contribution/src/main/resources/CreditCardPayment.wsdl
- copied unchanged from r742189,
tuscany/sandbox/travelsample/chapter-09/payment-contribution/src/wsdl/CreditCardPayment.wsdl
tuscany/sandbox/travelsample/chapter-09/payment-contribution/src/main/resources/META-INF/
tuscany/sandbox/travelsample/chapter-09/payment-contribution/src/main/resources/META-INF/sca-contribution.xml
- copied unchanged from r742189,
tuscany/sandbox/travelsample/chapter-09/payment-contribution/src/META-INF/sca-contribution.xml
tuscany/sandbox/travelsample/chapter-09/payment-contribution/src/test/
tuscany/sandbox/travelsample/chapter-09/payment-contribution/src/test/java/
tuscany/sandbox/travelsample/chapter-09/payment-contribution/src/test/java/payment/
tuscany/sandbox/travelsample/chapter-09/payment-contribution/src/test/java/payment/PaymentTestCase.java
- copied unchanged from r742189,
tuscany/sandbox/travelsample/chapter-09/payment-contribution/test/payment/PaymentTestCase.java
tuscany/sandbox/travelsample/chapter-09/payment-contribution/src/test/java/payment/creditcard/
tuscany/sandbox/travelsample/chapter-09/payment-contribution/src/test/java/payment/creditcard/CreditCardPaymentImpl.java
- copied unchanged from r742189,
tuscany/sandbox/travelsample/chapter-09/payment-contribution/test/payment/creditcard/CreditCardPaymentImpl.java
tuscany/sandbox/travelsample/chapter-09/payment-contribution/src/test/resources/
tuscany/sandbox/travelsample/chapter-09/payment-contribution/src/test/resources/payment.composite
- copied unchanged from r742189,
tuscany/sandbox/travelsample/chapter-09/payment-contribution/test/payment.composite
tuscany/sandbox/travelsample/chapter-09/ui-contribution/src/
tuscany/sandbox/travelsample/chapter-09/ui-contribution/src/main/
tuscany/sandbox/travelsample/chapter-09/ui-contribution/src/main/resources/
tuscany/sandbox/travelsample/chapter-09/ui-contribution/src/main/resources/META-INF/
tuscany/sandbox/travelsample/chapter-09/ui-contribution/src/main/resources/META-INF/sca-contribution.xml
- copied unchanged from r742189,
tuscany/sandbox/travelsample/chapter-09/ui-contribution/META-INF/sca-contribution.xml
tuscany/sandbox/travelsample/chapter-09/ui-contribution/src/main/resources/scatours.composite
- copied unchanged from r742189,
tuscany/sandbox/travelsample/chapter-09/ui-contribution/scatours.composite
tuscany/sandbox/travelsample/chapter-09/ui-contribution/src/main/resources/scatours.html
- copied unchanged from r742189,
tuscany/sandbox/travelsample/chapter-09/ui-contribution/scatours.html
tuscany/sandbox/travelsample/chapter-09/ui-contribution/src/main/resources/style.css
- copied unchanged from r742189,
tuscany/sandbox/travelsample/chapter-09/ui-contribution/style.css
Removed:
tuscany/sandbox/travelsample/chapter-09/node/src/scatours/
tuscany/sandbox/travelsample/chapter-09/payment-contribution/src/META-INF/
tuscany/sandbox/travelsample/chapter-09/payment-contribution/src/payment/
tuscany/sandbox/travelsample/chapter-09/payment-contribution/src/wsdl/
tuscany/sandbox/travelsample/chapter-09/payment-contribution/test/
tuscany/sandbox/travelsample/chapter-09/ui-contribution/META-INF/
tuscany/sandbox/travelsample/chapter-09/ui-contribution/scatours.composite
tuscany/sandbox/travelsample/chapter-09/ui-contribution/scatours.html
tuscany/sandbox/travelsample/chapter-09/ui-contribution/style.css
Modified:
tuscany/sandbox/travelsample/chapter-09/node/pom.xml
tuscany/sandbox/travelsample/chapter-09/payment-contribution/pom.xml
tuscany/sandbox/travelsample/chapter-09/pom.xml
tuscany/sandbox/travelsample/chapter-09/ui-contribution/pom.xml
Modified: tuscany/sandbox/travelsample/chapter-09/node/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/chapter-09/node/pom.xml?rev=742374&r1=742373&r2=742374&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/chapter-09/node/pom.xml (original)
+++ tuscany/sandbox/travelsample/chapter-09/node/pom.xml Mon Feb 9 10:18:38
2009
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-sca</artifactId>
- <version>1.5-SNAPSHOT</version>
+ <version>1.4</version>
<!--relativePath>../../pom.xml</relativePath-->
</parent>
<artifactId>scatours-chapter-09-node</artifactId>
@@ -32,82 +32,82 @@
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-node-api</artifactId>
- <version>1.5-SNAPSHOT</version>
+ <version>1.4</version>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-node-launcher</artifactId>
- <version>1.5-SNAPSHOT</version>
+ <version>1.4</version>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-domain-manager</artifactId>
- <version>1.5-SNAPSHOT</version>
+ <version>1.4</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-implementation-node-runtime</artifactId>
- <version>1.5-SNAPSHOT</version>
+ <version>1.4</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-implementation-java-runtime</artifactId>
- <version>1.5-SNAPSHOT</version>
+ <version>1.4</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-implementation-widget-runtime</artifactId>
- <version>1.5-SNAPSHOT</version>
+ <version>1.4</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-implementation-resource-runtime</artifactId>
- <version>1.5-SNAPSHOT</version>
+ <version>1.4</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-binding-atom-abdera</artifactId>
- <version>1.5-SNAPSHOT</version>
+ <version>1.4</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-binding-jsonrpc-runtime</artifactId>
- <version>1.5-SNAPSHOT</version>
+ <version>1.4</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-binding-http-runtime</artifactId>
- <version>1.5-SNAPSHOT</version>
+ <version>1.4</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-binding-ws-axis2</artifactId>
- <version>1.5-SNAPSHOT</version>
+ <version>1.4</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-binding-sca-axis2</artifactId>
- <version>1.5-SNAPSHOT</version>
+ <version>1.4</version>
<scope>runtime</scope>
</dependency>
Modified: tuscany/sandbox/travelsample/chapter-09/payment-contribution/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/chapter-09/payment-contribution/pom.xml?rev=742374&r1=742373&r2=742374&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/chapter-09/payment-contribution/pom.xml
(original)
+++ tuscany/sandbox/travelsample/chapter-09/payment-contribution/pom.xml Mon
Feb 9 10:18:38 2009
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-sca</artifactId>
- <version>1.5-SNAPSHOT</version>
+ <version>1.4</version>
<!--relativePath>../../pom.xml</relativePath-->
</parent>
<artifactId>scatours-chapter-09-payment-contribution</artifactId>
@@ -32,34 +32,34 @@
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-host-embedded</artifactId>
- <version>1.5-SNAPSHOT</version>
+ <version>1.4</version>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-implementation-java-runtime</artifactId>
- <version>1.5-SNAPSHOT</version>
+ <version>1.4</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-binding-jsonrpc-runtime</artifactId>
- <version>1.5-SNAPSHOT</version>
+ <version>1.4</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-binding-ws-axis2</artifactId>
- <version>1.5-SNAPSHOT</version>
+ <version>1.4</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-host-jetty</artifactId>
- <version>1.5-SNAPSHOT</version>
+ <version>1.4</version>
<scope>runtime</scope>
</dependency>
@@ -73,6 +73,7 @@
</dependencies>
<build>
<finalName>${artifactId}</finalName>
+ <!--
<sourceDirectory>${basedir}/src</sourceDirectory>
<testSourceDirectory>${basedir}/test</testSourceDirectory>
<resources>
@@ -92,7 +93,8 @@
<exclude>**/.*/**</exclude>
</excludes>
</testResource>
- </testResources>
+ </testResources>
+ -->
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
@@ -126,7 +128,7 @@
</goals>
<configuration>
<packageName>payment.creditcard</packageName>
- <wsdlDirectory>${basedir}/src/wsdl
+ <wsdlDirectory>${basedir}/src/main/resources
</wsdlDirectory>
<wsdlFiles>
<wsdlFile>CreditCardPayment.wsdl</wsdlFile>
Modified: tuscany/sandbox/travelsample/chapter-09/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/chapter-09/pom.xml?rev=742374&r1=742373&r2=742374&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/chapter-09/pom.xml (original)
+++ tuscany/sandbox/travelsample/chapter-09/pom.xml Mon Feb 9 10:18:38 2009
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-sca</artifactId>
- <version>1.4-SNAPSHOT</version>
+ <version>1.4</version>
<!--relativePath>../pom.xml</relativePath-->
</parent>
<artifactId>tuscany-scatours-chapter-09</artifactId>
Modified: tuscany/sandbox/travelsample/chapter-09/ui-contribution/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/chapter-09/ui-contribution/pom.xml?rev=742374&r1=742373&r2=742374&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/chapter-09/ui-contribution/pom.xml (original)
+++ tuscany/sandbox/travelsample/chapter-09/ui-contribution/pom.xml Mon Feb 9
10:18:38 2009
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-sca</artifactId>
- <version>1.5-SNAPSHOT</version>
+ <version>1.4</version>
<!--relativePath>../../pom.xml</relativePath-->
</parent>
<artifactId>scatours-chapter-09-ui-contribution</artifactId>
@@ -32,27 +32,27 @@
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-host-embedded</artifactId>
- <version>1.5-SNAPSHOT</version>
+ <version>1.4</version>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-implementation-java-runtime</artifactId>
- <version>1.5-SNAPSHOT</version>
+ <version>1.4</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-binding-ws-axis2</artifactId>
- <version>1.5-SNAPSHOT</version>
+ <version>1.4</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-host-tomcat</artifactId>
- <version>1.5-SNAPSHOT</version>
+ <version>1.4</version>
<scope>test</scope>
</dependency>
