Author: ekoneil
Date: Thu Apr 14 21:24:48 2005
New Revision: 161377

URL: http://svn.apache.org/viewcvs?view=rev&rev=161377
Log:
Fix for JIRA 477.

Contributed by Chad Schoettger.  

This change adds an Ant macro that can build web services and controls.

BB: self
DRT: Beehive pass / build.dist pass


Modified:
    incubator/beehive/trunk/ant/beehive-tools.xml
    incubator/beehive/trunk/samples/wsm-addressbook-enhanced/WEB-INF/build.xml
    incubator/beehive/trunk/samples/wsm-addressbook-fromWSDL/WEB-INF/build.xml
    incubator/beehive/trunk/samples/wsm-addressbook/WEB-INF/build.xml
    incubator/beehive/trunk/samples/wsm-blank/WEB-INF/build.xml
    incubator/beehive/trunk/samples/wsm-employee/WEB-INF/build.xml
    incubator/beehive/trunk/samples/wsm-samples/WEB-INF/build.xml

Modified: incubator/beehive/trunk/ant/beehive-tools.xml
URL: 
http://svn.apache.org/viewcvs/incubator/beehive/trunk/ant/beehive-tools.xml?view=diff&r1=161376&r2=161377
==============================================================================
--- incubator/beehive/trunk/ant/beehive-tools.xml (original)
+++ incubator/beehive/trunk/ant/beehive-tools.xml Thu Apr 14 21:24:48 2005
@@ -108,6 +108,32 @@
         </sequential>
     </macrodef>
 
+     <!-- This macrodef is intended for the compilation of the *web services" 
portions of a web application. -->
+    <macrodef name="build-webservices">
+        <attribute name="sourceDir"/>
+        <attribute name="destDir"/>
+        <attribute name="tmpDir"/>
+        <attribute name="classpathRef"/>
+        <sequential>
+            <taskdef name="apt"
+                     
classname="org.apache.beehive.controls.runtime.generator.AptTask"
+                     classpathref="apt.task.classpath"
+                     onerror="fail" />
+
+            <path id="_webservices.build.classpath">
+                <path refid="@{classpathRef}"/>
+            </path>
+
+            <apt srcdir="@{sourceDir}"
+                 destdir="@{destDir}"
+                 gendir="@{tmpDir}"
+                 classpathref="_webservices.build.classpath"
+                 compileByExtension="true"
+                 srcExtensions="*.java,*.jcx,*.jcs,*.jws"
+                 debug="true" />
+        </sequential>
+    </macrodef>
+
     <target name="usage" description="Print the usage for this Ant build 
file.">
         <echo>
 The beehive-tools.xml file contains Ant macros which can be used 

