GlobPlot and DIsembl execs all test passed

[jabaws.git] / build.xml

diff --git a/build.xml b/build.xml
index 5aab7b1..5597457 100644 (file)
--- a/build.xml
+++ b/build.xml
@@ -10,7 +10,7 @@
        <mkdir dir="${distdir}" />\r
        <property name="datamodel" value="${distdir}/datamodel-1.0.jar"/>\r
        <property name="min-jaba-client" value="${distdir}/min-jaba-client.jar"/>\r
-       <property name="aacon-client" value="${distdir}/aacon-client.jar"/>\r
+       <property name="aacon-ws-client" value="${distdir}/aacon-ws-client.jar"/>\r
        <property name="full-jaba-client" value="${distdir}/full-jaba-client.jar"/>\r
        <property name="jaba-source-jar" value="${distdir}/jaba-source.jar"/>\r
        <property name="full-jaba-client-pack" value="${distdir}/full-jaba-client-pack.zip"/>\r
@@ -87,18 +87,18 @@
                                <compilerarg value="-Xlint:unchecked"/>\r
                                <classpath refid="project.classpath" />\r
                </javac>\r
-               <!-- Complile the tests -->\r
-               <javac srcdir="${basedir}/testsrc" destdir="${classes}" target="1.6"\r
+               <!-- Complile the webservices -->\r
+               <javac srcdir="${basedir}/webservices" destdir="${classes}" target="1.6"\r
                                source="1.6" debug="on" encoding="UTF-8" verbose="false" nowarn="true" >\r
                                <compilerarg value="-Xlint:unchecked"/>\r
                                <classpath refid="project.classpath" />\r
-                               <classpath refid="test.classpath" />\r
                </javac>\r
-               <!-- Complile the webservices -->\r
-               <javac srcdir="${basedir}/webservices" destdir="${classes}" target="1.6"\r
+               <!-- Complile the tests -->\r
+               <javac srcdir="${basedir}/testsrc" destdir="${classes}" target="1.6"\r
                                source="1.6" debug="on" encoding="UTF-8" verbose="false" nowarn="true" >\r
                                <compilerarg value="-Xlint:unchecked"/>\r
                                <classpath refid="project.classpath" />\r
+                               <classpath refid="test.classpath" />\r
                </javac>\r
        </target>\r
 \r
@@ -192,10 +192,10 @@
                </jar>\r
        </target>\r
        \r
-       <target name="aacon-client-jar" description="Pack metadata, data model, WS interfaces, a simple ws client class" depends="compile, datamodel-jar">\r
+       <target name="aacon-ws-client-jar" description="Pack metadata, data model, WS interfaces, a simple ws client class" depends="compile, datamodel-jar">\r
                        <echo>Jar file: AAConWS client jar</echo>\r
-                       <delete file="${basedir}/${aacon-client}"></delete>\r
-                       <jar jarfile="${basedir}/${aacon-client}">\r
+                       <delete file="${basedir}/${aacon-ws-client}"></delete>\r
+                       <jar jarfile="${basedir}/${aacon-ws-client}">\r
                                <zipgroupfileset excludes="META-INF/*.SF" dir="" includes="${datamodel}" />\r
                                <fileset dir="${basedir}/WEB-INF/classes/"> \r
                                        <!-- This will include JAXWS artifacts. Alternatively they can be generated on the fly. -->\r