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 2009/08/27 03:07:41 UTC
svn commit: r808241 [3/3] - in /tuscany/sandbox/travelsample: contributions/
contributions/car-contribution/
contributions/car-contribution/src/main/java/scatours/car/
contributions/car-contribution/src/main/resources/META-INF/
contributions/car/ contr...
Copied: tuscany/sandbox/travelsample/contributions/scatours/src/main/resources/META-INF/sca-contribution.xml (from r807014, tuscany/sandbox/travelsample/contributions/scatours-contribution/src/main/resources/META-INF/sca-contribution.xml)
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/contributions/scatours/src/main/resources/META-INF/sca-contribution.xml?p2=tuscany/sandbox/travelsample/contributions/scatours/src/main/resources/META-INF/sca-contribution.xml&p1=tuscany/sandbox/travelsample/contributions/scatours-contribution/src/main/resources/META-INF/sca-contribution.xml&r1=807014&r2=808241&rev=808241&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/contributions/scatours-contribution/src/main/resources/META-INF/sca-contribution.xml (original)
+++ tuscany/sandbox/travelsample/contributions/scatours/src/main/resources/META-INF/sca-contribution.xml Thu Aug 27 01:07:30 2009
@@ -18,9 +18,10 @@
* under the License.
-->
<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0">
- <import.java package="scatours.common"/>
- <import.java package="scatours.travelcatalog"/>
- <import.java package="scatours.tripbooking"/>
- <import.java package="scatours.shoppingcart"/>
- <export.java package="scatours"/>
-</contribution>
\ No newline at end of file
+ <import.java package="com.tuscanyscatours.common" />
+ <import.java package="com.tuscanyscatours.travelcatalog" />
+ <import.java package="com.tuscanyscatours.tripbooking" />
+ <import.java package="com.tuscanyscatours.shoppingcart" />
+ <export.java package="com.tuscanyscatours" />
+ <export.java package="com.tuscanyscatours.impl" />
+</contribution>
Propchange: tuscany/sandbox/travelsample/contributions/shoppingcart/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Aug 27 01:07:30 2009
@@ -0,0 +1,15 @@
+target
+*.iws
+*.ipr
+*.iml
+.project
+.classpath
+maven.log
+velocity.log*
+junit*.properties
+surefire*.properties
+.settings
+.deployables
+.wtpmodules
+.externalToolBuilders
+maven-eclipse.xml
Copied: tuscany/sandbox/travelsample/contributions/shoppingcart/pom.xml (from r807014, tuscany/sandbox/travelsample/contributions/shoppingcart-contribution/pom.xml)
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/contributions/shoppingcart/pom.xml?p2=tuscany/sandbox/travelsample/contributions/shoppingcart/pom.xml&p1=tuscany/sandbox/travelsample/contributions/shoppingcart-contribution/pom.xml&r1=807014&r2=808241&rev=808241&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/contributions/shoppingcart-contribution/pom.xml (original)
+++ tuscany/sandbox/travelsample/contributions/shoppingcart/pom.xml Thu Aug 27 01:07:30 2009
@@ -26,7 +26,7 @@
<!--relativePath>../../pom.xml</relativePath-->
</parent>
<version>1.0-SNAPSHOT</version>
- <artifactId>scatours-shoppingcart-contribution</artifactId>
+ <artifactId>scatours-contribution-shoppingcart</artifactId>
<name>Apache Tuscany SCA Tours Shopping Cart Contribution</name>
<dependencies>
@@ -44,19 +44,7 @@
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>scatours-common-contribution</artifactId>
- <version>1.0-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>scatours-currency-contribution</artifactId>
- <version>1.0-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>scatours-payment-java-contribution</artifactId>
+ <artifactId>scatours-contribution-common</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>
@@ -114,7 +102,7 @@
<goal>wsimport</goal>
</goals>
<configuration>
- <packageName>payment</packageName>
+ <packageName>com.tuscanyscatours.payment</packageName>
<wsdlDirectory>${basedir}/src/main/resources</wsdlDirectory>
<wsdlFiles>
<wsdlFile>Payment.wsdl</wsdlFile>
Copied: tuscany/sandbox/travelsample/contributions/shoppingcart/src/main/java/com/tuscanyscatours/shoppingcart/CartStore.java (from r807014, tuscany/sandbox/travelsample/contributions/shoppingcart-contribution/src/main/java/scatours/shoppingcart/CartStore.java)
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/contributions/shoppingcart/src/main/java/com/tuscanyscatours/shoppingcart/CartStore.java?p2=tuscany/sandbox/travelsample/contributions/shoppingcart/src/main/java/com/tuscanyscatours/shoppingcart/CartStore.java&p1=tuscany/sandbox/travelsample/contributions/shoppingcart-contribution/src/main/java/scatours/shoppingcart/CartStore.java&r1=807014&r2=808241&rev=808241&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/contributions/shoppingcart-contribution/src/main/java/scatours/shoppingcart/CartStore.java (original)
+++ tuscany/sandbox/travelsample/contributions/shoppingcart/src/main/java/com/tuscanyscatours/shoppingcart/CartStore.java Thu Aug 27 01:07:30 2009
@@ -16,13 +16,13 @@
* specific language governing permissions and limitations
* under the License.
*/
-package scatours.shoppingcart;
+package com.tuscanyscatours.shoppingcart;
import org.osoa.sca.annotations.Conversational;
import org.osoa.sca.annotations.EndsConversation;
import org.osoa.sca.annotations.Remotable;
-import scatours.common.TripItem;
+import com.tuscanyscatours.common.TripItem;
/**
* The CartStore service interface
Copied: tuscany/sandbox/travelsample/contributions/shoppingcart/src/main/java/com/tuscanyscatours/shoppingcart/ShoppingCart.java (from r807014, tuscany/sandbox/travelsample/contributions/shoppingcart-contribution/src/main/java/scatours/shoppingcart/ShoppingCart.java)
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/contributions/shoppingcart/src/main/java/com/tuscanyscatours/shoppingcart/ShoppingCart.java?p2=tuscany/sandbox/travelsample/contributions/shoppingcart/src/main/java/com/tuscanyscatours/shoppingcart/ShoppingCart.java&p1=tuscany/sandbox/travelsample/contributions/shoppingcart-contribution/src/main/java/scatours/shoppingcart/ShoppingCart.java&r1=807014&r2=808241&rev=808241&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/contributions/shoppingcart-contribution/src/main/java/scatours/shoppingcart/ShoppingCart.java (original)
+++ tuscany/sandbox/travelsample/contributions/shoppingcart/src/main/java/com/tuscanyscatours/shoppingcart/ShoppingCart.java Thu Aug 27 01:07:30 2009
@@ -16,13 +16,13 @@
* specific language governing permissions and limitations
* under the License.
*/
-package scatours.shoppingcart;
+package com.tuscanyscatours.shoppingcart;
import org.osoa.sca.annotations.Conversational;
import org.osoa.sca.annotations.EndsConversation;
import org.osoa.sca.annotations.Remotable;
-import scatours.common.TripItem;
+import com.tuscanyscatours.common.TripItem;
/**
* The ShoppingCart service interface
Copied: tuscany/sandbox/travelsample/contributions/shoppingcart/src/main/java/com/tuscanyscatours/shoppingcart/impl/CartStoreImpl.java (from r807014, tuscany/sandbox/travelsample/contributions/shoppingcart-contribution/src/main/java/scatours/shoppingcart/CartStoreImpl.java)
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/contributions/shoppingcart/src/main/java/com/tuscanyscatours/shoppingcart/impl/CartStoreImpl.java?p2=tuscany/sandbox/travelsample/contributions/shoppingcart/src/main/java/com/tuscanyscatours/shoppingcart/impl/CartStoreImpl.java&p1=tuscany/sandbox/travelsample/contributions/shoppingcart-contribution/src/main/java/scatours/shoppingcart/CartStoreImpl.java&r1=807014&r2=808241&rev=808241&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/contributions/shoppingcart-contribution/src/main/java/scatours/shoppingcart/CartStoreImpl.java (original)
+++ tuscany/sandbox/travelsample/contributions/shoppingcart/src/main/java/com/tuscanyscatours/shoppingcart/impl/CartStoreImpl.java Thu Aug 27 01:07:30 2009
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package scatours.shoppingcart;
+package com.tuscanyscatours.shoppingcart.impl;
import java.util.ArrayList;
import java.util.List;
@@ -28,11 +28,12 @@
import org.osoa.sca.annotations.Scope;
import org.osoa.sca.annotations.Service;
-import payment.Payment;
-import scatours.common.TripItem;
+import com.tuscanyscatours.common.TripItem;
+import com.tuscanyscatours.payment.Payment;
+import com.tuscanyscatours.shoppingcart.CartStore;
/**
- * An implementation of the Trip service
+ * An implementation of the CartStore service
*/
@Scope("CONVERSATION")
@Service(interfaces={CartStore.class})
Copied: tuscany/sandbox/travelsample/contributions/shoppingcart/src/main/java/com/tuscanyscatours/shoppingcart/impl/ShoppingCartImpl.java (from r807014, tuscany/sandbox/travelsample/contributions/shoppingcart-contribution/src/main/java/scatours/shoppingcart/ShoppingCartImpl.java)
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/contributions/shoppingcart/src/main/java/com/tuscanyscatours/shoppingcart/impl/ShoppingCartImpl.java?p2=tuscany/sandbox/travelsample/contributions/shoppingcart/src/main/java/com/tuscanyscatours/shoppingcart/impl/ShoppingCartImpl.java&p1=tuscany/sandbox/travelsample/contributions/shoppingcart-contribution/src/main/java/scatours/shoppingcart/ShoppingCartImpl.java&r1=807014&r2=808241&rev=808241&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/contributions/shoppingcart-contribution/src/main/java/scatours/shoppingcart/ShoppingCartImpl.java (original)
+++ tuscany/sandbox/travelsample/contributions/shoppingcart/src/main/java/com/tuscanyscatours/shoppingcart/impl/ShoppingCartImpl.java Thu Aug 27 01:07:30 2009
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package scatours.shoppingcart;
+package com.tuscanyscatours.shoppingcart.impl;
import java.util.ArrayList;
import java.util.HashMap;
@@ -34,11 +34,13 @@
import org.osoa.sca.annotations.Scope;
import org.osoa.sca.annotations.Service;
-import payment.Payment;
-import scatours.common.TripItem;
+import com.tuscanyscatours.common.TripItem;
+import com.tuscanyscatours.payment.Payment;
+import com.tuscanyscatours.shoppingcart.CartStore;
+import com.tuscanyscatours.shoppingcart.ShoppingCart;
/**
- * An implementation of the Trip service
+ * An implementation of the ShoppingCart service
*/
@Service(interfaces={ShoppingCart.class})
public class ShoppingCartImpl implements ShoppingCart{
Copied: tuscany/sandbox/travelsample/contributions/shoppingcart/src/main/resources/META-INF/sca-contribution.xml (from r807014, tuscany/sandbox/travelsample/contributions/shoppingcart-contribution/src/main/resources/META-INF/sca-contribution.xml)
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/contributions/shoppingcart/src/main/resources/META-INF/sca-contribution.xml?p2=tuscany/sandbox/travelsample/contributions/shoppingcart/src/main/resources/META-INF/sca-contribution.xml&p1=tuscany/sandbox/travelsample/contributions/shoppingcart-contribution/src/main/resources/META-INF/sca-contribution.xml&r1=807014&r2=808241&rev=808241&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/contributions/shoppingcart-contribution/src/main/resources/META-INF/sca-contribution.xml (original)
+++ tuscany/sandbox/travelsample/contributions/shoppingcart/src/main/resources/META-INF/sca-contribution.xml Thu Aug 27 01:07:30 2009
@@ -18,7 +18,8 @@
* under the License.
-->
<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0">
- <import.java package="scatours.common"/>
- <export.java package="scatours.shoppingcart"/>
- <export.java package="payment"/>
-</contribution>
\ No newline at end of file
+ <import.java package="com.tuscanyscatours.common" />
+ <export.java package="com.tuscanyscatours.payment" />
+ <export.java package="com.tuscanyscatours.shoppingcart" />
+ <export.java package="com.tuscanyscatours.shoppingcart.impl" />
+</contribution>
Propchange: tuscany/sandbox/travelsample/contributions/travelcatalog/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Aug 27 01:07:30 2009
@@ -0,0 +1,15 @@
+target
+*.iws
+*.ipr
+*.iml
+.project
+.classpath
+maven.log
+velocity.log*
+junit*.properties
+surefire*.properties
+.settings
+.deployables
+.wtpmodules
+.externalToolBuilders
+maven-eclipse.xml
Copied: tuscany/sandbox/travelsample/contributions/travelcatalog/pom.xml (from r807014, tuscany/sandbox/travelsample/contributions/travelcatalog-contribution/pom.xml)
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/contributions/travelcatalog/pom.xml?p2=tuscany/sandbox/travelsample/contributions/travelcatalog/pom.xml&p1=tuscany/sandbox/travelsample/contributions/travelcatalog-contribution/pom.xml&r1=807014&r2=808241&rev=808241&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/contributions/travelcatalog-contribution/pom.xml (original)
+++ tuscany/sandbox/travelsample/contributions/travelcatalog/pom.xml Thu Aug 27 01:07:30 2009
@@ -25,7 +25,7 @@
<version>1.6-SNAPSHOT</version>
<!--relativePath>../../pom.xml</relativePath-->
</parent><version>1.0-SNAPSHOT</version>
- <artifactId>scatours-travelcatalog-contribution</artifactId>
+ <artifactId>scatours-contribution-travelcatalog</artifactId>
<name>Apache Tuscany SCA Tours Travel Catalog Contribution</name>
<dependencies>
@@ -43,19 +43,13 @@
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>scatours-common-contribution</artifactId>
+ <artifactId>scatours-contribution-common</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>scatours-currency-contribution</artifactId>
- <version>1.0-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>scatours-tripbooking-contribution</artifactId>
+ <artifactId>scatours-contribution-currency</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>
Copied: tuscany/sandbox/travelsample/contributions/travelcatalog/src/main/java/com/tuscanyscatours/travelcatalog/TravelCatalogSearch.java (from r807014, tuscany/sandbox/travelsample/contributions/travelcatalog-contribution/src/main/java/scatours/travelcatalog/TravelCatalogSearch.java)
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/contributions/travelcatalog/src/main/java/com/tuscanyscatours/travelcatalog/TravelCatalogSearch.java?p2=tuscany/sandbox/travelsample/contributions/travelcatalog/src/main/java/com/tuscanyscatours/travelcatalog/TravelCatalogSearch.java&p1=tuscany/sandbox/travelsample/contributions/travelcatalog-contribution/src/main/java/scatours/travelcatalog/TravelCatalogSearch.java&r1=807014&r2=808241&rev=808241&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/contributions/travelcatalog-contribution/src/main/java/scatours/travelcatalog/TravelCatalogSearch.java (original)
+++ tuscany/sandbox/travelsample/contributions/travelcatalog/src/main/java/com/tuscanyscatours/travelcatalog/TravelCatalogSearch.java Thu Aug 27 01:07:30 2009
@@ -16,15 +16,15 @@
* specific language governing permissions and limitations
* under the License.
*/
-package scatours.travelcatalog;
+package com.tuscanyscatours.travelcatalog;
import org.osoa.sca.annotations.Remotable;
-import scatours.common.TripItem;
-import scatours.common.TripLeg;
+import com.tuscanyscatours.common.TripItem;
+import com.tuscanyscatours.common.TripLeg;
/**
- * The Trip service interface
+ * The TravelCatalogSearch service interface
*/
@Remotable
public interface TravelCatalogSearch {
Copied: tuscany/sandbox/travelsample/contributions/travelcatalog/src/main/java/com/tuscanyscatours/travelcatalog/impl/TravelCatalogImpl.java (from r807014, tuscany/sandbox/travelsample/contributions/travelcatalog-contribution/src/main/java/scatours/travelcatalog/TravelCatalogImpl.java)
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/contributions/travelcatalog/src/main/java/com/tuscanyscatours/travelcatalog/impl/TravelCatalogImpl.java?p2=tuscany/sandbox/travelsample/contributions/travelcatalog/src/main/java/com/tuscanyscatours/travelcatalog/impl/TravelCatalogImpl.java&p1=tuscany/sandbox/travelsample/contributions/travelcatalog-contribution/src/main/java/scatours/travelcatalog/TravelCatalogImpl.java&r1=807014&r2=808241&rev=808241&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/contributions/travelcatalog-contribution/src/main/java/scatours/travelcatalog/TravelCatalogImpl.java (original)
+++ tuscany/sandbox/travelsample/contributions/travelcatalog/src/main/java/com/tuscanyscatours/travelcatalog/impl/TravelCatalogImpl.java Thu Aug 27 01:07:30 2009
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package scatours.travelcatalog;
+package com.tuscanyscatours.travelcatalog.impl;
import java.util.ArrayList;
import java.util.List;
@@ -32,14 +32,15 @@
import org.osoa.sca.annotations.Scope;
import org.osoa.sca.annotations.Service;
-import scatours.common.Search;
-import scatours.common.SearchCallback;
-import scatours.common.TripItem;
-import scatours.common.TripLeg;
-import scatours.currencyconverter.CurrencyConverter;
+import com.tuscanyscatours.common.Search;
+import com.tuscanyscatours.common.SearchCallback;
+import com.tuscanyscatours.common.TripItem;
+import com.tuscanyscatours.common.TripLeg;
+import com.tuscanyscatours.currencyconverter.CurrencyConverter;
+import com.tuscanyscatours.travelcatalog.TravelCatalogSearch;
/**
- * An implementation of the Trip service
+ * An implementation of the travel catalog service
*/
@Scope("COMPOSITE")
@Service(interfaces={TravelCatalogSearch.class})
Copied: tuscany/sandbox/travelsample/contributions/travelcatalog/src/main/resources/META-INF/sca-contribution.xml (from r807014, tuscany/sandbox/travelsample/contributions/travelcatalog-contribution/src/main/resources/META-INF/sca-contribution.xml)
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/contributions/travelcatalog/src/main/resources/META-INF/sca-contribution.xml?p2=tuscany/sandbox/travelsample/contributions/travelcatalog/src/main/resources/META-INF/sca-contribution.xml&p1=tuscany/sandbox/travelsample/contributions/travelcatalog-contribution/src/main/resources/META-INF/sca-contribution.xml&r1=807014&r2=808241&rev=808241&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/contributions/travelcatalog-contribution/src/main/resources/META-INF/sca-contribution.xml (original)
+++ tuscany/sandbox/travelsample/contributions/travelcatalog/src/main/resources/META-INF/sca-contribution.xml Thu Aug 27 01:07:30 2009
@@ -18,7 +18,8 @@
* under the License.
-->
<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0">
- <import.java package="scatours.common"/>
- <import.java package="scatours.currencyconverter"/>
- <export.java package="scatours.travelcatalog"/>
-</contribution>
\ No newline at end of file
+ <import.java package="com.tuscanyscatours.common" />
+ <import.java package="com.tuscanyscatours.currencyconverter" />
+ <export.java package="com.tuscanyscatours.travelcatalog" />
+ <export.java package="com.tuscanyscatours.travelcatalog.impl" />
+</contribution>
Propchange: tuscany/sandbox/travelsample/contributions/trip/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Aug 27 01:07:30 2009
@@ -0,0 +1,15 @@
+target
+*.iws
+*.ipr
+*.iml
+.project
+.classpath
+maven.log
+velocity.log*
+junit*.properties
+surefire*.properties
+.settings
+.deployables
+.wtpmodules
+.externalToolBuilders
+maven-eclipse.xml
Copied: tuscany/sandbox/travelsample/contributions/trip/pom.xml (from r807014, tuscany/sandbox/travelsample/contributions/trip-contribution/pom.xml)
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/contributions/trip/pom.xml?p2=tuscany/sandbox/travelsample/contributions/trip/pom.xml&p1=tuscany/sandbox/travelsample/contributions/trip-contribution/pom.xml&r1=807014&r2=808241&rev=808241&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/contributions/trip-contribution/pom.xml (original)
+++ tuscany/sandbox/travelsample/contributions/trip/pom.xml Thu Aug 27 01:07:30 2009
@@ -25,7 +25,7 @@
<version>1.6-SNAPSHOT</version>
<!--relativePath>../../pom.xml</relativePath-->
</parent><version>1.0-SNAPSHOT</version>
- <artifactId>scatours-trip-contribution</artifactId>
+ <artifactId>scatours-contribution-trip</artifactId>
<name>Apache Tuscany SCA Tours Prepackaged Trip Contribution</name>
<dependencies>
@@ -64,7 +64,7 @@
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>scatours-common-contribution</artifactId>
+ <artifactId>scatours-contribution-common</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>
Copied: tuscany/sandbox/travelsample/contributions/trip/src/main/java/com/tuscanyscatours/trip/impl/TripImpl.java (from r807014, tuscany/sandbox/travelsample/contributions/trip-contribution/src/main/java/scatours/trip/TripImpl.java)
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/contributions/trip/src/main/java/com/tuscanyscatours/trip/impl/TripImpl.java?p2=tuscany/sandbox/travelsample/contributions/trip/src/main/java/com/tuscanyscatours/trip/impl/TripImpl.java&p1=tuscany/sandbox/travelsample/contributions/trip-contribution/src/main/java/scatours/trip/TripImpl.java&r1=807014&r2=808241&rev=808241&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/contributions/trip-contribution/src/main/java/scatours/trip/TripImpl.java (original)
+++ tuscany/sandbox/travelsample/contributions/trip/src/main/java/com/tuscanyscatours/trip/impl/TripImpl.java Thu Aug 27 01:07:30 2009
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package scatours.trip;
+package com.tuscanyscatours.trip.impl;
import java.util.ArrayList;
import java.util.List;
@@ -26,14 +26,14 @@
import org.osoa.sca.annotations.Scope;
import org.osoa.sca.annotations.Service;
-import scatours.common.Book;
-import scatours.common.Search;
-import scatours.common.SearchCallback;
-import scatours.common.TripItem;
-import scatours.common.TripLeg;
+import com.tuscanyscatours.common.Book;
+import com.tuscanyscatours.common.Search;
+import com.tuscanyscatours.common.SearchCallback;
+import com.tuscanyscatours.common.TripItem;
+import com.tuscanyscatours.common.TripLeg;
/**
- * An implementation of the Hotel service
+ * An implementation of the Trip service
*/
@Scope("STATELESS")
@Service(interfaces={Search.class, Book.class})
Copied: tuscany/sandbox/travelsample/contributions/trip/src/main/java/com/tuscanyscatours/trip/impl/TripInfo.java (from r807014, tuscany/sandbox/travelsample/contributions/trip-contribution/src/main/java/scatours/trip/TripInfo.java)
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/contributions/trip/src/main/java/com/tuscanyscatours/trip/impl/TripInfo.java?p2=tuscany/sandbox/travelsample/contributions/trip/src/main/java/com/tuscanyscatours/trip/impl/TripInfo.java&p1=tuscany/sandbox/travelsample/contributions/trip-contribution/src/main/java/scatours/trip/TripInfo.java&r1=807014&r2=808241&rev=808241&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/contributions/trip-contribution/src/main/java/scatours/trip/TripInfo.java (original)
+++ tuscany/sandbox/travelsample/contributions/trip/src/main/java/com/tuscanyscatours/trip/impl/TripInfo.java Thu Aug 27 01:07:30 2009
@@ -17,7 +17,7 @@
* under the License.
*/
-package scatours.trip;
+package com.tuscanyscatours.trip.impl;
public class TripInfo {
Copied: tuscany/sandbox/travelsample/contributions/trip/src/main/resources/META-INF/sca-contribution.xml (from r807014, tuscany/sandbox/travelsample/contributions/trip-contribution/src/main/resources/META-INF/sca-contribution.xml)
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/contributions/trip/src/main/resources/META-INF/sca-contribution.xml?p2=tuscany/sandbox/travelsample/contributions/trip/src/main/resources/META-INF/sca-contribution.xml&p1=tuscany/sandbox/travelsample/contributions/trip-contribution/src/main/resources/META-INF/sca-contribution.xml&r1=807014&r2=808241&rev=808241&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/contributions/trip-contribution/src/main/resources/META-INF/sca-contribution.xml (original)
+++ tuscany/sandbox/travelsample/contributions/trip/src/main/resources/META-INF/sca-contribution.xml Thu Aug 27 01:07:30 2009
@@ -18,6 +18,6 @@
* under the License.
-->
<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0">
- <import.java package="scatours.common"/>
- <export.java package="scatours.trip"/>
-</contribution>
\ No newline at end of file
+ <import.java package="com.tuscanyscatours.common"/>
+ <export.java package="com.tuscanyscatours.trip.impl"/>
+</contribution>
Copied: tuscany/sandbox/travelsample/contributions/trip/src/test/java/scatours/trip/TripTestCase.java (from r807014, tuscany/sandbox/travelsample/contributions/trip-contribution/src/test/java/scatours/trip/TripTestCase.java)
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/contributions/trip/src/test/java/scatours/trip/TripTestCase.java?p2=tuscany/sandbox/travelsample/contributions/trip/src/test/java/scatours/trip/TripTestCase.java&p1=tuscany/sandbox/travelsample/contributions/trip-contribution/src/test/java/scatours/trip/TripTestCase.java&r1=807014&r2=808241&rev=808241&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/contributions/trip-contribution/src/test/java/scatours/trip/TripTestCase.java (original)
+++ tuscany/sandbox/travelsample/contributions/trip/src/test/java/scatours/trip/TripTestCase.java Thu Aug 27 01:07:30 2009
@@ -27,8 +27,8 @@
import org.junit.BeforeClass;
import org.junit.Test;
-import scatours.common.Book;
-import scatours.common.TripItem;
+import com.tuscanyscatours.common.Book;
+import com.tuscanyscatours.common.TripItem;
/**
*
@@ -53,7 +53,7 @@
@Test
public void testPayment() {
SCAClient client = (SCAClient) tripNode;
- Book booking = client.getService(Book.class, "TripComponent/Book");
+ Book booking = client.getService(Book.class, "Trip/Book");
TripItem tripItem = new TripItem("1234",
"5678",
TripItem.TRIP,
Copied: tuscany/sandbox/travelsample/contributions/trip/src/test/resources/definitions.xml (from r807014, tuscany/sandbox/travelsample/contributions/trip-contribution/src/test/resources/definitions.xml)
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/contributions/trip/src/test/resources/definitions.xml?p2=tuscany/sandbox/travelsample/contributions/trip/src/test/resources/definitions.xml&p1=tuscany/sandbox/travelsample/contributions/trip-contribution/src/test/resources/definitions.xml&r1=807014&r2=808241&rev=808241&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/contributions/trip-contribution/src/test/resources/definitions.xml (original)
+++ tuscany/sandbox/travelsample/contributions/trip/src/test/resources/definitions.xml Thu Aug 27 01:07:30 2009
@@ -20,8 +20,7 @@
<definitions xmlns="http://www.osoa.org/xmlns/sca/1.0"
targetNamespace="http://tuscany.apache.org/xmlns/sca/1.0"
xmlns:sca="http://www.osoa.org/xmlns/sca/1.0"
- xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
- xmlns:scatours="http://scatours">
+ xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0">
<!-- PolicySets -->
<policySet name="JDKLoggingPolicy" provides="tuscany:logging" appliesTo="sca:implementation.java"
@@ -30,4 +29,4 @@
<logLevel>FINER</logLevel>
</tuscany:jdkLogger>
</policySet>
-</definitions>
\ No newline at end of file
+</definitions>
Copied: tuscany/sandbox/travelsample/contributions/trip/src/test/resources/trip.composite (from r807014, tuscany/sandbox/travelsample/contributions/trip-contribution/src/test/resources/trip.composite)
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/contributions/trip/src/test/resources/trip.composite?p2=tuscany/sandbox/travelsample/contributions/trip/src/test/resources/trip.composite&p1=tuscany/sandbox/travelsample/contributions/trip-contribution/src/test/resources/trip.composite&r1=807014&r2=808241&rev=808241&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/contributions/trip-contribution/src/test/resources/trip.composite (original)
+++ tuscany/sandbox/travelsample/contributions/trip/src/test/resources/trip.composite Thu Aug 27 01:07:30 2009
@@ -19,12 +19,11 @@
-->
<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
targetNamespace="http://scatours"
- xmlns:scatours="http://scatours"
xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
name="packagedtrip">
- <component name="TripComponent">
- <implementation.java class="scatours.trip.TripImpl" requires="tuscany:logging"/>
+ <component name="Trip">
+ <implementation.java class="com.tuscanyscatours.trip.impl.TripImpl" requires="tuscany:logging"/>
<service name="Search"/>
<service name="Book"/>
</component>
Propchange: tuscany/sandbox/travelsample/contributions/tripbooking/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Aug 27 01:07:30 2009
@@ -0,0 +1,15 @@
+target
+*.iws
+*.ipr
+*.iml
+.project
+.classpath
+maven.log
+velocity.log*
+junit*.properties
+surefire*.properties
+.settings
+.deployables
+.wtpmodules
+.externalToolBuilders
+maven-eclipse.xml
Copied: tuscany/sandbox/travelsample/contributions/tripbooking/pom.xml (from r807014, tuscany/sandbox/travelsample/contributions/tripbooking-contribution/pom.xml)
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/contributions/tripbooking/pom.xml?p2=tuscany/sandbox/travelsample/contributions/tripbooking/pom.xml&p1=tuscany/sandbox/travelsample/contributions/tripbooking-contribution/pom.xml&r1=807014&r2=808241&rev=808241&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/contributions/tripbooking-contribution/pom.xml (original)
+++ tuscany/sandbox/travelsample/contributions/tripbooking/pom.xml Thu Aug 27 01:07:30 2009
@@ -25,7 +25,7 @@
<version>1.6-SNAPSHOT</version>
<!--relativePath>../../pom.xml</relativePath-->
</parent><version>1.0-SNAPSHOT</version>
- <artifactId>scatours-tripbooking-contribution</artifactId>
+ <artifactId>scatours-contribution-tripbooking</artifactId>
<name>Apache Tuscany SCA Tours Trip Booking Contribution</name>
<dependencies>
@@ -43,19 +43,19 @@
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>scatours-common-contribution</artifactId>
+ <artifactId>scatours-contribution-common</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>scatours-currency-contribution</artifactId>
+ <artifactId>scatours-contribution-currency</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>scatours-shoppingcart-contribution</artifactId>
+ <artifactId>scatours-contribution-shoppingcart</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>
Copied: tuscany/sandbox/travelsample/contributions/tripbooking/src/main/java/com/tuscanyscatours/tripbooking/TripBooking.java (from r807014, tuscany/sandbox/travelsample/contributions/tripbooking-contribution/src/main/java/scatours/tripbooking/TripBooking.java)
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/contributions/tripbooking/src/main/java/com/tuscanyscatours/tripbooking/TripBooking.java?p2=tuscany/sandbox/travelsample/contributions/tripbooking/src/main/java/com/tuscanyscatours/tripbooking/TripBooking.java&p1=tuscany/sandbox/travelsample/contributions/tripbooking-contribution/src/main/java/scatours/tripbooking/TripBooking.java&r1=807014&r2=808241&rev=808241&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/contributions/tripbooking-contribution/src/main/java/scatours/tripbooking/TripBooking.java (original)
+++ tuscany/sandbox/travelsample/contributions/tripbooking/src/main/java/com/tuscanyscatours/tripbooking/TripBooking.java Thu Aug 27 01:07:30 2009
@@ -16,14 +16,14 @@
* specific language governing permissions and limitations
* under the License.
*/
-package scatours.tripbooking;
+package com.tuscanyscatours.tripbooking;
import org.osoa.sca.annotations.Remotable;
-import scatours.common.TripItem;
+import com.tuscanyscatours.common.TripItem;
/**
- * The Trip service interface
+ * The TripBooking service interface
*/
@Remotable
public interface TripBooking {
Copied: tuscany/sandbox/travelsample/contributions/tripbooking/src/main/java/com/tuscanyscatours/tripbooking/impl/TripBookingImpl.java (from r807014, tuscany/sandbox/travelsample/contributions/tripbooking-contribution/src/main/java/scatours/tripbooking/TripBookingImpl.java)
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/contributions/tripbooking/src/main/java/com/tuscanyscatours/tripbooking/impl/TripBookingImpl.java?p2=tuscany/sandbox/travelsample/contributions/tripbooking/src/main/java/com/tuscanyscatours/tripbooking/impl/TripBookingImpl.java&p1=tuscany/sandbox/travelsample/contributions/tripbooking-contribution/src/main/java/scatours/tripbooking/TripBookingImpl.java&r1=807014&r2=808241&rev=808241&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/contributions/tripbooking-contribution/src/main/java/scatours/tripbooking/TripBookingImpl.java (original)
+++ tuscany/sandbox/travelsample/contributions/tripbooking/src/main/java/com/tuscanyscatours/tripbooking/impl/TripBookingImpl.java Thu Aug 27 01:07:30 2009
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package scatours.tripbooking;
+package com.tuscanyscatours.tripbooking.impl;
import org.osoa.sca.ComponentContext;
import org.osoa.sca.ServiceReference;
@@ -24,12 +24,13 @@
import org.osoa.sca.annotations.Reference;
import org.osoa.sca.annotations.Service;
-import scatours.common.Book;
-import scatours.common.TripItem;
-import scatours.shoppingcart.ShoppingCart;
+import com.tuscanyscatours.common.Book;
+import com.tuscanyscatours.common.TripItem;
+import com.tuscanyscatours.shoppingcart.ShoppingCart;
+import com.tuscanyscatours.tripbooking.TripBooking;
/**
- * An implementation of the Trip service
+ * An implementation of the TripBooking service
*/
@Service(interfaces={TripBooking.class})
public class TripBookingImpl implements TripBooking{
Copied: tuscany/sandbox/travelsample/contributions/tripbooking/src/main/resources/META-INF/sca-contribution.xml (from r807014, tuscany/sandbox/travelsample/contributions/tripbooking-contribution/src/main/resources/META-INF/sca-contribution.xml)
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/contributions/tripbooking/src/main/resources/META-INF/sca-contribution.xml?p2=tuscany/sandbox/travelsample/contributions/tripbooking/src/main/resources/META-INF/sca-contribution.xml&p1=tuscany/sandbox/travelsample/contributions/tripbooking-contribution/src/main/resources/META-INF/sca-contribution.xml&r1=807014&r2=808241&rev=808241&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/contributions/tripbooking-contribution/src/main/resources/META-INF/sca-contribution.xml (original)
+++ tuscany/sandbox/travelsample/contributions/tripbooking/src/main/resources/META-INF/sca-contribution.xml Thu Aug 27 01:07:30 2009
@@ -18,8 +18,9 @@
* under the License.
-->
<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0">
- <import.java package="scatours.common"/>
- <import.java package="scatours.currencyconverter"/>
- <import.java package="scatours.shoppingcart"/>
- <export.java package="scatours.tripbooking"/>
-</contribution>
\ No newline at end of file
+ <import.java package="com.tuscanyscatours.common" />
+ <import.java package="com.tuscanyscatours.currencyconverter" />
+ <import.java package="com.tuscanyscatours.shoppingcart" />
+ <export.java package="com.tuscanyscatours.tripbooking" />
+ <export.java package="com.tuscanyscatours.tripbooking.impl" />
+</contribution>
Propchange: tuscany/sandbox/travelsample/launchers/fullapp/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Aug 27 01:07:30 2009
@@ -0,0 +1,15 @@
+target
+*.iws
+*.ipr
+*.iml
+.project
+.classpath
+maven.log
+velocity.log*
+junit*.properties
+surefire*.properties
+.settings
+.deployables
+.wtpmodules
+.externalToolBuilders
+maven-eclipse.xml
Propchange: tuscany/sandbox/travelsample/launchers/fullapp-domain/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Aug 27 01:07:30 2009
@@ -0,0 +1,15 @@
+target
+*.iws
+*.ipr
+*.iml
+.project
+.classpath
+maven.log
+velocity.log*
+junit*.properties
+surefire*.properties
+.settings
+.deployables
+.wtpmodules
+.externalToolBuilders
+maven-eclipse.xml
Added: tuscany/sandbox/travelsample/launchers/fullapp-domain/build.xml
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/launchers/fullapp-domain/build.xml?rev=808241&view=auto
==============================================================================
--- tuscany/sandbox/travelsample/launchers/fullapp-domain/build.xml (added)
+++ tuscany/sandbox/travelsample/launchers/fullapp-domain/build.xml Thu Aug 27 01:07:30 2009
@@ -0,0 +1,36 @@
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+-->
+
+<project name="scatours-launcher-fullapp-domain" default="run">
+ <property environment="env"/>
+
+ <target name="run">
+ <java classname="org.apache.tuscany.sca.node.launcher.DomainManagerLauncher"
+ dir="target/classes" fork="true">
+ <classpath>
+ <pathelement location="${env.TUSCANY}/lib/tuscany-sca-manifest.jar"/>
+ </classpath>
+ </java>
+ </target>
+
+ <target name="clean">
+ <delete dir="./target"/>
+ </target>
+
+</project>
Added: tuscany/sandbox/travelsample/launchers/fullapp-domain/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/launchers/fullapp-domain/pom.xml?rev=808241&view=auto
==============================================================================
--- tuscany/sandbox/travelsample/launchers/fullapp-domain/pom.xml (added)
+++ tuscany/sandbox/travelsample/launchers/fullapp-domain/pom.xml Thu Aug 27 01:07:30 2009
@@ -0,0 +1,93 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+-->
+<project>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-sca</artifactId>
+ <version>1.6-SNAPSHOT</version>
+ <!--relativePath>../../pom.xml</relativePath-->
+ </parent><version>1.0-SNAPSHOT</version>
+ <artifactId>scatours-launcher-fullapp-domain</artifactId>
+ <name>Apache Tuscany SCA Tours Full App Domain Launcher</name>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>scatours-contribution-fullapp-bespoketrip</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>scatours-contribution-creditcard-payment-jaxb</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>scatours-contribution-fullapp-currency</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>scatours-contribution-fullapp-frontend</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>scatours-contribution-fullapp-packagedtrip</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>scatours-contribution-payment-java</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>scatours-contribution-fullapp-shoppingcart</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>scatours-contribution-fullapp-ui</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <finalName>${artifactId}</finalName>
+ </build>
+
+</project>
Copied: tuscany/sandbox/travelsample/launchers/fullapp-domain/src/main/resources/cloud.composite (from r807014, tuscany/sandbox/travelsample/launchers/fullapp-launcher/cloud.composite)
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/launchers/fullapp-domain/src/main/resources/cloud.composite?p2=tuscany/sandbox/travelsample/launchers/fullapp-domain/src/main/resources/cloud.composite&p1=tuscany/sandbox/travelsample/launchers/fullapp-launcher/cloud.composite&r1=807014&r2=808241&rev=808241&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/launchers/fullapp-launcher/cloud.composite (original)
+++ tuscany/sandbox/travelsample/launchers/fullapp-domain/src/main/resources/cloud.composite Thu Aug 27 01:07:30 2009
@@ -21,7 +21,7 @@
targetNamespace="http://tuscany.apache.org/xmlns/sca/1.0"
xmlns="http://www.osoa.org/xmlns/sca/1.0"
xmlns:ns1="http://www.osoa.org/xmlns/sca/1.0"
- xmlns:ns2="http://scatours/cloud">
+ xmlns:ns2="http://tuscany.apache.org/cloud">
<include name="ns2:ui" uri="http://tuscany.apache.org/cloud" />
<include name="ns2:frontend" uri="http://tuscany.apache.org/cloud" />
Copied: tuscany/sandbox/travelsample/launchers/fullapp-domain/src/main/resources/cloud/fullapp-bespoketrip.composite (from r807014, tuscany/sandbox/travelsample/launchers/fullapp-launcher/src/main/resources/cloud/fullapp-bespoketrip.composite)
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/launchers/fullapp-domain/src/main/resources/cloud/fullapp-bespoketrip.composite?p2=tuscany/sandbox/travelsample/launchers/fullapp-domain/src/main/resources/cloud/fullapp-bespoketrip.composite&p1=tuscany/sandbox/travelsample/launchers/fullapp-launcher/src/main/resources/cloud/fullapp-bespoketrip.composite&r1=807014&r2=808241&rev=808241&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/launchers/fullapp-launcher/src/main/resources/cloud/fullapp-bespoketrip.composite (original)
+++ tuscany/sandbox/travelsample/launchers/fullapp-domain/src/main/resources/cloud/fullapp-bespoketrip.composite Thu Aug 27 01:07:30 2009
@@ -19,9 +19,9 @@
-->
<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
xmlns:t="http://tuscany.apache.org/xmlns/sca/1.0"
- targetNamespace="http://scatours/cloud"
- xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
- xmlns:s="http://scatours"
+ targetNamespace="http://tuscany.apache.org/cloud"
+ xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
+ xmlns:s="http://tuscanyscatours.com/"
name="bespoketrip">
<component name="bespoketrip">
Copied: tuscany/sandbox/travelsample/launchers/fullapp-domain/src/main/resources/cloud/fullapp-creditcard.composite (from r807014, tuscany/sandbox/travelsample/launchers/fullapp-launcher/src/main/resources/cloud/fullapp-creditcard.composite)
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/launchers/fullapp-domain/src/main/resources/cloud/fullapp-creditcard.composite?p2=tuscany/sandbox/travelsample/launchers/fullapp-domain/src/main/resources/cloud/fullapp-creditcard.composite&p1=tuscany/sandbox/travelsample/launchers/fullapp-launcher/src/main/resources/cloud/fullapp-creditcard.composite&r1=807014&r2=808241&rev=808241&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/launchers/fullapp-launcher/src/main/resources/cloud/fullapp-creditcard.composite (original)
+++ tuscany/sandbox/travelsample/launchers/fullapp-domain/src/main/resources/cloud/fullapp-creditcard.composite Thu Aug 27 01:07:30 2009
@@ -19,13 +19,13 @@
-->
<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
xmlns:t="http://tuscany.apache.org/xmlns/sca/1.0"
- targetNamespace="http://scatours/cloud"
- xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
- xmlns:c="http://creditcard"
+ targetNamespace="http://tuscany.apache.org/cloud"
+ xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
+ xmlns:s="http://tuscanyscatours.com/"
name="creditcard">
<component name="creditcard">
- <t:implementation.node uri="fullapp-creditcard" composite="c:creditcard"/>
+ <t:implementation.node uri="fullapp-creditcard" composite="s:creditcard"/>
<service name="Node">
<binding.sca uri="http://localhost:8082"/>
<binding.ws uri="http://localhost:8082"/>
Copied: tuscany/sandbox/travelsample/launchers/fullapp-domain/src/main/resources/cloud/fullapp-currency.composite (from r807014, tuscany/sandbox/travelsample/launchers/fullapp-launcher/src/main/resources/cloud/fullapp-currency.composite)
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/launchers/fullapp-domain/src/main/resources/cloud/fullapp-currency.composite?p2=tuscany/sandbox/travelsample/launchers/fullapp-domain/src/main/resources/cloud/fullapp-currency.composite&p1=tuscany/sandbox/travelsample/launchers/fullapp-launcher/src/main/resources/cloud/fullapp-currency.composite&r1=807014&r2=808241&rev=808241&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/launchers/fullapp-launcher/src/main/resources/cloud/fullapp-currency.composite (original)
+++ tuscany/sandbox/travelsample/launchers/fullapp-domain/src/main/resources/cloud/fullapp-currency.composite Thu Aug 27 01:07:30 2009
@@ -19,9 +19,9 @@
-->
<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
xmlns:t="http://tuscany.apache.org/xmlns/sca/1.0"
- targetNamespace="http://scatours/cloud"
- xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
- xmlns:s="http://scatours"
+ targetNamespace="http://tuscany.apache.org/cloud"
+ xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
+ xmlns:s="http://tuscanyscatours.com/"
name="currency">
<component name="currency">
Copied: tuscany/sandbox/travelsample/launchers/fullapp-domain/src/main/resources/cloud/fullapp-frontend.composite (from r807014, tuscany/sandbox/travelsample/launchers/fullapp-launcher/src/main/resources/cloud/fullapp-frontend.composite)
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/launchers/fullapp-domain/src/main/resources/cloud/fullapp-frontend.composite?p2=tuscany/sandbox/travelsample/launchers/fullapp-domain/src/main/resources/cloud/fullapp-frontend.composite&p1=tuscany/sandbox/travelsample/launchers/fullapp-launcher/src/main/resources/cloud/fullapp-frontend.composite&r1=807014&r2=808241&rev=808241&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/launchers/fullapp-launcher/src/main/resources/cloud/fullapp-frontend.composite (original)
+++ tuscany/sandbox/travelsample/launchers/fullapp-domain/src/main/resources/cloud/fullapp-frontend.composite Thu Aug 27 01:07:30 2009
@@ -19,9 +19,9 @@
-->
<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
xmlns:t="http://tuscany.apache.org/xmlns/sca/1.0"
- targetNamespace="http://scatours/cloud"
- xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
- xmlns:s="http://scatours"
+ targetNamespace="http://tuscany.apache.org/cloud"
+ xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
+ xmlns:s="http://tuscanyscatours.com/"
name="frontend">
<component name="frontend">
Copied: tuscany/sandbox/travelsample/launchers/fullapp-domain/src/main/resources/cloud/fullapp-packagedtrip.composite (from r807014, tuscany/sandbox/travelsample/launchers/fullapp-launcher/src/main/resources/cloud/fullapp-pacakgedtrip.composite)
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/launchers/fullapp-domain/src/main/resources/cloud/fullapp-packagedtrip.composite?p2=tuscany/sandbox/travelsample/launchers/fullapp-domain/src/main/resources/cloud/fullapp-packagedtrip.composite&p1=tuscany/sandbox/travelsample/launchers/fullapp-launcher/src/main/resources/cloud/fullapp-pacakgedtrip.composite&r1=807014&r2=808241&rev=808241&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/launchers/fullapp-launcher/src/main/resources/cloud/fullapp-pacakgedtrip.composite (original)
+++ tuscany/sandbox/travelsample/launchers/fullapp-domain/src/main/resources/cloud/fullapp-packagedtrip.composite Thu Aug 27 01:07:30 2009
@@ -19,9 +19,9 @@
-->
<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
xmlns:t="http://tuscany.apache.org/xmlns/sca/1.0"
- targetNamespace="http://scatours/cloud"
- xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
- xmlns:s="http://scatours"
+ targetNamespace="http://tuscany.apache.org/cloud"
+ xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
+ xmlns:s="http://tuscanyscatours.com/"
name="packagedtrip">
<component name="packagedtrip">
Copied: tuscany/sandbox/travelsample/launchers/fullapp-domain/src/main/resources/cloud/fullapp-payment.composite (from r807014, tuscany/sandbox/travelsample/launchers/fullapp-launcher/src/main/resources/cloud/fullapp-payment.composite)
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/launchers/fullapp-domain/src/main/resources/cloud/fullapp-payment.composite?p2=tuscany/sandbox/travelsample/launchers/fullapp-domain/src/main/resources/cloud/fullapp-payment.composite&p1=tuscany/sandbox/travelsample/launchers/fullapp-launcher/src/main/resources/cloud/fullapp-payment.composite&r1=807014&r2=808241&rev=808241&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/launchers/fullapp-launcher/src/main/resources/cloud/fullapp-payment.composite (original)
+++ tuscany/sandbox/travelsample/launchers/fullapp-domain/src/main/resources/cloud/fullapp-payment.composite Thu Aug 27 01:07:30 2009
@@ -19,9 +19,9 @@
-->
<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
xmlns:t="http://tuscany.apache.org/xmlns/sca/1.0"
- targetNamespace="http://scatours/cloud"
- xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
- xmlns:s="http://scatours"
+ targetNamespace="http://tuscany.apache.org/cloud"
+ xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
+ xmlns:s="http://tuscanyscatours.com/"
name="payment">
<component name="payment">
Copied: tuscany/sandbox/travelsample/launchers/fullapp-domain/src/main/resources/cloud/fullapp-shoppingcart.composite (from r807014, tuscany/sandbox/travelsample/launchers/fullapp-launcher/src/main/resources/cloud/fullapp-shoppingcart.composite)
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/launchers/fullapp-domain/src/main/resources/cloud/fullapp-shoppingcart.composite?p2=tuscany/sandbox/travelsample/launchers/fullapp-domain/src/main/resources/cloud/fullapp-shoppingcart.composite&p1=tuscany/sandbox/travelsample/launchers/fullapp-launcher/src/main/resources/cloud/fullapp-shoppingcart.composite&r1=807014&r2=808241&rev=808241&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/launchers/fullapp-launcher/src/main/resources/cloud/fullapp-shoppingcart.composite (original)
+++ tuscany/sandbox/travelsample/launchers/fullapp-domain/src/main/resources/cloud/fullapp-shoppingcart.composite Thu Aug 27 01:07:30 2009
@@ -19,9 +19,9 @@
-->
<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
xmlns:t="http://tuscany.apache.org/xmlns/sca/1.0"
- targetNamespace="http://scatours/cloud"
- xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
- xmlns:s="http://scatours"
+ targetNamespace="http://tuscany.apache.org/cloud"
+ xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
+ xmlns:s="http://tuscanyscatours.com/"
name="shoppingcart">
<component name="shoppingcart">
Copied: tuscany/sandbox/travelsample/launchers/fullapp-domain/src/main/resources/cloud/fullapp-ui.composite (from r807014, tuscany/sandbox/travelsample/launchers/fullapp-launcher/src/main/resources/cloud/fullapp-ui.composite)
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/launchers/fullapp-domain/src/main/resources/cloud/fullapp-ui.composite?p2=tuscany/sandbox/travelsample/launchers/fullapp-domain/src/main/resources/cloud/fullapp-ui.composite&p1=tuscany/sandbox/travelsample/launchers/fullapp-launcher/src/main/resources/cloud/fullapp-ui.composite&r1=807014&r2=808241&rev=808241&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/launchers/fullapp-launcher/src/main/resources/cloud/fullapp-ui.composite (original)
+++ tuscany/sandbox/travelsample/launchers/fullapp-domain/src/main/resources/cloud/fullapp-ui.composite Thu Aug 27 01:07:30 2009
@@ -19,8 +19,8 @@
-->
<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
xmlns:t="http://tuscany.apache.org/xmlns/sca/1.0"
- targetNamespace="http://scatours/cloud"
- xmlns:s="http://scatours"
+ targetNamespace="http://tuscany.apache.org/cloud"
+ xmlns:s="http://tuscanyscatours.com/"
name="ui">
<component name="ui">
Copied: tuscany/sandbox/travelsample/launchers/fullapp-domain/src/main/resources/domain.composite (from r807014, tuscany/sandbox/travelsample/launchers/fullapp-launcher/domain.composite)
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/launchers/fullapp-domain/src/main/resources/domain.composite?p2=tuscany/sandbox/travelsample/launchers/fullapp-domain/src/main/resources/domain.composite&p1=tuscany/sandbox/travelsample/launchers/fullapp-launcher/domain.composite&r1=807014&r2=808241&rev=808241&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/launchers/fullapp-launcher/domain.composite (original)
+++ tuscany/sandbox/travelsample/launchers/fullapp-domain/src/main/resources/domain.composite Thu Aug 27 01:07:30 2009
@@ -21,10 +21,9 @@
targetNamespace="http://tuscany.apache.org/xmlns/sca/1.0"
xmlns="http://www.osoa.org/xmlns/sca/1.0"
xmlns:ns1="http://www.osoa.org/xmlns/sca/1.0"
- xmlns:ns2="http://scatours"
- xmlns:ns3="http://creditcard">
+ xmlns:ns2="http://tuscanyscatours.com/">
- <include name="ns3:creditcard" uri="fullapp-creditcard" />
+ <include name="ns2:creditcard" uri="fullapp-creditcard" />
<include name="ns2:payment" uri="fullapp-payment" />
<include name="ns2:shoppingcart" uri="fullapp-shoppingcart" />
<include name="ns2:currency" uri="fullapp-currency" />
Copied: tuscany/sandbox/travelsample/launchers/fullapp-domain/src/main/resources/workspace.xml (from r807014, tuscany/sandbox/travelsample/launchers/fullapp-launcher/workspace.xml)
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/launchers/fullapp-domain/src/main/resources/workspace.xml?p2=tuscany/sandbox/travelsample/launchers/fullapp-domain/src/main/resources/workspace.xml&p1=tuscany/sandbox/travelsample/launchers/fullapp-launcher/workspace.xml&r1=807014&r2=808241&rev=808241&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/launchers/fullapp-launcher/workspace.xml (original)
+++ tuscany/sandbox/travelsample/launchers/fullapp-domain/src/main/resources/workspace.xml Thu Aug 27 01:07:30 2009
@@ -19,23 +19,23 @@
-->
<workspace xmlns="http://tuscany.apache.org/xmlns/sca/1.0"
xmlns:ns1="http://tuscany.apache.org/xmlns/sca/1.0">
- <contribution location="file:../../contributions/common-contribution/target/scatours-common-contribution.jar" uri="common"/>
- <contribution location="file:../../contributions/currency-contribution/target/scatours-currency-contribution.jar" uri="currency"/>
- <contribution location="file:../../contributions/hotel-contribution/target/scatours-hotel-contribution.jar" uri="hotel"/>
- <contribution location="file:../../contributions/flight-contribution/target/scatours-flight-contribution.jar" uri="flight"/>
- <contribution location="file:../../contributions/car-contribution/target/scatours-car-contribution.jar" uri="car"/>
- <contribution location="file:../../contributions/trip-contribution/target/scatours-trip-contribution.jar" uri="trip"/>
- <contribution location="file:../../contributions/tripbooking-contribution/target/scatours-tripbooking-contribution.jar" uri="tripbooking"/>
- <contribution location="file:../../contributions/travelcatalog-contribution/target/scatours-travelcatalog-contribution.jar" uri="travelcatalog"/>
- <contribution location="file:../../contributions/payment-java-contribution/target/scatours-payment-java-contribution.jar" uri="fullapp-payment"/>
- <contribution location="file:../../contributions/creditcard-payment-jaxb-contribution/target/scatours-creditcard-payment-jaxb-contribution.jar" uri="fullapp-creditcard"/>
- <contribution location="file:../../contributions/shoppingcart-contribution/target/scatours-shoppingcart-contribution.jar" uri="shoppingcart"/>
- <contribution location="file:../../contributions/scatours-contribution/target/scatours-scatours-contribution.jar" uri="scatours"/>
- <contribution location="file:../../contributions/fullapp-ui-contribution/target/scatours-fullapp-ui-contribution.jar" uri="fullapp-ui"/>
- <contribution location="file:../../contributions/fullapp-frontend-contribution/target/scatours-fullapp-frontend-contribution.jar" uri="fullapp-frontend"/>
- <contribution location="file:../../contributions/fullapp-currency-contribution/target/scatours-fullapp-currency-contribution.jar" uri="fullapp-currency"/>
- <contribution location="file:../../contributions/fullapp-packagedtrip-contribution/target/scatours-fullapp-packagedtrip-contribution.jar" uri="fullapp-packagedtrip"/>
- <contribution location="file:../../contributions/fullapp-bespoketrip-contribution/target/scatours-fullapp-bespoketrip-contribution.jar" uri="fullapp-bespoketrip"/>
- <contribution location="file:../../contributions/fullapp-shoppingcart-contribution/target/scatours-fullapp-shoppingcart-contribution.jar" uri="fullapp-shoppingcart"/>
- <contribution location="file:./src/main/resources/cloud" uri="http://tuscany.apache.org/cloud"/>
+ <contribution location="file:../../../../contributions/common/target/scatours-contribution-common.jar" uri="common"/>
+ <contribution location="file:../../../../contributions/currency/target/scatours-contribution-currency.jar" uri="currency"/>
+ <contribution location="file:../../../../contributions/hotel/target/scatours-contribution-hotel.jar" uri="hotel"/>
+ <contribution location="file:../../../../contributions/flight/target/scatours-contribution-flight.jar" uri="flight"/>
+ <contribution location="file:../../../../contributions/car/target/scatours-contribution-car.jar" uri="car"/>
+ <contribution location="file:../../../../contributions/trip/target/scatours-contribution-trip.jar" uri="trip"/>
+ <contribution location="file:../../../../contributions/tripbooking/target/scatours-contribution-tripbooking.jar" uri="tripbooking"/>
+ <contribution location="file:../../../../contributions/travelcatalog/target/scatours-contribution-travelcatalog.jar" uri="travelcatalog"/>
+ <contribution location="file:../../../../contributions/payment-java/target/scatours-contribution-payment-java.jar" uri="fullapp-payment"/>
+ <contribution location="file:../../../../contributions/creditcard-payment-jaxb/target/scatours-contribution-creditcard-payment-jaxb.jar" uri="fullapp-creditcard"/>
+ <contribution location="file:../../../../contributions/shoppingcart/target/scatours-contribution-shoppingcart.jar" uri="shoppingcart"/>
+ <contribution location="file:../../../../contributions/scatours/target/scatours-contribution-scatours.jar" uri="scatours"/>
+ <contribution location="file:../../../../contributions/fullapp-ui/target/scatours-contribution-fullapp-ui.jar" uri="fullapp-ui"/>
+ <contribution location="file:../../../../contributions/fullapp-frontend/target/scatours-contribution-fullapp-frontend.jar" uri="fullapp-frontend"/>
+ <contribution location="file:../../../../contributions/fullapp-currency/target/scatours-contribution-fullapp-currency.jar" uri="fullapp-currency"/>
+ <contribution location="file:../../../../contributions/fullapp-packagedtrip/target/scatours-contribution-fullapp-packagedtrip.jar" uri="fullapp-packagedtrip"/>
+ <contribution location="file:../../../../contributions/fullapp-bespoketrip/target/scatours-contribution-fullapp-bespoketrip.jar" uri="fullapp-bespoketrip"/>
+ <contribution location="file:../../../../contributions/fullapp-shoppingcart/target/scatours-contribution-fullapp-shoppingcart.jar" uri="fullapp-shoppingcart"/>
+ <contribution location="file:./cloud" uri="http://tuscany.apache.org/cloud"/>
</workspace>
\ No newline at end of file
Propchange: tuscany/sandbox/travelsample/launchers/fullapp-nodes/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Aug 27 01:07:30 2009
@@ -0,0 +1,15 @@
+target
+*.iws
+*.ipr
+*.iml
+.project
+.classpath
+maven.log
+velocity.log*
+junit*.properties
+surefire*.properties
+.settings
+.deployables
+.wtpmodules
+.externalToolBuilders
+maven-eclipse.xml
Copied: tuscany/sandbox/travelsample/launchers/fullapp-nodes/build.xml (from r807014, tuscany/sandbox/travelsample/launchers/fullapp-launcher/build.xml)
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/launchers/fullapp-nodes/build.xml?p2=tuscany/sandbox/travelsample/launchers/fullapp-nodes/build.xml&p1=tuscany/sandbox/travelsample/launchers/fullapp-launcher/build.xml&r1=807014&r2=808241&rev=808241&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/launchers/fullapp-launcher/build.xml (original)
+++ tuscany/sandbox/travelsample/launchers/fullapp-nodes/build.xml Thu Aug 27 01:07:30 2009
@@ -17,7 +17,7 @@
* under the License.
-->
-<project name="scatours-fullapp-launcher" default="compile">
+<project name="scatours-launcher-fullapp-nodes" default="compile">
<property environment="env"/>
<target name="compile">
@@ -31,39 +31,21 @@
<copy todir="target/classes">
<fileset dir="src\main\resources"/>
</copy>
- <jar destfile="target/scatours-fullapp-launcher.jar" basedir="target/classes">
+ <jar destfile="target/scatours-launcher-fullapp-nodes.jar" basedir="target/classes">
<manifest>
- <attribute name="Main-Class" value="scatours.LaunchFullAppNode"/>
+ <attribute name="Main-Class" value="scatours.FullAppNodesLauncher"/>
</manifest>
</jar>
</target>
<target name="run">
- <java classname="scatours.LaunchFullAppNode" fork="true">
+ <java classname="scatours.FullAppNodesLauncher" fork="true">
<classpath>
<pathelement location="target/classes"/>
<pathelement location="${env.TUSCANY}/lib/tuscany-sca-manifest.jar"/>
</classpath>
</java>
</target>
-
- <target name="run-domain">
- <java classname="scatours.LaunchFullAppDomain" fork="true">
- <classpath>
- <pathelement location="target/classes"/>
- <pathelement location="${env.TUSCANY}/lib/tuscany-sca-manifest.jar"/>
- </classpath>
- </java>
- </target>
-
- <target name="run-domain-nodes">
- <java classname="scatours.LaunchFullAppDomainNodes" fork="true">
- <classpath>
- <pathelement location="target/classes"/>
- <pathelement location="${env.TUSCANY}/lib/tuscany-sca-manifest.jar"/>
- </classpath>
- </java>
- </target>
<target name="clean">
<delete includeemptydirs="true">
Copied: tuscany/sandbox/travelsample/launchers/fullapp-nodes/pom.xml (from r807014, tuscany/sandbox/travelsample/launchers/fullapp-launcher/pom.xml)
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/launchers/fullapp-nodes/pom.xml?p2=tuscany/sandbox/travelsample/launchers/fullapp-nodes/pom.xml&p1=tuscany/sandbox/travelsample/launchers/fullapp-launcher/pom.xml&r1=807014&r2=808241&rev=808241&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/launchers/fullapp-launcher/pom.xml (original)
+++ tuscany/sandbox/travelsample/launchers/fullapp-nodes/pom.xml Thu Aug 27 01:07:30 2009
@@ -25,8 +25,8 @@
<version>1.6-SNAPSHOT</version>
<!--relativePath>../../pom.xml</relativePath-->
</parent><version>1.0-SNAPSHOT</version>
- <artifactId>scatours-fullapp-launcher</artifactId>
- <name>Apache Tuscany SCA Tours Full Application Launcher</name>
+ <artifactId>scatours-launcher-fullapp-nodes</artifactId>
+ <name>Apache Tuscany SCA Tours Full Application Nodes Launcher</name>
<dependencies>
Copied: tuscany/sandbox/travelsample/launchers/fullapp-nodes/src/main/java/scatours/FullAppNodesLauncher.java (from r807014, tuscany/sandbox/travelsample/launchers/fullapp-launcher/src/main/java/scatours/LaunchFullAppDomainNodes.java)
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/launchers/fullapp-nodes/src/main/java/scatours/FullAppNodesLauncher.java?p2=tuscany/sandbox/travelsample/launchers/fullapp-nodes/src/main/java/scatours/FullAppNodesLauncher.java&p1=tuscany/sandbox/travelsample/launchers/fullapp-launcher/src/main/java/scatours/LaunchFullAppDomainNodes.java&r1=807014&r2=808241&rev=808241&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/launchers/fullapp-launcher/src/main/java/scatours/LaunchFullAppDomainNodes.java (original)
+++ tuscany/sandbox/travelsample/launchers/fullapp-nodes/src/main/java/scatours/FullAppNodesLauncher.java Thu Aug 27 01:07:30 2009
@@ -21,64 +21,49 @@
import java.io.IOException;
-import org.apache.tuscany.sca.node.SCAContribution;
import org.apache.tuscany.sca.node.SCANode;
import org.apache.tuscany.sca.node.SCANodeFactory;
-import org.apache.tuscany.sca.node.launcher.DomainManagerLauncher;
-public class LaunchFullAppDomainNodes {
+public class FullAppNodesLauncher {
+
public static void main(String[] args) throws Exception {
- LaunchFullAppDomainNodes.launchFromFileSystemDir();
- }
+ SCANode nodeCreditcard = SCANodeFactory.newInstance().createSCANodeFromURL("http://localhost:9990/node-config/creditcard");
+ nodeCreditcard.start();
+
+ SCANode nodePayment = SCANodeFactory.newInstance().createSCANodeFromURL("http://localhost:9990/node-config/payment");
+ nodePayment.start();
+
+ SCANode nodeShoppingcart = SCANodeFactory.newInstance().createSCANodeFromURL("http://localhost:9990/node-config/shoppingcart");
+ nodeShoppingcart.start();
+
+ SCANode nodeCurrency = SCANodeFactory.newInstance().createSCANodeFromURL("http://localhost:9990/node-config/currency");
+ nodeCurrency.start();
+
+ SCANode nodePackagedtrip = SCANodeFactory.newInstance().createSCANodeFromURL("http://localhost:9990/node-config/packagedtrip");
+ nodePackagedtrip.start();
- // OK for development but you must launch the node from this module
- public static void launchFromFileSystemDir(){
+ SCANode nodeBespoketrip = SCANodeFactory.newInstance().createSCANodeFromURL("http://localhost:9990/node-config/bespoketrip");
+ nodeBespoketrip.start();
+
+ SCANode nodeFrontend = SCANodeFactory.newInstance().createSCANodeFromURL("http://localhost:9990/node-config/frontend");
+ nodeFrontend.start();
+
+ SCANode nodeUI = SCANodeFactory.newInstance().createSCANodeFromURL("http://localhost:9990/node-config/ui");
+ nodeUI.start();
+
+ System.out.println("Nodes started - Press enter to shutdown.");
try {
- // turn off validation
- System.setProperty("org.apache.tuscany.sca.contribution.processor.ValidationSchemaExtensionPoint.enabled", "false");
-
- SCANode nodeCreditcard = SCANodeFactory.newInstance().createSCANodeFromURL("http://localhost:9990/node-config/creditcard");
- nodeCreditcard.start();
-
- SCANode nodePayment = SCANodeFactory.newInstance().createSCANodeFromURL("http://localhost:9990/node-config/payment");
- nodePayment.start();
-
- SCANode nodeShoppingcart = SCANodeFactory.newInstance().createSCANodeFromURL("http://localhost:9990/node-config/shoppingcart");
- nodeShoppingcart.start();
-
- SCANode nodeCurrency = SCANodeFactory.newInstance().createSCANodeFromURL("http://localhost:9990/node-config/currency");
- nodeCurrency.start();
-
- SCANode nodePackagedtrip = SCANodeFactory.newInstance().createSCANodeFromURL("http://localhost:9990/node-config/packagedtrip");
- nodePackagedtrip.start();
-
- SCANode nodeBespoketrip = SCANodeFactory.newInstance().createSCANodeFromURL("http://localhost:9990/node-config/bespoketrip");
- nodeBespoketrip.start();
-
- SCANode nodeFrontend = SCANodeFactory.newInstance().createSCANodeFromURL("http://localhost:9990/node-config/frontend");
- nodeFrontend.start();
-
- SCANode nodeUI = SCANodeFactory.newInstance().createSCANodeFromURL("http://localhost:9990/node-config/ui");
- nodeUI.start();
-
- System.out.println("Node started - Press enter to shutdown.");
-
- try {
- System.in.read();
- } catch (IOException e) {}
-
- nodeCreditcard.stop();
- nodePayment.stop();
- nodeShoppingcart.stop();
- nodeCurrency.stop();
- nodePackagedtrip.stop();
- nodeBespoketrip.stop();
- nodeFrontend.stop();
- nodeUI.stop();
-
- } catch (Exception ex) {
- System.out.println(ex.toString());
- }
+ System.in.read();
+ } catch (IOException e) {}
+
+ nodeCreditcard.stop();
+ nodePayment.stop();
+ nodeShoppingcart.stop();
+ nodeCurrency.stop();
+ nodePackagedtrip.stop();
+ nodeBespoketrip.stop();
+ nodeFrontend.stop();
+ nodeUI.stop();
}
}
Copied: tuscany/sandbox/travelsample/launchers/fullapp/build.xml (from r807014, tuscany/sandbox/travelsample/launchers/fullapp-launcher/build.xml)
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/launchers/fullapp/build.xml?p2=tuscany/sandbox/travelsample/launchers/fullapp/build.xml&p1=tuscany/sandbox/travelsample/launchers/fullapp-launcher/build.xml&r1=807014&r2=808241&rev=808241&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/launchers/fullapp-launcher/build.xml (original)
+++ tuscany/sandbox/travelsample/launchers/fullapp/build.xml Thu Aug 27 01:07:30 2009
@@ -17,7 +17,7 @@
* under the License.
-->
-<project name="scatours-fullapp-launcher" default="compile">
+<project name="scatours-launcher-fullapp" default="compile">
<property environment="env"/>
<target name="compile">
@@ -31,15 +31,15 @@
<copy todir="target/classes">
<fileset dir="src\main\resources"/>
</copy>
- <jar destfile="target/scatours-fullapp-launcher.jar" basedir="target/classes">
+ <jar destfile="target/scatours-launcher-fullapp.jar" basedir="target/classes">
<manifest>
- <attribute name="Main-Class" value="scatours.LaunchFullAppNode"/>
+ <attribute name="Main-Class" value="scatours.FullAppLauncher"/>
</manifest>
</jar>
</target>
<target name="run">
- <java classname="scatours.LaunchFullAppNode" fork="true">
+ <java classname="scatours.FullAppLauncher" fork="true">
<classpath>
<pathelement location="target/classes"/>
<pathelement location="${env.TUSCANY}/lib/tuscany-sca-manifest.jar"/>
@@ -47,24 +47,6 @@
</java>
</target>
- <target name="run-domain">
- <java classname="scatours.LaunchFullAppDomain" fork="true">
- <classpath>
- <pathelement location="target/classes"/>
- <pathelement location="${env.TUSCANY}/lib/tuscany-sca-manifest.jar"/>
- </classpath>
- </java>
- </target>
-
- <target name="run-domain-nodes">
- <java classname="scatours.LaunchFullAppDomainNodes" fork="true">
- <classpath>
- <pathelement location="target/classes"/>
- <pathelement location="${env.TUSCANY}/lib/tuscany-sca-manifest.jar"/>
- </classpath>
- </java>
- </target>
-
<target name="clean">
<delete includeemptydirs="true">
<fileset dir="target"/>
Copied: tuscany/sandbox/travelsample/launchers/fullapp/pom.xml (from r807014, tuscany/sandbox/travelsample/launchers/fullapp-launcher/pom.xml)
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/launchers/fullapp/pom.xml?p2=tuscany/sandbox/travelsample/launchers/fullapp/pom.xml&p1=tuscany/sandbox/travelsample/launchers/fullapp-launcher/pom.xml&r1=807014&r2=808241&rev=808241&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/launchers/fullapp-launcher/pom.xml (original)
+++ tuscany/sandbox/travelsample/launchers/fullapp/pom.xml Thu Aug 27 01:07:30 2009
@@ -25,7 +25,7 @@
<version>1.6-SNAPSHOT</version>
<!--relativePath>../../pom.xml</relativePath-->
</parent><version>1.0-SNAPSHOT</version>
- <artifactId>scatours-fullapp-launcher</artifactId>
+ <artifactId>scatours-launcher-fullapp</artifactId>
<name>Apache Tuscany SCA Tours Full Application Launcher</name>
<dependencies>
Copied: tuscany/sandbox/travelsample/launchers/fullapp/src/main/java/scatours/FullAppLauncher.java (from r807014, tuscany/sandbox/travelsample/launchers/fullapp-launcher/src/main/java/scatours/LaunchFullAppNode.java)
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/launchers/fullapp/src/main/java/scatours/FullAppLauncher.java?p2=tuscany/sandbox/travelsample/launchers/fullapp/src/main/java/scatours/FullAppLauncher.java&p1=tuscany/sandbox/travelsample/launchers/fullapp-launcher/src/main/java/scatours/LaunchFullAppNode.java&r1=807014&r2=808241&rev=808241&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/launchers/fullapp-launcher/src/main/java/scatours/LaunchFullAppNode.java (original)
+++ tuscany/sandbox/travelsample/launchers/fullapp/src/main/java/scatours/FullAppLauncher.java Thu Aug 27 01:07:30 2009
@@ -25,49 +25,39 @@
import org.apache.tuscany.sca.node.SCANode;
import org.apache.tuscany.sca.node.SCANodeFactory;
-public class LaunchFullAppNode {
+public class FullAppLauncher {
+
public static void main(String[] args) throws Exception {
- LaunchFullAppNode.launchFromFileSystemDir();
- }
+ SCANode node = SCANodeFactory.newInstance().createSCANode(null,
+ new SCAContribution("common", "../../contributions/common/target/classes"),
+ new SCAContribution("currency", "../../contributions/currency/target/classes"),
+ new SCAContribution("hotel", "../../contributions/hotel/target/classes"),
+ new SCAContribution("flight", "../../contributions/flight/target/classes"),
+ new SCAContribution("car", "../../contributions/car/target/classes"),
+ new SCAContribution("trip", "../../contributions/trip/target/classes"),
+ new SCAContribution("tripbooking", "../../contributions/tripbooking/target/classes"),
+ new SCAContribution("travelcatalog", "../../contributions/travelcatalog/target/classes"),
+ new SCAContribution("payment", "../../contributions/payment-java/target/classes"),
+ //new SCAContribution("payment", "../../contributions/payment-spring/target/classes"),
+ new SCAContribution("creditcard", "../../contributions/creditcard-payment-jaxb/target/classes"),
+ new SCAContribution("shoppingcart", "../../contributions/shoppingcart/target/classes"),
+ new SCAContribution("scatours", "../../contributions/scatours/target/classes"),
+ new SCAContribution("fullapp-ui", "../../contributions/fullapp-ui/target/classes"),
+ new SCAContribution("fullapp-frontend", "../../contributions/fullapp-frontend/target/classes"),
+ new SCAContribution("fullapp-currency", "../../contributions/fullapp-currency/target/classes"),
+ new SCAContribution("fullapp-packagedtrip", "../../contributions/fullapp-packagedtrip/target/classes"),
+ new SCAContribution("fullapp-bespoketrip", "../../contributions/fullapp-bespoketrip/target/classes"),
+ new SCAContribution("fullapp-shoppingcart", "../../contributions/fullapp-shoppingcart/target/classes"));
- // OK for development but you must launch the node from this module
- public static void launchFromFileSystemDir(){
+ node.start();
+
+ System.out.println("Point your browser at - http://localhost:8080/scatours/ ");
+ System.out.println("Node started - Press enter to shutdown.");
try {
- SCANode node1 = SCANodeFactory.newInstance().createSCANode(null,
- new SCAContribution("common", "../../contributions/common-contribution/target/classes"),
- new SCAContribution("currency", "../../contributions/currency-contribution/target/classes"),
- new SCAContribution("hotel", "../../contributions/hotel-contribution/target/classes"),
- new SCAContribution("flight", "../../contributions/flight-contribution/target/classes"),
- new SCAContribution("car", "../../contributions/car-contribution/target/classes"),
- new SCAContribution("trip", "../../contributions/trip-contribution/target/classes"),
- new SCAContribution("tripbooking", "../../contributions/tripbooking-contribution/target/classes"),
- new SCAContribution("travelcatalog", "../../contributions/travelcatalog-contribution/target/classes"),
- new SCAContribution("payment", "../../contributions/payment-java-contribution/target/classes"),
- //new SCAContribution("payment", "../../contributions/payment-spring-contribution/target/classes"),
- new SCAContribution("creditcard", "../../contributions/creditcard-payment-jaxb-contribution/target/classes"),
- new SCAContribution("shoppingcart", "../../contributions/shoppingcart-contribution/target/classes"),
- new SCAContribution("scatours", "../../contributions/scatours-contribution/target/classes"),
- new SCAContribution("fullapp-ui", "../../contributions/fullapp-ui-contribution/target/classes"),
- new SCAContribution("fullapp-frontend", "../../contributions/fullapp-frontend-contribution/target/classes"),
- new SCAContribution("fullapp-currency", "../../contributions/fullapp-currency-contribution/target/classes"),
- new SCAContribution("fullapp-packagedtrip", "../../contributions/fullapp-packagedtrip-contribution/target/classes"),
- new SCAContribution("fullapp-bespoketrip", "../../contributions/fullapp-bespoketrip-contribution/target/classes"),
- new SCAContribution("fullapp-shoppingcart", "../../contributions/fullapp-shoppingcart-contribution/target/classes"));
-
- node1.start();
-
- System.out.println("Point your browser at - http://localhost:8080/scatours/ ");
- System.out.println("Node started - Press enter to shutdown.");
-
- try {
- System.in.read();
- } catch (IOException e) {}
-
- node1.stop();
-
- } catch (Exception ex) {
- System.out.println(ex.toString());
- }
+ System.in.read();
+ } catch (IOException e) {}
+
+ node.stop();
}
}
Modified: tuscany/sandbox/travelsample/launchers/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/launchers/pom.xml?rev=808241&r1=808240&r2=808241&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/launchers/pom.xml (original)
+++ tuscany/sandbox/travelsample/launchers/pom.xml Thu Aug 27 01:07:30 2009
@@ -50,7 +50,9 @@
<module>introducing-client</module>
<module>introducing-domain</module>
<module>jumpstart-launcher</module>
- <module>fullapp-launcher</module>
+ <module>fullapp</module>
+ <module>fullapp-domain</module>
+ <module>fullapp-nodes</module>
<module>help-pages-launcher</module>
<module>notification-ws-launcher</module>
<module>notification-corba-launcher</module>