Author: mmerz
Date: Fri Feb  4 17:05:48 2005
New Revision: 151455

URL: http://svn.apache.org/viewcvs?view=rev&rev=151455
Log:
Cleaned up employee sample.

Added:
    incubator/beehive/trunk/samples/wsm-employee/WEB-INF/build-client-svn.xml
      - copied, changed from r151321, 
incubator/beehive/trunk/samples/wsm-employee/WEB-INF/client-build.xml
    incubator/beehive/trunk/samples/wsm-employee/WEB-INF/build-svn.xml
      - copied, changed from r151321, 
incubator/beehive/trunk/samples/wsm-employee/WEB-INF/build.xml
Removed:
    
incubator/beehive/trunk/samples/wsm-addressbook-fromWSDL/WEB-INF/client-build.xml
    incubator/beehive/trunk/samples/wsm-employee/WEB-INF/attachments/
    incubator/beehive/trunk/samples/wsm-employee/WEB-INF/build.xml
    incubator/beehive/trunk/samples/wsm-employee/WEB-INF/client-build.xml
Modified:
    
incubator/beehive/trunk/samples/wsm-addressbook-fromWSDL/WEB-INF/build-svn.xml

Modified: 
incubator/beehive/trunk/samples/wsm-addressbook-fromWSDL/WEB-INF/build-svn.xml
URL: 
http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/wsm-addressbook-fromWSDL/WEB-INF/build-svn.xml?view=diff&r1=151454&r2=151455
==============================================================================
--- 
incubator/beehive/trunk/samples/wsm-addressbook-fromWSDL/WEB-INF/build-svn.xml 
(original)
+++ 
incubator/beehive/trunk/samples/wsm-addressbook-fromWSDL/WEB-INF/build-svn.xml 
Fri Feb  4 17:05:48 2005
@@ -1,181 +1,181 @@
-<?xml version="1.0" ?>
-
-<!--
-   Copyright 2004 The Apache Software Foundation 
- 
-   Licensed 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.
- 
-   $Header:$
- -->
-
-<project name="wsm-addressbook-fromWSDL" default="build" basedir=".">
-
-  <import file="../../../beehive-imports.xml" />
-
-  <property name="service.name" value="fromWSDL" />
-  
-  <taskdef
-      name="apt"
-      classname="org.apache.beehive.controls.runtime.generator.AptTask"
-      classpath="lib/controls.jar" onerror="report" />
-
-  <property name="webapp.dir" location=".." />
-  <property name="web.inf.dir" location="${webapp.dir}/WEB-INF" />
-  <property name="attachments.dir" location="${web.inf.dir}/attachments" />
-  <property name="lib.dir" location="${web.inf.dir}/lib" />
-  <property name="build.dir" location="${web.inf.dir}/build" />
-  <property name="gen.dir" location="${build.dir}/gen" />
-  <property name="aptgen.dir" location="${build.dir}/apt-gen" />
-  <property name="classes.dir" location="${build.dir}/classes" /> 
-  <property name="sourcegen.dir" value="${gen.dir}/src"/>
-  <property name="webservice.jar" location="${lib.dir}/${service.name}WS.jar" 
/>
-
-  <property name="webservice.war" location="${service.name}WS.war" />
-  <property name="schema.dir" value="wsdl" />
-  <property name="wsdl.location" location="${schema.dir}/${service.name}.wsdl" 
/>
-    
-  <condition property="isJDK15">
-    <equals arg1="${ant.java.version}" arg2="1.5" />
-  </condition>
-
-  <path id="jars">
-    <fileset dir="${lib.dir}" >
-      <include name="**/*.jar" />
-    </fileset>
-  </path>
-
-  
-  <!-- ========================================= -->
-  <!-- deploy.war - build deployable artifact    -->
-  <!-- ========================================= -->
-  
-  <target name="deploy.war">
-    <jar jarfile="${to.dir}/${service.name}WS.war">
-      <fileset dir="${webapp.dir}">
-        <exclude name="${web.inf}/src/**" />
-        <exclude name="${web.inf}/.tmpbeansrc/**" />
-      </fileset>
-    </jar>
-  </target>
-  
-  
-  <!-- ========================================= -->
-  <!-- build - build all binaries                -->
-  <!-- ========================================= -->
-
-  <target name="build" depends="dirs">
-    <deploy-wsm webappDir="${webapp.dir}" />
-    <antcall target="source-gen" />
-    <antcall target="generate-xmlbean-datatypes" />
-    <!-- build-webapp webappDir="${webapp.dir}" / -->
-    <jar jarfile="${webservice.jar}">
-      <fileset dir="${classes.dir}" />
-    </jar>
-  </target>
-
-
-  <!-- ========================================= -->
-  <!-- clean - remove binary files               -->
-  <!-- ========================================= -->
-
-  <target name="clean">
-    <delete dir="${attachments.dir}" />
-    <delete dir="${lib.dir}" />
-    <delete dir="${build.dir}" />
-    <delete dir="${gen.dir}" />
-    <delete dir="${aptgen.dir}" />
-    <delete file="velocity.log" />
-    <clean-webapp webappDir="${webapp.dir}" />
-  </target>
-
-
-  <!-- ========================================= -->
-  <!-- source-gen - generate source from wsdl    -->
-  <!-- ========================================= -->   
-
-  <target name="source-gen" depends="generate-xmlbean-datatypes" >
-  
-    <taskdef
-        name="wsdl2AJava" 
-        classname="org.apache.beehive.wsm.axis.ant.WSDL2AJavaTask">
-      <classpath>
-        <path refid="jars"/>
-      </classpath>    
-    </taskdef>
-
-    <!-- apt
-        srcdir="${sourcegen.dir}"
-        destdir="${classes.dir}"
-        gendir="${aptgen.dir}"
-        compileByExtension="true" 
-        classpathref="jars"
-        srcExtensions="*.java,*.jcx,*.jcs,*.jws" / -->
-               
-    <wsdl2AJava outputdir="${sourcegen.dir}" wsdlfile="${wsdl.location}">
-      <classpath>
-        <path refid="jars"/>
-        <path location="${classes.dir}" />
-      </classpath>
-    </wsdl2AJava>
-               
-    <apt
-        srcdir="${sourcegen.dir}"
-        destdir="${classes.dir}"
-        gendir="${aptgen.dir}"
-        compileByExtension="true" 
-        srcExtensions="*.java,*.jcx,*.jcs,*.jws">
-      <classpath>
-        <path refid="jars"/>
-        <path location="${classes.dir}" />
-      </classpath>
-    </apt>
-  </target>
-       
-  <!-- ========================================= -->
-  <!-- generate-xmlbean-datatypes -              -->
-  <!-- ========================================= -->
-
-  <target name="generate-xmlbean-datatypes">
-    <taskdef
-        name="xmlbeanbuild" 
-       classname="org.apache.xmlbeans.impl.tool.XMLBean">
-      <classpath>
-        <path refid="jars" />
-      </classpath>
-    </taskdef>
-    <mkdir dir="${classes.dir}" />
-    <mkdir dir="${sourcegen.dir}" />
-    <xmlbeanbuild
-        schema="${schema.dir}" 
-       srcgendir="${sourcegen.dir}"
-       classgendir="${classes.dir}"
-       failonerror="true" >
-      <classpath>
-        <path refid="jars" />
-      </classpath>
-    </xmlbeanbuild>
-  </target>
-  
-  
-  <!-- ========================================= -->
-  <!-- dirs - create dirs required for compile   -->
-  <!-- ========================================= -->
-
-  <target name="dirs">
-    <mkdir dir="${aptgen.dir}" />
-    <mkdir dir="${attachments.dir}" />
-    <mkdir dir="${classes.dir}" />
-    <mkdir dir="${gen.dir}" />
-  </target>
-
-</project>
\ No newline at end of file
+<?xml version="1.0" ?>
+
+<!--
+   Copyright 2004 The Apache Software Foundation 
+ 
+   Licensed 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.
+ 
+   $Header:$
+ -->
+
+<project name="wsm-addressbook-fromWSDL" default="build" basedir=".">
+
+  <import file="../../../beehive-imports.xml" />
+
+  <property name="service.name" value="fromWSDL" />
+  
+  <taskdef
+      name="apt"
+      classname="org.apache.beehive.controls.runtime.generator.AptTask"
+      classpath="lib/controls.jar" onerror="report" />
+
+  <property name="webapp.dir" location=".." />
+  <property name="web.inf.dir" location="${webapp.dir}/WEB-INF" />
+  <property name="attachments.dir" location="${web.inf.dir}/attachments" />
+  <property name="lib.dir" location="${web.inf.dir}/lib" />
+  <property name="build.dir" location="${web.inf.dir}/build" />
+  <property name="gen.dir" location="${build.dir}/gen" />
+  <property name="aptgen.dir" location="${build.dir}/apt-gen" />
+  <property name="classes.dir" location="${build.dir}/classes" /> 
+  <property name="sourcegen.dir" value="${gen.dir}/src"/>
+  <property name="webservice.jar" location="${lib.dir}/${service.name}WS.jar" 
/>
+
+  <property name="webservice.war" location="${service.name}WS.war" />
+  <property name="schema.dir" value="wsdl" />
+  <property name="wsdl.location" location="${schema.dir}/${service.name}.wsdl" 
/>
+    
+  <condition property="isJDK15">
+    <equals arg1="${ant.java.version}" arg2="1.5" />
+  </condition>
+
+  <path id="jars">
+    <fileset dir="${lib.dir}" >
+      <include name="**/*.jar" />
+    </fileset>
+  </path>
+
+  
+  <!-- ========================================= -->
+  <!-- deploy.war - build deployable artifact    -->
+  <!-- ========================================= -->
+  
+  <target name="deploy.war">
+    <jar jarfile="${to.dir}/${service.name}WS.war">
+      <fileset dir="${webapp.dir}">
+        <exclude name="${web.inf}/src/**" />
+        <exclude name="${web.inf}/.tmpbeansrc/**" />
+      </fileset>
+    </jar>
+  </target>
+  
+  
+  <!-- ========================================= -->
+  <!-- build - build all binaries                -->
+  <!-- ========================================= -->
+
+  <target name="build" depends="dirs">
+    <deploy-wsm webappDir="${webapp.dir}" />
+    <antcall target="source-gen" />
+    <antcall target="generate-xmlbean-datatypes" />
+    <!-- build-webapp webappDir="${webapp.dir}" / -->
+    <jar jarfile="${webservice.jar}">
+      <fileset dir="${classes.dir}" />
+    </jar>
+  </target>
+
+
+  <!-- ========================================= -->
+  <!-- clean - remove binary files               -->
+  <!-- ========================================= -->
+
+  <target name="clean">
+    <delete dir="${attachments.dir}" />
+    <delete dir="${lib.dir}" />
+    <delete dir="${build.dir}" />
+    <delete dir="${gen.dir}" />
+    <delete dir="${aptgen.dir}" />
+    <delete file="velocity.log" />
+    <clean-webapp webappDir="${webapp.dir}" />
+  </target>
+
+
+  <!-- ========================================= -->
+  <!-- source-gen - generate source from wsdl    -->
+  <!-- ========================================= -->   
+
+  <target name="source-gen" depends="generate-xmlbean-datatypes" >
+  
+    <taskdef
+        name="wsdl2AJava" 
+        classname="org.apache.beehive.wsm.axis.ant.WSDL2AJavaTask">
+      <classpath>
+        <path refid="jars"/>
+      </classpath>    
+    </taskdef>
+
+    <!-- apt
+        srcdir="${sourcegen.dir}"
+        destdir="${classes.dir}"
+        gendir="${aptgen.dir}"
+        compileByExtension="true" 
+        classpathref="jars"
+        srcExtensions="*.java,*.jcx,*.jcs,*.jws" / -->
+               
+    <wsdl2AJava outputdir="${sourcegen.dir}" wsdlfile="${wsdl.location}">
+      <classpath>
+        <path refid="jars"/>
+        <path location="${classes.dir}" />
+      </classpath>
+    </wsdl2AJava>
+               
+    <apt
+        srcdir="${sourcegen.dir}"
+        destdir="${classes.dir}"
+        gendir="${aptgen.dir}"
+        compileByExtension="true" 
+        srcExtensions="*.java,*.jcx,*.jcs,*.jws">
+      <classpath>
+        <path refid="jars"/>
+        <path location="${classes.dir}" />
+      </classpath>
+    </apt>
+  </target>
+       
+  <!-- ========================================= -->
+  <!-- generate-xmlbean-datatypes -              -->
+  <!-- ========================================= -->
+
+  <target name="generate-xmlbean-datatypes">
+    <taskdef
+        name="xmlbeanbuild" 
+       classname="org.apache.xmlbeans.impl.tool.XMLBean">
+      <classpath>
+        <path refid="jars" />
+      </classpath>
+    </taskdef>
+    <mkdir dir="${classes.dir}" />
+    <mkdir dir="${sourcegen.dir}" />
+    <xmlbeanbuild
+        schema="${schema.dir}" 
+       srcgendir="${sourcegen.dir}"
+       classgendir="${classes.dir}"
+       failonerror="true" >
+      <classpath>
+        <path refid="jars" />
+      </classpath>
+    </xmlbeanbuild>
+  </target>
+  
+  
+  <!-- ========================================= -->
+  <!-- dirs - create dirs required for compile   -->
+  <!-- ========================================= -->
+
+  <target name="dirs">
+    <mkdir dir="${aptgen.dir}" />
+    <mkdir dir="${attachments.dir}" />
+    <mkdir dir="${classes.dir}" />
+    <mkdir dir="${gen.dir}" />
+  </target>
+
+</project>