Modified: 
incubator/beehive/trunk/samples/wsm-addressbook-enhanced/WEB-INF/build.xml
URL: 
http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/wsm-addressbook-enhanced/WEB-INF/build.xml?view=diff&r1=161376&r2=161377
==============================================================================
--- incubator/beehive/trunk/samples/wsm-addressbook-enhanced/WEB-INF/build.xml 
(original)
+++ incubator/beehive/trunk/samples/wsm-addressbook-enhanced/WEB-INF/build.xml 
Thu Apr 14 21:24:48 2005
@@ -1,137 +1,126 @@
-<?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="Enhanced Address Book Sample" default="build" basedir=".">
-  
-  <property file="build.properties"/>
-
-  <import file="${beehive.home}/beehive-imports.xml" />
-
-  <property name="service.name" value="EnhancedAddressBook" />
-
-  <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="classes.dir" location="${web.inf.dir}/classes" />
-  <property name="gen.dir" location="${web.inf.dir}/gen" />
-  <property name="lib.dir" location="${web.inf.dir}/lib" />
-  <property name="src.dir" location="${web.inf.dir}/src" />
-  <property name="webservice.jar" value="${lib.dir}/${service.name}WS.jar" />
-  <property name="webservice.war" value="${service.name}WS.war" />
-
-  <path id="lib.path">
-    <fileset dir="${lib.dir}">
-      <include name="**/*.jar" />
-    </fileset>
-  </path>
-
-  <path id="build.classpath">
-    <path refid="lib.path"/>
-    <pathelement location="${classes.dir}"/>
-  </path>
-    
-  
-  <!-- ========================================= -->
-  <!-- deploy - build deployable artifact        -->
-  <!-- ========================================= -->
-  
-  <target name="deploy">
-    <antcall target="deploy.war" />
-  </target>
-
-
-  <!-- ========================================= -->
-  <!-- deploy.war - build deployable artifact    -->
-  <!-- ========================================= -->
-  
-  <target name="deploy.war">
-    <jar jarfile="${to.dir}/${webservice.war}">
-      <fileset dir="..">
-        <exclude name="${src.dir}/**" />
-        <exclude name="${gen.dir}/**" />
-      </fileset>
-    </jar>
-  </target>
-  
-
-  <!-- ========================================= -->
-  <!-- build - build all binaries                -->
-  <!-- ========================================= -->
-
-  <target name="build" depends="dirs">
-    <antcall target="deploy.beehive.webservice.runtime" />
-    <antcall target="build.beehive.webservice" />
-    <jar jarfile="${webservice.jar}">
-      <fileset dir="${classes.dir}" />
-    </jar>
-  </target>
-
-  
-  <!-- ========================================= -->
-  <!-- clean - remove binary files               -->
-  <!-- ========================================= -->
-
-  <target name="clean">
-    <delete dir="${attachments.dir}" />
-    <delete dir="${classes.dir}" />
-    <delete dir="${gen.dir}" />
-    <delete dir="${lib.dir}" />
-    <delete file="velocity.log" />
-  </target>
-
-  
-  <!-- ========================================= -->
-  <!-- dirs - create dirs required for compile   -->
-  <!-- ========================================= -->
-
-  <target name="dirs">
-    <mkdir dir="${attachments.dir}" />
-    <mkdir dir="${classes.dir}" />
-    <mkdir dir="${gen.dir}" />
-    <mkdir dir="${lib.dir}" />
-  </target>
-
-  <!-- copy all dependencies -->
-  <target name="deploy.beehive.webservice.runtime" depends="dirs">
-    <copy todir="${lib.dir}">
-      <fileset file="${beehive.home}/lib/common/*.jar" />
-      <fileset file="${beehive.home}/lib/controls/controls.jar" />
-      <fileset file="${beehive.home}/lib/wsm/*.jar" />
-    </copy>
-  </target>
-
-
-  <!-- build all beehive webservice binaries -->
-  <target name="build.beehive.webservice">
-    <taskdef name="apt" 
-        classname="org.apache.beehive.controls.runtime.generator.AptTask" 
-        classpathref="lib.path" 
-        onerror="report" />
-    <apt
-        srcdir="${src.dir}" 
-        destdir="${classes.dir}"
-        gendir="${gen.dir}"
-        classpathref="build.classpath" 
-        compileByExtension="true" 
-        srcExtensions="*.java,*.jcx,*.jcs,*.jws" 
-        debug="true" />
-  </target>
-
-</project>
+<?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="Enhanced Address Book Sample" default="build" basedir=".">
+  
+  <property file="build.properties"/>
+
+  <import file="${beehive.home}/beehive-imports.xml" />
+  <import file="${beehive.home}/beehive-tools.xml" />
+
+  <property name="service.name" value="EnhancedAddressBook" />
+
+  <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="classes.dir" location="${web.inf.dir}/classes" />
+  <property name="gen.dir" location="${web.inf.dir}/gen" />
+  <property name="lib.dir" location="${web.inf.dir}/lib" />
+  <property name="src.dir" location="${web.inf.dir}/src" />
+  <property name="webservice.jar" value="${lib.dir}/${service.name}WS.jar" />
+  <property name="webservice.war" value="${service.name}WS.war" />
+
+  <path id="lib.path">
+    <fileset dir="${lib.dir}">
+      <include name="**/*.jar" />
+    </fileset>
+  </path>
+
+  <path id="build.classpath">
+    <path refid="lib.path"/>
+    <pathelement location="${classes.dir}"/>
+  </path>
+    
+  
+  <!-- ========================================= -->
+  <!-- deploy - build deployable artifact        -->
+  <!-- ========================================= -->
+  
+  <target name="deploy">
+    <antcall target="deploy.war" />
+  </target>
+
+
+  <!-- ========================================= -->
+  <!-- deploy.war - build deployable artifact    -->
+  <!-- ========================================= -->
+  
+  <target name="deploy.war">
+    <jar jarfile="${to.dir}/${webservice.war}">
+      <fileset dir="..">
+        <exclude name="${src.dir}/**" />
+        <exclude name="${gen.dir}/**" />
+      </fileset>
+    </jar>
+  </target>
+  
+
+  <!-- ========================================= -->
+  <!-- build - build all binaries                -->
+  <!-- ========================================= -->
+
+  <target name="build" depends="dirs">
+    <antcall target="deploy.beehive.webservice.runtime" />
+
+    <build-webservices sourceDir="${src.dir}"
+                       destDir="${classes.dir}"
+                       tmpDir="${gen.dir}"
+                       classPathRef="build.classpath"/>
+
+    <jar jarfile="${webservice.jar}">
+      <fileset dir="${classes.dir}" />
+    </jar>
+  </target>
+
+  
+  <!-- ========================================= -->
+  <!-- clean - remove binary files               -->
+  <!-- ========================================= -->
+
+  <target name="clean">
+    <delete dir="${attachments.dir}" />
+    <delete dir="${classes.dir}" />
+    <delete dir="${gen.dir}" />
+    <delete dir="${lib.dir}" />
+    <delete file="velocity.log" />
+  </target>
+
+  
+  <!-- ========================================= -->
+  <!-- dirs - create dirs required for compile   -->
+  <!-- ========================================= -->
+
+  <target name="dirs">
+    <mkdir dir="${attachments.dir}" />
+    <mkdir dir="${classes.dir}" />
+    <mkdir dir="${gen.dir}" />
+    <mkdir dir="${lib.dir}" />
+  </target>
+
+  <!-- copy all dependencies -->
+  <target name="deploy.beehive.webservice.runtime" depends="dirs">
+    <copy todir="${lib.dir}">
+      <fileset file="${beehive.home}/lib/common/*.jar" />
+      <fileset file="${beehive.home}/lib/controls/controls.jar" />
+      <fileset file="${beehive.home}/lib/wsm/*.jar" />
+    </copy>
+  </target>
+
+</project>

