Fix ant script problems and add a test case

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

4 files changed, 49 insertions, 10 deletions

diff --git a/sandbox/travelsample/chapter-02/tuscanyscatours-contribution/build.xml b/sandbox/travelsample/chapter-02/tuscanyscatours-contribution/build.xml
new file mode 100644
index 0000000000..d9961176f3
--- /dev/null
+++ b/sandbox/travelsample/chapter-02/tuscanyscatours-contribution/build.xml
@@ -0,0 +1,44 @@
+<!--

+ * 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-chapter-02-tuscanyscatours-contribution" default="compile">

+    <property environment="env"/> 

+

+    <target name="compile">

+        <mkdir dir="target/classes"/>

+        <javac destdir="target/classes" debug="on" source="1.5" target="1.5">

+            <src path="src/main/java"/>

+            <classpath>

+                <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-chapter-02-tuscanyscatours-contribution.jar"

+             basedir="target/classes"/>

+    </target>

+

+    <target name="clean">

+        <delete includeemptydirs="true">

+            <fileset dir="target"/>

+        </delete>

+    </target>

+

+</project>

diff --git a/sandbox/travelsample/chapter-02/tuscanyscatours-contribution/pom.xml b/sandbox/travelsample/chapter-02/tuscanyscatours-contribution/pom.xml
index dc6cea44ae..6913d7665d 100644
--- a/sandbox/travelsample/chapter-02/tuscanyscatours-contribution/pom.xml
+++ b/sandbox/travelsample/chapter-02/tuscanyscatours-contribution/pom.xml
@@ -34,13 +34,6 @@
             <artifactId>tuscany-sca-api</artifactId>
             <version>1.5-SNAPSHOT</version>
         </dependency>        
-
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.5</version>
-            <scope>test</scope>
-        </dependency>
     </dependencies>
 
     <build>
diff --git a/sandbox/travelsample/chapter-02/tuscanyscatours-contribution/src/main/resources/META-INF/sca-contribution.xml b/sandbox/travelsample/chapter-02/tuscanyscatours-contribution/src/main/resources/META-INF/sca-contribution.xml
index e3614abda3..cf1153ac14 100644
--- a/sandbox/travelsample/chapter-02/tuscanyscatours-contribution/src/main/resources/META-INF/sca-contribution.xml
+++ b/sandbox/travelsample/chapter-02/tuscanyscatours-contribution/src/main/resources/META-INF/sca-contribution.xml
@@ -18,6 +18,8 @@
     * under the License.    
 -->
 <contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"
-              xmlns:scatours="http://tuscanyscatours.com/">
-    <deployable composite="scatours:tours"/>
+              xmlns:tst="http://tuscanyscatours.com/">
+    <export namespace="http://tuscanyscatours.com/" />
+    <export.java package="com.tuscanyscatours" />
+    <deployable composite="tst:Tours" />
 </contribution>
diff --git a/sandbox/travelsample/chapter-02/tuscanyscatours-contribution/src/main/resources/tours.composite b/sandbox/travelsample/chapter-02/tuscanyscatours-contribution/src/main/resources/tours.composite
index 62fa1fd792..f166a1635d 100644
--- a/sandbox/travelsample/chapter-02/tuscanyscatours-contribution/src/main/resources/tours.composite
+++ b/sandbox/travelsample/chapter-02/tuscanyscatours-contribution/src/main/resources/tours.composite
@@ -19,7 +19,7 @@
 -->

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

     targetNamespace="http://tuscanyscatours.com/"

-    name="tours">

+    name="Tours">

 

     <component name="TripBooking">

         <implementation.java class="com.tuscanyscatours.TripBooking" />