You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beehive.apache.org by ek...@apache.org on 2005/05/12 19:30:27 UTC
svn commit: r169854 - in /incubator/beehive/trunk:
docs/forrest/src/documentation/content/xdocs/
samples/controls-blank/src/pkg/ samples/controls-db/src/dbControl/
samples/netui-samples/
samples/netui-samples/WEB-INF/src/org/apache/beehive/samples/controls/pets/
samples/netui-samples/WEB-INF/src/shared/
samples/netui-samples/ui/datagrid/ samples/netui-samples/ui/popup/
samples/netui-samples/ui/popup/getColorPopup/
samples/netui-samples/ui/tree/ samples/netui-samples/validation/
samples/wsm-addressbook-enhanced/WEB-INF/src/
samples/wsm-addressbook/WEB-INF/src/ samples/wsm-blank/WEB-INF/src/
samples/wsm-employee/WEB-INF/src/ samples/wsm-samples/WEB-INF/src/
Author: ekoneil
Date: Thu May 12 10:30:25 2005
New Revision: 169854
URL: http://svn.apache.org/viewcvs?rev=169854&view=rev
Log:
Various work on the Beehive samples.
- change .jcs / .jcx / .jpf / .jpfs to .java. This makes it easier to use Eclipse for these projects.
- cleanup some of the wsm-* builds are more consistent and use the Beehive provided targets for building webservices and getting the runtime
- fix the "war" targets in the wsm-* samples
BB: self
DRT: Beehive pass / build.dist pass
Added:
incubator/beehive/trunk/samples/controls-blank/src/pkg/HelloImpl.java
- copied unchanged from r169823, incubator/beehive/trunk/samples/controls-blank/src/pkg/HelloImpl.jcs
incubator/beehive/trunk/samples/controls-db/src/dbControl/DatabaseControlImpl.java
- copied unchanged from r169823, incubator/beehive/trunk/samples/controls-db/src/dbControl/DatabaseControlImpl.jcs
incubator/beehive/trunk/samples/netui-samples/Controller.java
- copied unchanged from r169823, incubator/beehive/trunk/samples/netui-samples/Controller.jpf
incubator/beehive/trunk/samples/netui-samples/WEB-INF/src/org/apache/beehive/samples/controls/pets/PetsImpl.java
- copied unchanged from r169823, incubator/beehive/trunk/samples/netui-samples/WEB-INF/src/org/apache/beehive/samples/controls/pets/PetsImpl.jcs
incubator/beehive/trunk/samples/netui-samples/WEB-INF/src/shared/SharedFlow.java
- copied unchanged from r169823, incubator/beehive/trunk/samples/netui-samples/WEB-INF/src/shared/SharedFlow.jpfs
incubator/beehive/trunk/samples/netui-samples/ui/datagrid/Controller.java
- copied unchanged from r169823, incubator/beehive/trunk/samples/netui-samples/ui/datagrid/Controller.jpf
incubator/beehive/trunk/samples/netui-samples/ui/popup/Controller.java
- copied unchanged from r169823, incubator/beehive/trunk/samples/netui-samples/ui/popup/Controller.jpf
incubator/beehive/trunk/samples/netui-samples/ui/popup/getColorPopup/GetColorController.java
- copied unchanged from r169823, incubator/beehive/trunk/samples/netui-samples/ui/popup/getColorPopup/GetColorController.jpf
incubator/beehive/trunk/samples/netui-samples/ui/tree/Controller.java
- copied unchanged from r169823, incubator/beehive/trunk/samples/netui-samples/ui/tree/Controller.jpf
incubator/beehive/trunk/samples/netui-samples/validation/Controller.java
- copied unchanged from r169823, incubator/beehive/trunk/samples/netui-samples/validation/Controller.jpf
Removed:
incubator/beehive/trunk/samples/controls-blank/src/pkg/HelloImpl.jcs
incubator/beehive/trunk/samples/controls-db/src/dbControl/DatabaseControlImpl.jcs
incubator/beehive/trunk/samples/netui-samples/Controller.jpf
incubator/beehive/trunk/samples/netui-samples/WEB-INF/src/org/apache/beehive/samples/controls/pets/PetsImpl.jcs
incubator/beehive/trunk/samples/netui-samples/WEB-INF/src/shared/SharedFlow.jpfs
incubator/beehive/trunk/samples/netui-samples/ui/datagrid/Controller.jpf
incubator/beehive/trunk/samples/netui-samples/ui/popup/Controller.jpf
incubator/beehive/trunk/samples/netui-samples/ui/popup/getColorPopup/GetColorController.jpf
incubator/beehive/trunk/samples/netui-samples/ui/tree/Controller.jpf
incubator/beehive/trunk/samples/netui-samples/validation/Controller.jpf
Modified:
incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/jpetstore.xml
incubator/beehive/trunk/samples/wsm-addressbook-enhanced/WEB-INF/src/build-svn.xml
incubator/beehive/trunk/samples/wsm-addressbook-enhanced/WEB-INF/src/build.xml
incubator/beehive/trunk/samples/wsm-addressbook/WEB-INF/src/build-svn.xml
incubator/beehive/trunk/samples/wsm-addressbook/WEB-INF/src/build.xml
incubator/beehive/trunk/samples/wsm-blank/WEB-INF/src/build-svn.xml
incubator/beehive/trunk/samples/wsm-blank/WEB-INF/src/build.xml
incubator/beehive/trunk/samples/wsm-employee/WEB-INF/src/build.xml
incubator/beehive/trunk/samples/wsm-samples/WEB-INF/src/build-svn.xml
incubator/beehive/trunk/samples/wsm-samples/WEB-INF/src/build.xml
Modified: incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/jpetstore.xml
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/jpetstore.xml?rev=169854&r1=169853&r2=169854&view=diff
==============================================================================
--- incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/jpetstore.xml (original)
+++ incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/jpetstore.xml Thu May 12 10:30:25 2005
@@ -17,14 +17,6 @@
<code>petstoreWeb/shop/</code>) lets users browse the catalog
of pets, the 'checkout' Page Flow (petstoreWeb/checkout) lets
users purchase selected items from a shopping cart, etc.</p>
- <p>The Web Service provides employee access to the Petstore.
- Through the web service (located at
- <code>petstoreWeb/WEB-INF/src/PetstoreInventoryManager.jws</code>)
- employees can update the current inventory and prices displayed
- to customers through the web site. A Swing client for the web
- service is provided in the sample <a
- href="http://incubator.apache.org/beehive/wsm/sample_Dashboard.html">Petstore
- Dashboard</a>. </p>
<p>Most of the Page Flows have associated Control files (located
at:
<code>petstoreWeb/WEB-INF/src/org/apache/beehive/samples/petstore/controls/</code>).
@@ -47,7 +39,7 @@
</tr>
<tr>
<td> account</td>
- <td>Page Flow (=Controller.jpf + JSP files) user interface
+ <td>Page Flow (=Controller.java + JSP files) user interface
for managing user accounts</td>
</tr>
<tr>
@@ -92,7 +84,7 @@
</tr>
<tr>
<td>
- lib/PetstoreInventoryManager.jws</td>
+ src/PetstoreInventoryManager.jws</td>
<td>Web service for employee access to the store</td>
</tr>
<tr>
@@ -170,16 +162,9 @@
<section id="compile">
<title>To Compile the Petstore Application</title>
<p>To compile the Petstore app, enter the following Ant command:</p>
-<source>ant
- clean
- deploy-beehive
- build
- war
-
-<strong>Copy and Paste version:</strong>
-ant clean deploy-beehive build war
+<source>ant clean build war
</source>
-<p>A WAR file named <code>petstoreWeb.war</code> will be saved at <code>C:/beehive_projects/petstoreWeb.war</code>.</p>
+<p>A WAR file named <code>petstoreWeb.war</code> will be created at <code>C:/beehive_projects/petstoreWeb.war</code>.</p>
</section>
<section id="start_tomcat">
<title>To Start Tomcat</title>
Modified: incubator/beehive/trunk/samples/wsm-addressbook-enhanced/WEB-INF/src/build-svn.xml
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/wsm-addressbook-enhanced/WEB-INF/src/build-svn.xml?rev=169854&r1=169853&r2=169854&view=diff
==============================================================================
--- incubator/beehive/trunk/samples/wsm-addressbook-enhanced/WEB-INF/src/build-svn.xml (original)
+++ incubator/beehive/trunk/samples/wsm-addressbook-enhanced/WEB-INF/src/build-svn.xml Thu May 12 10:30:25 2005
@@ -41,19 +41,9 @@
</path>
<!-- ========================================= -->
- <!-- deploy - build deployable artifact -->
+ <!-- war - build deployable artifact -->
<!-- ========================================= -->
-
- <target name="deploy">
- <antcall target="deploy.war" />
- </target>
-
-
- <!-- ========================================= -->
- <!-- deploy.war - build deployable artifact -->
- <!-- ========================================= -->
-
- <target name="deploy.war">
+ <target name="war">
<jar jarfile="../../../${service.name}WS.war">
<fileset dir="${webapp.dir}">
<exclude name="${src.dir}/**" />
@@ -65,7 +55,6 @@
<!-- ========================================= -->
<!-- build - build all binaries -->
<!-- ========================================= -->
-
<target name="build" depends="dirs">
<deploy-wsm webappDir="${webapp.dir}" />
<build-webapp webappDir="${webapp.dir}" />
@@ -77,19 +66,16 @@
<!-- ========================================= -->
<!-- clean - remove binary files -->
<!-- ========================================= -->
-
<target name="clean">
<delete dir="${attachments.dir}" />
<delete dir="${lib.dir}" />
<delete file="velocity.log" />
<clean-webapp webappDir="${webapp.dir}" />
</target>
-
<!-- ========================================= -->
<!-- dirs - create dirs required for compile -->
<!-- ========================================= -->
-
<target name="dirs">
<mkdir dir="${attachments.dir}" />
<mkdir dir="${classes.dir}" />
Modified: incubator/beehive/trunk/samples/wsm-addressbook-enhanced/WEB-INF/src/build.xml
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/wsm-addressbook-enhanced/WEB-INF/src/build.xml?rev=169854&r1=169853&r2=169854&view=diff
==============================================================================
--- incubator/beehive/trunk/samples/wsm-addressbook-enhanced/WEB-INF/src/build.xml (original)
+++ incubator/beehive/trunk/samples/wsm-addressbook-enhanced/WEB-INF/src/build.xml Thu May 12 10:30:25 2005
@@ -37,34 +37,19 @@
<property name="webservice.jar" value="${lib.dir}/${service.name}WS.jar" />
<property name="webservice.war" value="${service.name}WS.war" />
- <path id="lib.path">
+ <path id="build.classpath">
<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">
+ <target name="war">
<jar jarfile="../../../${webservice.war}">
- <fileset dir="../..">
+ <fileset dir="${webapp.dir}">
<exclude name="${src.dir}/**" />
<exclude name="${gen.dir}/**" />
</fileset>
@@ -77,7 +62,7 @@
<!-- ========================================= -->
<target name="build" depends="dirs">
- <antcall target="deploy.beehive.webservice.runtime" />
+ <deploy-wsm webappDir="${webapp.dir}"/>
<build-webservices srcdir="${src.dir}"
destdir="${classes.dir}"
@@ -88,12 +73,10 @@
<fileset dir="${classes.dir}" />
</jar>
</target>
-
<!-- ========================================= -->
<!-- clean - remove binary files -->
<!-- ========================================= -->
-
<target name="clean">
<delete dir="${attachments.dir}" />
<delete dir="${classes.dir}" />
@@ -102,25 +85,14 @@
<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/beehive-controls.jar" />
- <fileset file="${beehive.home}/lib/wsm/*.jar" />
- </copy>
</target>
</project>
Modified: incubator/beehive/trunk/samples/wsm-addressbook/WEB-INF/src/build-svn.xml
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/wsm-addressbook/WEB-INF/src/build-svn.xml?rev=169854&r1=169853&r2=169854&view=diff
==============================================================================
--- incubator/beehive/trunk/samples/wsm-addressbook/WEB-INF/src/build-svn.xml (original)
+++ incubator/beehive/trunk/samples/wsm-addressbook/WEB-INF/src/build-svn.xml Thu May 12 10:30:25 2005
@@ -33,10 +33,6 @@
<property name="src.dir" value="${web.inf.dir}/src" />
<property name="webservice.jar" value="${lib.dir}/${service.name}WS.jar" />
<property name="webservice.war" value="${service.name}WS.war" />
-
- <condition property="isJDK15">
- <equals arg1="${ant.java.version}" arg2="1.5" />
- </condition>
<path id="jars">
<fileset dir="${lib.dir}" >
@@ -44,21 +40,10 @@
</fileset>
</path>
-
- <!-- ========================================= -->
- <!-- deploy - build deployable artifact -->
- <!-- ========================================= -->
-
- <target name="deploy">
- <antcall target="deploy.war" />
- </target>
-
-
<!-- ========================================= -->
- <!-- deploy.war - build deployable artifact -->
+ <!-- war - build deployable artifact -->
<!-- ========================================= -->
-
- <target name="deploy.war">
+ <target name="war">
<jar jarfile="../../../${webservice.war}">
<fileset dir="${webapp.dir}">
<exclude name="${src.dir}/**" />
@@ -66,12 +51,10 @@
</fileset>
</jar>
</target>
-
<!-- ========================================= -->
<!-- build - build all binaries -->
<!-- ========================================= -->
-
<target name="build" depends="dirs">
<deploy-wsm webappDir="${webapp.dir}" />
<build-webapp webappDir="${webapp.dir}" />
@@ -79,24 +62,20 @@
<fileset dir="${classes.dir}" />
</jar>
</target>
-
<!-- ========================================= -->
<!-- clean - remove binary files -->
<!-- ========================================= -->
-
<target name="clean">
<delete dir="${attachments.dir}" />
<delete dir="${lib.dir}" />
<delete file="velocity.log" />
<clean-webapp webappDir="${webapp.dir}" />
</target>
-
<!-- ========================================= -->
<!-- dirs - create dirs required for compile -->
<!-- ========================================= -->
-
<target name="dirs">
<mkdir dir="${attachments.dir}" />
<mkdir dir="${classes.dir}" />
Modified: incubator/beehive/trunk/samples/wsm-addressbook/WEB-INF/src/build.xml
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/wsm-addressbook/WEB-INF/src/build.xml?rev=169854&r1=169853&r2=169854&view=diff
==============================================================================
--- incubator/beehive/trunk/samples/wsm-addressbook/WEB-INF/src/build.xml (original)
+++ incubator/beehive/trunk/samples/wsm-addressbook/WEB-INF/src/build.xml Thu May 12 10:30:25 2005
@@ -37,47 +37,30 @@
<property name="webservice.jar" location="${lib.dir}/${service.name}WS.jar" />
<property name="webservice.war" value="${service.name}WS.war" />
- <path id="lib.path">
+ <path id="build.classpath">
<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 -->
+ <!-- war - build deployable artifact -->
<!-- ========================================= -->
-
- <target name="deploy.war">
+ <target name="war">
<jar jarfile="../../../${webservice.war}">
- <fileset dir="../..">
+ <fileset dir="${webapp.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" />
+ <deploy-wsm webappDir="${webapp.dir}"/>
<build-webservices srcdir="${src.dir}"
destdir="${classes.dir}"
@@ -88,12 +71,10 @@
<fileset dir="${classes.dir}" />
</jar>
</target>
-
<!-- ========================================= -->
<!-- clean - remove binary files -->
<!-- ========================================= -->
-
<target name="clean">
<delete dir="${attachments.dir}" />
<delete dir="${classes.dir}" />
@@ -102,25 +83,14 @@
<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/beehive-controls.jar" />
- <fileset file="${beehive.home}/lib/wsm/*.jar" />
- </copy>
</target>
</project>
Modified: incubator/beehive/trunk/samples/wsm-blank/WEB-INF/src/build-svn.xml
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/wsm-blank/WEB-INF/src/build-svn.xml?rev=169854&r1=169853&r2=169854&view=diff
==============================================================================
--- incubator/beehive/trunk/samples/wsm-blank/WEB-INF/src/build-svn.xml (original)
+++ incubator/beehive/trunk/samples/wsm-blank/WEB-INF/src/build-svn.xml Thu May 12 10:30:25 2005
@@ -21,6 +21,7 @@
<project name="wsm-blank" default="build" basedir=".">
<import file="../../../../beehive-imports.xml" />
+ <import file="../../../../ant/beehive-tools.xml" />
<property name="service.name" value="blank" />
@@ -35,30 +36,15 @@
<property name="webservice.jar" value="${lib.dir}/${service.name}WS.jar" />
<property name="webservice.war" value="${service.name}WS.war" />
- <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 - build deployable artifact -->
- <!-- ========================================= -->
-
- <target name="deploy">
- <antcall target="deploy.war" />
- </target>
-
-
<!-- ========================================= -->
- <!-- deploy.war - build deployable artifact -->
+ <!-- war - build deployable artifact -->
<!-- ========================================= -->
-
<target name="deploy.war">
<jar destfile="../../../${webservice.war}">
<fileset dir="${webapp.dir}">
@@ -70,24 +56,23 @@
</jar>
</target>
-
<!-- ========================================= -->
<!-- build - create jar in ${lib.dir} -->
<!-- ========================================= -->
-
<target name="build" depends="dirs">
- <antcall target="deploy.beehive.webservice.runtime" />
- <antcall target="build.beehive.webservice" />
+ <deploy-wsm webappDir="${webapp.dir}"/>
+ <build-webservices srcdir="${src.dir}"
+ destdir="${classes.dir}"
+ tempdir="${gen.dir}"
+ classpathref="jars"/>
<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}" />
@@ -95,36 +80,16 @@
<delete file="velocity.log" />
<clean-webapp webappDir="${webapp.dir}" />
</target>
-
<!-- ========================================= -->
<!-- dirs - create dirs required for compile -->
<!-- ========================================= -->
-
<target name="dirs">
<mkdir dir="${lib.dir}" />
<mkdir dir="${build.dir}" />
<mkdir dir="${attachments.dir}" />
<mkdir dir="${classes.dir}" />
<mkdir dir="${gen.dir}" />
- </target>
-
-
- <!-- ========================================= -->
- <!-- deploy.beehive.webservice.runtime - -->
- <!-- ========================================= -->
-
- <target name="deploy.beehive.webservice.runtime">
- <deploy-wsm webappDir="${webapp.dir}" />
- </target>
-
-
- <!-- ========================================= -->
- <!-- build.beehive.webservice - -->
- <!-- ========================================= -->
-
- <target name="build.beehive.webservice">
- <build-webapp webappDir="${webapp.dir}" />
</target>
</project>
Modified: incubator/beehive/trunk/samples/wsm-blank/WEB-INF/src/build.xml
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/wsm-blank/WEB-INF/src/build.xml?rev=169854&r1=169853&r2=169854&view=diff
==============================================================================
--- incubator/beehive/trunk/samples/wsm-blank/WEB-INF/src/build.xml (original)
+++ incubator/beehive/trunk/samples/wsm-blank/WEB-INF/src/build.xml Thu May 12 10:30:25 2005
@@ -37,34 +37,19 @@
<property name="webservice.jar" value="${lib.dir}/${service.name}WS.jar" />
<property name="webservice.war" value="${service.name}WS.war" />
- <path id="lib.path">
+ <path id="build.classpath">
<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">
+ <target name="war">
<jar jarfile="../../../${webservice.war}">
- <fileset dir="../..">
+ <fileset dir="${webapp.dir}">
<exclude name="${src.dir}/**" />
<exclude name="${gen.dir}/**" />
</fileset>
@@ -75,9 +60,8 @@
<!-- ========================================= -->
<!-- build - build all binaries -->
<!-- ========================================= -->
-
<target name="build" depends="dirs">
- <antcall target="deploy.beehive.webservice.runtime" />
+ <deploy-wsm webappDir="${webapp.dir}"/>
<build-webservices srcdir="${src.dir}"
destdir="${classes.dir}"
tempdir="${gen.dir}"
@@ -91,7 +75,6 @@
<!-- ========================================= -->
<!-- clean - remove binary files -->
<!-- ========================================= -->
-
<target name="clean">
<delete dir="${attachments.dir}" />
<delete dir="${classes.dir}" />
@@ -99,12 +82,10 @@
<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}" />
@@ -112,12 +93,4 @@
<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/beehive-controls.jar" />
- <fileset file="${beehive.home}/lib/wsm/*.jar" />
- </copy>
- </target>
</project>
Modified: incubator/beehive/trunk/samples/wsm-employee/WEB-INF/src/build.xml
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/wsm-employee/WEB-INF/src/build.xml?rev=169854&r1=169853&r2=169854&view=diff
==============================================================================
--- incubator/beehive/trunk/samples/wsm-employee/WEB-INF/src/build.xml (original)
+++ incubator/beehive/trunk/samples/wsm-employee/WEB-INF/src/build.xml Thu May 12 10:30:25 2005
@@ -37,25 +37,19 @@
<property name="webservice.jar" location="${lib.dir}/EmployeeWS.jar" />
<property name="webservice.war" location="EmployeeWS.war" />
- <path id="lib.path">
+ <path id="build.classpath">
<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="../../../${webservice.war}">
- <fileset dir="../..">
+ <fileset dir="${webapp.dir}">
<exclude name="${src.dir}/**" />
<exclude name="${gen.dir}/**" />
</fileset>
@@ -65,19 +59,18 @@
<!-- ========================================= -->
<!-- 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"/>
+ <deploy-wsm webappDir="${webapp.dir}"/>
- <build-webservices srcdir="${src.dir}"
- destdir="${classes.dir}"
- tempdir="${gen.dir}"
- classpathref="build.classpath"/>
+ <copy todir="${lib.dir}">
+ <fileset dir="../../controls-db/build" includes="dbControl.jar" />
+ <fileset dir="${beehive.home}/external/derby" includes="derby_46005.jar" />
+ </copy>
+
+ <build-webservices srcdir="${src.dir}"
+ destdir="${classes.dir}"
+ tempdir="${gen.dir}"
+ classpathref="build.classpath"/>
<jar jarfile="${webservice.jar}">
<fileset dir="${classes.dir}">
@@ -86,31 +79,9 @@
</jar>
</target>
-
- <!-- ========================================= -->
- <!-- compile - -->
- <!-- ========================================= -->
-
- <target name="compile" depends="dirs">
- <taskdef
- name="apt"
- classname="org.apache.beehive.controls.runtime.generator.AptTask"
- classpath="lib/beehive-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}" />
@@ -118,12 +89,10 @@
<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}" />
@@ -131,13 +100,4 @@
<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/beehive-controls.jar" />
- <fileset file="${beehive.home}/lib/wsm/*.jar" />
- </copy>
- </target>
</project>
Modified: incubator/beehive/trunk/samples/wsm-samples/WEB-INF/src/build-svn.xml
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/wsm-samples/WEB-INF/src/build-svn.xml?rev=169854&r1=169853&r2=169854&view=diff
==============================================================================
--- incubator/beehive/trunk/samples/wsm-samples/WEB-INF/src/build-svn.xml (original)
+++ incubator/beehive/trunk/samples/wsm-samples/WEB-INF/src/build-svn.xml Thu May 12 10:30:25 2005
@@ -21,6 +21,7 @@
<project name="wsm-samples" default="build" basedir=".">
<import file="../../../../beehive-imports.xml" />
+ <import file="../../../../ant/beehive-tools.xml" />
<property name="service.name" value="wsm-samples" />
@@ -33,38 +34,19 @@
<property name="gen.dir" value="${web.inf.dir}/.tmpbeansrc" />
<property name="webservice.jar" value="${lib.dir}/${service.name}WS.jar" />
<property name="webservice.war" value="${service.name}WS.war" />
-
- <condition property="isJDK15">
- <equals arg1="${ant.java.version}" arg2="1.5" />
- </condition>
- <path id="lib.path">
+ <path id="build.classpath">
<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 -->
+ <!-- war - build deployable artifact -->
<!-- ========================================= -->
-
- <target name="deploy.war">
- <jar destfile="${to.dir}/${webservice.war}">
+ <target name="war">
+ <jar destfile="${webservice.war}">
<fileset dir="${webapp.dir}">
<exclude name="WEB-INF/classes/**" />
<exclude name="WEB-INF/.tmpbeansrc/**" />
@@ -74,85 +56,41 @@
</jar>
</target>
-
<!-- ========================================= -->
<!-- build - create jar in ${lib.dir} -->
<!-- ========================================= -->
-
<target name="build" depends="dirs">
- <antcall target="deploy.beehive.webservice.runtime" />
- <antcall target="build.beehive.webservice" />
+ <deploy-wsm webappDir="${webapp.dir}"/>
+ <build-webservices srcdir="${src.dir}"
+ destdir="${classes.dir}"
+ tempdir="${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 file="${webservice.jar}" />
<delete file="velocity.log" />
<delete dir="${lib.dir}" />
- <clean-webapp webappDir="${webapp.dir}" />
+ <clean-webapp webappDir="${webapp.dir}" />
<delete file="${webservice.jar}" />
- <delete file="${webservice.war}" />
+ <delete file="${webservice.war}" />
</target>
-
<!-- ========================================= -->
<!-- dirs - create dirs required for compile -->
<!-- ========================================= -->
-
<target name="dirs">
<mkdir dir="${lib.dir}" />
<mkdir dir="${attachments.dir}" />
<mkdir dir="${classes.dir}" />
<mkdir dir="${gen.dir}" />
- </target>
-
-
- <!-- ========================================= -->
- <!-- deploy.beehive.webservice.runtime - -->
- <!-- ========================================= -->
-
- <target name="deploy.beehive.webservice.runtime">
- <deploy-wsm webappDir="${webapp.dir}" />
- </target>
-
-
- <!-- ========================================= -->
- <!-- build.beehive.webservice - -->
- <!-- ========================================= -->
-<!--
- <target name="build.beehive.webservice">
- <build-webapp webappDir="${webapp.dir}" />
- </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"
- failonerror="false"
- debug="true" />
-
- <copy todir="${classes.dir}" overwrite="true">
- <fileset dir="${src.dir}" includes="**/*.properties"/>
- </copy>
-
</target>
</project>
Modified: incubator/beehive/trunk/samples/wsm-samples/WEB-INF/src/build.xml
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/wsm-samples/WEB-INF/src/build.xml?rev=169854&r1=169853&r2=169854&view=diff
==============================================================================
--- incubator/beehive/trunk/samples/wsm-samples/WEB-INF/src/build.xml (original)
+++ incubator/beehive/trunk/samples/wsm-samples/WEB-INF/src/build.xml Thu May 12 10:30:25 2005
@@ -47,21 +47,17 @@
<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="../../../${webservice.war}">
<fileset dir="../..">
@@ -70,14 +66,12 @@
</fileset>
</jar>
</target>
-
<!-- ========================================= -->
<!-- build - build all binaries -->
<!-- ========================================= -->
-
<target name="build" depends="dirs">
- <antcall target="deploy.beehive.webservice.runtime" />
+ <deploy-wsm webappDir="${webapp.dir}"/>
<build-webservices srcdir="${src.dir}"
destdir="${classes.dir}"
tempdir="${gen.dir}"
@@ -86,12 +80,10 @@
<fileset dir="${classes.dir}" />
</jar>
</target>
-
<!-- ========================================= -->
<!-- clean - remove binary files -->
<!-- ========================================= -->
-
<target name="clean">
<delete dir="${attachments.dir}" />
<delete dir="${classes.dir}" />
@@ -99,12 +91,10 @@
<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}" />
@@ -112,12 +102,4 @@
<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/beehive-controls.jar" />
- <fileset file="${beehive.home}/lib/wsm/*.jar" />
- </copy>
- </target>
</project>