diff options
Diffstat (limited to 'sandbox')
43 files changed, 411 insertions, 248 deletions
diff --git a/sandbox/travelsample/distribution/pom.xml b/sandbox/travelsample/distribution/pom.xml index 6cb519d3f5..ed962fea6c 100644 --- a/sandbox/travelsample/distribution/pom.xml +++ b/sandbox/travelsample/distribution/pom.xml @@ -4,7 +4,6 @@ <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> @@ -15,436 +14,441 @@ <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>scatours-client-currency-converter-corba</artifactId> - <version>1.0-SNAPSHOT</version> + <version>${pom.version}</version> </dependency> <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>scatours-client-currency-converter-jms</artifactId> - <version>1.0-SNAPSHOT</version> + <version>${pom.version}</version> </dependency> <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>scatours-client-currency-converter-rmi</artifactId> - <version>1.0-SNAPSHOT</version> + <version>${pom.version}</version> </dependency> <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>scatours-client-currency-converter-ws-jaxws</artifactId> - <version>1.0-SNAPSHOT</version> + <version>${pom.version}</version> </dependency> <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>scatours-contribution-blog-feed</artifactId> - <version>1.0-SNAPSHOT</version> + <version>${pom.version}</version> </dependency> <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>scatours-contribution-calendar</artifactId> - <version>1.0-SNAPSHOT</version> + <version>${pom.version}</version> </dependency> <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>scatours-contribution-car</artifactId> - <version>1.0-SNAPSHOT</version> + <version>${pom.version}</version> </dependency> <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>scatours-contribution-common</artifactId> - <version>1.0-SNAPSHOT</version> + <version>${pom.version}</version> </dependency> <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>scatours-contribution-creditcard-payment-jaxb</artifactId> - <version>1.0-SNAPSHOT</version> + <version>${pom.version}</version> </dependency> <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>scatours-contribution-creditcard-payment-webapp</artifactId> - <version>1.0-SNAPSHOT</version> + <version>${pom.version}</version> <type>war</type> </dependency> <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>scatours-contribution-creditcard-payment-jaxb-policy</artifactId> - <version>1.0-SNAPSHOT</version> + <version>${pom.version}</version> </dependency> <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>scatours-contribution-creditcard-payment-sdo</artifactId> - <version>1.0-SNAPSHOT</version> + <version>${pom.version}</version> </dependency> <!-- <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>scatours-contribution-creditcard-payment-webapp</artifactId> - <version>1.0-SNAPSHOT</version> + <version>${pom.version}</version> </dependency> --> <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>scatours-contribution-currency</artifactId> - <version>1.0-SNAPSHOT</version> + <version>${pom.version}</version> </dependency> <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>scatours-contribution-currency-corba</artifactId> - <version>1.0-SNAPSHOT</version> + <version>${pom.version}</version> </dependency> <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>scatours-contribution-currency-jms</artifactId> - <version>1.0-SNAPSHOT</version> + <version>${pom.version}</version> </dependency> <!-- <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>scatours-contribution-currency-jsp</artifactId> - <version>1.0-SNAPSHOT</version> + <version>${pom.version}</version> </dependency> --> <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>scatours-contribution-currency-rmi</artifactId> - <version>1.0-SNAPSHOT</version> + <version>${pom.version}</version> </dependency> <!-- <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>scatours-contribution-currency-servlet</artifactId> - <version>1.0-SNAPSHOT</version> + <version>${pom.version}</version> </dependency> --> <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>scatours-contribution-currency-ws</artifactId> - <version>1.0-SNAPSHOT</version> + <version>${pom.version}</version> </dependency> <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>scatours-contribution-databinding-client</artifactId> - <version>1.0-SNAPSHOT</version> + <version>${pom.version}</version> </dependency> <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>scatours-contribution-emailgateway</artifactId> - <version>1.0-SNAPSHOT</version> + <version>${pom.version}</version> </dependency> <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>scatours-contribution-feed-logger</artifactId> - <version>1.0-SNAPSHOT</version> + <version>${pom.version}</version> </dependency> <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>scatours-contribution-flight</artifactId> - <version>1.0-SNAPSHOT</version> + <version>${pom.version}</version> </dependency> <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>scatours-contribution-fullapp-bespoketrip</artifactId> - <version>1.0-SNAPSHOT</version> + <version>${pom.version}</version> </dependency> <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>scatours-contribution-fullapp-currency</artifactId> - <version>1.0-SNAPSHOT</version> + <version>${pom.version}</version> </dependency> <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>scatours-contribution-fullapp-frontend</artifactId> - <version>1.0-SNAPSHOT</version> + <version>${pom.version}</version> </dependency> <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>scatours-contribution-fullapp-packagedtrip</artifactId> - <version>1.0-SNAPSHOT</version> + <version>${pom.version}</version> </dependency> <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>scatours-contribution-fullapp-shoppingcart</artifactId> - <version>1.0-SNAPSHOT</version> + <version>${pom.version}</version> </dependency> <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>scatours-contribution-fullapp-ui</artifactId> - <version>1.0-SNAPSHOT</version> + <version>${pom.version}</version> </dependency> <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>scatours-contribution-help-pages</artifactId> - <version>1.0-SNAPSHOT</version> + <version>${pom.version}</version> </dependency> <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>scatours-contribution-hotel</artifactId> - <version>1.0-SNAPSHOT</version> + <version>${pom.version}</version> </dependency> <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>scatours-contribution-interaction-client</artifactId> - <version>1.0-SNAPSHOT</version> + <version>${pom.version}</version> </dependency> <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>scatours-contribution-interaction-service-remote</artifactId> - <version>1.0-SNAPSHOT</version> + <version>${pom.version}</version> </dependency> <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>scatours-contribution-introducing-client</artifactId> - <version>1.0-SNAPSHOT</version> + <version>${pom.version}</version> </dependency> <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>scatours-contribution-introducing-tours</artifactId> - <version>1.0-SNAPSHOT</version> + <version>${pom.version}</version> </dependency> <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>scatours-contribution-introducing-trips</artifactId> - <version>1.0-SNAPSHOT</version> + <version>${pom.version}</version> </dependency> <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>scatours-contribution-notification</artifactId> - <version>1.0-SNAPSHOT</version> + <version>${pom.version}</version> </dependency> <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>scatours-contribution-notification-corba</artifactId> - <version>1.0-SNAPSHOT</version> + <version>${pom.version}</version> </dependency> <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>scatours-contribution-notification-ejb</artifactId> - <version>1.0-SNAPSHOT</version> + <version>${pom.version}</version> </dependency> <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>scatours-contribution-notification-jms</artifactId> - <version>1.0-SNAPSHOT</version> + <version>${pom.version}</version> </dependency> <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>scatours-contribution-notification-rmi</artifactId> - <version>1.0-SNAPSHOT</version> + <version>${pom.version}</version> </dependency> <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>scatours-contribution-notification-ws</artifactId> - <version>1.0-SNAPSHOT</version> + <version>${pom.version}</version> </dependency> <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>scatours-contribution-payment-bpel</artifactId> - <version>1.0-SNAPSHOT</version> + <version>${pom.version}</version> </dependency> <!-- <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>scatours-contribution-payment-groovy</artifactId> - <version>1.0-SNAPSHOT</version> + <version>${pom.version}</version> </dependency> --> <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>scatours-contribution-payment-java</artifactId> - <version>1.0-SNAPSHOT</version> + <version>${pom.version}</version> </dependency> <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>scatours-contribution-payment-java-policy</artifactId> - <version>1.0-SNAPSHOT</version> + <version>${pom.version}</version> </dependency> <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>scatours-contribution-payment-spring</artifactId> - <version>1.0-SNAPSHOT</version> + <version>${pom.version}</version> </dependency> <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>scatours-contribution-payment-spring-policy</artifactId> - <version>1.0-SNAPSHOT</version> + <version>${pom.version}</version> </dependency> <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>scatours-contribution-payment-spring-scatag</artifactId> - <version>1.0-SNAPSHOT</version> + <version>${pom.version}</version> </dependency> <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>scatours-contribution-policy-client</artifactId> - <version>1.0-SNAPSHOT</version> + <version>${pom.version}</version> </dependency> <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>scatours-contribution-scatours</artifactId> - <version>1.0-SNAPSHOT</version> + <version>${pom.version}</version> </dependency> <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>scatours-contribution-shoppingcart</artifactId> - <version>1.0-SNAPSHOT</version> + <version>${pom.version}</version> </dependency> <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>scatours-contribution-travelcatalog</artifactId> - <version>1.0-SNAPSHOT</version> + <version>${pom.version}</version> </dependency> <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>scatours-contribution-trip</artifactId> - <version>1.0-SNAPSHOT</version> + <version>${pom.version}</version> </dependency> <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>scatours-contribution-tripbooking</artifactId> - <version>1.0-SNAPSHOT</version> + <version>${pom.version}</version> + </dependency> + <dependency> + <groupId>org.apache.tuscany.sca</groupId> + <artifactId>scatours-launcher-common</artifactId> + <version>${pom.version}</version> </dependency> <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>scatours-launcher-blog-feed</artifactId> - <version>1.0-SNAPSHOT</version> + <version>${pom.version}</version> </dependency> <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>scatours-launcher-currency-converter</artifactId> - <version>1.0-SNAPSHOT</version> + <version>${pom.version}</version> </dependency> <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>scatours-launcher-currency-converter-corba</artifactId> - <version>1.0-SNAPSHOT</version> + <version>${pom.version}</version> </dependency> <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>scatours-launcher-currency-converter-jms</artifactId> - <version>1.0-SNAPSHOT</version> + <version>${pom.version}</version> </dependency> <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>scatours-launcher-currency-converter-rmi</artifactId> - <version>1.0-SNAPSHOT</version> + <version>${pom.version}</version> </dependency> <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>scatours-launcher-currency-converter-ws</artifactId> - <version>1.0-SNAPSHOT</version> + <version>${pom.version}</version> </dependency> <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>scatours-launcher-databinding</artifactId> - <version>1.0-SNAPSHOT</version> + <version>${pom.version}</version> </dependency> <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>scatours-launcher-feed-logger</artifactId> - <version>1.0-SNAPSHOT</version> + <version>${pom.version}</version> </dependency> <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>scatours-launcher-fullapp</artifactId> - <version>1.0-SNAPSHOT</version> + <version>${pom.version}</version> </dependency> <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>scatours-launcher-fullapp-domain</artifactId> - <version>1.0-SNAPSHOT</version> + <version>${pom.version}</version> </dependency> <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>scatours-launcher-fullapp-nodes</artifactId> - <version>1.0-SNAPSHOT</version> + <version>${pom.version}</version> </dependency> <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>scatours-launcher-help-pages</artifactId> - <version>1.0-SNAPSHOT</version> + <version>${pom.version}</version> </dependency> <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>scatours-launcher-interaction</artifactId> - <version>1.0-SNAPSHOT</version> + <version>${pom.version}</version> </dependency> <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>scatours-launcher-introducing</artifactId> - <version>1.0-SNAPSHOT</version> + <version>${pom.version}</version> </dependency> <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>scatours-launcher-introducing-client</artifactId> - <version>1.0-SNAPSHOT</version> + <version>${pom.version}</version> </dependency> <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>scatours-launcher-introducing-domain</artifactId> - <version>1.0-SNAPSHOT</version> + <version>${pom.version}</version> </dependency> <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>scatours-launcher-jumpstart</artifactId> - <version>1.0-SNAPSHOT</version> + <version>${pom.version}</version> </dependency> <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>scatours-launcher-notification-corba</artifactId> - <version>1.0-SNAPSHOT</version> + <version>${pom.version}</version> </dependency> <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>scatours-launcher-notification-ejb</artifactId> - <version>1.0-SNAPSHOT</version> + <version>${pom.version}</version> </dependency> <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>scatours-launcher-notification-jms</artifactId> - <version>1.0-SNAPSHOT</version> + <version>${pom.version}</version> </dependency> <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>scatours-launcher-notification-rmi</artifactId> - <version>1.0-SNAPSHOT</version> + <version>${pom.version}</version> </dependency> <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>scatours-launcher-notification-ws</artifactId> - <version>1.0-SNAPSHOT</version> + <version>${pom.version}</version> </dependency> <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>scatours-launcher-policy</artifactId> - <version>1.0-SNAPSHOT</version> + <version>${pom.version}</version> </dependency> <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>scatours-service-creditcard-payment-jaxws</artifactId> - <version>1.0-SNAPSHOT</version> + <version>${pom.version}</version> </dependency> <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>scatours-service-smsgateway-corba</artifactId> - <version>1.0-SNAPSHOT</version> + <version>${pom.version}</version> </dependency> <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>scatours-service-smsgateway-ejb</artifactId> - <version>1.0-SNAPSHOT</version> + <version>${pom.version}</version> </dependency> <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>scatours-service-smsgateway-jaxws</artifactId> - <version>1.0-SNAPSHOT</version> + <version>${pom.version}</version> </dependency> <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>scatours-service-smsgateway-jms</artifactId> - <version>1.0-SNAPSHOT</version> + <version>${pom.version}</version> </dependency> <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>scatours-service-smsgateway-rmi</artifactId> - <version>1.0-SNAPSHOT</version> + <version>${pom.version}</version> </dependency> </dependencies> diff --git a/sandbox/travelsample/distribution/src/main/components/bin-modules.xml b/sandbox/travelsample/distribution/src/main/components/bin-modules.xml index db3687bfb1..2a3e93583e 100644 --- a/sandbox/travelsample/distribution/src/main/components/bin-modules.xml +++ b/sandbox/travelsample/distribution/src/main/components/bin-modules.xml @@ -47,6 +47,15 @@ </dependencySet> <dependencySet> + <outputDirectory>lib</outputDirectory> + <unpack>false</unpack> + <includes> + <include>org.apache.tuscany.sca:scatours-launcher-common</include> + </includes> + <scope>runtime</scope> + </dependencySet> + + <dependencySet> <outputDirectory>contributions</outputDirectory> <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping> <unpack>false</unpack> @@ -62,6 +71,9 @@ <includes> <include>org.apache.tuscany.sca:scatours-launcher-*</include> </includes> + <excludes> + <exclude>org.apache.tuscany.sca:scatours-launcher-common</exclude> + </excludes> <scope>runtime</scope> </dependencySet> <dependencySet> diff --git a/sandbox/travelsample/launchers/blog-feed/pom.xml b/sandbox/travelsample/launchers/blog-feed/pom.xml index b2a49570d9..de942815c6 100644 --- a/sandbox/travelsample/launchers/blog-feed/pom.xml +++ b/sandbox/travelsample/launchers/blog-feed/pom.xml @@ -29,6 +29,13 @@ <name>Apache Tuscany SCA Tours Blog Feed Launcher</name>
<dependencies>
+
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>scatours-launcher-common</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-node-impl</artifactId>
diff --git a/sandbox/travelsample/launchers/blog-feed/src/main/java/scatours/BlogFeedLauncher.java b/sandbox/travelsample/launchers/blog-feed/src/main/java/scatours/BlogFeedLauncher.java index f6712dc00e..54d94ec046 100644 --- a/sandbox/travelsample/launchers/blog-feed/src/main/java/scatours/BlogFeedLauncher.java +++ b/sandbox/travelsample/launchers/blog-feed/src/main/java/scatours/BlogFeedLauncher.java @@ -19,6 +19,8 @@ package scatours;
+import static scatours.launcher.LauncherUtil.locate;
+
import org.apache.tuscany.sca.node.SCAContribution;
import org.apache.tuscany.sca.node.SCANode;
import org.apache.tuscany.sca.node.SCANodeFactory;
@@ -27,8 +29,7 @@ public class BlogFeedLauncher { public static void main(String[] args) throws Exception {
SCAContribution feedContribution =
- new SCAContribution("blog-feed",
- "../../contributions/blog-feed/target/classes");
+ locate("blog-feed");
SCANode node = SCANodeFactory.newInstance().createSCANode(
"blog-feed.composite", feedContribution);
diff --git a/sandbox/travelsample/launchers/currency-converter-corba/pom.xml b/sandbox/travelsample/launchers/currency-converter-corba/pom.xml index 4b53cd2d74..2d6871ba07 100644 --- a/sandbox/travelsample/launchers/currency-converter-corba/pom.xml +++ b/sandbox/travelsample/launchers/currency-converter-corba/pom.xml @@ -29,6 +29,13 @@ <name>Apache Tuscany SCA Tours Currency Converter CORBA Launcher</name>
<dependencies>
+
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>scatours-launcher-common</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-node-api</artifactId>
diff --git a/sandbox/travelsample/launchers/currency-converter-corba/src/main/java/scatours/CurrencyConverterCORBALauncher.java b/sandbox/travelsample/launchers/currency-converter-corba/src/main/java/scatours/CurrencyConverterCORBALauncher.java index f1bdbb852d..d18acc6df1 100644 --- a/sandbox/travelsample/launchers/currency-converter-corba/src/main/java/scatours/CurrencyConverterCORBALauncher.java +++ b/sandbox/travelsample/launchers/currency-converter-corba/src/main/java/scatours/CurrencyConverterCORBALauncher.java @@ -19,6 +19,8 @@ package scatours;
+import static scatours.launcher.LauncherUtil.locate;
+
import org.apache.tuscany.sca.node.SCAClient;
import org.apache.tuscany.sca.node.SCAContribution;
import org.apache.tuscany.sca.node.SCANode;
@@ -30,11 +32,9 @@ public class CurrencyConverterCORBALauncher { public static void main(String[] args) throws Exception {
SCAContribution currencyCORBAContribution =
- new SCAContribution("currency-corba",
- "../../contributions/currency-corba/target/classes");
+ locate("currency-corba");
SCAContribution currencyContribution =
- new SCAContribution("currency",
- "../../contributions/currency/target/classes");
+ locate("currency");
SCANode node = SCANodeFactory.newInstance().createSCANode(
"currency-converter-corba.composite", currencyContribution, currencyCORBAContribution);
diff --git a/sandbox/travelsample/launchers/currency-converter-jms/pom.xml b/sandbox/travelsample/launchers/currency-converter-jms/pom.xml index 8684156e95..a714b6c19e 100644 --- a/sandbox/travelsample/launchers/currency-converter-jms/pom.xml +++ b/sandbox/travelsample/launchers/currency-converter-jms/pom.xml @@ -29,6 +29,13 @@ <name>Apache Tuscany SCA Tours Currency Converter JMS Launcher</name>
<dependencies>
+
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>scatours-launcher-common</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-node-api</artifactId>
diff --git a/sandbox/travelsample/launchers/currency-converter-jms/src/main/java/scatours/CurrencyConverterJMSLauncher.java b/sandbox/travelsample/launchers/currency-converter-jms/src/main/java/scatours/CurrencyConverterJMSLauncher.java index a8cf9079e0..08a0d8430a 100644 --- a/sandbox/travelsample/launchers/currency-converter-jms/src/main/java/scatours/CurrencyConverterJMSLauncher.java +++ b/sandbox/travelsample/launchers/currency-converter-jms/src/main/java/scatours/CurrencyConverterJMSLauncher.java @@ -19,6 +19,8 @@ package scatours;
+import static scatours.launcher.LauncherUtil.locate;
+
import org.apache.tuscany.sca.node.SCAContribution;
import org.apache.tuscany.sca.node.SCANode;
import org.apache.tuscany.sca.node.SCANodeFactory;
@@ -26,10 +28,8 @@ import org.apache.tuscany.sca.node.SCANodeFactory; public class CurrencyConverterJMSLauncher {
public static void main(String[] args) throws Exception {
- SCAContribution currencyJMSContribution =
- new SCAContribution("currency-jms", "../../contributions/currency-jms/target/classes");
- SCAContribution currencyContribution =
- new SCAContribution("currency", "../../contributions/currency/target/classes");
+ SCAContribution currencyJMSContribution = locate("currency-jms");
+ SCAContribution currencyContribution = locate("currency");
SCANode node = SCANodeFactory.newInstance().createSCANode(
"currency-converter-jms.composite", currencyContribution, currencyJMSContribution);
diff --git a/sandbox/travelsample/launchers/currency-converter-rmi/pom.xml b/sandbox/travelsample/launchers/currency-converter-rmi/pom.xml index 4073bc9528..dd01bb901f 100644 --- a/sandbox/travelsample/launchers/currency-converter-rmi/pom.xml +++ b/sandbox/travelsample/launchers/currency-converter-rmi/pom.xml @@ -29,8 +29,15 @@ <name>Apache Tuscany SCA Tours Currency Converter RMI Launcher</name>
<dependencies>
+
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>scatours-launcher-common</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-node-api</artifactId>
<version>1.6-SNAPSHOT</version>
</dependency>
diff --git a/sandbox/travelsample/launchers/currency-converter-rmi/src/main/java/scatours/CurrencyConverterRMILauncher.java b/sandbox/travelsample/launchers/currency-converter-rmi/src/main/java/scatours/CurrencyConverterRMILauncher.java index c614886820..87660bdfb6 100644 --- a/sandbox/travelsample/launchers/currency-converter-rmi/src/main/java/scatours/CurrencyConverterRMILauncher.java +++ b/sandbox/travelsample/launchers/currency-converter-rmi/src/main/java/scatours/CurrencyConverterRMILauncher.java @@ -19,6 +19,8 @@ package scatours;
+import static scatours.launcher.LauncherUtil.locate;
+
import org.apache.tuscany.sca.node.SCAClient;
import org.apache.tuscany.sca.node.SCAContribution;
import org.apache.tuscany.sca.node.SCANode;
@@ -30,11 +32,9 @@ public class CurrencyConverterRMILauncher { public static void main(String[] args) throws Exception {
SCAContribution currencyRMIContribution =
- new SCAContribution("currency-rmi",
- "../../contributions/currency-rmi/target/classes");
+ locate("currency-rmi");
SCAContribution currencyContribution =
- new SCAContribution("currency",
- "../../contributions/currency/target/classes");
+ locate("currency");
SCANode node = SCANodeFactory.newInstance().createSCANode(
"currency-converter-rmi.composite", currencyContribution, currencyRMIContribution);
diff --git a/sandbox/travelsample/launchers/currency-converter-ws/pom.xml b/sandbox/travelsample/launchers/currency-converter-ws/pom.xml index 3f0ee48512..ef99f5ea17 100644 --- a/sandbox/travelsample/launchers/currency-converter-ws/pom.xml +++ b/sandbox/travelsample/launchers/currency-converter-ws/pom.xml @@ -30,6 +30,13 @@ <name>Apache Tuscany SCA Tours Currency Converter Web Service Launcher</name>
<dependencies>
+
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>scatours-launcher-common</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-node-api</artifactId>
diff --git a/sandbox/travelsample/launchers/currency-converter-ws/src/main/java/scatours/CurrencyConverterWSLauncher.java b/sandbox/travelsample/launchers/currency-converter-ws/src/main/java/scatours/CurrencyConverterWSLauncher.java index d62dfebf31..36b907d454 100644 --- a/sandbox/travelsample/launchers/currency-converter-ws/src/main/java/scatours/CurrencyConverterWSLauncher.java +++ b/sandbox/travelsample/launchers/currency-converter-ws/src/main/java/scatours/CurrencyConverterWSLauncher.java @@ -19,6 +19,8 @@ package scatours;
+import static scatours.launcher.LauncherUtil.locate;
+
import org.apache.tuscany.sca.node.SCAClient;
import org.apache.tuscany.sca.node.SCAContribution;
import org.apache.tuscany.sca.node.SCANode;
@@ -30,11 +32,9 @@ public class CurrencyConverterWSLauncher { public static void main(String[] args) throws Exception {
SCAContribution currencyWSContribution =
- new SCAContribution("currency-ws",
- "../../contributions/currency-ws/target/classes");
+ locate("currency-ws");
SCAContribution currencyContribution =
- new SCAContribution("currency",
- "../../contributions/currency/target/classes");
+ locate("currency");
SCANode node = SCANodeFactory.newInstance().createSCANode(
"currency-converter-ws.composite", currencyContribution, currencyWSContribution);
diff --git a/sandbox/travelsample/launchers/currency-converter/pom.xml b/sandbox/travelsample/launchers/currency-converter/pom.xml index ecc6ec75f1..e3f2e49e7e 100644 --- a/sandbox/travelsample/launchers/currency-converter/pom.xml +++ b/sandbox/travelsample/launchers/currency-converter/pom.xml @@ -29,6 +29,13 @@ <name>Apache Tuscany SCA Tours Currency Converter Launcher</name>
<dependencies>
+
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>scatours-launcher-common</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-node-api</artifactId>
diff --git a/sandbox/travelsample/launchers/currency-converter/src/main/java/scatours/CurrencyConverterLauncher.java b/sandbox/travelsample/launchers/currency-converter/src/main/java/scatours/CurrencyConverterLauncher.java index fb74e8eeb1..9e8385e9af 100644 --- a/sandbox/travelsample/launchers/currency-converter/src/main/java/scatours/CurrencyConverterLauncher.java +++ b/sandbox/travelsample/launchers/currency-converter/src/main/java/scatours/CurrencyConverterLauncher.java @@ -19,6 +19,8 @@ package scatours;
+import static scatours.launcher.LauncherUtil.locate;
+
import org.apache.tuscany.sca.node.SCAClient;
import org.apache.tuscany.sca.node.SCAContribution;
import org.apache.tuscany.sca.node.SCANode;
@@ -30,8 +32,7 @@ public class CurrencyConverterLauncher { public static void main(String[] args) throws Exception {
SCAContribution currencyContribution =
- new SCAContribution("currency",
- "../../contributions/currency/target/classes");
+ locate("currency");
SCANode node = SCANodeFactory.newInstance().createSCANode(
"currency-converter.composite", currencyContribution);
diff --git a/sandbox/travelsample/launchers/databinding/pom.xml b/sandbox/travelsample/launchers/databinding/pom.xml index 76a0d3524e..da2133dea0 100644 --- a/sandbox/travelsample/launchers/databinding/pom.xml +++ b/sandbox/travelsample/launchers/databinding/pom.xml @@ -30,6 +30,13 @@ <name>Apache Tuscany SCA Tours Databinding Launcher</name> <dependencies> + + <dependency> + <groupId>org.apache.tuscany.sca</groupId> + <artifactId>scatours-launcher-common</artifactId> + <version>${pom.version}</version> + </dependency> + <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>tuscany-node-api</artifactId> diff --git a/sandbox/travelsample/launchers/databinding/src/main/java/scatours/DatabindingLauncher.java b/sandbox/travelsample/launchers/databinding/src/main/java/scatours/DatabindingLauncher.java index 7128c966de..1ae22baca6 100644 --- a/sandbox/travelsample/launchers/databinding/src/main/java/scatours/DatabindingLauncher.java +++ b/sandbox/travelsample/launchers/databinding/src/main/java/scatours/DatabindingLauncher.java @@ -19,19 +19,20 @@ package scatours; +import static scatours.launcher.LauncherUtil.locate; + import org.apache.tuscany.sca.node.SCAClient; -import org.apache.tuscany.sca.node.SCAContribution; import org.apache.tuscany.sca.node.SCANode; import org.apache.tuscany.sca.node.SCANodeFactory; public class DatabindingLauncher { public static void main(String[] args) throws Exception { SCANode node1 = SCANodeFactory.newInstance().createSCANode(null, - new SCAContribution("paymentjava", "../../contributions/payment-java/target/classes"), - new SCAContribution("client", "../../contributions/databinding-client/target/classes")); + locate("paymentjava"), + locate("client")); SCANode node2 = SCANodeFactory.newInstance().createSCANode(null, - new SCAContribution("creditcardpaymentsdo", "../../contributions/creditcard-payment-sdo/target/classes")); + locate("creditcardpaymentsdo")); node1.start(); node2.start(); diff --git a/sandbox/travelsample/launchers/feed-logger/pom.xml b/sandbox/travelsample/launchers/feed-logger/pom.xml index 53fad2ff0e..9b3ecdfe08 100644 --- a/sandbox/travelsample/launchers/feed-logger/pom.xml +++ b/sandbox/travelsample/launchers/feed-logger/pom.xml @@ -30,6 +30,13 @@ <name>Apache Tuscany SCA Tours Feed Logger Launcher</name>
<dependencies>
+
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>scatours-launcher-common</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-node-impl</artifactId>
diff --git a/sandbox/travelsample/launchers/feed-logger/src/main/java/scatours/FeedLoggerLauncher.java b/sandbox/travelsample/launchers/feed-logger/src/main/java/scatours/FeedLoggerLauncher.java index a92c149d77..73970b12ca 100644 --- a/sandbox/travelsample/launchers/feed-logger/src/main/java/scatours/FeedLoggerLauncher.java +++ b/sandbox/travelsample/launchers/feed-logger/src/main/java/scatours/FeedLoggerLauncher.java @@ -19,6 +19,8 @@ package scatours;
+import static scatours.launcher.LauncherUtil.locate;
+
import org.apache.tuscany.sca.node.SCAClient;
import org.apache.tuscany.sca.node.SCAContribution;
import org.apache.tuscany.sca.node.SCANode;
@@ -30,8 +32,7 @@ public class FeedLoggerLauncher { public static void main(String[] args) throws Exception {
SCAContribution feedContribution =
- new SCAContribution("feed-logger",
- "../../contributions/feed-logger/target/classes");
+ locate("feed-logger");
SCANode node = SCANodeFactory.newInstance().createSCANode(
"feed-logger.composite", feedContribution);
diff --git a/sandbox/travelsample/launchers/fullapp/pom.xml b/sandbox/travelsample/launchers/fullapp/pom.xml index 28236ac687..2584718d15 100644 --- a/sandbox/travelsample/launchers/fullapp/pom.xml +++ b/sandbox/travelsample/launchers/fullapp/pom.xml @@ -24,12 +24,19 @@ <artifactId>tuscany-sca</artifactId> <version>1.6-SNAPSHOT</version> <!--relativePath>../../pom.xml</relativePath--> - </parent><version>1.0-SNAPSHOT</version> + </parent> + <version>1.0-SNAPSHOT</version> <artifactId>scatours-launcher-fullapp</artifactId> <name>Apache Tuscany SCA Tours Full Application Launcher</name> <dependencies> - + + <dependency> + <groupId>org.apache.tuscany.sca</groupId> + <artifactId>scatours-launcher-common</artifactId> + <version>${pom.version}</version> + </dependency> + <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>tuscany-assembly</artifactId> diff --git a/sandbox/travelsample/launchers/fullapp/src/main/java/scatours/FullAppLauncher.java b/sandbox/travelsample/launchers/fullapp/src/main/java/scatours/FullAppLauncher.java index 426aeb60ff..e9496eef8e 100644 --- a/sandbox/travelsample/launchers/fullapp/src/main/java/scatours/FullAppLauncher.java +++ b/sandbox/travelsample/launchers/fullapp/src/main/java/scatours/FullAppLauncher.java @@ -19,35 +19,38 @@ package scatours; +import static scatours.launcher.LauncherUtil.locate; + 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; public class FullAppLauncher { + public static void main(String[] args) throws Exception { - 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")); + SCANode node = + SCANodeFactory.newInstance().createSCANode(null, + locate("common"), + locate("currency"), + locate("hotel"), + locate("flight"), + locate("car"), + locate("trip"), + locate("tripbooking"), + locate("travelcatalog"), + locate("payment"), + //locate("payment"), + locate("creditcard"), + locate("shoppingcart"), + locate("scatours"), + locate("fullapp-ui"), + locate("fullapp-frontend"), + locate("fullapp-currency"), + locate("fullapp-packagedtrip"), + locate("fullapp-bespoketrip"), + locate("fullapp-shoppingcart")); node.start(); @@ -56,7 +59,8 @@ public class FullAppLauncher { try { System.in.read(); - } catch (IOException e) {} + } catch (IOException e) { + } node.stop(); } diff --git a/sandbox/travelsample/launchers/help-pages/pom.xml b/sandbox/travelsample/launchers/help-pages/pom.xml index 70b2300d7e..af502cf9af 100644 --- a/sandbox/travelsample/launchers/help-pages/pom.xml +++ b/sandbox/travelsample/launchers/help-pages/pom.xml @@ -29,6 +29,13 @@ <name>Apache Tuscany SCA Tours Help Pages Launcher</name>
<dependencies>
+
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>scatours-launcher-common</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-node-api</artifactId>
diff --git a/sandbox/travelsample/launchers/help-pages/src/main/java/scatours/HelpPagesLauncher.java b/sandbox/travelsample/launchers/help-pages/src/main/java/scatours/HelpPagesLauncher.java index b363748a63..097e05e7e5 100644 --- a/sandbox/travelsample/launchers/help-pages/src/main/java/scatours/HelpPagesLauncher.java +++ b/sandbox/travelsample/launchers/help-pages/src/main/java/scatours/HelpPagesLauncher.java @@ -19,6 +19,8 @@ package scatours;
+import static scatours.launcher.LauncherUtil.locate;
+
import org.apache.tuscany.sca.node.SCAContribution;
import org.apache.tuscany.sca.node.SCANode;
import org.apache.tuscany.sca.node.SCANodeFactory;
@@ -27,8 +29,7 @@ public class HelpPagesLauncher { public static void main(String[] args) throws Exception {
SCAContribution helpContribution =
- new SCAContribution("help-pages",
- "../../contributions/help-pages/target/classes");
+ locate("help-pages");
SCANode node = SCANodeFactory.newInstance().createSCANode(
"help-pages.composite", helpContribution);
diff --git a/sandbox/travelsample/launchers/interaction/pom.xml b/sandbox/travelsample/launchers/interaction/pom.xml index e66bf1c1df..4195f386cc 100644 --- a/sandbox/travelsample/launchers/interaction/pom.xml +++ b/sandbox/travelsample/launchers/interaction/pom.xml @@ -29,6 +29,13 @@ <name>Apache Tuscany SCA Tours Interaction Launcher</name>
<dependencies>
+
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>scatours-launcher-common</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-node-api</artifactId>
diff --git a/sandbox/travelsample/launchers/interaction/src/main/java/scatours/InteractionLauncher.java b/sandbox/travelsample/launchers/interaction/src/main/java/scatours/InteractionLauncher.java index 6ab50cb712..315233f40f 100644 --- a/sandbox/travelsample/launchers/interaction/src/main/java/scatours/InteractionLauncher.java +++ b/sandbox/travelsample/launchers/interaction/src/main/java/scatours/InteractionLauncher.java @@ -19,8 +19,9 @@ package scatours;
+import static scatours.launcher.LauncherUtil.locate;
+
import org.apache.tuscany.sca.node.SCAClient;
-import org.apache.tuscany.sca.node.SCAContribution;
import org.apache.tuscany.sca.node.SCANode;
import org.apache.tuscany.sca.node.SCANodeFactory;
@@ -28,17 +29,17 @@ public class InteractionLauncher { public static void main(String[] args) throws Exception {
SCANode node1 = SCANodeFactory.newInstance().createSCANode("client.composite",
- new SCAContribution("common", "../../contributions/common/target/classes"),
- new SCAContribution("currency", "../../contributions/currency/target/classes"),
- new SCAContribution("calendar", "../../contributions/calendar/target/classes"),
- new SCAContribution("shoppingcart", "../../contributions/shoppingcart/target/classes"),
- new SCAContribution("client", "../../contributions/interaction-client/target/classes"));
+ locate("common"),
+ locate("currency"),
+ locate("calendar"),
+ locate("shoppingcart"),
+ locate("client"));
SCANode node2 = SCANodeFactory.newInstance().createSCANode("service.composite",
- new SCAContribution("common", "../../contributions/common/target/classes"),
- new SCAContribution("hotel", "../../contributions/hotel/target/classes"),
- new SCAContribution("flight", "../../contributions/flight/target/classes"),
- new SCAContribution("remoteService", "../../contributions/interaction-service-remote/target/classes"));
+ locate("common"),
+ locate("hotel"),
+ locate("flight"),
+ locate("remoteService"));
node2.start();
node1.start();
diff --git a/sandbox/travelsample/launchers/introducing/pom.xml b/sandbox/travelsample/launchers/introducing/pom.xml index f1c26105c7..6953c7b3f9 100644 --- a/sandbox/travelsample/launchers/introducing/pom.xml +++ b/sandbox/travelsample/launchers/introducing/pom.xml @@ -29,6 +29,13 @@ <name>Apache Tuscany SCA Tours Introducing Launcher</name>
<dependencies>
+
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>scatours-launcher-common</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-node-api</artifactId>
diff --git a/sandbox/travelsample/launchers/introducing/src/main/java/scatours/IntroducingLauncher.java b/sandbox/travelsample/launchers/introducing/src/main/java/scatours/IntroducingLauncher.java index b137c115ee..bef43d9c7a 100644 --- a/sandbox/travelsample/launchers/introducing/src/main/java/scatours/IntroducingLauncher.java +++ b/sandbox/travelsample/launchers/introducing/src/main/java/scatours/IntroducingLauncher.java @@ -19,8 +19,9 @@ package scatours; +import static scatours.launcher.LauncherUtil.locate; + import org.apache.tuscany.sca.node.SCAClient; -import org.apache.tuscany.sca.node.SCAContribution; import org.apache.tuscany.sca.node.SCANode; import org.apache.tuscany.sca.node.SCANodeFactory; @@ -28,9 +29,9 @@ public class IntroducingLauncher { public static void main(String[] args) throws Exception { SCANode node = SCANodeFactory.newInstance().createSCANode(null, - new SCAContribution("introducing-tours", "../../contributions/introducing-tuscanyscatours-contribution/target/classes"), - new SCAContribution("introducing-trips", "../../contributions/introducing-goodvaluetrips-contribution/target/classes"), - new SCAContribution("introducing-client", "../../contributions/introducing-client-contribution/target/classes")); + locate("introducing-tours"), + locate("introducing-trips"), + locate("introducing-client")); node.start(); diff --git a/sandbox/travelsample/launchers/jumpstart/pom.xml b/sandbox/travelsample/launchers/jumpstart/pom.xml index 61755fd82f..003e22fbf6 100644 --- a/sandbox/travelsample/launchers/jumpstart/pom.xml +++ b/sandbox/travelsample/launchers/jumpstart/pom.xml @@ -29,6 +29,13 @@ <name>Apache Tuscany SCA Tours Jump Start Launcher</name>
<dependencies>
+
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>scatours-launcher-common</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-node-api</artifactId>
diff --git a/sandbox/travelsample/launchers/jumpstart/src/main/java/scatours/JumpstartLauncher.java b/sandbox/travelsample/launchers/jumpstart/src/main/java/scatours/JumpstartLauncher.java index 69ca38010f..8c6f19f1db 100644 --- a/sandbox/travelsample/launchers/jumpstart/src/main/java/scatours/JumpstartLauncher.java +++ b/sandbox/travelsample/launchers/jumpstart/src/main/java/scatours/JumpstartLauncher.java @@ -19,6 +19,8 @@ package scatours;
+import static scatours.launcher.LauncherUtil.locate;
+
import org.apache.tuscany.sca.node.SCAClient;
import org.apache.tuscany.sca.node.SCAContribution;
import org.apache.tuscany.sca.node.SCANode;
@@ -28,8 +30,7 @@ public class JumpstartLauncher { public static void main(String[] args) throws Exception {
SCAContribution gvtContribution =
- new SCAContribution("introducing-trips",
- "../../contributions/introducing-trips/target/classes");
+ locate("introducing-trips");
SCANode node = SCANodeFactory.newInstance().
createSCANode("trips.composite",
diff --git a/sandbox/travelsample/launchers/notification-corba/pom.xml b/sandbox/travelsample/launchers/notification-corba/pom.xml index b930df6328..e557c6b932 100644 --- a/sandbox/travelsample/launchers/notification-corba/pom.xml +++ b/sandbox/travelsample/launchers/notification-corba/pom.xml @@ -29,6 +29,13 @@ <name>Apache Tuscany SCA Tours Notification CORBA Service Launcher</name>
<dependencies>
+
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>scatours-launcher-common</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-node-api</artifactId>
diff --git a/sandbox/travelsample/launchers/notification-corba/src/main/java/scatours/NotificationCORBALauncher.java b/sandbox/travelsample/launchers/notification-corba/src/main/java/scatours/NotificationCORBALauncher.java index 6b3147dce9..eb7d12f2f9 100644 --- a/sandbox/travelsample/launchers/notification-corba/src/main/java/scatours/NotificationCORBALauncher.java +++ b/sandbox/travelsample/launchers/notification-corba/src/main/java/scatours/NotificationCORBALauncher.java @@ -19,6 +19,8 @@ package scatours;
+import static scatours.launcher.LauncherUtil.locate;
+
import org.apache.tuscany.sca.node.SCAClient;
import org.apache.tuscany.sca.node.SCAContribution;
import org.apache.tuscany.sca.node.SCANode;
@@ -30,11 +32,9 @@ public class NotificationCORBALauncher { public static void main(String[] args) throws Exception {
SCAContribution notificationContribution =
- new SCAContribution("notification",
- "../../contributions/notification/target/classes");
+ locate("notification");
SCAContribution notificationCORBAContribution =
- new SCAContribution("notification-corba",
- "../../contributions/notification-corba/target/classes");
+ locate("notification-corba");
SCANode node = SCANodeFactory.newInstance().createSCANode(
"notification-corba.composite", notificationContribution, notificationCORBAContribution);
diff --git a/sandbox/travelsample/launchers/notification-ejb/pom.xml b/sandbox/travelsample/launchers/notification-ejb/pom.xml index 70954b4b0d..abd13f1ed7 100644 --- a/sandbox/travelsample/launchers/notification-ejb/pom.xml +++ b/sandbox/travelsample/launchers/notification-ejb/pom.xml @@ -29,6 +29,13 @@ <name>Apache Tuscany SCA Tours Notification EJB Launcher</name>
<dependencies>
+
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>scatours-launcher-common</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-node-api</artifactId>
diff --git a/sandbox/travelsample/launchers/notification-ejb/src/main/java/scatours/NotificationEJBLauncher.java b/sandbox/travelsample/launchers/notification-ejb/src/main/java/scatours/NotificationEJBLauncher.java index 6b01299ca8..880908a7a7 100644 --- a/sandbox/travelsample/launchers/notification-ejb/src/main/java/scatours/NotificationEJBLauncher.java +++ b/sandbox/travelsample/launchers/notification-ejb/src/main/java/scatours/NotificationEJBLauncher.java @@ -19,6 +19,8 @@ package scatours;
+import static scatours.launcher.LauncherUtil.locate;
+
import javax.naming.Context;
import org.apache.tuscany.sca.node.SCAClient;
@@ -35,11 +37,9 @@ public class NotificationEJBLauncher { System.setProperty(Context.PROVIDER_URL, "ejbd://localhost:4201");
SCAContribution notificationContribution =
- new SCAContribution("notification",
- "../../contributions/notification/target/classes");
+ locate("notification");
SCAContribution notificationEJBContribution =
- new SCAContribution("notification-ejb",
- "../../contributions/notification-ejb/target/classes");
+ locate("notification-ejb");
SCANode node = SCANodeFactory.newInstance().createSCANode(
"notification-ejb.composite", notificationContribution, notificationEJBContribution);
diff --git a/sandbox/travelsample/launchers/notification-jms/pom.xml b/sandbox/travelsample/launchers/notification-jms/pom.xml index 4057986830..23ee3a92b8 100644 --- a/sandbox/travelsample/launchers/notification-jms/pom.xml +++ b/sandbox/travelsample/launchers/notification-jms/pom.xml @@ -29,6 +29,13 @@ <name>Apache Tuscany SCA Tours Notification JMS Launcher</name>
<dependencies>
+
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>scatours-launcher-common</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-node-api</artifactId>
diff --git a/sandbox/travelsample/launchers/notification-jms/src/main/java/scatours/NotificationJMSLauncher.java b/sandbox/travelsample/launchers/notification-jms/src/main/java/scatours/NotificationJMSLauncher.java index c0d6b5742e..c6ee50e2e8 100644 --- a/sandbox/travelsample/launchers/notification-jms/src/main/java/scatours/NotificationJMSLauncher.java +++ b/sandbox/travelsample/launchers/notification-jms/src/main/java/scatours/NotificationJMSLauncher.java @@ -19,6 +19,8 @@ package scatours;
+import static scatours.launcher.LauncherUtil.locate;
+
import org.apache.tuscany.sca.node.SCAClient;
import org.apache.tuscany.sca.node.SCAContribution;
import org.apache.tuscany.sca.node.SCANode;
@@ -30,11 +32,9 @@ public class NotificationJMSLauncher { public static void main(String[] args) throws Exception {
SCAContribution notificationContribution =
- new SCAContribution("notification",
- "../../contributions/notification/target/classes");
+ locate("notification");
SCAContribution notificationJMSContribution =
- new SCAContribution("notification-jms",
- "../../contributions/notification-jms/target/classes");
+ locate("notification-jms");
SCANode node = SCANodeFactory.newInstance().createSCANode(
"notification-jms.composite", notificationContribution, notificationJMSContribution);
diff --git a/sandbox/travelsample/launchers/notification-rmi/pom.xml b/sandbox/travelsample/launchers/notification-rmi/pom.xml index 345213a8a1..dbba890f46 100644 --- a/sandbox/travelsample/launchers/notification-rmi/pom.xml +++ b/sandbox/travelsample/launchers/notification-rmi/pom.xml @@ -29,6 +29,13 @@ <name>Apache Tuscany SCA Tours Notification RMI Launcher</name>
<dependencies>
+
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>scatours-launcher-common</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-node-api</artifactId>
diff --git a/sandbox/travelsample/launchers/notification-rmi/src/main/java/scatours/NotificationRMILauncher.java b/sandbox/travelsample/launchers/notification-rmi/src/main/java/scatours/NotificationRMILauncher.java index 6fdb064c16..200f870417 100644 --- a/sandbox/travelsample/launchers/notification-rmi/src/main/java/scatours/NotificationRMILauncher.java +++ b/sandbox/travelsample/launchers/notification-rmi/src/main/java/scatours/NotificationRMILauncher.java @@ -19,6 +19,8 @@ package scatours;
+import static scatours.launcher.LauncherUtil.locate;
+
import org.apache.tuscany.sca.node.SCAClient;
import org.apache.tuscany.sca.node.SCAContribution;
import org.apache.tuscany.sca.node.SCANode;
@@ -30,11 +32,9 @@ public class NotificationRMILauncher { public static void main(String[] args) throws Exception {
SCAContribution notificationContribution =
- new SCAContribution("notification",
- "../../contributions/notification/target/classes");
+ locate("notification");
SCAContribution notificationRMIContribution =
- new SCAContribution("notification-rmi",
- "../../contributions/notification-rmi/target/classes");
+ locate("notification-rmi");
SCANode node = SCANodeFactory.newInstance().createSCANode(
"notification-rmi.composite", notificationContribution, notificationRMIContribution);
diff --git a/sandbox/travelsample/launchers/notification-ws/pom.xml b/sandbox/travelsample/launchers/notification-ws/pom.xml index 4c03972565..5581df1aef 100644 --- a/sandbox/travelsample/launchers/notification-ws/pom.xml +++ b/sandbox/travelsample/launchers/notification-ws/pom.xml @@ -29,6 +29,13 @@ <name>Apache Tuscany SCA Tours Notification Web Service Launcher</name>
<dependencies>
+
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>scatours-launcher-common</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-node-api</artifactId>
diff --git a/sandbox/travelsample/launchers/notification-ws/src/main/java/scatours/NotificationWSLauncher.java b/sandbox/travelsample/launchers/notification-ws/src/main/java/scatours/NotificationWSLauncher.java index 08af2c3b58..4d7f1741fe 100644 --- a/sandbox/travelsample/launchers/notification-ws/src/main/java/scatours/NotificationWSLauncher.java +++ b/sandbox/travelsample/launchers/notification-ws/src/main/java/scatours/NotificationWSLauncher.java @@ -19,6 +19,8 @@ package scatours;
+import static scatours.launcher.LauncherUtil.locate;
+
import org.apache.tuscany.sca.node.SCAClient;
import org.apache.tuscany.sca.node.SCAContribution;
import org.apache.tuscany.sca.node.SCANode;
@@ -30,11 +32,9 @@ public class NotificationWSLauncher { public static void main(String[] args) throws Exception {
SCAContribution notificationContribution =
- new SCAContribution("notification",
- "../../contributions/notification/target/classes");
+ locate("notification");
SCAContribution notificationWSContribution =
- new SCAContribution("notification-ws",
- "../../contributions/notification-ws/target/classes");
+ locate("notification-ws");
SCANode node = SCANodeFactory.newInstance().createSCANode(
"notification-ws.composite", notificationContribution, notificationWSContribution);
diff --git a/sandbox/travelsample/launchers/policy/pom.xml b/sandbox/travelsample/launchers/policy/pom.xml index ed33c0662b..02fe4bfdf4 100644 --- a/sandbox/travelsample/launchers/policy/pom.xml +++ b/sandbox/travelsample/launchers/policy/pom.xml @@ -29,6 +29,13 @@ <name>Apache Tuscany SCA Tours Policy Launcher</name> <dependencies> + + <dependency> + <groupId>org.apache.tuscany.sca</groupId> + <artifactId>scatours-launcher-common</artifactId> + <version>${pom.version}</version> + </dependency> + <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>tuscany-node-api</artifactId> diff --git a/sandbox/travelsample/launchers/policy/src/main/java/scatours/PolicyLauncher.java b/sandbox/travelsample/launchers/policy/src/main/java/scatours/PolicyLauncher.java index c55c8d4c13..838b9d93e5 100644 --- a/sandbox/travelsample/launchers/policy/src/main/java/scatours/PolicyLauncher.java +++ b/sandbox/travelsample/launchers/policy/src/main/java/scatours/PolicyLauncher.java @@ -19,8 +19,9 @@ package scatours; +import static scatours.launcher.LauncherUtil.locate; + import org.apache.tuscany.sca.node.SCAClient; -import org.apache.tuscany.sca.node.SCAContribution; import org.apache.tuscany.sca.node.SCANode; import org.apache.tuscany.sca.node.SCANodeFactory; @@ -28,13 +29,13 @@ public class PolicyLauncher { public static void main(String[] args) throws Exception { SCANode node1 = SCANodeFactory.newInstance().createSCANode(null, - new SCAContribution("client", "../../contributions/policy-client/target/classes"), - new SCAContribution("payment", "../../contributions/payment-java-policy/target/classes")); + locate("client"), + locate("payment")); node1.start(); SCANode node2 = SCANodeFactory.newInstance().createSCANode(null, - new SCAContribution("creditcard", "../../contributions/creditcard-payment-jaxb-policy/target/classes")); + locate("creditcard")); node2.start(); diff --git a/sandbox/travelsample/launchers/pom.xml b/sandbox/travelsample/launchers/pom.xml index edfccff641..ffcf71ceb4 100644 --- a/sandbox/travelsample/launchers/pom.xml +++ b/sandbox/travelsample/launchers/pom.xml @@ -1,68 +1,69 @@ -<?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-launchers</artifactId> - <packaging>pom</packaging> - <name>Apache Tuscany SCA Tours Launchers</name> - - <profiles> - <profile> - <id>default</id> - <activation> - <activeByDefault>true</activeByDefault> - </activation> - <modules> - <module>blog-feed</module> - <module>currency-converter</module> - <module>currency-converter-corba</module> - <module>currency-converter-jms</module> - <module>currency-converter-rmi</module> - <module>currency-converter-ws</module> - <module>databinding</module> - <module>feed-logger</module> - <module>interaction</module> - <module>introducing</module> - <module>introducing-client</module> - <module>introducing-domain</module> - <module>jumpstart</module> - <module>fullapp</module> - <module>fullapp-domain</module> - <module>fullapp-nodes</module> - <module>help-pages</module> - <module>notification-ws</module> - <module>notification-corba</module> - <module>notification-ejb</module> - <module>notification-jms</module> - <module>notification-rmi</module> - <module>policy</module> - </modules> - </profile> - - </profiles> - -</project> +<?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-launchers</artifactId>
+ <packaging>pom</packaging>
+ <name>Apache Tuscany SCA Tours Launchers</name>
+
+ <profiles>
+ <profile>
+ <id>default</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ <modules>
+ <module>common</module>
+ <module>blog-feed</module>
+ <module>currency-converter</module>
+ <module>currency-converter-corba</module>
+ <module>currency-converter-jms</module>
+ <module>currency-converter-rmi</module>
+ <module>currency-converter-ws</module>
+ <module>databinding</module>
+ <module>feed-logger</module>
+ <module>interaction</module>
+ <module>introducing</module>
+ <module>introducing-client</module>
+ <module>introducing-domain</module>
+ <module>jumpstart</module>
+ <module>fullapp</module>
+ <module>fullapp-domain</module>
+ <module>fullapp-nodes</module>
+ <module>help-pages</module>
+ <module>notification-ws</module>
+ <module>notification-corba</module>
+ <module>notification-ejb</module>
+ <module>notification-jms</module>
+ <module>notification-rmi</module>
+ <module>policy</module>
+ </modules>
+ </profile>
+
+ </profiles>
+
+</project>
diff --git a/sandbox/travelsample/services/smsgateway-corba/src/main/java/scatours/smsgateway/SMSGatewayCORBAServiceBootstrap.java b/sandbox/travelsample/services/smsgateway-corba/src/main/java/scatours/smsgateway/SMSGatewayCORBAServiceBootstrap.java index 1e7ba2984f..b21bff7a1b 100644 --- a/sandbox/travelsample/services/smsgateway-corba/src/main/java/scatours/smsgateway/SMSGatewayCORBAServiceBootstrap.java +++ b/sandbox/travelsample/services/smsgateway-corba/src/main/java/scatours/smsgateway/SMSGatewayCORBAServiceBootstrap.java @@ -29,7 +29,7 @@ import org.omg.PortableServer.POAHelper; public class SMSGatewayCORBAServiceBootstrap {
public static void main(String[] args) throws Exception {
- System.out.println("Publishing SMS Gateway Service as a CORBA service");
+ System.out.println("Publishing SMS Gateway Service as a CORBA service: SMSGatewayCORBAService (port=5080)");
String[] orbArgs = {"-ORBInitialPort", "5080"};
ORB orb = ORB.init( orbArgs, null );
diff --git a/sandbox/travelsample/services/smsgateway-jms/src/main/java/scatours/smsgateway/SMSGatewayJMSServiceBootstrap.java b/sandbox/travelsample/services/smsgateway-jms/src/main/java/scatours/smsgateway/SMSGatewayJMSServiceBootstrap.java index 6fe08a44b5..3e5668ed23 100644 --- a/sandbox/travelsample/services/smsgateway-jms/src/main/java/scatours/smsgateway/SMSGatewayJMSServiceBootstrap.java +++ b/sandbox/travelsample/services/smsgateway-jms/src/main/java/scatours/smsgateway/SMSGatewayJMSServiceBootstrap.java @@ -26,7 +26,7 @@ import org.apache.activemq.ActiveMQConnectionFactory; public class SMSGatewayJMSServiceBootstrap {
public static void main(String[] args) throws Exception {
- System.out.println("Publishing SMS Gateway Service as a JMS service");
+ System.out.println("Publishing SMS Gateway Service as a JMS service: tcp://localhost:61619");
ActiveMQConnectionFactory connectionFactory
= new ActiveMQConnectionFactory("tcp://localhost:61619");
|