Modified: 
incubator/beehive/trunk/samples/wsm-addressbook-fromWSDL/WEB-INF/build.xml
URL: 
http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/wsm-addressbook-fromWSDL/WEB-INF/build.xml?view=diff&r1=161376&r2=161377
==============================================================================
--- incubator/beehive/trunk/samples/wsm-addressbook-fromWSDL/WEB-INF/build.xml 
(original)
+++ incubator/beehive/trunk/samples/wsm-addressbook-fromWSDL/WEB-INF/build.xml 
Thu Apr 14 21:24:48 2005
@@ -1,136 +1,122 @@
-<?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="Address Book from WSDL Sample" default="build" basedir=".">
-  
-  <property file="build.properties"/>
-
-  <import file="${beehive.home}/beehive-imports.xml" />
-
-  <property name="service.name" value="fromWSDL" />
-
-  <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="classes.dir" location="${web.inf.dir}/classes" />
-  <property name="gen.dir" location="${web.inf.dir}/gen" />
-  <property name="lib.dir" location="${web.inf.dir}/lib" />
-  <property name="src.dir" location="${web.inf.dir}/src" />
-  <property name="webservice.jar" value="${lib.dir}/${service.name}.jar" />
-  <property name="webservice.war" value="${service.name}.war" />
-
-  <path id="lib.path">
-    <fileset dir="${lib.dir}">
-      <include name="**/*.jar" />
-    </fileset>
-  </path>
-
-  <path id="build.classpath">
-    <path refid="lib.path"/>
-    <pathelement location="${classes.dir}"/>
-  </path>
-    
-  
-  <!-- ========================================= -->
-  <!-- deploy - build deployable artifact        -->
-  <!-- ========================================= -->
-  
-  <target name="deploy">
-    <antcall target="deploy.war" />
-  </target>
-  
-
-  <!-- ========================================= -->
-  <!-- deploy.war - build deployable artifact    -->
-  <!-- ========================================= -->
-  
-  <target name="deploy.war">
-    <jar jarfile="${to.dir}/${webservice.war}">
-      <fileset dir="..">
-        <exclude name="${build.dir}/**" />
-      </fileset>
-    </jar>
-  </target>
-  
-
-  <!-- ========================================= -->
-  <!-- build - build all binaries                -->
-  <!-- ========================================= -->
-
-  <target name="build" depends="dirs">
-    <antcall target="deploy.beehive.webservice.runtime" />
-    <antcall target="build.beehive.webservice" />
-    <jar jarfile="${webservice.jar}">
-      <fileset dir="${classes.dir}" />
-    </jar>
-  </target>
-
-  
-  <!-- ========================================= -->
-  <!-- clean - remove binary files               -->
-  <!-- ========================================= -->
-
-  <target name="clean">
-    <delete dir="${attachments.dir}" />
-    <delete dir="${build.dir}" />
-    <delete dir="${gen.dir}" />
-    <delete dir="${lib.dir}" />
-    <delete file="velocity.log" />
-  </target>
-
-  
-  <!-- ========================================= -->
-  <!-- dirs - create dirs required for compile   -->
-  <!-- ========================================= -->
-
-  <target name="dirs">
-    <mkdir dir="${attachments.dir}" />
-    <mkdir dir="${classes.dir}" />
-    <mkdir dir="${gen.dir}" />
-    <mkdir dir="${lib.dir}" />
-  </target>
-
-  <!-- copy all dependencies -->
-  <target name="deploy.beehive.webservice.runtime" depends="dirs">
-    <copy todir="${lib.dir}">
-      <fileset file="${beehive.home}/lib/common/*.jar" />
-      <fileset file="${beehive.home}/lib/controls/controls.jar" />
-      <fileset file="${beehive.home}/lib/wsm/*.jar" />
-    </copy>
-  </target>
-
-
-  <!-- build all beehive webservice binaries -->
-  <target name="build.beehive.webservice">
-    <taskdef name="apt" 
-        classname="org.apache.beehive.controls.runtime.generator.AptTask" 
-        classpathref="lib.path" 
-        onerror="report" />
-    <apt
-        srcdir="${src.dir}" 
-        destdir="${classes.dir}"
-        gendir="${gen.dir}"
-        classpathref="build.classpath" 
-        compileByExtension="true" 
-        srcExtensions="*.java,*.jcx,*.jcs,*.jws" 
-        debug="true" />
-  </target>
-
-</project>
+<?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="Address Book from WSDL Sample" default="build" basedir=".">
+  
+  <property file="build.properties"/>
+
+  <import file="${beehive.home}/beehive-imports.xml" />
+  <import file="${beehive.home}/beehive-tools.xml" />
+
+  <property name="service.name" value="fromWSDL" />
+
+  <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="classes.dir" location="${web.inf.dir}/classes" />
+  <property name="gen.dir" location="${web.inf.dir}/gen" />
+  <property name="lib.dir" location="${web.inf.dir}/lib" />
+  <property name="src.dir" location="${web.inf.dir}/src" />
+  <property name="webservice.jar" value="${lib.dir}/${service.name}.jar" />
+  <property name="webservice.war" value="${service.name}.war" />
+
+  <path id="lib.path">
+    <fileset dir="${lib.dir}">
+      <include name="**/*.jar" />
+    </fileset>
+  </path>
+
+  <path id="build.classpath">
+    <path refid="lib.path"/>
+    <pathelement location="${classes.dir}"/>
+  </path>
+    
+  
+  <!-- ========================================= -->
+  <!-- deploy - build deployable artifact        -->
+  <!-- ========================================= -->
+  
+  <target name="deploy">
+    <antcall target="deploy.war" />
+  </target>
+  
+
+  <!-- ========================================= -->
+  <!-- deploy.war - build deployable artifact    -->
+  <!-- ========================================= -->
+  
+  <target name="deploy.war">
+    <jar jarfile="${to.dir}/${webservice.war}">
+      <fileset dir="..">
+        <exclude name="${build.dir}/**" />
+      </fileset>
+    </jar>
+  </target>
+  
+
+  <!-- ========================================= -->
+  <!-- build - build all binaries                -->
+  <!-- ========================================= -->
+
+  <target name="build" depends="dirs">
+    <antcall target="deploy.beehive.webservice.runtime" />
+      <build-webservices sourceDir="${src.dir}"
+                         destDir="${classes.dir}"
+                         tmpDir="${gen.dir}"
+                         classPathRef="build.classpath"/>
+    <jar jarfile="${webservice.jar}">
+      <fileset dir="${classes.dir}" />
+    </jar>
+  </target>
+
+  
+  <!-- ========================================= -->
+  <!-- clean - remove binary files               -->
+  <!-- ========================================= -->
+
+  <target name="clean">
+    <delete dir="${attachments.dir}" />
+    <delete dir="${build.dir}" />
+    <delete dir="${gen.dir}" />
+    <delete dir="${lib.dir}" />
+    <delete file="velocity.log" />
+  </target>
+
+  
+  <!-- ========================================= -->
+  <!-- dirs - create dirs required for compile   -->
+  <!-- ========================================= -->
+
+  <target name="dirs">
+    <mkdir dir="${attachments.dir}" />
+    <mkdir dir="${classes.dir}" />
+    <mkdir dir="${gen.dir}" />
+    <mkdir dir="${lib.dir}" />
+  </target>
+
+  <!-- copy all dependencies -->
+  <target name="deploy.beehive.webservice.runtime" depends="dirs">
+    <copy todir="${lib.dir}">
+      <fileset file="${beehive.home}/lib/common/*.jar" />
+      <fileset file="${beehive.home}/lib/controls/controls.jar" />
+      <fileset file="${beehive.home}/lib/wsm/*.jar" />
+    </copy>
+  </target>
+</project>

