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

1 files changed, 8 insertions, 136 deletions

diff --git a/sandbox/travelsample/chapter-02/node/build.xml b/sandbox/travelsample/chapter-02/node/build.xml
index 1d3e3adea3..0c3c506b67 100644
--- a/sandbox/travelsample/chapter-02/node/build.xml
+++ b/sandbox/travelsample/chapter-02/node/build.xml
@@ -18,34 +18,31 @@
 -->
 
 <project name="scatours-chapter-02-node" 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"/>
+            <src path="src/main/java"/>
             <classpath>
-                <fileset refid="tuscany.jars"/>
-                <fileset refid="3rdparty.jars"/>
+                <pathelement location="${env.TUSCANY}/lib/tuscany-sca-manifest.jar"/>
             </classpath>
         </javac>
         <copy todir="target/classes">
-            <fileset dir="." excludes="**/*.java, pom.xml, build.xml, target"/>
+            <fileset dir="src/main/resources"/>
         </copy>
         <jar destfile="target/scatours-chapter-02-node.jar" basedir="target/classes">
             <manifest>
-                <attribute name="Main-Class" value="launch.LaunchTutorialAdmin"/>
+                <attribute name="Main-Class" value="scatours.LaunchNode"/>
             </manifest>
         </jar>
     </target>
 
-    <target name="package" depends="compile"/>
-
     <target name="run">
-        <java classname="launch.LaunchTutorialAdmin" fork="true">
+        <java classname="scatours.LaunchNode" fork="true">
             <classpath>
-                <pathelement location="target/scatours-chapter-02-node.jar"/>
-                <fileset refid="tuscany.jars"/>
-                <fileset refid="3rdparty.jars"/>
+                <pathelement location="target/classes"/>
+                <pathelement location="${env.TUSCANY}/lib/tuscany-sca-manifest.jar"/>
             </classpath>
         </java>
     </target>
@@ -56,129 +53,4 @@
         </delete>
     </target>
 
