summaryrefslogtreecommitdiffstats
path: root/sandbox/travelsample/launchers/fullapp-launcher
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--sandbox/travelsample/launchers/fullapp-domain/build.xml (renamed from sandbox/travelsample/launchers/fullapp-launcher/src/main/java/scatours/LaunchFullAppDomain.java)73
-rw-r--r--sandbox/travelsample/launchers/fullapp-domain/src/main/resources/cloud.composite (renamed from sandbox/travelsample/launchers/fullapp-launcher/cloud.composite)2
-rw-r--r--sandbox/travelsample/launchers/fullapp-domain/src/main/resources/cloud/fullapp-bespoketrip.composite (renamed from sandbox/travelsample/launchers/fullapp-launcher/src/main/resources/cloud/fullapp-bespoketrip.composite)6
-rw-r--r--sandbox/travelsample/launchers/fullapp-domain/src/main/resources/cloud/fullapp-creditcard.composite (renamed from sandbox/travelsample/launchers/fullapp-launcher/src/main/resources/cloud/fullapp-creditcard.composite)8
-rw-r--r--sandbox/travelsample/launchers/fullapp-domain/src/main/resources/cloud/fullapp-currency.composite (renamed from sandbox/travelsample/launchers/fullapp-launcher/src/main/resources/cloud/fullapp-currency.composite)6
-rw-r--r--sandbox/travelsample/launchers/fullapp-domain/src/main/resources/cloud/fullapp-frontend.composite (renamed from sandbox/travelsample/launchers/fullapp-launcher/src/main/resources/cloud/fullapp-frontend.composite)6
-rw-r--r--sandbox/travelsample/launchers/fullapp-domain/src/main/resources/cloud/fullapp-packagedtrip.composite (renamed from sandbox/travelsample/launchers/fullapp-launcher/src/main/resources/cloud/fullapp-pacakgedtrip.composite)6
-rw-r--r--sandbox/travelsample/launchers/fullapp-domain/src/main/resources/cloud/fullapp-payment.composite (renamed from sandbox/travelsample/launchers/fullapp-launcher/src/main/resources/cloud/fullapp-payment.composite)6
-rw-r--r--sandbox/travelsample/launchers/fullapp-domain/src/main/resources/cloud/fullapp-shoppingcart.composite (renamed from sandbox/travelsample/launchers/fullapp-launcher/src/main/resources/cloud/fullapp-shoppingcart.composite)6
-rw-r--r--sandbox/travelsample/launchers/fullapp-domain/src/main/resources/cloud/fullapp-ui.composite (renamed from sandbox/travelsample/launchers/fullapp-launcher/src/main/resources/cloud/fullapp-ui.composite)4
-rw-r--r--sandbox/travelsample/launchers/fullapp-domain/src/main/resources/domain.composite (renamed from sandbox/travelsample/launchers/fullapp-launcher/domain.composite)5
-rw-r--r--sandbox/travelsample/launchers/fullapp-launcher/src/main/java/scatours/LaunchFullAppDomainNodes.java84
-rw-r--r--sandbox/travelsample/launchers/fullapp-launcher/src/main/java/scatours/LaunchFullAppNode.java73
-rw-r--r--sandbox/travelsample/launchers/fullapp-launcher/workspace.xml41
-rw-r--r--sandbox/travelsample/launchers/fullapp/build.xml (renamed from sandbox/travelsample/launchers/fullapp-launcher/build.xml)26
-rw-r--r--sandbox/travelsample/launchers/fullapp/pom.xml (renamed from sandbox/travelsample/launchers/fullapp-launcher/pom.xml)2
16 files changed, 68 insertions, 286 deletions
diff --git a/sandbox/travelsample/launchers/fullapp-launcher/src/main/java/scatours/LaunchFullAppDomain.java b/sandbox/travelsample/launchers/fullapp-domain/build.xml
index 9fae5de58a..9ad84ef602 100644
--- a/sandbox/travelsample/launchers/fullapp-launcher/src/main/java/scatours/LaunchFullAppDomain.java
+++ b/sandbox/travelsample/launchers/fullapp-domain/build.xml
@@ -1,37 +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.
- */
-
-package scatours;
-
-import org.apache.tuscany.sca.node.launcher.DomainManagerLauncher;
-
-public class LaunchFullAppDomain {
- public static void main(String[] args) throws Exception {
- LaunchFullAppDomain.launchFromFileSystemDir();
- }
-
- public static void launchFromFileSystemDir(){
-
- try {
- DomainManagerLauncher.main(null);
- } catch (Exception ex) {
- System.out.println(ex.toString());
- }
- }
-}
+<!--
+ * 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>
diff --git a/sandbox/travelsample/launchers/fullapp-launcher/cloud.composite b/sandbox/travelsample/launchers/fullapp-domain/src/main/resources/cloud.composite
index a0c2ba9e75..812736e620 100644
--- a/sandbox/travelsample/launchers/fullapp-launcher/cloud.composite
+++ b/sandbox/travelsample/launchers/fullapp-domain/src/main/resources/cloud.composite
@@ -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" />
diff --git a/sandbox/travelsample/launchers/fullapp-launcher/src/main/resources/cloud/fullapp-bespoketrip.composite b/sandbox/travelsample/launchers/fullapp-domain/src/main/resources/cloud/fullapp-bespoketrip.composite
index c793a36126..51f48a93f1 100644
--- a/sandbox/travelsample/launchers/fullapp-launcher/src/main/resources/cloud/fullapp-bespoketrip.composite
+++ b/sandbox/travelsample/launchers/fullapp-domain/src/main/resources/cloud/fullapp-bespoketrip.composite
@@ -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">
diff --git a/sandbox/travelsample/launchers/fullapp-launcher/src/main/resources/cloud/fullapp-creditcard.composite b/sandbox/travelsample/launchers/fullapp-domain/src/main/resources/cloud/fullapp-creditcard.composite
index 46e7091c8d..93e1727266 100644
--- a/sandbox/travelsample/launchers/fullapp-launcher/src/main/resources/cloud/fullapp-creditcard.composite
+++ b/sandbox/travelsample/launchers/fullapp-domain/src/main/resources/cloud/fullapp-creditcard.composite
@@ -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"/>
diff --git a/sandbox/travelsample/launchers/fullapp-launcher/src/main/resources/cloud/fullapp-currency.composite b/sandbox/travelsample/launchers/fullapp-domain/src/main/resources/cloud/fullapp-currency.composite
index e625c77cea..808d2843bd 100644
--- a/sandbox/travelsample/launchers/fullapp-launcher/src/main/resources/cloud/fullapp-currency.composite
+++ b/sandbox/travelsample/launchers/fullapp-domain/src/main/resources/cloud/fullapp-currency.composite
@@ -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">
diff --git a/sandbox/travelsample/launchers/fullapp-launcher/src/main/resources/cloud/fullapp-frontend.composite b/sandbox/travelsample/launchers/fullapp-domain/src/main/resources/cloud/fullapp-frontend.composite
index ef71edc684..75c95daf4b 100644
--- a/sandbox/travelsample/launchers/fullapp-launcher/src/main/resources/cloud/fullapp-frontend.composite
+++ b/sandbox/travelsample/launchers/fullapp-domain/src/main/resources/cloud/fullapp-frontend.composite
@@ -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">
diff --git a/sandbox/travelsample/launchers/fullapp-launcher/src/main/resources/cloud/fullapp-pacakgedtrip.composite b/sandbox/travelsample/launchers/fullapp-domain/src/main/resources/cloud/fullapp-packagedtrip.composite
index 2ee42cfc58..a6ec78b56c 100644
--- a/sandbox/travelsample/launchers/fullapp-launcher/src/main/resources/cloud/fullapp-pacakgedtrip.composite
+++ b/sandbox/travelsample/launchers/fullapp-domain/src/main/resources/cloud/fullapp-packagedtrip.composite
@@ -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">
diff --git a/sandbox/travelsample/launchers/fullapp-launcher/src/main/resources/cloud/fullapp-payment.composite b/sandbox/travelsample/launchers/fullapp-domain/src/main/resources/cloud/fullapp-payment.composite
index af57963673..a73d034805 100644
--- a/sandbox/travelsample/launchers/fullapp-launcher/src/main/resources/cloud/fullapp-payment.composite
+++ b/sandbox/travelsample/launchers/fullapp-domain/src/main/resources/cloud/fullapp-payment.composite
@@ -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">
diff --git a/sandbox/travelsample/launchers/fullapp-launcher/src/main/resources/cloud/fullapp-shoppingcart.composite b/sandbox/travelsample/launchers/fullapp-domain/src/main/resources/cloud/fullapp-shoppingcart.composite
index 8b92721c24..dce5fe829e 100644
--- a/sandbox/travelsample/launchers/fullapp-launcher/src/main/resources/cloud/fullapp-shoppingcart.composite
+++ b/sandbox/travelsample/launchers/fullapp-domain/src/main/resources/cloud/fullapp-shoppingcart.composite
@@ -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">
diff --git a/sandbox/travelsample/launchers/fullapp-launcher/src/main/resources/cloud/fullapp-ui.composite b/sandbox/travelsample/launchers/fullapp-domain/src/main/resources/cloud/fullapp-ui.composite
index 4841ab5246..d72432daff 100644
--- a/sandbox/travelsample/launchers/fullapp-launcher/src/main/resources/cloud/fullapp-ui.composite
+++ b/sandbox/travelsample/launchers/fullapp-domain/src/main/resources/cloud/fullapp-ui.composite
@@ -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">
diff --git a/sandbox/travelsample/launchers/fullapp-launcher/domain.composite b/sandbox/travelsample/launchers/fullapp-domain/src/main/resources/domain.composite
index e1ebe1f1f4..636397c705 100644
--- a/sandbox/travelsample/launchers/fullapp-launcher/domain.composite
+++ b/sandbox/travelsample/launchers/fullapp-domain/src/main/resources/domain.composite
@@ -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" />
diff --git a/sandbox/travelsample/launchers/fullapp-launcher/src/main/java/scatours/LaunchFullAppDomainNodes.java b/sandbox/travelsample/launchers/fullapp-launcher/src/main/java/scatours/LaunchFullAppDomainNodes.java
deleted file mode 100644
index 5ec587f421..0000000000
--- a/sandbox/travelsample/launchers/fullapp-launcher/src/main/java/scatours/LaunchFullAppDomainNodes.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- * 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.
- */
-
-package scatours;
-
-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 static void main(String[] args) throws Exception {
- LaunchFullAppDomainNodes.launchFromFileSystemDir();
- }
-
- // OK for development but you must launch the node from this module
- public static void launchFromFileSystemDir(){
-
- 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());
- }
- }
-}
diff --git a/sandbox/travelsample/launchers/fullapp-launcher/src/main/java/scatours/LaunchFullAppNode.java b/sandbox/travelsample/launchers/fullapp-launcher/src/main/java/scatours/LaunchFullAppNode.java
deleted file mode 100644
index 4ef76d1807..0000000000
--- a/sandbox/travelsample/launchers/fullapp-launcher/src/main/java/scatours/LaunchFullAppNode.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * 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.
- */
-
-package scatours;
-
-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 LaunchFullAppNode {
- public static void main(String[] args) throws Exception {
- LaunchFullAppNode.launchFromFileSystemDir();
- }
-
- // OK for development but you must launch the node from this module
- public static void launchFromFileSystemDir(){
-
- 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());
- }
- }
-}
diff --git a/sandbox/travelsample/launchers/fullapp-launcher/workspace.xml b/sandbox/travelsample/launchers/fullapp-launcher/workspace.xml
deleted file mode 100644
index 7833f3deb6..0000000000
--- a/sandbox/travelsample/launchers/fullapp-launcher/workspace.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?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.
--->
-<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"/>
-</workspace> \ No newline at end of file
diff --git a/sandbox/travelsample/launchers/fullapp-launcher/build.xml b/sandbox/travelsample/launchers/fullapp/build.xml
index 77aacfb41a..8061df32e3 100644
--- a/sandbox/travelsample/launchers/fullapp-launcher/build.xml
+++ b/sandbox/travelsample/launchers/fullapp/build.xml
@@ -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"/>
diff --git a/sandbox/travelsample/launchers/fullapp-launcher/pom.xml b/sandbox/travelsample/launchers/fullapp/pom.xml
index 97e2eddd05..ca4a64207a 100644
--- a/sandbox/travelsample/launchers/fullapp-launcher/pom.xml
+++ b/sandbox/travelsample/launchers/fullapp/pom.xml
@@ -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>