Modified: incubator/beehive/trunk/samples/wsm-addressbook/WEB-INF/build.xml
URL: 
http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/wsm-addressbook/WEB-INF/build.xml?view=diff&r1=161376&r2=161377
==============================================================================
--- incubator/beehive/trunk/samples/wsm-addressbook/WEB-INF/build.xml (original)
+++ incubator/beehive/trunk/samples/wsm-addressbook/WEB-INF/build.xml Thu Apr 
14 21:24:48 2005
@@ -1,137 +1,126 @@
-<?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="Address Book Sample" default="build" basedir=".">
-
-  <property file="build.properties"/>
-
-  <import file="${beehive.home}/beehive-imports.xml" />
-
-  <property name="service.name" value="AddressBook" />
-
-  <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="classes.dir" location="${web.inf.dir}/classes" />
-  <property name="gen.dir" location="${web.inf.dir}/gen" />
-  <property name="lib.dir" location="${web.inf.dir}/lib" />
-  <property name="src.dir" location="${web.inf.dir}/src" />
-  <property name="webservice.jar" location="${lib.dir}/${service.name}WS.jar" 
/>
-  <property name="webservice.war" value="${service.name}WS.war" />
-
-  <path id="lib.path">
-    <fileset dir="${lib.dir}">
-      <include name="**/*.jar" />
-    </fileset>
-  </path>
-
-  <path id="build.classpath">
-    <path refid="lib.path"/>
-    <pathelement location="${classes.dir}"/>
-  </path>
-    
-  
-  <!-- ========================================= -->
-  <!-- deploy - build deployable artifact        -->
-  <!-- ========================================= -->
-  
-  <target name="deploy">
-    <antcall target="deploy.war" />
-  </target>
-
-
-  <!-- ========================================= -->
-  <!-- deploy.war - build deployable artifact    -->
-  <!-- ========================================= -->
-  
-  <target name="deploy.war">
-    <jar jarfile="${to.dir}/${webservice.war}">
-      <fileset dir="..">
-        <exclude name="${src.dir}/**" />
-        <exclude name="${gen.dir}/**" />
-      </fileset>
-    </jar>
-  </target>
-  
-
-  <!-- ========================================= -->
-  <!-- build - build all binaries                -->
-  <!-- ========================================= -->
-
-  <target name="build" depends="dirs">
-    <antcall target="deploy.beehive.webservice.runtime" />
-    <antcall target="build.beehive.webservice" />
-    <jar jarfile="${webservice.jar}">
-      <fileset dir="${classes.dir}" />
-    </jar>
-  </target>
-
-  
-  <!-- ========================================= -->
-  <!-- clean - remove binary files               -->
-  <!-- ========================================= -->
-
-  <target name="clean">
-    <delete dir="${attachments.dir}" />
-    <delete dir="${classes.dir}" />
-    <delete dir="${gen.dir}" />
-    <delete dir="${lib.dir}" />
-    <delete file="velocity.log" />
-  </target>
-
-  
-  <!-- ========================================= -->
-  <!-- dirs - create dirs required for compile   -->
-  <!-- ========================================= -->
-
-  <target name="dirs">
-    <mkdir dir="${attachments.dir}" />
-    <mkdir dir="${classes.dir}" />
-    <mkdir dir="${gen.dir}" />
-    <mkdir dir="${lib.dir}" />
-  </target>
-
-  <!-- copy all dependencies -->
-  <target name="deploy.beehive.webservice.runtime" depends="dirs">
-    <copy todir="${lib.dir}">
-      <fileset file="${beehive.home}/lib/common/*.jar" />
-      <fileset file="${beehive.home}/lib/controls/controls.jar" />
-      <fileset file="${beehive.home}/lib/wsm/*.jar" />
-    </copy>
-  </target>
-
-
-  <!-- build all beehive webservice binaries -->
-  <target name="build.beehive.webservice">
-    <taskdef name="apt" 
-        classname="org.apache.beehive.controls.runtime.generator.AptTask" 
-        classpathref="lib.path" 
-        onerror="report" />
-    <apt
-        srcdir="${src.dir}" 
-        destdir="${classes.dir}"
-        gendir="${gen.dir}"
-        classpathref="build.classpath" 
-        compileByExtension="true" 
-        srcExtensions="*.java,*.jcx,*.jcs,*.jws" 
-        debug="true" />
-  </target>
-
-</project>
+<?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="Address Book Sample" default="build" basedir=".">
+
+  <property file="build.properties"/>
+
+  <import file="${beehive.home}/beehive-imports.xml" />
+  <import file="${beehive.home}/ant/beehive-tools.xml"/>
+
+  <property name="service.name" value="AddressBook" />
+
+  <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="classes.dir" location="${web.inf.dir}/classes" />
+  <property name="gen.dir" location="${web.inf.dir}/gen" />
+  <property name="lib.dir" location="${web.inf.dir}/lib" />
+  <property name="src.dir" location="${web.inf.dir}/src" />
+  <property name="webservice.jar" location="${lib.dir}/${service.name}WS.jar" 
/>
+  <property name="webservice.war" value="${service.name}WS.war" />
+
+  <path id="lib.path">
+    <fileset dir="${lib.dir}">
+      <include name="**/*.jar" />
+    </fileset>
+  </path>
+
+  <path id="build.classpath">
+    <path refid="lib.path"/>
+    <pathelement location="${classes.dir}"/>
+  </path>
+    
+  
+  <!-- ========================================= -->
+  <!-- deploy - build deployable artifact        -->
+  <!-- ========================================= -->
+  
+  <target name="deploy">
+    <antcall target="deploy.war" />
+  </target>
+
+
+  <!-- ========================================= -->
+  <!-- deploy.war - build deployable artifact    -->
+  <!-- ========================================= -->
+  
+  <target name="deploy.war">
+    <jar jarfile="${to.dir}/${webservice.war}">
+      <fileset dir="..">
+        <exclude name="${src.dir}/**" />
+        <exclude name="${gen.dir}/**" />
+      </fileset>
+    </jar>
+  </target>
+  
+
+  <!-- ========================================= -->
+  <!-- build - build all binaries                -->
+  <!-- ========================================= -->
+
+  <target name="build" depends="dirs">
+    <antcall target="deploy.beehive.webservice.runtime" />
+
+      <build-webservices sourceDir="${src.dir}"
+                         destDir="${classes.dir}"
+                         tmpDir="${gen.dir}"
+                         classPathRef="build.classpath"/>
+
+    <jar jarfile="${webservice.jar}">
+      <fileset dir="${classes.dir}" />
+    </jar>
+  </target>
+
+  
+  <!-- ========================================= -->
+  <!-- clean - remove binary files               -->
+  <!-- ========================================= -->
+
+  <target name="clean">
+    <delete dir="${attachments.dir}" />
+    <delete dir="${classes.dir}" />
+    <delete dir="${gen.dir}" />
+    <delete dir="${lib.dir}" />
+    <delete file="velocity.log" />
+  </target>
+
+  
+  <!-- ========================================= -->
+  <!-- dirs - create dirs required for compile   -->
+  <!-- ========================================= -->
+
+  <target name="dirs">
+    <mkdir dir="${attachments.dir}" />
+    <mkdir dir="${classes.dir}" />
+    <mkdir dir="${gen.dir}" />
+    <mkdir dir="${lib.dir}" />
+  </target>
+
+  <!-- copy all dependencies -->
+  <target name="deploy.beehive.webservice.runtime" depends="dirs">
+    <copy todir="${lib.dir}">
+      <fileset file="${beehive.home}/lib/common/*.jar" />
+      <fileset file="${beehive.home}/lib/controls/controls.jar" />
+      <fileset file="${beehive.home}/lib/wsm/*.jar" />
+    </copy>
+  </target>
+
+</project>

