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 2007/06/01 05:28:52 UTC
svn commit: r543378 - in /beehive/trunk: ./ ant/ docs/ docs/forrest/
docs/forrest/release/ docs/forrest/src/ docs/forrest/src/documentation/
test/dist-test/
Author: ekoneil
Date: Thu May 31 20:28:50 2007
New Revision: 543378
URL: http://svn.apache.org/viewvc?view=rev&rev=543378
Log:
Commit some outstanding changes that simplify the build/ directory and simplify cutting a release. In general, this flattens the build/ directory so that it's easier to navigate and deal with.
Additionally, this removes a layer of directories from docs/.
Test: distribution tests pass
Added:
beehive/trunk/docs/forrest/forrest.properties
- copied unchanged from r510583, beehive/trunk/docs/forrest/release/forrest.properties
beehive/trunk/docs/forrest/src/
- copied from r510583, beehive/trunk/docs/forrest/release/src/
beehive/trunk/docs/forrest/src/documentation/
- copied from r541920, beehive/trunk/docs/forrest/release/src/documentation/
beehive/trunk/docs/howto-contribute-docs.txt
- copied unchanged from r510583, beehive/trunk/docs/how_to_contribute_docs.txt
Removed:
beehive/trunk/docs/forrest/release/
beehive/trunk/docs/how_to_contribute_docs.txt
Modified:
beehive/trunk/ant/nightly.xml
beehive/trunk/beehive-imports.xml
beehive/trunk/build.xml
beehive/trunk/distribution.xml
beehive/trunk/docs/build.xml
beehive/trunk/docs/forrest/build.xml
beehive/trunk/test/dist-test/build.xml
Modified: beehive/trunk/ant/nightly.xml
URL: http://svn.apache.org/viewvc/beehive/trunk/ant/nightly.xml?view=diff&rev=543378&r1=543377&r2=543378
==============================================================================
--- beehive/trunk/ant/nightly.xml (original)
+++ beehive/trunk/ant/nightly.xml Thu May 31 20:28:50 2007
@@ -96,31 +96,6 @@
</classpath>
<arg line="-f ${beehive.home}/test/dist-test/build.xml run -Dbeehive.dist.dir=${beehive.home}/build/dist/${dist.name} -Dbeehive.dist.name=${dist.name} -Dant.home=${os.ANT_HOME} -emacs"/>
</java>
-
- <!-- ftp to Apache -->
- <echo></echo>
- <echo></echo>
- <echo>FTP to Beehive distribution to Apache</echo>
- <echo></echo>
- <echo></echo>
- </target>
-
- <!-- this target is a work in progress for automatically FTPing the archives via sftp to Apache -->
- <target name="sftp.nightly" description="SFTP the nightly release to apache.org; note, this target currently does not work">
- <fail unless="user" message="Username undefined"/>
-
- <property name="sftp.script" location="${beehive.home}/build/dist/archives/sftp-${date}-${beehive.svn.revision}"/>
- <echo file="${sftp.script}">
-chdir /www/cvs.apache.org/dist/beehive/nightlies/
-mkdir ${date}
-put /home/eko/dev/oss/beehive-nightly/trunk/build/dist/archives/apache-beehive-${date}-${beehive.svn.revision}.tar.gz
-put /home/eko/dev/oss/beehive-nightly/trunk/build/dist/archives/apache-beehive-${date}-${beehive.svn.revision}.zip
-put /home/eko/dev/oss/beehive-nightly/trunk/build/dist/archives/README.txt
- </echo>
-
- <exec dir="." executable="sftp" os="Linux" output="results.txt">
- <arg line=" -b ${sftp.script} ${user}@cvs.apache.org"/>
- </exec>
</target>
<target name="scrub.tomcat" description="Scrub a local Tomcat install of Beehive related test web applications">
Modified: beehive/trunk/beehive-imports.xml
URL: http://svn.apache.org/viewvc/beehive/trunk/beehive-imports.xml?view=diff&rev=543378&r1=543377&r2=543378
==============================================================================
--- beehive/trunk/beehive-imports.xml (original)
+++ beehive/trunk/beehive-imports.xml Thu May 31 20:28:50 2007
@@ -39,8 +39,8 @@
<property name="maven.groupId" value="org/apache/beehive"/>
- <property name="build.m2.dir" value="${beehive.home}/build/maven/m2/${maven.groupId}"/>
- <property name="build.m1.dir" value="${beehive.home}/build/maven/m1/beehive"/>
+ <property name="build.m2.dir" value="${beehive.home}/build/maven2/${maven.groupId}"/>
+ <property name="build.m1.dir" value="${beehive.home}/build/maven1/beehive"/>
<!-- TODO: move the MyFaces jars up into trunk/external -->
<property name="myfaces.dir" location="${beehive.home}/netui/external/jsf/myfaces-core-1.1.4/lib"/>
@@ -305,9 +305,11 @@
<!-- ======================================================================== -->
<!-- Verify JDK version -->
<!-- ======================================================================== -->
- <property name="required.jdk.version" value="1.5"/>
<condition property="jdk.version.okay">
- <contains string="${java.version}" substring="${required.jdk.version}"/>
+ <or>
+ <contains string="${java.version}" substring="1.5"/>
+ <contains string="${java.version}" substring="1.6"/>
+ </or>
</condition>
<fail unless="jdk.version.okay">
Modified: beehive/trunk/build.xml
URL: http://svn.apache.org/viewvc/beehive/trunk/build.xml?view=diff&rev=543378&r1=543377&r2=543378
==============================================================================
--- beehive/trunk/build.xml (original)
+++ beehive/trunk/build.xml Thu May 31 20:28:50 2007
@@ -205,7 +205,7 @@
<available file="${forrest.dir}" type="dir" property="forrest.present"/>
<fail unless="forrest.present" message="You must have Apache Forrest installed to execute this target. For more information, see trunk/BUILDING.TXT"/>
- <ant dir="docs" target="build.release"/>
+ <ant dir="docs" target="build"/>
<ant dir="controls" target="docs" inheritAll="false"/>
<ant dir="netui" target="docs" inheritAll="false"/>
Modified: beehive/trunk/distribution.xml
URL: http://svn.apache.org/viewvc/beehive/trunk/distribution.xml?view=diff&rev=543378&r1=543377&r2=543378
==============================================================================
--- beehive/trunk/distribution.xml (original)
+++ beehive/trunk/distribution.xml Thu May 31 20:28:50 2007
@@ -39,13 +39,18 @@
<property name="dist.docs.name" value="${dist.name}-docs"/>
<property name="beehive.user.dir" location="${beehive.home}/user"/>
- <property name="dist.base.dir" location="${beehive.home}/build/dist"/>
+ <property name="build.dir" location="${beehive.home}/build"/>
+ <property name="dist.base.dir" location="${build.dir}/dist"/>
+
+ <property name="dist.archives.dir" location="${build.dir}/archives"/>
+ <property name="dist.tmp.dir" location="${build.dir}/tmp"/>
+ <property name="dist.docs.dir" location="${build.dir}/docs"/>
+
+ <!-- locations for the distribution libraries -->
<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"/>
- <property name="dist.tmp.dir" location="${beehive.home}/build/tmp-dist/"/>
<!-- files to dynamically pull together slightly different readmes when building distributions -->
<property name="dist.readme.template" location="${beehive.home}/docs/dist-docs/README.txt"/>
@@ -53,8 +58,6 @@
<property name="dist.readme.rev.trailer" location="${beehive.home}/docs/dist-docs/rev-readme-trailer.txt"/>
<property name="dist.readme.toplvl.trailer" location="${beehive.home}/docs/dist-docs/toplvl-readme-trailer.txt"/>
- <property name="release.docs.build.dir" location="${beehive.home}/build/release-docs"/>
-
<!-- Properties used by the "build.dist*.{tgz,zip}" targets for translating end-of-line characters in text files -->
<property name="text.file.includes.unix" value="**/*.beaninfo,**/*.css,**/*.dtd,**/*.html,**/*.inc,**/*.java,**/*.jcs,**/*.jcx,**/*.jj,**/*.jpf,**/*.jpfs,**/*.js,**/*.jsfb,**/*.jsp,**/*.jspf,**/*.jspx,**/*.log,**/*.properties,**/*.sql,**/*.tag,**/*.tld,**/*.txt,**/*.TXT,**/*.wsdd,**/*.wsdl,**/*.xml,**/*.xsd,**/*.xsdconfig,**/*.xsl,**/*.xslt,**/Global.app"/>
<property name="text.file.includes.dos" value="**/*.bat,**/*.cmd,${text.file.includes.unix}"/>
@@ -64,7 +67,7 @@
<!-- Distribution targets -->
<!-- -->
<!-- ============================================= -->
- <target name="build.dist" description="Builds a Beehive distribution">
+ <target name="build.dist" description="Build a complete distribution">
<mkdir dir="${dist.dir}"/>
<antcall target="build.dist.core"/>
@@ -76,14 +79,14 @@
<antcall target="verify.dist.samples"/>
</target>
- <target name="minprod.dist" description="Build a minimal distribution">
+ <target name="minprod.dist" description="Build a minimal distribution that does not include samples or documentation">
<property name="skip.samples.verify" value="true"/>
<property name="skip.docs.build" value="true"/>
<antcall target="build.dist"/>
</target>
- <target name="verify.dist.samples" unless="skip.samples.verify" description="Verify the builds for the samples for a Beehive distribution">
+ <target name="verify.dist.samples" unless="skip.samples.verify" description="Verify the samples by building them.">
<property name="samples.verify.dir" location="${dist.tmp.dir}/samples-build-verification"/>
<copy todir="${samples.verify.dir}">
<fileset dir="${dist.dir}"/>
@@ -302,7 +305,7 @@
<antcall target="build.release.docs"/>
<copy todir="${dist.dir}/docs" failOnError="true">
- <fileset dir="${release.docs.build.dir}"/>
+ <fileset dir="${dist.docs.dir}"/>
</copy>
<copy todir="${dist.dir}/docs" failOnError="true">
@@ -335,37 +338,37 @@
</target>
<target name="build.release.docs" unless="skip.docs" description="Builds documentation for a Beehive distribution">
- <property name="release.docs.build.dir" location="${build.dir}/docs"/>
- <mkdir dir="${release.docs.build.dir}"/>
+ <property name="dist.docs.dir" location="${build.dir}/docs"/>
+ <mkdir dir="${dist.docs.dir}"/>
<!-- generate the Beehive documentation -->
<ant antfile="build.xml" target="docs" inheritAll="false"/>
- <copy todir="${release.docs.build.dir}" failOnError="true">
- <fileset dir="docs/forrest/release/build/site"/>
+ <copy todir="${dist.docs.dir}" failOnError="true">
+ <fileset dir="docs/forrest/build/site"/>
</copy>
- <copy todir="${release.docs.build.dir}/netui/apidocs/javadoc" failOnError="true">
+ <copy todir="${dist.docs.dir}/netui/apidocs/javadoc" failOnError="true">
<fileset dir="netui/build/docs/apidocs"/>
</copy>
- <copy todir="${release.docs.build.dir}/netui/apidocs/taglib" failOnError="true" overwrite="true">
+ <copy todir="${dist.docs.dir}/netui/apidocs/taglib" failOnError="true" overwrite="true">
<fileset dir="netui/build/docs/taglib"/>
</copy>
- <copy todir="${release.docs.build.dir}/controls/apidocs/javadoc" failOnError="true">
+ <copy todir="${dist.docs.dir}/controls/apidocs/javadoc" failOnError="true">
<fileset dir="controls/build/docs/apidocs"/>
</copy>
- <copy todir="${release.docs.build.dir}/system-controls/jdbc/apidocs/javadoc" failOnError="true">
+ <copy todir="${dist.docs.dir}/system-controls/jdbc/apidocs/javadoc" failOnError="true">
<fileset dir="system-controls/build/docs/jdbc/apidocs"/>
</copy>
- <copy todir="${release.docs.build.dir}/system-controls/ejb/apidocs/javadoc" failOnError="true">
+ <copy todir="${dist.docs.dir}/system-controls/ejb/apidocs/javadoc" failOnError="true">
<fileset dir="system-controls/build/docs/ejb/apidocs"/>
</copy>
- <copy todir="${release.docs.build.dir}/system-controls/jms/apidocs/javadoc" failOnError="true">
+ <copy todir="${dist.docs.dir}/system-controls/jms/apidocs/javadoc" failOnError="true">
<fileset dir="system-controls/build/docs/jms/apidocs"/>
</copy>
</target>
@@ -375,7 +378,7 @@
prereq: Now you manually have to ensure that build.dist, build.dist.lib and build.dist.src are done before calling this.
-->
- <target name="build.dist.archives" description="Builds all Beehive distribution archives in .zip and .tar.gz formats">
+ <target name="build.dist.archives" description="Build the distribution archives in .zip and .tar.gz formats">
<fail unless="beehive.version" message="Could not build distribution archives; beehive.version property not specified!"/>
<check-exists file="${dist.dir}" type="dir"/>
<check-exists file="${dist.lib.dir}" type="dir"/>
@@ -404,7 +407,7 @@
<!-- -->
<!-- ============================================= -->
- <target name="build.dist.zip" description="Builds a distribution zip archive">
+ <target name="build.dist.zip" description="Build a distribution zip archive">
<fail unless="beehive.version" message="Could not build distribution archive; beehive.version was not specified"/>
<!-- Change all text files to CRLF line endings. -->
@@ -422,7 +425,7 @@
</zip>
</target>
- <target name="build.dist.tgz" description="Builds a distribution .tar.gz archive">
+ <target name="build.dist.tgz" description="Build a distribution .tar.gz archive">
<fail unless="beehive.version" message="Could not build distribution archive; beehive.version was not specified"/>
<!-- Change all text files to LF line endings. -->
@@ -445,7 +448,7 @@
<!-- -->
<!-- ============================================= -->
- <target name="build.dist.lib.zip" description="Builds a Beehive library distribution zipfile">
+ <target name="build.dist.lib.zip" description="Build a Beehive library distribution zipfile">
<fail unless="beehive.version" message="Could not build distribution archive; beehive.version was not specified"/>
<!-- Change all text files to CRLF line endings. -->
@@ -461,7 +464,7 @@
</zip>
</target>
- <target name="build.dist.lib.tgz" description="Builds a Beehive library distribution tarball (.tar.gz)">
+ <target name="build.dist.lib.tgz" description="Build a Beehive library distribution tarball (.tar.gz)">
<fail unless="beehive.version" message="Could not build distribution archive; beehive.version was not specified"/>
<!-- Change all text files to LF line endings. -->
@@ -482,7 +485,7 @@
<!-- Docs Distribution Archives -->
<!-- -->
<!-- ============================================= -->
- <target name="build.dist.docs.zip" description="Builds a Beehive distribution docs zipfile">
+ <target name="build.dist.docs.zip" description="Build the documentation archive as a .zip">
<fail unless="beehive.version" message="Could not build distribution archive; beehive.version was not specified"/>
<!-- Change all text files to CRLF line endings. -->
@@ -501,7 +504,7 @@
</zip>
</target>
- <target name="build.dist.docs.tgz" description="Builds a Beehive distribution docs tarball (.tar.gz)">
+ <target name="build.dist.docs.tgz" description="Build the documentation archive as a .tar.gz">
<fail unless="beehive.version" message="Could not build distribution archive; beehive.version was not specified"/>
<!-- Change all text files to LF line endings. -->
@@ -526,7 +529,7 @@
<!-- -->
<!-- ============================================= -->
- <target name="build.dist.src.zip" description="Builds a Beehive source distribution zipfile">
+ <target name="build.dist.src.zip" description="Build the source archive as a .zip">
<fail unless="beehive.version" message="Could not build distribution archive; beehive.version was not specified"/>
<!-- Change all text files to CRLF line endings. -->
@@ -543,7 +546,7 @@
</zip>
</target>
- <target name="build.dist.src.tgz" description="Builds a Beehive source distribution tarball (.tar.gz)">
+ <target name="build.dist.src.tgz" description="Build the source distribution as a .tar.gz">
<fail unless="beehive.version" message="Could not build distribution archive; beehive.version was not specified"/>
<!-- Change all text files to LF line endings. -->
@@ -561,13 +564,13 @@
</target>
<!-- prereq: you must have built the archives with build.dist.archives already -->
- <target name="verify.dist.archives" description="Verifies all Beehive distribution archives (.zip, .tar.gz, src, etc)">
+ <target name="verify.dist.archives" description="Verifies all distribution .zip / .tar.gz archives">
<verify-archive filebase="${dist.name}"/>
<verify-archive filebase="${dist.lib.name}"/>
<verify-archive filebase="${dist.docs.name}"/>
<verify-archive filebase="${dist.src.name}"/>
</target>
-
+<!--
<target name="build.livesite" description="Builds a zipfile of the current live site.">
<property name="tmpdocsdir" location="${dist.tmp.dir}/${dist.docs.name}" />
<copy todir="${tmpdocsdir}">
@@ -581,6 +584,7 @@
<delete dir="${tmpdocsdir}" />
</target>
+-->
<target name="clean.dist" description="Cleans a Beehive distribution build">
<delete dir="${dist.archives.dir}"/>
@@ -610,7 +614,11 @@
</ant>
</target>
- <!-- prereq: before doing this, you will need to do a build.dist and build.test.dist -->
+ <!--
+ Note, before running the test distribution, the following targets must be run:
+ build.dist
+ build.test.dist
+ -->
<target name="run.test.dist" description="Run the beehive tests against the archive files">
<echo>distribution directory: ${dist.dir}</echo>
<echo>distribution name: ${dist.name}</echo>
@@ -621,7 +629,7 @@
</ant>
</target>
- <target name="rat" description="Run the RAT tool to verify a distribution">
+ <target name="rat" description="Verify a distribution with RAT">
<fail unless="os.RAT_HOME" message="To run RAT, set the RAT_HOME environment variable"/>
<property name="rat.jar" location="${os.RAT_HOME}/rat-0.2-SNAPSHOT.jar"/>
@@ -732,8 +740,9 @@
</sequential>
</macrodef>
- <!-- Do a chk to see if a file exists, but allow turning this off with the docheck attribute.
- Doing this instead of the simple available/fail pattern to reduce the number of properties being used.
+ <!--
+ Do a check to see if a file exists, but allow turning this off with the docheck attribute.
+ Doing this instead of the simple available/fail pattern to reduce the number of properties being used.
-->
<macrodef name="check-exists">
<attribute name="file"/>
@@ -754,3 +763,13 @@
</macrodef>
</project>
+
+<!--
+
+ build/
+ dist/
+ archives/
+ test/
+ test-run/
+ tmp/ <- temporary location for unzipping / verifying stuff
+-->
\ No newline at end of file
Modified: beehive/trunk/docs/build.xml
URL: http://svn.apache.org/viewvc/beehive/trunk/docs/build.xml?view=diff&rev=543378&r1=543377&r2=543378
==============================================================================
--- beehive/trunk/docs/build.xml (original)
+++ beehive/trunk/docs/build.xml Thu May 31 20:28:50 2007
@@ -18,23 +18,19 @@
$Header:$
-->
-<!--
--->
<project name="Beehive/Docs" default="usage" basedir=".">
<import file="../beehive-imports.xml"/>
-
- <target name="build" depends="build.release"/>
-
- <target name="build.release">
- <ant dir="forrest/" target="build.release"/>
- </target>
<target name="clean">
<delete dir="build"/>
<ant dir="forrest" target="clean"/>
</target>
+ <target name="build">
+ <ant dir="forrest/" target="build"/>
+ </target>
+
<target name="generate-anno-ref">
<antcall target="generate-anno-xml"/>
<antcall target="transform-to-forrestxml"/>
@@ -52,7 +48,6 @@
<fail unless="dbdoclet.avaialble" message="Unable to generate annotation reference; is the DocBook Doclet available?"/>
<property name="controls.src.api" location="${beehive.home}/controls/src/api/org/apache/beehive/controls/api"/>
- <property name="wsm.src.api" location="${beehive.home}wsm/src/api"/>
<property name="docbook.xml.dest.dir" location="build/temp/anno_ref/docbook"/>
@@ -106,26 +101,6 @@
sourcefiles="../netui/src/pageflow/org/apache/beehive/netui/pageflow/annotations/Jpf.java">
<doclet name="org.dbdoclet.doclet.docbook.DocBookDoclet" path="${dbdoclet.home}/jars/dbdoclet.jar"/>
</javadoc>
-
- <javadoc destdir="${docbook.xml.dest.dir}/wsm"
- docencoding="UTF-8"
- encoding="ISO-8859-15"
- failonerror="yes"
- maxmemory="512m"
- sourcefiles="${wsm.src.api}/javax/jws/HandlerChain.java,
- ${wsm.src.api}/javax/jws/Oneway.java,
- ${wsm.src.api}/javax/jws/WebMethod.java,
- ${wsm.src.api}/javax/jws/WebParam.java,
- ${wsm.src.api}/javax/jws/WebResult.java,
- ${wsm.src.api}/javax/jws/WebService.java,
- ${wsm.src.api}/javax/jws/security/SecurityIdentity.java,
- ${wsm.src.api}/javax/jws/security/SecurityRoles.java,
- ${wsm.src.api}/javax/jws/soap/InitParam.java,
- ${wsm.src.api}/javax/jws/soap/SOAPBinding.java,
- ${wsm.src.api}/javax/jws/soap/SOAPMessageHandler.java,
- ${wsm.src.api}/javax/jws/soap/SOAPMessageHandlers.java">
- <doclet name="org.dbdoclet.doclet.docbook.DocBookDoclet" path="${dbdoclet.home}/jars/dbdoclet.jar"/>
- </javadoc>
</target>
<target name="transform-to-forrestxml" description="Transforms DocBook XML into Forrest XML.">
@@ -148,17 +123,6 @@
out="build/temp/mytest.html"
style="tools/xslt/configRefHtml.xslt">
</xslt>
- </target>
-
- <!-- ============================================= -->
- <!-- -->
- <!-- Default usage target -->
- <!-- -->
- <!-- ============================================= -->
- <target name="usage" description="Print the usage for this build.xml">
- <java fork="no" classname="org.apache.tools.ant.Main">
- <arg line="-f build.xml -projecthelp"/>
- </java>
</target>
</project>
Modified: beehive/trunk/docs/forrest/build.xml
URL: http://svn.apache.org/viewvc/beehive/trunk/docs/forrest/build.xml?view=diff&rev=543378&r1=543377&r2=543378
==============================================================================
--- beehive/trunk/docs/forrest/build.xml (original)
+++ beehive/trunk/docs/forrest/build.xml Thu May 31 20:28:50 2007
@@ -20,24 +20,31 @@
-->
<!--
- This Ant file drives the creation of Beehive documentation and delegates
- its work to the Ant files in the site-author and release sub-directories.
+ ============================================================
+
+ This build file is merely a placeholder for the importation of the forrest.build.xml file.
+ 'site', the default target here, is a target imported from forrest.build.xml
+
+ ============================================================
-->
-<project name="Beehive/Documentation/Release" default="build">
+<project name="Beehive Forrest Site Build" default="usage" basedir=".">
- <property environment="os"/>
+ <property environment="os"/>
+ <property name="forrest.home" location="${os.FORREST_HOME}"/>
+
+ <import file="${os.FORREST_HOME}/main/forrest.build.xml"/>
<target name="build">
- <antcall target="build.release"/>
+ <antcall target="site"/>
</target>
<target name="clean">
- <delete dir="release/build"/>
<delete dir="build"/>
</target>
- <target name="build.release">
- <ant dir="release" target="build" inheritAll="false"/>
+ <target name="usage" description="Print the usage for this build.xml">
+ <java fork="no" classname="org.apache.tools.ant.Main">
+ <arg line="-f build.xml -projecthelp"/>
+ </java>
</target>
-
</project>
Modified: beehive/trunk/test/dist-test/build.xml
URL: http://svn.apache.org/viewvc/beehive/trunk/test/dist-test/build.xml?view=diff&rev=543378&r1=543377&r2=543378
==============================================================================
--- beehive/trunk/test/dist-test/build.xml (original)
+++ beehive/trunk/test/dist-test/build.xml Thu May 31 20:28:50 2007
@@ -23,7 +23,7 @@
<import file="../../beehive-imports.xml"/>
<property name="build.dir" location="${beehive.home}/build"/>
- <property name="test.dist.base.dir" location="${build.dir}/test-dist"/>
+ <property name="test.dist.base.dir" location="${build.dir}/test"/>
<property name="test.dist.exec.dir" location="${test.dist.base.dir}/run"/>
<property name="test.dist.name" value="beehive-test-dist"/>
@@ -32,13 +32,11 @@
<mkdir dir="${test.dist.base.dir}/${test.dist.name}"/>
<mkdir dir="${test.dist.base.dir}/${test.dist.name}/netui"/>
<mkdir dir="${test.dist.base.dir}/${test.dist.name}/controls"/>
- <mkdir dir="${test.dist.base.dir}/${test.dist.name}/wsm"/>
</target>
<target name="clean" description="Cleans the test distribution directories">
<delete dir="${test.dist.base.dir}"/>
<delete dir="${test.dist.exec.dir}"/>
- <delete dir="${beehive.home}/build/testDistArchives"/>
</target>
<target name="build" depends="prep" description="Build the test package for Beehive distribution test">
@@ -129,7 +127,7 @@
<fileset dir="${beehive.dist.dir}" includes="**/*"/>
</copy>
- <unzip src="${beehive.home}/build/testDistArchives/${beehive.dist.name}-test.zip" dest="${test.dist.exec.dir}"/>
+ <unzip src="${test.dist.base.dir}/${beehive.dist.name}-test.zip" dest="${test.dist.exec.dir}"/>
<!-- Tomcat has trouble deploying a webapp with an existing context path whose content root is different
from the currently deployed webapp. Thus, the distribution test infrastructure needs to scrub
@@ -147,13 +145,13 @@
</target>
<target name="package.test.dist" description="Package beehive test distribution into archive files">
- <mkdir dir="${beehive.home}/build/testDistArchives"/>
+ <mkdir dir="${test.dist.base.dir}"/>
- <zip destfile="${beehive.home}/build/testDistArchives/${dist.name}-test.zip" >
+ <zip destfile="${test.dist.base.dir}/${dist.name}-test.zip">
<fileset dir="${test.dist.base.dir}" excludes="**/*.gz,**/*.sh"/>
</zip>
- <tar destfile="${beehive.home}/build/testDistArchives/${dist.name}-test.tar.gz" compression="gzip">
+ <tar destfile="${test.dist.base.dir}/${dist.name}-test.tar.gz" compression="gzip">
<tarfileset dir="${test.dist.base.dir}" excludes="**/*.zip,**/*.cmd"/>
</tar>
</target>