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 16:31:18 UTC
svn commit: r169827 - in /incubator/beehive/trunk: ant/beehive-runtime.xml
distribution.xml samples/build.xml samples/controls-blank/build.xml
samples/controls-spring/web/WEB-INF/src/build-svn.xml
samples/controls-spring/web/WEB-INF/src/build.xml
Author: ekoneil
Date: Thu May 12 07:31:17 2005
New Revision: 169827
URL: http://svn.apache.org/viewcvs?rev=169827&view=rev
Log:
Enable the samples builds when creating a distribution.
BB: self
DRT: Beehive pass / build.dist pass
Modified:
incubator/beehive/trunk/ant/beehive-runtime.xml
incubator/beehive/trunk/distribution.xml
incubator/beehive/trunk/samples/build.xml
incubator/beehive/trunk/samples/controls-blank/build.xml
incubator/beehive/trunk/samples/controls-spring/web/WEB-INF/src/build-svn.xml
incubator/beehive/trunk/samples/controls-spring/web/WEB-INF/src/build.xml
Modified: incubator/beehive/trunk/ant/beehive-runtime.xml
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/ant/beehive-runtime.xml?rev=169827&r1=169826&r2=169827&view=diff
==============================================================================
--- incubator/beehive/trunk/ant/beehive-runtime.xml (original)
+++ incubator/beehive/trunk/ant/beehive-runtime.xml Thu May 12 07:31:17 2005
@@ -13,14 +13,14 @@
<!-- params (location webapp.dir) -->
<target name="deploy.beehive.webapp.runtime" description="Deploy the Beehive webapp runtime given a webapp root as -Dwebapp.dir">
<ant target="deploy.netui" dir="${beehive.home}/netui/" inheritAll="false">
- <property name="webapp.dir" value="${webapp.dir}"/>
+ <property name="webapp.dir" location="${webapp.dir}"/>
</ant>
</target>
<!-- params (location webapp.dir) -->
<target name="undeploy.beehive.webapp.runtime" description="Clean the Beehive webapp runtime given a webapp root as -Dwebapp.dir">
<ant target="undeploy.netui" dir="${beehive.home}/netui/" inheritAll="false">
- <property name="webapp.dir" value="${webapp.dir}"/>
+ <property name="webapp.dir" location="${webapp.dir}"/>
</ant>
</target>
@@ -28,13 +28,13 @@
<!-- todo: temporary addition; this should be in a new build-file: webserviceRuntimeCore; web services should not depend on webapps -->
<target name="deploy.wsm.webapp.runtime" description="Deploy the Beehive web services runtime given a webapp root as -Dwebapp.dir">
<ant target="deploy.webservice.runtime" dir="${beehive.home}/wsm/" inheritAll="false">
- <property name="webapp.dir" value="${webapp.dir}"/>
+ <property name="webapp.dir" location="${webapp.dir}"/>
</ant>
</target>
<target name="deploy.controls.webapp.runtime" description="Deploy the Beehive controls runtime given a webapp root as -Dwebapp.dir">
<ant target="deploy.controls.runtime" dir="${beehive.home}/controls/" inheritAll="false">
- <property name="webapp.dir" value="${webapp.dir}"/>
+ <property name="webapp.dir" location="${webapp.dir}"/>
</ant>
</target>
Modified: incubator/beehive/trunk/distribution.xml
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/distribution.xml?rev=169827&r1=169826&r2=169827&view=diff
==============================================================================
--- incubator/beehive/trunk/distribution.xml (original)
+++ incubator/beehive/trunk/distribution.xml Thu May 12 07:31:17 2005
@@ -40,8 +40,8 @@
<property name="beehive.user.dir" location="${beehive.home}/user"/>
<property name="dist.base.dir" location="${beehive.home}/build/dist"/>
- <property name="dist.dir" location="${dist.base.dir}/${dist.name}"/>
+ <property name="dist.dir" location="${dist.base.dir}/${dist.name}"/>
<property name="dist.lib.dir" location="${dist.base.dir}/${dist.lib.name}"/>
<property name="dist.src.dir" location="${dist.base.dir}/${dist.src.name}" />
<property name="dist.archives.dir" location="${dist.base.dir}/archives"/>
@@ -64,6 +64,7 @@
<!-- -->
<!-- ============================================= -->
<target name="build.dist" description="Builds a Beehive distribution">
+
<mkdir dir="${dist.dir}"/>
<antcall target="build.dist.core"/>
@@ -71,6 +72,30 @@
<antcall target="build.dist.docs"/>
<update-dist-readme/>
+
+ <property name="samples.verify.dir" location="${dist.tmp.dir}/samples-build-verification"/>
+ <copy todir="${samples.verify.dir}">
+ <fileset dir="${dist.dir}"/>
+ </copy>
+
+ <echo>---------------------------------------------------------</echo>
+ <echo>Building distribution samples</echo>
+ <echo>---------------------------------------------------------</echo>
+
+ <ant antfile="${samples.verify.dir}/samples/petstoreWeb/build.xml" target="deploy-beehive" inheritAll="false">
+ <property name="derby.jar" location="${beehive.home}/external/derby/derby_46005.jar"/>
+ </ant>
+ <ant antfile="${samples.verify.dir}/samples/petstoreWeb/build.xml" target="build" inheritAll="false"/>
+ <ant antfile="${samples.verify.dir}/samples/netui-samples/WEB-INF/src/build.xml" target="build" inheritAll="false"/>
+ <ant antfile="${samples.verify.dir}/samples/controls-blank/build.xml" target="build" inheritAll="false"/>
+ <ant antfile="${samples.verify.dir}/samples/wsm-addressbook-enhanced/WEB-INF/src/build.xml" target="build" inheritAll="false"/>
+ <ant antfile="${samples.verify.dir}/samples/wsm-addressbook/WEB-INF/src/build.xml" target="build" inheritAll="false"/>
+ <ant antfile="${samples.verify.dir}/samples/wsm-blank/WEB-INF/src/build.xml" target="build" inheritAll="false"/>
+ <ant antfile="${samples.verify.dir}/samples/wsm-samples/WEB-INF/src/build.xml" target="build" inheritAll="false"/>
+<!--
+ <ant antfile="${samples.verify.dir}/controls-spring/integration/build.xml" target="build" inheritAll="false"/>
+ <ant antfile="${samples.verify.dir}/controls-spring/web/WEB-INF/src/build.xml" target="build" inheritAll="false"/>
+-->
</target>
<macrodef name="update-dist-readme">
@@ -230,48 +255,14 @@
<!-- copy this now, at the end of build.dist we will add in the revision # info -->
<copy file="${dist.readme.template}" tofile="${dist.dir}/README.txt" overwrite="true" verbose="true"/>
-
- <property name="webapp.name" value="netui-blank"/>
-
- <!-- build the project templates in dist/ -->
- <echo>Create the Beehive webapp template</echo>
- <copy todir="${dist.tmp.dir}/${webapp.name}">
- <fileset dir="${beehive.home}/netui/build/dist/webapp">
- <exclude name="WEB-INF/lib/*.jar"/>
- <exclude name="WEB-INF/*.tld"/>
- <exclude name="WEB-INF/*.tldx"/>
- <exclude name="WEB-INF/src/build.xml"/>
- </fileset>
- </copy>
-
- <copy todir="${dist.dir}/samples/netui-blank/WEB-INF/src">
- <fileset dir="${beehive.home}/user/netui-blank" includes="**"/>
- </copy>
-
- <!-- finally, move netui-blank from the staging directory into the distribution -->
- <copy todir="${dist.dir}/samples/netui-blank">
- <fileset dir="${dist.tmp.dir}/${webapp.name}"/>
- </copy>
</target>
<target name="build.dist.samples">
- <!--
- mmerz@bea.com (3/4/04): sample taken out of distribution; issues around Axis need to be resolved first.
- -->
- <!-- Build the petstore dashboard distro
- <copy todir="${dist.dir}/samples/wsm-petstore-dashboard" failOnError="true">
- <fileset dir="samples/wsm-petstore-dashboard"/>
- </copy>
-
- <deploy-webservice-runtime appdir="${dist.dir}/samples/wsm-petstore-dashboard/lib" />
- <copy-junit todir="${dist.dir}/samples/wsm-petstore-dashboard/lib" />
- <copy-log4j todir="${dist.dir}/samples/wsm-petstore-dashboard/lib" />
- -->
- <!-- Build the petstore distro -->
- <ant antfile="${beehive.home}/ant/buildWebapp.xml" target="clean">
- <property name="webapp.dir" location="${beehive.home}/samples/petstoreWeb"/>
- </ant>
+ <!-- clean / build / clean the distribution samples -->
+ <ant antfile="samples/build.xml" target="clean" inheritAll="false"/>
+ <ant antfile="samples/build.xml" target="build" inheritAll="false"/>
+ <ant antfile="samples/build.xml" target="clean" inheritAll="false"/>
<copy todir="${dist.dir}/samples/petstoreWeb" failOnError="true">
<fileset dir="samples/petstoreWeb">
@@ -290,10 +281,22 @@
<!-- rename build-dist.properties to build.properties -->
<copy tofile="${dist.dir}/samples/petstoreWeb/build.properties" file="${beehive.home}/samples/petstoreWeb/build-dist.properties" failOnError="true"/>
- <!-- Build the netui-samples distro -->
- <ant antfile="${beehive.home}/ant/buildWebapp.xml" target="clean">
- <property name="webapp.dir" location="${beehive.home}/samples/netui-samples"/>
- </ant>
+ <!-- Build the netui-blank distro -->
+ <copy todir="${dist.tmp.dir}/netui-blank">
+ <fileset dir="${beehive.home}/netui/build/dist/webapp">
+ <exclude name="WEB-INF/lib/*.jar"/>
+ <exclude name="WEB-INF/src/build.xml"/>
+ </fileset>
+ </copy>
+
+ <copy todir="${dist.dir}/samples/netui-blank/WEB-INF/src">
+ <fileset dir="${beehive.home}/user/netui-blank" includes="**"/>
+ </copy>
+
+ <!-- finally, move netui-blank from the staging directory into the distribution -->
+ <copy todir="${dist.dir}/samples/netui-blank">
+ <fileset dir="${dist.tmp.dir}/netui-blank"/>
+ </copy>
<copy todir="${dist.dir}/samples/netui-samples" failOnError="true">
<fileset dir="samples/netui-samples">
@@ -302,13 +305,6 @@
<exclude name="WEB-INF/lib/*.jar"/>
</fileset>
</copy>
-<!--
- <copy tofile="${dist.dir}/samples/netui-samples/WEB-INF/src/build.xml"
- file="${beehive.home}/samples/netui-samples/WEB-INF/src/build-dist.xml" failOnError="true"/>
-
- <copy tofile="${dist.dir}/samples/netui-samples/WEB-INF/src/build.properties"
- file="${beehive.home}/samples/netui-samples/WEB-INF/src/build-dist.properties" failOnError="true"/>
--->
<!-- Build the controls blank template app distro -->
<copy todir="${dist.dir}/samples/controls-blank" failOnError="true">
@@ -323,24 +319,49 @@
<!-- Build the sample: wsm-blank -->
<copy todir="${dist.dir}/samples/wsm-blank" failOnError="true">
<fileset dir="samples/wsm-blank">
- <exclude name="WEB-INF/build*svn.xml"/>
+ <exclude name="WEB-INF/src/build*svn.xml"/>
</fileset>
</copy>
<!-- Build the sample: wsm-addressbook -->
<copy todir="${dist.dir}/samples/wsm-addressbook" failOnError="true">
<fileset dir="samples/wsm-addressbook">
- <exclude name="WEB-INF/build*svn.xml"/>
+ <exclude name="WEB-INF/src/build*svn.xml"/>
</fileset>
</copy>
<!-- Build the sample: wsm-addressbook-enhanced -->
<copy todir="${dist.dir}/samples/wsm-addressbook-enhanced" failOnError="true">
<fileset dir="samples/wsm-addressbook-enhanced">
- <exclude name="WEB-INF/build*svn.xml"/>
+ <exclude name="WEB-INF/src/build*svn.xml"/>
+ </fileset>
+ </copy>
+
+ <!-- build sample: wsm-samples -->
+ <copy todir="${dist.dir}/samples/wsm-samples" failOnError="true">
+ <fileset dir="samples/wsm-samples">
+ <exclude name="WEB-INF/src/build*svn.xml"/>
</fileset>
</copy>
+ <!-- copy samples README.txt -->
+ <copy tofile="${dist.dir}/samples/README.txt" failOnError="true">
+ <fileset file="user/samples-README.txt"/>
+ </copy>
+
+ <!--
+ mmerz@bea.com (3/4/04): sample taken out of distribution; issues around Axis need to be resolved first.
+ -->
+ <!-- Build the petstore dashboard distro
+ <copy todir="${dist.dir}/samples/wsm-petstore-dashboard" failOnError="true">
+ <fileset dir="samples/wsm-petstore-dashboard"/>
+ </copy>
+
+ <deploy-webservice-runtime appdir="${dist.dir}/samples/wsm-petstore-dashboard/lib" />
+ <copy-junit todir="${dist.dir}/samples/wsm-petstore-dashboard/lib" />
+ <copy-log4j todir="${dist.dir}/samples/wsm-petstore-dashboard/lib" />
+ -->
+
<!-- Build the sample: wsm-addressbook-fromWSDL -->
<!--
mmerz@apache.org (3/9/04): needs to be more stable.
@@ -353,7 +374,8 @@
</copy>
-->
- <!-- build sample: wsm-employee -->
+
+ <!-- copy README.txt --> <!-- build sample: wsm-employee -->
<!--
mmerz@apache.org (3/9/04): sample taken out of distribution; controls-db, derby dependencies need to be resolved first.
-->
@@ -365,13 +387,6 @@
</copy>
-->
- <!-- build sample: wsm-samples -->
- <copy todir="${dist.dir}/samples/wsm-samples" failOnError="true">
- <fileset dir="samples/wsm-samples">
- <exclude name="WEB-INF/build*svn.xml"/>
- </fileset>
- </copy>
-
<!-- build sample: db-control -->
<!--
mmerz@apache.org (3/11/04): sample taken out of distribution; controls-db, derby dependencies need to be resolved first.
@@ -394,11 +409,6 @@
target="clean"
inheritall="false"/>
-->
-
- <!-- copy README.txt -->
- <copy tofile="${dist.dir}/samples/README.txt" failOnError="true">
- <fileset file="user/samples-README.txt"/>
- </copy>
</target>
<target name="build.dist.docs" unless="skip.docs" description="Builds documentation for a Beehive distribution">
@@ -406,8 +416,8 @@
<ant antfile="build.xml" target="docs" inheritAll="false"/>
<mkdir dir="${dist.dir}"/>
+
<!-- copy javadocs to dist -->
-
<copy todir="${dist.dir}/docs/apidocs" failOnError="true">
<fileset dir="controls/build/docs/apidocs"/>
<fileset dir="netui/build/docs/apidocs"/>
@@ -459,7 +469,7 @@
<antcall target="build.dist.docs.jar"/>
-->
- <!-- go ahead and always verify them after making them -->
+ <!-- verify the distribution archives once they've been created -->
<antcall target="verify.dist.archives"/>
</target>
Modified: incubator/beehive/trunk/samples/build.xml
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/build.xml?rev=169827&r1=169826&r2=169827&view=diff
==============================================================================
--- incubator/beehive/trunk/samples/build.xml (original)
+++ incubator/beehive/trunk/samples/build.xml Thu May 12 07:31:17 2005
@@ -23,37 +23,39 @@
<import file="../beehive-imports.xml"/>
<target name="clean" description="Clean the Beehive samples">
- <ant dir="petstoreWeb" target="scrub" inheritAll="false"/>
-
- <ant dir="netui-samples" antfile="WEB-INF/src/build-dist.xml" target="clean" inheritAll="false"/>
-
- <ant dir="controls-blank" target="clean" inheritAll="false"/>
- <ant dir="wsm-addressbook-enhanced/WEB-INF" antfile="build-svn.xml" target="clean" inheritAll="false"/>
- <ant dir="wsm-addressbook/WEB-INF" target="clean" inheritAll="false"/>
- <ant dir="wsm-blank/WEB-INF" target="clean" inheritAll="false"/>
- <ant dir="wsm-employee/WEB-INF" target="clean" inheritAll="false"/>
- <ant dir="wsm-samples/WEB-INF" target="clean" inheritAll="false"/>
- <ant dir="controls-spring/integration" antfile="build.xml" target="clean" inheritAll="false"/>
- <ant dir="controls-spring/web/" antfile="WEB-INF/src/build-svn.xml" target="clean" inheritAll="false"/>
- <!-- <ant dir="wsm-petstore-dashboard/WEB-INF" target="clean" inheritAll="false"/> -->
+ <echo>---------------------------------------------------------</echo>
+ <echo>Cleaning distribution samples</echo>
+ <echo>---------------------------------------------------------</echo>
+
+ <ant antfile="petstoreWeb/build.xml" target="scrub" inheritAll="false"/>
+ <ant antfile="netui-samples/WEB-INF/src/build-dist.xml" target="clean" inheritAll="false"/>
+ <ant antfile="controls-blank/build.xml" target="clean" inheritAll="false"/>
+ <ant antfile="wsm-addressbook-enhanced/WEB-INF/src/build-svn.xml" target="clean" inheritAll="false"/>
+ <ant antfile="wsm-addressbook/WEB-INF/src/build.xml" target="clean" inheritAll="false"/>
+ <ant antfile="wsm-blank/WEB-INF/src/build.xml" target="clean" inheritAll="false"/>
+ <ant antfile="wsm-employee/WEB-INF/src/build.xml" target="clean" inheritAll="false"/>
+ <ant antfile="wsm-samples/WEB-INF/src/build.xml" target="clean" inheritAll="false"/>
+ <ant antfile="controls-spring/integration/build.xml" target="clean" inheritAll="false"/>
+ <ant antfile="controls-spring/web/WEB-INF/src/build-svn.xml" target="clean" inheritAll="false"/>
+ <!-- <ant antfile="wsm-petstore-dashboard/WEB-INF" target="clean" inheritAll="false"/> -->
</target>
<target name="build" description="Build the Beehive samples">
- <ant dir="petstoreWeb" target="deploy-beehive" inheritAll="false"/>
- <ant dir="petstoreWeb" target="build" inheritAll="false"/>
-
- <ant dir="netui-samples" antfile="WEB-INF/src/build-dist.xml" target="build" inheritAll="false"/>
-
- <ant dir="controls-blank" target="build" inheritAll="false"/>
- <ant dir="wsm-addressbook-enhanced/WEB-INF" antfile="build-svn.xml" target="build" inheritAll="false"/>
- <ant dir="wsm-addressbook/WEB-INF" antfile="build-svn.xml" target="build" inheritAll="false"/>
- <ant dir="wsm-blank/WEB-INF" antfile="build-svn.xml" target="build" inheritAll="false"/>
-
- <ant dir="wsm-samples/WEB-INF" antfile="build-svn.xml" target="build" inheritAll="false"/>
-
- <ant dir="controls-spring/integration" antfile="build.xml" target="build" inheritAll="false"/>
- <ant dir="controls-spring/web/" antfile="WEB-INF/src/build-svn.xml" target="build" inheritAll="false"/>
- <!-- <ant dir="wsm-employee/WEB-INF" antfile="build-svn.xml" target="build" inheritAll="false"/> -->
+ <echo>---------------------------------------------------------</echo>
+ <echo>Building distribution samples</echo>
+ <echo>---------------------------------------------------------</echo>
+
+ <ant antfile="petstoreWeb/build.xml" target="deploy-beehive" inheritAll="false"/>
+ <ant antfile="petstoreWeb/build.xml" target="build" inheritAll="false"/>
+ <ant antfile="netui-samples/WEB-INF/src/build-dist.xml" target="build" inheritAll="false"/>
+ <ant antfile="controls-blank/build.xml" target="build" inheritAll="false"/>
+ <ant antfile="wsm-addressbook-enhanced/WEB-INF/src/build-svn.xml" target="build" inheritAll="false"/>
+ <ant antfile="wsm-addressbook/WEB-INF/src/build-svn.xml" target="build" inheritAll="false"/>
+ <ant antfile="wsm-blank/WEB-INF/src/build-svn.xml" target="build" inheritAll="false"/>
+ <ant antfile="wsm-samples/WEB-INF/src/build-svn.xml" target="build" inheritAll="false"/>
+ <ant antfile="controls-spring/integration/build.xml" target="build" inheritAll="false"/>
+ <ant antfile="controls-spring/web/WEB-INF/src/build-svn.xml" target="build" inheritAll="false"/>
+ <!-- <ant antfile="wsm-employee/WEB-INF" antfile="build-svn.xml" target="build" inheritAll="false"/> -->
</target>
</project>
Modified: incubator/beehive/trunk/samples/controls-blank/build.xml
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/controls-blank/build.xml?rev=169827&r1=169826&r2=169827&view=diff
==============================================================================
--- incubator/beehive/trunk/samples/controls-blank/build.xml (original)
+++ incubator/beehive/trunk/samples/controls-blank/build.xml Thu May 12 07:31:17 2005
@@ -17,7 +17,7 @@
$Header:$
-->
-<project name="controls-blank" default="usage">
+<project name="controls-blank" default="usage" basedir=".">
<property environment="os"/>
<property file="build.properties"/>
Modified: incubator/beehive/trunk/samples/controls-spring/web/WEB-INF/src/build-svn.xml
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/controls-spring/web/WEB-INF/src/build-svn.xml?rev=169827&r1=169826&r2=169827&view=diff
==============================================================================
--- incubator/beehive/trunk/samples/controls-spring/web/WEB-INF/src/build-svn.xml (original)
+++ incubator/beehive/trunk/samples/controls-spring/web/WEB-INF/src/build-svn.xml Thu May 12 07:31:17 2005
@@ -18,18 +18,19 @@
$Header:$
-->
-<project name="Beehive Spring-Controls webapp sample" default="build" basedir="../..">
+<project name="Beehive Spring-Controls webapp sample" default="build" basedir=".">
<import file="../../../../../beehive-imports.xml" />
<property name="context.path" value="springControls"/>
+ <property name="webapp.dir" location="${basedir}/../.."/>
<!-- =========================================== -->
<!-- deploy targets - move the app to the server -->
<!-- =========================================== -->
<target name="deploy" description="Deploy the webapp to a running server">
- <deploy-webapp webappDir="${basedir}" contextPath="${context.path}"/>
+ <deploy-webapp webappDir="${webapp.dir}" contextPath="${context.path}"/>
</target>
<target name="undeploy" description="Undeploy the webapp from a running server">
@@ -45,22 +46,23 @@
<!-- ========================================= -->
<target name="build" description="Build the webapp">
- <deploy-controls destDir="${basedir}/WEB-INF/lib"/>
+ <mkdir dir="${webapp.dir}/WEB-INF/lib"/>
+ <deploy-controls destDir="${webapp.dir}/WEB-INF/lib"/>
- <copy todir="${basedir}/WEB-INF/lib/" overwrite="true">
- <fileset dir="${basedir}/../integration/build/lib" includes="**" />
- <fileset dir="${basedir}/../external" includes="**" />
+ <copy todir="${webapp.dir}/WEB-INF/lib/" overwrite="true">
+ <fileset dir="${webapp.dir}/../integration/build/lib" includes="**" />
+ <fileset dir="${webapp.dir}/../external" includes="**" />
</copy>
- <build-webapp webappDir="${basedir}"/>
+ <build-webapp webappDir="${webapp.dir}"/>
</target>
<!-- ========================================= -->
<!-- clean - clean the webapp -->
<!-- ========================================= -->
<target name="clean" description="Clean the webapp">
- <clean-webapp webappDir="${basedir}"/>
+ <clean-webapp webappDir="${webapp.dir}"/>
<delete>
- <fileset dir="${basedir}/WEB-INF">
+ <fileset dir="${webapp.dir}/WEB-INF">
<include name="lib/**"/>
<include name="classes/**"/>
</fileset>
Modified: incubator/beehive/trunk/samples/controls-spring/web/WEB-INF/src/build.xml
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/controls-spring/web/WEB-INF/src/build.xml?rev=169827&r1=169826&r2=169827&view=diff
==============================================================================
--- incubator/beehive/trunk/samples/controls-spring/web/WEB-INF/src/build.xml (original)
+++ incubator/beehive/trunk/samples/controls-spring/web/WEB-INF/src/build.xml Thu May 12 07:31:17 2005
@@ -18,23 +18,21 @@
$Header:$
-->
-<project name="Beehive Spring-Controls webapp sample" default="build" basedir="../..">
+<project name="Beehive Spring-Controls webapp sample" default="build" basedir=".">
<import file="../../../../../beehive-imports.xml" />
<import file="../../../../../ant/beehive-tools.xml" />
<property name="context.path" value="springControls"/>
- <property name="webapp.dir" location="${basedir}"/>
+ <property name="webapp.dir" location="${basedir}/../.."/>
<!-- ========================================= -->
<!-- build - build the webapp -->
<!-- ========================================= -->
<target name="build" description="Build the webapp">
<mkdir dir="${webapp.dir}/WEB-INF/lib"/>
-
- <property name="webinf.lib" location="${webapp.dir}/WEB-INF/lib"/>
- <deploy-controls destDir="${webinf.lib}"/>
+ <deploy-controls destDir="${webapp.dir}/WEB-INF/lib"/>
<copy todir="${webapp.dir}/WEB-INF/lib" overwrite="true">
<fileset dir="${webapp.dir}/../integration/build/lib" includes="**" />