Clean up the Introducing sample and the top-level pom.xml

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@777953 13f79535-47bb-0310-9956-ffa450edef68

9 files changed, 20 insertions, 129 deletions

diff --git a/sandbox/travelsample/contributions/introducing-tuscanyscatours-contribution/src/main/java/com/tuscanyscatours/ShoppingCart.java b/sandbox/travelsample/contributions/introducing-tuscanyscatours-contribution/src/main/java/com/tuscanyscatours/ShoppingCart.java
index 09e5d322a3..db551501e1 100644
--- a/sandbox/travelsample/contributions/introducing-tuscanyscatours-contribution/src/main/java/com/tuscanyscatours/ShoppingCart.java
+++ b/sandbox/travelsample/contributions/introducing-tuscanyscatours-contribution/src/main/java/com/tuscanyscatours/ShoppingCart.java
@@ -26,7 +26,8 @@ public class ShoppingCart implements Checkout, Updates {
 	private static List<String> bookedTrips = new ArrayList<String>();

 	

     public void makePayment(BigDecimal amount, String cardInfo) {

-    	System.out.print("Charged $" + amount + " to card " + cardInfo + " for trips" );

+    	System.out.print("Charged $" + amount + " to card " + cardInfo + " for " +

+                         (bookedTrips.size() > 1 ? "trips" : "trip"));

     	for (String trip : bookedTrips){

     		System.out.print(" " + trip);

     	}

diff --git a/sandbox/travelsample/launchers/introducing-launcher/build.xml b/sandbox/travelsample/launchers/introducing-launcher/build.xml
index 6085cd8af1..8a935954a0 100644
--- a/sandbox/travelsample/launchers/introducing-launcher/build.xml
+++ b/sandbox/travelsample/launchers/introducing-launcher/build.xml
@@ -28,18 +28,10 @@
                 <pathelement location="${env.TUSCANY}/lib/tuscany-sca-manifest.jar"/>

             </classpath>

         </javac>

-        <copy todir="target/classes">

-            <fileset dir="src/main/resources"/>

-        </copy>

-        <jar destfile="target/scatours-introducing-launcher.jar" basedir="target/classes">

-            <manifest>

-                <attribute name="Main-Class" value="scatours.LaunchNode"/>

-            </manifest>

-        </jar>

     </target>

 

     <target name="run">

-        <java classname="scatours.LaunchNode" fork="true">

+        <java classname="scatours.LaunchIntroducingNode" fork="true">

             <classpath>

                 <pathelement location="target/classes"/>

                 <pathelement location="${env.TUSCANY}/lib/tuscany-sca-manifest.jar"/>

diff --git a/sandbox/travelsample/launchers/introducing-launcher/src/main/java/scatours/Bookings.java b/sandbox/travelsample/launchers/introducing-launcher/src/main/java/scatours/Bookings.java
deleted file mode 100644
index a8e3ea5ccf..0000000000
--- a/sandbox/travelsample/launchers/introducing-launcher/src/main/java/scatours/Bookings.java
+++ /dev/null
@@ -1,26 +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 org.osoa.sca.annotations.Remotable;
-
-@Remotable
-public interface Bookings {
-    String newBooking(String trip, int people);
-}
diff --git a/sandbox/travelsample/launchers/introducing-launcher/src/main/java/scatours/Checkout.java b/sandbox/travelsample/launchers/introducing-launcher/src/main/java/scatours/Checkout.java
deleted file mode 100644
index 3b8f8b3130..0000000000
--- a/sandbox/travelsample/launchers/introducing-launcher/src/main/java/scatours/Checkout.java
+++ /dev/null
@@ -1,28 +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.math.BigDecimal;
-
-import org.osoa.sca.annotations.Remotable;
-
-@Remotable
-public interface Checkout {
-    void makePayment(BigDecimal amount, String cardInfo);
-}
diff --git a/sandbox/travelsample/launchers/introducing-launcher/src/main/java/scatours/LaunchIntroducingNode.java b/sandbox/travelsample/launchers/introducing-launcher/src/main/java/scatours/LaunchIntroducingNode.java
index c3f48b463e..580851d327 100644
--- a/sandbox/travelsample/launchers/introducing-launcher/src/main/java/scatours/LaunchIntroducingNode.java
+++ b/sandbox/travelsample/launchers/introducing-launcher/src/main/java/scatours/LaunchIntroducingNode.java
@@ -38,10 +38,14 @@ public class LaunchIntroducingNode {
         try {

             SCANode node = SCANodeFactory.newInstance().createSCANode(null, 

                 new SCAContribution("goodvaluetrips", "../../contributions/introducing-goodvaluetrips-contribution/target/classes"),

-                new SCAContribution("tuscanyscatours", "../../contributions/introducing-tuscanyscatours-contribution/target/classes"));

+                new SCAContribution("tuscanyscatours", "../../contributions/introducing-tuscanyscatours-contribution/target/classes"),

+                new SCAContribution("client", "../../contributions/introducing-client-contribution/target/classes"));

 

             node.start();

 

+            Runnable runner = ((SCAClient)node).getService(Runnable.class, "TestClient/Runnable");

+            runner.run();

+            /*

             Bookings bookings = ((SCAClient)node).getService(Bookings.class, 

                                                              "TripBooking/Bookings");

 

@@ -52,7 +56,7 @@ public class LaunchIntroducingNode {
                                                              "ShoppingCart/Checkout");

             

             checkout.makePayment(new BigDecimal("1995.00"), "1234567843218765 10/10");

-            

+            */

             

             node.stop();

             

diff --git a/sandbox/travelsample/launchers/introducing-launcher/src/main/resources/META-INF/sca-contribution.xml b/sandbox/travelsample/launchers/introducing-launcher/src/main/resources/META-INF/sca-contribution.xml
deleted file mode 100644
index 4a6250ad25..0000000000
--- a/sandbox/travelsample/launchers/introducing-launcher/src/main/resources/META-INF/sca-contribution.xml
+++ /dev/null
@@ -1,26 +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.    

--->

-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"

-              xmlns:scatours="http://scatours">

-    <import namespace="http://tuscanyscatours.com/" />

-    <import namespace="http://goodvaluetrips.com/" />

-    <import namespace="http://client.scatours/" />

-    <deployable composite="scatours:scatours" />

-</contribution>

diff --git a/sandbox/travelsample/launchers/introducing-launcher/src/main/resources/scatours.composite b/sandbox/travelsample/launchers/introducing-launcher/src/main/resources/scatours.composite
deleted file mode 100644
index eaa19f6174..0000000000
--- a/sandbox/travelsample/launchers/introducing-launcher/src/main/resources/scatours.composite
+++ /dev/null
@@ -1,31 +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.    

--->

-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"

-    targetNamespace="http://scatours"

-    xmlns:client="http://client.scatours/"

-    xmlns:tours="http://tuscanyscatours.com/"

-    xmlns:trips="http://goodvaluetrips.com/"

-    name="scatours">

-    

-    <include name="client:Client" />

-    <include name="tours:Tours" />

-    <include name="trips:Trips" />

-

-</composite>

diff --git a/sandbox/travelsample/launchers/introducing-launcher/src/test/java/scatours/NodeTestCase.java b/sandbox/travelsample/launchers/introducing-launcher/src/test/java/scatours/NodeTestCase.java
index f70dc8d3f8..2e423e016a 100644
--- a/sandbox/travelsample/launchers/introducing-launcher/src/test/java/scatours/NodeTestCase.java
+++ b/sandbox/travelsample/launchers/introducing-launcher/src/test/java/scatours/NodeTestCase.java
@@ -36,11 +36,10 @@ public class NodeTestCase {
     @Before

     public void startServer() throws Exception {

         try {

-            node = SCANodeFactory.newInstance().createSCANode("scatours.composite", 

+            node = SCANodeFactory.newInstance().createSCANode(null, 

                 new SCAContribution("goodvaluetrips", "../../contributions/introducing-goodvaluetrips-contribution/target/classes"),

                 new SCAContribution("tuscanyscatours", "../../contributions/introducing-tuscanyscatours-contribution/target/classes"),

-                new SCAContribution("client", "../../contributions/introducing-client-contribution/target/classes"),

-                new SCAContribution("node", "./target/classes"));

+                new SCAContribution("client", "../../contributions/introducing-client-contribution/target/classes"));

             node.start();

         } catch (Exception ex) {

             System.out.println(ex.toString());

diff --git a/sandbox/travelsample/pom.xml b/sandbox/travelsample/pom.xml
index 4227a3588a..36ad2c607c 100644
--- a/sandbox/travelsample/pom.xml
+++ b/sandbox/travelsample/pom.xml
@@ -36,16 +36,22 @@
                 <activeByDefault>true</activeByDefault>
             </activation>
             <modules>
+                <module>contributions</module>
+                <module>launchers</module>
+                <module>services</module>
+                <module>clients</module>
+                <!--
                 <module>shared-contributions</module>
                 <module>chapter-01</module>
                 <module>chapter-02</module>
-                <!--module>chapter-03</module-->
-                <!--module>chapter-04</module-->
                 <module>chapter-05</module>
                 <module>chapter-06</module>
+                <module>chapter-09</module>
+                -->
+                <!--module>chapter-03</module-->
+                <!--module>chapter-04</module-->
                 <!--module>chapter-07</module-->
                 <!--module>chapter-08</module-->
-                <module>chapter-09</module>
                 <!--module>chapter-10</module-->
                 <!--module>chapter-11</module-->
             </modules>