Copied: 
incubator/beehive/trunk/samples/wsm-employee/WEB-INF/build-client-svn.xml (from 
r151321, incubator/beehive/trunk/samples/wsm-employee/WEB-INF/client-build.xml)
URL: 
http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/wsm-employee/WEB-INF/build-client-svn.xml?view=diff&rev=151455&p1=incubator/beehive/trunk/samples/wsm-employee/WEB-INF/client-build.xml&r1=151321&p2=incubator/beehive/trunk/samples/wsm-employee/WEB-INF/build-client-svn.xml&r2=151455
==============================================================================
--- incubator/beehive/trunk/samples/wsm-employee/WEB-INF/client-build.xml 
(original)
+++ incubator/beehive/trunk/samples/wsm-employee/WEB-INF/build-client-svn.xml 
Fri Feb  4 17:05:48 2005
@@ -1,74 +1,97 @@
 <?xml version="1.0" ?>
 
-<project name="EmployeeWSClient" basedir="." default="all">
-       
-    <property name="EmployeeWS.wsdl.url"
-              value="http://localhost:8080/EmployeeWS/web/Service.jws?wsdl"; />
-       
-    <path id="jars">
-        <fileset dir="lib">
-            <include name="**/*.jar"/>
-        </fileset>
-    </path>
-       
-    <taskdef name="wsdl2java"
-             classname="org.apache.axis.tools.ant.wsdl.Wsdl2javaAntTask"
-             loaderref="axis">
-        <classpath refid="jars"/>
-    </taskdef>
+<!--
+   Copyright 2004 The Apache Software Foundation 
+ 
+   Licensed 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.
+ 
+   $Header:$
+ -->
 
