svn commit: r189842 - /incubator/beehive/trunk/wsm/drt/build.xml

[ek...@apache.org]

Author: ekoneil
Date: Thu Jun  9 15:39:52 2005
New Revision: 189842

URL: http://svn.apache.org/viewcvs?rev=189842&view=rev
Log:
Fix the WSM DRT file to use the <build-webservices> macro defined in beehive-tools.xml

Helps that macro get more test coverage.

BB: self
DRT: WSM pass


Modified:
    incubator/beehive/trunk/wsm/drt/build.xml

Modified: incubator/beehive/trunk/wsm/drt/build.xml
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/drt/build.xml?rev=189842&r1=189841&r2=189842&view=diff
==============================================================================
--- incubator/beehive/trunk/wsm/drt/build.xml (original)
+++ incubator/beehive/trunk/wsm/drt/build.xml Thu Jun  9 15:39:52 2005
@@ -3,6 +3,7 @@
 <project name="wsmdrt" default="drt">
 
     <import file="../../beehive-imports.xml"/>
+    <import file="../../ant/beehive-tools.xml"/>
 
     <property name="drt.root" location="${basedir}"/>
     <property name="drt.logs" location="${drt.root}/logs"/>
@@ -15,7 +16,6 @@
     <property name="build.tests" location="${build.classes}/tests"/>
     <property name="build.gen-tests" location="${build.classes}/gen-tests"/>
     <property name="webapp.dir" location="${drt.root}/webapp"/>
-    <property name="lib.dir" value="../lib"/>
     <property name="ext.lib.dir" value="../external"/>
     <property name="drt.wsdl.file" location="${drt.src}/org/apache/beehive/wsm/jsr181/wsdl/web/wsdl2javatest.wsdl"/>
 
@@ -27,10 +27,6 @@
         <include name="axis.jar"/>
     </fileset>
 
-    <path id="controls.dependency.path">
-        <fileset refid="controls.fileset"/>
-    </path>
-
     <path id="drt.classpath">
         <path refid="velocity.dependency.path"/>
         <path refid="xbean.dependency.path"/>
@@ -40,7 +36,6 @@
         <path refid="commons-discovery.dependency.path"/>
         <path refid="commons-logging.dependency.path"/>
         <path refid="controls.dependency.path"/>
-        <pathelement location="${lib.dir}/schematypes.jar"/>
         <pathelement location="../build/jars/jsr181.jar"/>
         <pathelement location="../build/jars/beehive-wsdltypes.jar"/>
         <pathelement location="../build/jars/beehive-wsm.jar"/>
@@ -66,16 +61,16 @@
 
     <target name="drt">
         <echo message="--------------------------------------------------"/>
-        <echo message="|         WSM drt starting                       |"/>
+        <echo message="|         WSM DRT starting                       |"/>
         <echo message="--------------------------------------------------"/>
         <antcall target="build"/>
         <antcall target="run.drt"/>
         <echo message="--------------------------------------------------"/>
-        <echo message="|         WSM drt ending                         |"/>
+        <echo message="|         WSM DRT ending                         |"/>
         <echo message="--------------------------------------------------"/>
     </target>
 
-    <target name="build" depends="dirs, xbean, gen_wsdl2java_test, build.webapp, build.tests"/>
+    <target name="build" depends="dirs,xbean,gen_wsdl2java_test,build.webapp,build.tests"/>
 
     <target name="clean" depends="clean.tests, clean.webapp"/>
 
@@ -104,11 +99,6 @@
         </copy>
     </target>
 
-    <target name="build.webapp">
-        <deploy-wsm webappDir="${webapp.dir}"/>
-        <build-webapp webappDir="${webapp.dir}"/>
-    </target>
-
     <target name="clean.tests">
         <delete dir="${build.dir}"/>
         <delete dir="${drt.logs}"/>
@@ -118,10 +108,14 @@
         <delete dir="${webapp.dir}/WEB-INF/temp"/>
     </target>
 
+    <target name="build.webapp">
+        <deploy-wsm webappDir="${webapp.dir}"/>
+        <build-webapp webappDir="${webapp.dir}"/>
+    </target>
+
     <target name="clean.webapp">
         <clean-webapp webappDir="${webapp.dir}"/>
         <delete dir="${webapp.dir}/WEB-INF/lib"/>
-        <!-- should be target in buildWebapp.xml -->
     </target>
 
     <target name="xbean">
@@ -132,7 +126,6 @@
         <build-xbean schemaDir="${drt.schemas}" classgenDir="${webapp.dir}/WEB-INF/classes" xbeanBuildClasspathRef="xbean.build.classpath"/>
     </target>
 
-
     <!-- ========================================= -->
     <!-- wsdl2java - generate source from wsdl     -->
     <!-- ========================================= -->
@@ -150,17 +143,7 @@
             </classpath>
         </wsdl2AJava>
 
-        <taskdef name="apt"
-            classname="org.apache.beehive.controls.runtime.generator.AptTask"
-            classpathref="controls.dependency.path" onerror="report"/>
-
-        <apt srcdir="${build.gen-src-wsdl}" destdir="${build.gen-tests}"
-             gendir="${build.gen-src-apt}" compileByExtension="true"
-             srcExtensions="*.java,*.jcx,*.jcs,*.jws">
-                <classpath>
-                    <path refid="drt.classpath"/>
-                </classpath>
-        </apt>
+        <build-webservices srcdir="${build.gen-src-wsdl}" destdir="${build.gen-tests}" tempdir="${build.gen-src-apt}" classpathRef="drt.classpath"/>
     </target>
 
     <target name="run.drt">