Modified: incubator/beehive/trunk/samples/wsm-blank/WEB-INF/build.xml
URL: 
http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/wsm-blank/WEB-INF/build.xml?view=diff&r1=161376&r2=161377
==============================================================================
--- incubator/beehive/trunk/samples/wsm-blank/WEB-INF/build.xml (original)
+++ incubator/beehive/trunk/samples/wsm-blank/WEB-INF/build.xml Thu Apr 14 
21:24:48 2005
@@ -1,137 +1,123 @@
-<?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="Blank Sample" default="build" basedir=".">
-  
-  <property file="build.properties"/>
-
-  <import file="${beehive.home}/beehive-imports.xml" />
-
-  <property name="service.name" value="blank" />
-
-  <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="classes.dir" location="${web.inf.dir}/classes" />
-  <property name="gen.dir" location="${web.inf.dir}/gen" />
-  <property name="lib.dir" location="${web.inf.dir}/lib" />
-  <property name="src.dir" location="${web.inf.dir}/src" />
-  <property name="webservice.jar" value="${lib.dir}/${service.name}WS.jar" />
-  <property name="webservice.war" value="${service.name}WS.war" />
-
-  <path id="lib.path">
-    <fileset dir="${lib.dir}">
-      <include name="**/*.jar" />
-    </fileset>
-  </path>
-
-  <path id="build.classpath">
-    <path refid="lib.path"/>
-    <pathelement location="${classes.dir}"/>
-  </path>
-    
-  
-  <!-- ========================================= -->
-  <!-- deploy - build deployable artifact        -->
-  <!-- ========================================= -->
-  
-  <target name="deploy">
-    <antcall target="deploy.war" />
-  </target>
-
-
-  <!-- ========================================= -->
-  <!-- deploy.war - build deployable artifact    -->
-  <!-- ========================================= -->
-  
-  <target name="deploy.war">
-    <jar jarfile="${to.dir}/${webservice.war}">
-      <fileset dir="..">
-        <exclude name="${src.dir}/**" />
-        <exclude name="${gen.dir}/**" />
-      </fileset>
-    </jar>
-  </target>
-  
-
-  <!-- ========================================= -->
-  <!-- build - build all binaries                -->
-  <!-- ========================================= -->
-
-  <target name="build" depends="dirs">
-    <antcall target="deploy.beehive.webservice.runtime" />
-    <antcall target="build.beehive.webservice" />
-    <jar jarfile="${webservice.jar}">
-      <fileset dir="${classes.dir}" />
-    </jar>
-  </target>
-
-  
-  <!-- ========================================= -->
-  <!-- clean - remove binary files               -->
-  <!-- ========================================= -->
-
-  <target name="clean">
-    <delete dir="${attachments.dir}" />
-    <delete dir="${classes.dir}" />
-    <delete dir="${gen.dir}" />
-    <delete dir="${lib.dir}" />
-    <delete file="velocity.log" />
-  </target>
-
-  
-  <!-- ========================================= -->
-  <!-- dirs - create dirs required for compile   -->
-  <!-- ========================================= -->
-
-  <target name="dirs">
-    <mkdir dir="${attachments.dir}" />
-    <mkdir dir="${classes.dir}" />
-    <mkdir dir="${gen.dir}" />
-    <mkdir dir="${lib.dir}" />
-  </target>
-
-  <!-- copy all dependencies -->
-  <target name="deploy.beehive.webservice.runtime" depends="dirs">
-    <copy todir="${lib.dir}">
-      <fileset file="${beehive.home}/lib/common/*.jar" />
-      <fileset file="${beehive.home}/lib/controls/controls.jar" />
-      <fileset file="${beehive.home}/lib/wsm/*.jar" />
-    </copy>
-  </target>
-
-
-  <!-- build all beehive webservice binaries -->
-  <target name="build.beehive.webservice">
-    <taskdef name="apt" 
-        classname="org.apache.beehive.controls.runtime.generator.AptTask" 
-        classpathref="lib.path" 
-        onerror="report" />
-    <apt
-        srcdir="${src.dir}" 
-        destdir="${classes.dir}"
-        gendir="${gen.dir}"
-        classpathref="build.classpath" 
-        compileByExtension="true" 
-        srcExtensions="*.java,*.jws" 
-        debug="true" />
-  </target>
-
-</project>
+<?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="Blank Sample" default="build" basedir=".">
+  
+  <property file="build.properties"/>
+
+  <import file="${beehive.home}/beehive-imports.xml" />
+  <import file="${beehive.home}/beehive-tools.xml" />
+
+  <property name="service.name" value="blank" />
+
+  <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="classes.dir" location="${web.inf.dir}/classes" />
+  <property name="gen.dir" location="${web.inf.dir}/gen" />
+  <property name="lib.dir" location="${web.inf.dir}/lib" />
+  <property name="src.dir" location="${web.inf.dir}/src" />
+  <property name="webservice.jar" value="${lib.dir}/${service.name}WS.jar" />
+  <property name="webservice.war" value="${service.name}WS.war" />
+
+  <path id="lib.path">
+    <fileset dir="${lib.dir}">
+      <include name="**/*.jar" />
+    </fileset>
+  </path>
+
+  <path id="build.classpath">
+    <path refid="lib.path"/>
+    <pathelement location="${classes.dir}"/>
+  </path>
+    
+  
+  <!-- ========================================= -->
+  <!-- deploy - build deployable artifact        -->
+  <!-- ========================================= -->
+  
+  <target name="deploy">
+    <antcall target="deploy.war" />
+  </target>
+
+
+  <!-- ========================================= -->
+  <!-- deploy.war - build deployable artifact    -->
+  <!-- ========================================= -->
+  
+  <target name="deploy.war">
+    <jar jarfile="${to.dir}/${webservice.war}">
+      <fileset dir="..">
+        <exclude name="${src.dir}/**" />
+        <exclude name="${gen.dir}/**" />
+      </fileset>
+    </jar>
+  </target>
+  
+
+  <!-- ========================================= -->
+  <!-- build - build all binaries                -->
+  <!-- ========================================= -->
+
+  <target name="build" depends="dirs">
+    <antcall target="deploy.beehive.webservice.runtime" />
+     <build-webservices sourceDir="${src.dir}"
+                        destDir="${classes.dir}"
+                        tmpDir="${gen.dir}"
+                        classPathRef="build.classpath"/>
+    <jar jarfile="${webservice.jar}">
+      <fileset dir="${classes.dir}" />
+    </jar>
+  </target>
+
+  
+  <!-- ========================================= -->
+  <!-- clean - remove binary files               -->
+  <!-- ========================================= -->
+
+  <target name="clean">
+    <delete dir="${attachments.dir}" />
+    <delete dir="${classes.dir}" />
+    <delete dir="${gen.dir}" />
+    <delete dir="${lib.dir}" />
+    <delete file="velocity.log" />
+  </target>
+
+  
+  <!-- ========================================= -->
+  <!-- dirs - create dirs required for compile   -->
+  <!-- ========================================= -->
+
+  <target name="dirs">
+    <mkdir dir="${attachments.dir}" />
+    <mkdir dir="${classes.dir}" />
+    <mkdir dir="${gen.dir}" />
+    <mkdir dir="${lib.dir}" />
+  </target>
+
+  <!-- copy all dependencies -->
+  <target name="deploy.beehive.webservice.runtime" depends="dirs">
+    <copy todir="${lib.dir}">
+      <fileset file="${beehive.home}/lib/common/*.jar" />
+      <fileset file="${beehive.home}/lib/controls/controls.jar" />
+      <fileset file="${beehive.home}/lib/wsm/*.jar" />
+    </copy>
+  </target>
+</project>