-    <fileset id="tuscany.jars" dir="../../modules">
-        <include name="tuscany-assembly-1.5-SNAPSHOT.jar"/>
-        <include name="tuscany-assembly-xml-1.5-SNAPSHOT.jar"/>
-        <include name="tuscany-assembly-xsd-1.5-SNAPSHOT.jar"/>
-        <include name="tuscany-binding-http-1.5-SNAPSHOT.jar"/>
-        <include name="tuscany-binding-http-runtime-1.5-SNAPSHOT.jar"/>
-        <include name="tuscany-binding-jsonrpc-1.5-SNAPSHOT.jar"/>
-        <include name="tuscany-binding-jsonrpc-runtime-1.5-SNAPSHOT.jar"/>
-        <include name="tuscany-binding-sca-1.5-SNAPSHOT.jar"/>
-        <include name="tuscany-binding-sca-axis2-1.5-SNAPSHOT.jar"/>
-        <include name="tuscany-binding-sca-xml-1.5-SNAPSHOT.jar"/>
-        <include name="tuscany-binding-ws-1.5-SNAPSHOT.jar"/>
-        <include name="tuscany-binding-ws-axis2-1.5-SNAPSHOT.jar"/>
-        <include name="tuscany-binding-ws-axis2-policy-1.5-SNAPSHOT.jar"/>
-        <include name="tuscany-binding-ws-wsdlgen-1.5-SNAPSHOT.jar"/>
-        <include name="tuscany-binding-ws-xml-1.5-SNAPSHOT.jar"/>
-        <include name="tuscany-contribution-1.5-SNAPSHOT.jar"/>
-        <include name="tuscany-contribution-impl-1.5-SNAPSHOT.jar"/>
-        <include name="tuscany-contribution-java-1.5-SNAPSHOT.jar"/>
-        <include name="tuscany-contribution-namespace-1.5-SNAPSHOT.jar"/>
-        <include name="tuscany-contribution-xml-1.5-SNAPSHOT.jar"/>
-        <include name="tuscany-core-1.5-SNAPSHOT.jar"/>
-        <include name="tuscany-core-databinding-1.5-SNAPSHOT.jar"/>
-        <include name="tuscany-core-spi-1.5-SNAPSHOT.jar"/>
-        <include name="tuscany-data-api-1.5-SNAPSHOT.jar"/>
-        <include name="tuscany-databinding-1.5-SNAPSHOT.jar"/>
-        <include name="tuscany-databinding-axiom-1.5-SNAPSHOT.jar"/>
-        <include name="tuscany-databinding-jaxb-1.5-SNAPSHOT.jar"/>
-        <include name="tuscany-databinding-jaxb-axiom-1.5-SNAPSHOT.jar"/>
-        <include name="tuscany-databinding-json-1.5-SNAPSHOT.jar"/>
-        <include name="tuscany-definitions-1.5-SNAPSHOT.jar"/>
-        <include name="tuscany-definitions-xml-1.5-SNAPSHOT.jar"/>
-        <include name="tuscany-endpoint-1.5-SNAPSHOT.jar"/>
-        <include name="tuscany-extensibility-1.5-SNAPSHOT.jar"/>
-        <include name="tuscany-host-http-1.5-SNAPSHOT.jar"/>
-        <include name="tuscany-implementation-java-1.5-SNAPSHOT.jar"/>
-        <include name="tuscany-implementation-java-runtime-1.5-SNAPSHOT.jar"/>
-        <include name="tuscany-implementation-java-xml-1.5-SNAPSHOT.jar"/>
-        <include name="tuscany-implementation-node-1.5-SNAPSHOT.jar"/>
-        <include name="tuscany-implementation-node-runtime-1.5-SNAPSHOT.jar"/>
-        <include name="tuscany-implementation-resource-1.5-SNAPSHOT.jar"/>
-        <include name="tuscany-implementation-resource-runtime-1.5-SNAPSHOT.jar"/>
-        <include name="tuscany-interface-1.5-SNAPSHOT.jar"/>
-        <include name="tuscany-interface-java-1.5-SNAPSHOT.jar"/>
-        <include name="tuscany-interface-java-jaxws-1.5-SNAPSHOT.jar"/>
-        <include name="tuscany-interface-java-xml-1.5-SNAPSHOT.jar"/>
-        <include name="tuscany-interface-wsdl-1.5-SNAPSHOT.jar"/>
-        <include name="tuscany-interface-wsdl-xml-1.5-SNAPSHOT.jar"/>
-        <include name="tuscany-monitor-1.5-SNAPSHOT.jar"/>
-        <include name="tuscany-node-api-1.5-SNAPSHOT.jar"/>
-        <include name="tuscany-node-impl-1.5-SNAPSHOT.jar"/>
-        <include name="tuscany-node-launcher-1.5-SNAPSHOT.jar"/>
-        <include name="tuscany-policy-1.5-SNAPSHOT.jar"/>
-        <include name="tuscany-policy-security-1.5-SNAPSHOT.jar"/>
-        <include name="tuscany-policy-xml-1.5-SNAPSHOT.jar"/>
-        <include name="tuscany-policy-xml-ws-1.5-SNAPSHOT.jar"/>
-        <include name="tuscany-sca-api-1.5-SNAPSHOT.jar"/>
-        <include name="tuscany-sca-api-extension-1.5-SNAPSHOT.jar"/>
-        <include name="tuscany-xsd-1.5-SNAPSHOT.jar"/>
-        <include name="tuscany-xsd-xml-1.5-SNAPSHOT.jar"/>
-    </fileset>
-    <fileset id="3rdparty.jars" dir="../../lib">
-        <include name="XmlSchema-1.5-SNAPSHOT.2.jar"/>
-        <include name="activation-1.1.jar"/>
-        <include name="annogen-0.1.0.jar"/>
-        <include name="asm-all-3.1.jar"/>
-        <include name="axiom-api-1.2.7.jar"/>
-        <include name="axiom-dom-1.2.7.jar"/>
-        <include name="axiom-impl-1.2.7.jar"/>
-        <include name="axis-ant-1.5-SNAPSHOT.jar"/>
-        <include name="axis2-adb-1.5-SNAPSHOT.1.jar"/>
-        <include name="axis2-codegen-1.5-SNAPSHOT.1.jar"/>
-        <include name="axis2-java2wsdl-1.5-SNAPSHOT.1.jar"/>
-        <include name="axis2-kernel-1.5-SNAPSHOT.1.jar"/>
-        <include name="axis2-mtompolicy-1.5-SNAPSHOT.1.jar"/>
-        <include name="backport-util-concurrent-3.1.jar"/>
-        <include name="bcprov-jdk13-132.jar"/>
-        <include name="cglib-nodep-2.2.jar"/>
-        <include name="commons-codec-1.3.jar"/>
-        <include name="commons-collections-3.1.jar"/>
-        <include name="commons-discovery-0.2.jar"/>
-        <include name="commons-fileupload-1.2.jar"/>
-        <include name="commons-httpclient-3.1.jar"/>
-        <include name="commons-io-1.5-SNAPSHOT.jar"/>
-        <include name="commons-logging-1.1.1.jar"/>
-        <include name="derby-10.3.1.5-SNAPSHOT.jar"/>
-        <include name="dom4j-1.6.1.jar"/>
-        <include name="geronimo-activation_1.1_spec-1.0.1.jar"/>
-        <include name="geronimo-javamail_1.5-SNAPSHOT_spec-1.2.jar"/>
-        <include name="geronimo-jms_1.1_spec-1.1.jar"/>
-        <include name="geronimo-stax-api_1.0_spec-1.0.1.jar"/>
-        <include name="httpcore-4.0-beta1.jar"/>
-        <include name="httpcore-nio-4.0-beta1.jar"/>
-        <include name="jaxb-api-2.1.jar"/>
-        <include name="jaxb-impl-2.1.7.jar"/>
-        <include name="jaxen-1.1.1.jar"/>
-        <include name="jaxws-api-2.1.jar"/>
-        <include name="jdom-1.0.jar"/>
-        <include name="jettison-1.0.1.jar"/>
-        <include name="json-rpc-1.0.jar"/>
-        <include name="jsr181-api-1.0-MR1.jar"/>
-        <include name="jsr250-api-1.0.jar"/>
-        <include name="junit-4.5.jar"/>
-        <include name="log4j-1.2.15.jar"/>
-        <include name="mail-1.5-SNAPSHOT.jar"/>
-        <include name="mex-1.5-SNAPSHOT1-impl.jar"/>
-        <include name="neethi-2.0.4.jar"/>
-        <include name="opensaml-1.1.jar"/>
-        <include name="rampart-core-1.5-SNAPSHOT.jar"/>
-        <include name="rampart-policy-1.5-SNAPSHOT.jar"/>
-        <include name="rampart-trust-1.5-SNAPSHOT.jar"/>
-        <include name="servlet-api-2.3.jar"/>
-        <include name="stax-api-1.0-2.jar"/>
-        <include name="woden-api-1.0M8.jar"/>
-        <include name="woden-impl-dom-1.0M8.jar"/>
-        <include name="wsdl4j-1.6.2.jar"/>
-        <include name="wss4j-1.5.4.jar"/>
-        <include name="wstx-asl-3.2.4.jar"/>
-        <include name="xalan-2.7.0.jar"/>
-        <include name="xercesImpl-2.8.1.jar"/>
-        <include name="xml-apis-1.3.03.jar"/>
-        <include name="xmlParserAPIs-2.6.0.jar"/>
-        <include name="xmlsec-1.5-SNAPSHOT.2.jar"/>
-    </fileset>
-
 </project>