-    <!-- targets -->
-
-    <target name="all" depends="genClient,compile,test" />
+<project name="wsm-employee Client" basedir="." default="test">
        
-    <target name="dirs">
-        <mkdir dir="build" />
-        <mkdir dir="build/generated" />
-        <mkdir dir="build/classes" />
-        <mkdir dir="logs" />
-    </target> 
+  <import file="../../../beehive-imports.xml" />
 
-    <target name="genClient" depends="dirs">
-        <echo>** generating client classes into build/generated **</echo>
-        <wsdl2java url="${EmployeeWS.wsdl.url}"
-                   output="build/generated"
-                   testcase="no">
-        </wsdl2java>
-    </target>
-       
-    <target name="compile" depends="genClient">
-        <echo>** compiling generated classes **</echo>
-        <javac srcdir="build/generated"
-               destdir="build/classes"
-               classpathref="jars"
-               failonerror="true"
-               source="1.4"/>
-    </target> 
-       
-    <target name="test" depends="compile">
-        <echo>** junit logfiles written to logs **</echo>
-        <javac srcdir="client-tests"
-               destdir="build/classes"
-               classpathref="jars"
-               failonerror="true"
-               source="1.4"  />
-        <junit printsummary="on" tempdir="." fork="yes">
-            <classpath>
-                <pathelement location= "build/classes"/>
-                <path refid="jars"/>
-            </classpath>
-            <formatter type="plain" />
-            <batchtest fork="yes" todir="logs">
-                <fileset dir="build/classes">
-                    <include name="**/*Test*.class"/>
-                </fileset>
-            </batchtest>
-        </junit>
-    </target>
+  <property
+      name="wsdl.url" 
+      value="http://localhost:8080/wsm-employeeWS/web/Service.jws?wsdl"; />
+  <property name="webapp.dir" value=".." />
+  <property name="web.inf.dir" value="${webapp.dir}/WEB-INF" />
+  <property name="lib.dir" value="${web.inf.dir}/lib" />
+  <property name="log.dir" value="${web.inf.dir}/logs" />
+  <property name="build.dir" value="${web.inf.dir}/build-client" />
+  <property name="gen.dir" value="${build.dir}/gen" />
+  <property name="classes.dir" value="${build.dir}/classes" />
+      
+  <path id="jars">
+    <fileset dir="${lib.dir}">
+      <include name="**/*.jar"/>
+    </fileset>
+  </path>
+       
+  <target name="test" depends="dirs,compile">
+    <junit
+        printsummary="yes"
+        haltonfailure="yes"
+        showoutput="yes">
+      <classpath>
+        <pathelement location= "${classes.dir}"/>
+      <path refid="jars"/>
+      </classpath>
+      <formatter type="plain"/>
+      <batchtest fork="yes" todir="${log.dir}">
+        <fileset dir="${classes.dir}">
+          <include name="**/*Test*.class"/>
+        </fileset>
+      </batchtest>
+    </junit>
+  </target>
+       
+  <target name="compile" depends="genClient">
+    <javac
+        srcdir="${gen.dir}"
+       destdir="${classes.dir}"
+       classpathref="jars"
+       failonerror="true"
+       source="1.4" />
+  </target>    
+       
+  <target name="genClient" depends="dirs">
+    <deploy-wsm webappDir="${webapp.dir}" />
+    <taskdef
+        name="wsdl2java"
+        classname="org.apache.axis.tools.ant.wsdl.Wsdl2javaAntTask"
+        loaderref="axis">
+      <classpath refid="jars"/>
+    </taskdef>
+    <wsdl2java
+        url="${wsdl.url}"
+       output="${gen.dir}"
+       testcase="yes">
+    </wsdl2java>
+  </target>
+       
+  <target name="clean">
+    <delete dir="${build.dir}" />
+    <delete dir="${log.dir}" />
+    <delete dir="${lib.dir}" />
+  </target>
+       
+  <target name="dirs">
+    <mkdir dir="${build.dir}" />
+    <mkdir dir="${gen.dir}" />
+    <mkdir dir="${classes.dir}" />
+    <mkdir dir="${log.dir}" />
+  </target>    
 