Modified: 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.xml?view=diff&r1=161376&r2=161377
==============================================================================
--- incubator/beehive/trunk/samples/wsm-employee/WEB-INF/build.xml (original)
+++ incubator/beehive/trunk/samples/wsm-employee/WEB-INF/build.xml Thu Apr 14 
21:24:48 2005
@@ -1,155 +1,143 @@
-<?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="Employee Database Sample" default="build" basedir=".">
-  
-  <property file="build.properties"/>
-
-  <import file="${beehive.home}/beehive-imports.xml" />
-
-  <property name="service.name" value="Employee" />
-
-  <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="classes.dir" location="${web.inf.dir}/classes" />
-  <property name="gen.dir" location="${web.inf.dir}/gen" />
-  <property name="lib.dir" location="${web.inf.dir}/lib" />
-  <property name="src.dir" location="${web.inf.dir}/src" />
-  <property name="webservice.jar" value="${lib.dir}/EmployeeWS.jar" />
-  <property name="webservice.war" value="EmployeeWS.war" />
-
-  <path id="lib.path">
-    <fileset dir="${lib.dir}">
-      <include name="**/*.jar" />
-    </fileset>
-  </path>
-
-  <path id="build.classpath">
-    <path refid="lib.path"/>
-    <pathelement location="${classes.dir}"/>
-  </path>
-    
-  
-  <!-- ========================================= -->
-  <!-- deploy.war - build deployable artifact    -->
-  <!-- ========================================= -->
-  
-  <target name="deploy.war">
-    <jar jarfile="${to.dir}/${webservice.war}">
-      <fileset dir="..">
-        <exclude name="${src.dir}/**" />
-        <exclude name="${gen.dir}/**" />
-      </fileset>
-    </jar>
-  </target>
-  
-  <!-- ========================================= -->
-  <!-- build - build jar-file                    -->
-  <!-- ========================================= -->
-
-  <target name="build" depends="dirs">
-    <antcall target="deploy.beehive.webservice.runtime" />
-    <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"/>
-    <antcall target="build.beehive.webservice" />
-    <jar jarfile="${webservice.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.dir}"
-        destdir="${classes.dir}"
-        gendir="${gen.dir}"
-        compileByExtension="true" 
-        classpathref="jars"
-        srcExtensions="*.java,*.jcx,*.jcs,*.jws" />
-  </target>
-
-    
-  <!-- ========================================= -->
-  <!-- clean - remove binary files               -->
-  <!-- ========================================= -->
-
-  <target name="clean">
-    <delete dir="${attachments.dir}" />
-    <delete dir="${classes.dir}" />
-    <delete dir="${gen.dir}" />
-    <delete dir="${lib.dir}" />
-    <delete file="velocity.log" />
-  </target>
-
-  
-  <!-- ========================================= -->
-  <!-- dirs - create dirs required for compile   -->
-  <!-- ========================================= -->
-
-  <target name="dirs">
-    <mkdir dir="${attachments.dir}" />
-    <mkdir dir="${classes.dir}" />
-    <mkdir dir="${gen.dir}" />
-    <mkdir dir="${lib.dir}" />
-  </target>
-
-  
-  <!-- copy all dependencies -->
-  <target name="deploy.beehive.webservice.runtime" depends="dirs">
-    <copy todir="${lib.dir}">
-      <fileset file="${beehive.home}/lib/common/*.jar" />
-      <fileset file="${beehive.home}/lib/controls/controls.jar" />
-      <fileset file="${beehive.home}/lib/wsm/*.jar" />
-    </copy>
-  </target>
-
-
-  <!-- build all beehive webservice binaries -->
-  <target name="build.beehive.webservice">
-    <taskdef name="apt" 
-        classname="org.apache.beehive.controls.runtime.generator.AptTask" 
-        classpathref="lib.path" 
-        onerror="report" />
-    <apt
-        srcdir="${src.dir}" 
-        destdir="${classes.dir}"
-        gendir="${gen.dir}"
-        classpathref="build.classpath" 
-        compileByExtension="true" 
-        srcExtensions="*.java,*.jcx,*.jcs,*.jws" 
-        debug="true" />
-  </target>
-
+<?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="Employee Database Sample" default="build" basedir=".">
+  
+  <property file="build.properties"/>
+
+  <import file="${beehive.home}/beehive-imports.xml" />
+  <import file="${beehive.home}/beehive-tools.xml" />
+
+  <property name="service.name" value="Employee" />
+
+  <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="classes.dir" location="${web.inf.dir}/classes" />
+  <property name="gen.dir" location="${web.inf.dir}/gen" />
+  <property name="lib.dir" location="${web.inf.dir}/lib" />
+  <property name="src.dir" location="${web.inf.dir}/src" />
+  <property name="webservice.jar" value="${lib.dir}/EmployeeWS.jar" />
+  <property name="webservice.war" value="EmployeeWS.war" />
+
+  <path id="lib.path">
+    <fileset dir="${lib.dir}">
+      <include name="**/*.jar" />
+    </fileset>
+  </path>
+
+  <path id="build.classpath">
+    <path refid="lib.path"/>
+    <pathelement location="${classes.dir}"/>
+  </path>
+    
+  
+  <!-- ========================================= -->
+  <!-- deploy.war - build deployable artifact    -->
+  <!-- ========================================= -->
+  
+  <target name="deploy.war">
+    <jar jarfile="${to.dir}/${webservice.war}">
+      <fileset dir="..">
+        <exclude name="${src.dir}/**" />
+        <exclude name="${gen.dir}/**" />
+      </fileset>
+    </jar>
+  </target>
+  
+  <!-- ========================================= -->
+  <!-- build - build jar-file                    -->
+  <!-- ========================================= -->
+
+  <target name="build" depends="dirs">
+    <antcall target="deploy.beehive.webservice.runtime" />
+    <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"/>
+
+    <build-webservices sourceDir="${src.dir}"
+                       destDir="${classes.dir}"
+                       tmpDir="${gen.dir}"
+                       classPathRef="build.classpath"/>
+
+    <jar jarfile="${webservice.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.dir}"
+        destdir="${classes.dir}"
+        gendir="${gen.dir}"
+        compileByExtension="true" 
+        classpathref="jars"
+        srcExtensions="*.java,*.jcx,*.jcs,*.jws" />
+  </target>
+
+    
+  <!-- ========================================= -->
+  <!-- clean - remove binary files               -->
+  <!-- ========================================= -->
+
+  <target name="clean">
+    <delete dir="${attachments.dir}" />
+    <delete dir="${classes.dir}" />
+    <delete dir="${gen.dir}" />
+    <delete dir="${lib.dir}" />
+    <delete file="velocity.log" />
+  </target>
+
+  
+  <!-- ========================================= -->
+  <!-- dirs - create dirs required for compile   -->
+  <!-- ========================================= -->
+
+  <target name="dirs">
+    <mkdir dir="${attachments.dir}" />
+    <mkdir dir="${classes.dir}" />
+    <mkdir dir="${gen.dir}" />
+    <mkdir dir="${lib.dir}" />
+  </target>
+
+  
+  <!-- copy all dependencies -->
+  <target name="deploy.beehive.webservice.runtime" depends="dirs">
+    <copy todir="${lib.dir}">
+      <fileset file="${beehive.home}/lib/common/*.jar" />
+      <fileset file="${beehive.home}/lib/controls/controls.jar" />
+      <fileset file="${beehive.home}/lib/wsm/*.jar" />
+    </copy>
+  </target>
 </project>

Modified: incubator/beehive/trunk/samples/wsm-samples/WEB-INF/build.xml
URL: 
http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/wsm-samples/WEB-INF/build.xml?view=diff&r1=161376&r2=161377
==============================================================================
--- incubator/beehive/trunk/samples/wsm-samples/WEB-INF/build.xml (original)
+++ incubator/beehive/trunk/samples/wsm-samples/WEB-INF/build.xml Thu Apr 14 
21:24:48 2005
@@ -1,137 +1,123 @@
-<?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="Beehive/WSM Sample Web Services" default="build" basedir=".">
-  
-  <property file="build.properties"/>
-
-  <import file="${beehive.home}/beehive-imports.xml" />
-
-  <property name="service.name" value="wsm-samples" />
-
-  <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="classes.dir" location="${web.inf.dir}/classes" />
-  <property name="gen.dir" location="${web.inf.dir}/gen" />
-  <property name="lib.dir" location="${web.inf.dir}/lib" />
-  <property name="src.dir" location="${web.inf.dir}/src" />
-  <property name="webservice.jar" value="${lib.dir}/${service.name}WS.jar" />
-  <property name="webservice.war" value="${service.name}WS.war" />
-
-  <path id="lib.path">
-    <fileset dir="${lib.dir}">
-      <include name="**/*.jar" />
-    </fileset>
-  </path>
-
-  <path id="build.classpath">
-    <path refid="lib.path"/>
-    <pathelement location="${classes.dir}"/>
-  </path>
-    
-  
-  <!-- ========================================= -->
-  <!-- deploy - build deployable artifact        -->
-  <!-- ========================================= -->
-  
-  <target name="deploy">
-    <antcall target="deploy.war" />
-  </target>
-
-
-  <!-- ========================================= -->
-  <!-- deploy.war - build deployable artifact    -->
-  <!-- ========================================= -->
-  
-  <target name="deploy.war">
-    <jar jarfile="${to.dir}/${webservice.war}">
-      <fileset dir="..">
-        <exclude name="${src.dir}/**" />
-        <exclude name="${gen.dir}/**" />
-      </fileset>
-    </jar>
-  </target>
-  
-
-  <!-- ========================================= -->
-  <!-- build - build all binaries                -->
-  <!-- ========================================= -->
-
-  <target name="build" depends="dirs">
-    <antcall target="deploy.beehive.webservice.runtime" />
-    <antcall target="build.beehive.webservice" />
-    <jar jarfile="${webservice.jar}">
-      <fileset dir="${classes.dir}" />
-    </jar>
-  </target>
-
-  
-  <!-- ========================================= -->
-  <!-- clean - remove binary files               -->
-  <!-- ========================================= -->
-
-  <target name="clean">
-    <delete dir="${attachments.dir}" />
-    <delete dir="${classes.dir}" />
-    <delete dir="${gen.dir}" />
-    <delete dir="${lib.dir}" />
-    <delete file="velocity.log" />
-  </target>
-
-  
-  <!-- ========================================= -->
-  <!-- dirs - create dirs required for compile   -->
-  <!-- ========================================= -->
-
-  <target name="dirs">
-    <mkdir dir="${attachments.dir}" />
-    <mkdir dir="${classes.dir}" />
-    <mkdir dir="${gen.dir}" />
-    <mkdir dir="${lib.dir}" />
-  </target>
-
-  <!-- copy all dependencies -->
-  <target name="deploy.beehive.webservice.runtime" depends="dirs">
-    <copy todir="${lib.dir}">
-      <fileset file="${beehive.home}/lib/common/*.jar" />
-      <fileset file="${beehive.home}/lib/controls/controls.jar" />
-      <fileset file="${beehive.home}/lib/wsm/*.jar" />
-    </copy>
-  </target>
-
-
-  <!-- build all beehive webservice binaries -->
-  <target name="build.beehive.webservice">
-    <taskdef name="apt" 
-        classname="org.apache.beehive.controls.runtime.generator.AptTask" 
-        classpathref="lib.path" 
-        onerror="report" />
-    <apt
-        srcdir="${src.dir}" 
-        destdir="${classes.dir}"
-        gendir="${gen.dir}"
-        classpathref="build.classpath" 
-        compileByExtension="true" 
-        srcExtensions="*.java,*.jws" 
-        debug="true" />
-  </target>
-
+<?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="Beehive/WSM Sample Web Services" default="build" basedir=".">
+  
+  <property file="build.properties"/>
+
+  <import file="${beehive.home}/beehive-imports.xml" />
+  <import file="${beehive.home}/beehive-tools.xml" />
+
+  <property name="service.name" value="wsm-samples" />
+
+  <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="classes.dir" location="${web.inf.dir}/classes" />
+  <property name="gen.dir" location="${web.inf.dir}/gen" />
+  <property name="lib.dir" location="${web.inf.dir}/lib" />
+  <property name="src.dir" location="${web.inf.dir}/src" />
+  <property name="webservice.jar" value="${lib.dir}/${service.name}WS.jar" />
+  <property name="webservice.war" value="${service.name}WS.war" />
+
+  <path id="lib.path">
+    <fileset dir="${lib.dir}">
+      <include name="**/*.jar" />
+    </fileset>
+  </path>
+
+  <path id="build.classpath">
+    <path refid="lib.path"/>
+    <pathelement location="${classes.dir}"/>
+  </path>
+    
+  
+  <!-- ========================================= -->
+  <!-- deploy - build deployable artifact        -->
+  <!-- ========================================= -->
+  
+  <target name="deploy">
+    <antcall target="deploy.war" />
+  </target>
+
+
+  <!-- ========================================= -->
+  <!-- deploy.war - build deployable artifact    -->
+  <!-- ========================================= -->
+  
+  <target name="deploy.war">
+    <jar jarfile="${to.dir}/${webservice.war}">
+      <fileset dir="..">
+        <exclude name="${src.dir}/**" />
+        <exclude name="${gen.dir}/**" />
+      </fileset>
+    </jar>
+  </target>
+  
+
+  <!-- ========================================= -->
+  <!-- build - build all binaries                -->
+  <!-- ========================================= -->
+
+  <target name="build" depends="dirs">
+    <antcall target="deploy.beehive.webservice.runtime" />
+     <build-webservices sourceDir="${src.dir}"
+                        destDir="${classes.dir}"
+                        tmpDir="${gen.dir}"
+                        classPathRef="build.classpath"/>
+    <jar jarfile="${webservice.jar}">
+      <fileset dir="${classes.dir}" />
+    </jar>
+  </target>
+
+  
+  <!-- ========================================= -->
+  <!-- clean - remove binary files               -->
+  <!-- ========================================= -->
+
+  <target name="clean">
+    <delete dir="${attachments.dir}" />
+    <delete dir="${classes.dir}" />
+    <delete dir="${gen.dir}" />
+    <delete dir="${lib.dir}" />
+    <delete file="velocity.log" />
+  </target>
+
+  
+  <!-- ========================================= -->
+  <!-- dirs - create dirs required for compile   -->
+  <!-- ========================================= -->
+
+  <target name="dirs">
+    <mkdir dir="${attachments.dir}" />
+    <mkdir dir="${classes.dir}" />
+    <mkdir dir="${gen.dir}" />
+    <mkdir dir="${lib.dir}" />
+  </target>
+
+  <!-- copy all dependencies -->
+  <target name="deploy.beehive.webservice.runtime" depends="dirs">
+    <copy todir="${lib.dir}">
+      <fileset file="${beehive.home}/lib/common/*.jar" />
+      <fileset file="${beehive.home}/lib/controls/controls.jar" />
+      <fileset file="${beehive.home}/lib/wsm/*.jar" />
+    </copy>
+  </target>
 </project>


Reply via email to