-    <target name="clean">
-        <delete dir="build" />
-        <delete dir="logs" />
-    </target>
-       
 </project>

Copied: incubator/beehive/trunk/samples/wsm-employee/WEB-INF/build-svn.xml 
(from r151321, incubator/beehive/trunk/samples/wsm-employee/WEB-INF/build.xml)
URL: 
http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/wsm-employee/WEB-INF/build-svn.xml?view=diff&rev=151455&p1=incubator/beehive/trunk/samples/wsm-employee/WEB-INF/build.xml&r1=151321&p2=incubator/beehive/trunk/samples/wsm-employee/WEB-INF/build-svn.xml&r2=151455
==============================================================================
--- incubator/beehive/trunk/samples/wsm-employee/WEB-INF/build.xml (original)
+++ incubator/beehive/trunk/samples/wsm-employee/WEB-INF/build-svn.xml Fri Feb  
4 17:05:48 2005
@@ -18,112 +18,97 @@
    $Header:$
  -->
 
-<project name="EmployeeWS" default="build" basedir=".">
+<project name="wsm-employee" default="build" basedir=".">
 
+  <import file="../../../beehive-imports.xml" />
 
+  <property name="service.name" value="wsm-employee" />
 
-       <property environment="env" />
-
-       <property name="build.dir" location="build" />
-       <property name="gen.dir" location="${build.dir}/gen" />
-       <property name="classes.dir" location="${build.dir}/classes" />
+  <property name="webapp.dir" location=".." />
+  <property name="lib.dir" location="lib" />
+  <property name="build.dir" location="build" />
+  <property name="gen.dir" location="${build.dir}/gen" />
+  <property name="classes.dir" location="${build.dir}/classes" />
+
+  <path id="jars">
+    <fileset dir="./lib">
+      <include name="**/*.jar" />
+    </fileset>
+  </path>
+
+  
+  <!-- ========================================= -->
+  <!-- deploy.war - build deployable artifact    -->
+  <!-- ========================================= -->
+  
+  <target name="deploy.war">
+    <jar jarfile="${to.dir}/${service.name}WS.war">
+      <fileset dir="..">
+        <exclude name="src/**" />
+        <exclude name=".tmpbeansrc/**" />
+      </fileset>
+    </jar>
+  </target>
+
+
+  <!-- ========================================= -->
+  <!-- build - build jar-file                    -->
+  <!-- ========================================= -->
+
+  <target name="build">
+    <deploy-wsm webappDir="${webapp.dir}" />
+    <copy todir="${lib.dir}">
+      <fileset dir="../../controls-db/build" includes="dbControl.jar" />
+      <fileset dir="${beehive.home}/external/derby" includes="derby_46005.jar" 
/>
+    </copy>
+    <antcall target="compile"/>
+    <jar jarfile="${lib.dir}/${service.name}WS.jar">
+      <fileset dir="${classes.dir}">
+        <exclude name="**/Test.class" />
+      </fileset>
+    </jar>
+  </target>
+
+
+  <!-- ========================================= -->
+  <!-- compile -                                 -->
+  <!-- ========================================= -->
+
+  <target name="compile" depends="dirs">
+    <taskdef
+        name="apt"
+        classname="org.apache.beehive.controls.runtime.generator.AptTask"
+        classpath="lib/controls.jar"
+        onerror="report" />
+    <apt
+        srcdir="./src"
+        destdir="${classes.dir}"
+        gendir="${gen.dir}"
+        compileByExtension="true" 
+        classpathref="jars"
+        srcExtensions="*.java,*.jcx,*.jcs,*.jws" />
+  </target>
        
 
-
-       <path id="jars">
-               <fileset dir="./lib">
-                       <include name="**/*.jar" />
-               </fileset>
-       </path>
-
-
-
-
-       <!-- ========================================= -->
-       <!-- build - build jar-file                    -->
-       <!-- ========================================= -->
-
-       <target name="build" depends="compile">
-               <jar jarfile="./lib/EmployeeWS.jar">
-                       <fileset dir="${classes.dir}">
-                               <exclude name="**/Test.class" />
-                       </fileset>
-               </jar>
-       </target>
-
-
-       <target name="compile" depends="update_jars, dirs" >
-               <taskdef name="apt" 
classname="org.apache.beehive.controls.runtime.generator.AptTask" 
classpath="lib/controls.jar" onerror="report" />
-
-               <apt srcdir="./src" destdir="${classes.dir}" 
gendir="${gen.dir}" compileByExtension="true" 
-                       classpathref="jars" 
srcExtensions="*.java,*.jcx,*.jcs,*.jws" >
-
-               </apt>
-
-       </target>
-       
-
-       <target name="update_jars" >
-               <property name="log4j.jar" 
location="${env.BEEHIVE_HOME}/external/log4j/log4j-1.2.8.jar" />
-               <property name="junit.jar" 
location="${env.BEEHIVE_HOME}/external/junit/junit.jar" />
-               <property name="velocity14.jar" 
location="${env.BEEHIVE_HOME}/external/velocity/velocity-1.4.jar" />
-               <property name="velocitydep14.jar" 
location="${env.BEEHIVE_HOME}/external/velocity/velocity-dep-1.4.jar" />
-               <property name="derby.jar" 
location="${env.BEEHIVE_HOME}/external/derby/derby_46005.jar" />
-               <property name="xbean.jar" 
location="${env.BEEHIVE_HOME}/external/xmlbeans/apache-xbean.jar" />
-
-               <copy todir="lib" >
-                       <fileset file="../../controls-db/build/dbControl.jar" />
-                       <fileset file="${log4j.jar}"/>
-                       <fileset file="${xbean.jar}"/>
-
-                       <!-- these are required by Controls and WSM -->
-                       <fileset file="${velocity14.jar}" />
-                       <fileset file="${velocitydep14.jar}"/>
-                       <fileset dir="${env.BEEHIVE_HOME}/wsm/lib">
-                               <include name="wsdltypes.jar"/>
-                       </fileset>
-
-                       <fileset dir="${env.BEEHIVE_HOME}/wsm/external">
-                               <include name="axis.jar"/>
-                               <include name="axis-ant.jar"/>
-                               <include name="jaxrpc.jar"/>
-                               <include name="saaj.jar"/>
-                               <include name="wsdl4j.jar"/>
-                               <include name="commons-discovery.jar"/>
-                       </fileset>
-
-                       <fileset dir="${env.BEEHIVE_HOME}/wsm/build/jars">
-                               <include name="wsm.jar"/>
-                               <include name="wsm-axis.jar"/>
-                       </fileset>
-                       <fileset dir="${env.BEEHIVE_HOME}/controls/build/jars">
-                               <include name="controls.jar"/>
-                       </fileset>
-               </copy>
-       </target>
-
-       <!-- ========================================= -->
-       <!-- dirs - create dirs required for compile   -->
-       <!-- ========================================= -->
-
-       <target name="dirs">
-               <mkdir dir="${classes.dir}" />
-               <mkdir dir="${gen.dir}" />
-       </target>
-
-
-       <!-- ========================================= -->
-       <!-- clean - remove build files                -->
-       <!-- ========================================= -->
-
-       <target name="clean" depends="update_jars">
-               <delete file="velocity.log" />
-               <delete file="./lib/EmployeeWS.jar" />
-               <delete dir="${build.dir}" />
-               <delete dir="${gen.dir}" />
-       </target>
-
-
-
+  <!-- ========================================= -->
+  <!-- dirs - create dirs required for compile   -->
+  <!-- ========================================= -->
+
+  <target name="dirs">
+    <mkdir dir="${classes.dir}" />
+    <mkdir dir="${gen.dir}" />
+  </target>
+
+
+  <!-- ========================================= -->
+  <!-- clean - remove build files                -->
+  <!-- ========================================= -->
+
+  <target name="clean">
+    <delete file="velocity.log" />
+    <delete file="${lib.dir}/${service.name}WS.jar" />
+    <delete dir="${build.dir}" />
+    <delete dir="${gen.dir}" />
+  </target>
 
 </project>


Reply via email to