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 2004/10/12 23:41:36 UTC
svn commit: rev 54700 - in incubator/beehive/trunk: . netui/ant netui/src/webapp-template/default test/ant
Author: ekoneil
Date: Tue Oct 12 14:41:35 2004
New Revision: 54700
Added:
incubator/beehive/trunk/netui/src/webapp-template/default/build.xml (contents, props changed)
Modified:
incubator/beehive/trunk/build.xml
incubator/beehive/trunk/netui/ant/webappTemplate.xml
incubator/beehive/trunk/test/ant/runTomcatCore.xml
Log:
More build updates in prep for having the build/dist directory setup.
This is really a checkpoint that's relying on a weird environment variable in the default build.xml file for a webapp; more on that in a bit.
- fix runTomcatCore.xml to break a dependence on a Beehive dev target that won't always be present
- fix webappTemplate.xml to include the correct build.xml file
- begin implementing the clean.dist / build.dist targets in /build.xml
BB: self
DRT: Beehive pass
Modified: incubator/beehive/trunk/build.xml
==============================================================================
--- incubator/beehive/trunk/build.xml (original)
+++ incubator/beehive/trunk/build.xml Tue Oct 12 14:41:35 2004
@@ -34,6 +34,8 @@
<ant dir="controls" target="clean" inheritAll="false"/>
<ant dir="netui" target="clean" inheritAll="false"/>
<ant dir="wsm" target="clean" inheritAll="false"/>
+
+ <delete dir="${os.BEEHIVE_HOME}/build"/>
</target>
<target name="deploy" description="Deploy Beehive">
@@ -240,13 +242,67 @@
<!-- -->
<!-- ============================================= -->
<target name="build.dist">
- <mkdir dir="build/dist"/>
+ <property name="dist.dir" location="${os.BEEHIVE_HOME}/build/dist"/>
+
+ <mkdir dir="${dist.dir}"/>
+ <mkdir dir="${dist.dir}/templates"/>
<!-- copy the required libraries into dist/ -->
+ <copy todir="${dist.dir}/lib/common" failOnError="true">
+ <fileset file="${log4j.jar}"/>
+ <fileset file="${xbean.jar}"/>
+ <fileset file="${jsr173.jar}"/>
+ </copy>
+
+ <copy todir="${dist.dir}/lib/controls" failOnError="true">
+ <fileset file="${controls.jar}"/>
+ <fileset file="${velocity14.jar}"/>
+ <fileset file="${velocity14dep.jar}"/>
+ </copy>
+
+ <copy todir="${dist.dir}/lib/wsm" failOnError="true">
+ <fileset file="${os.BEEHIVE_HOME}/wsm/build/jars/wsm.jar"/>
+ <fileset file="${os.BEEHIVE_HOME}/wsm/build/jars/wsm-axis.jar"/>
+ </copy>
+
+ <copy todir="${dist.dir}/lib/netui" failOnError="true" flatten="true">
+ <fileset file="${os.BEEHIVE_HOME}/netui/build/dist/compiler">
+ <include name="*.jar"/>
+ </fileset>
+ <fileset dir="${os.BEEHIVE_HOME}/netui/build/dist/webapp">
+ <include name="WEB-INF/lib/*.jar"/>
+ <exclude name="WEB-INF/lib/apache-xbean.jar"/>
+ <exclude name="WEB-INF/lib/controls.jar"/>
+ <exclude name="WEB-INF/lib/jsr173*.jar"/>
+ <exclude name="WEB-INF/lib/log4j*.jar"/>
+ <include name="WEB-INF/*.tld"/>
+ <include name="WEB-INF/*.tldx"/>
+ </fileset>
+ </copy>
<!-- copy the required Ant build files dist/ -->
+ <copy todir="${dist.dir}/ant" failOnError="true">
+ <fileset file="${beehive.test.dir}/ant/buildWebappCore.xml"/>
+ <fileset file="${beehive.test.dir}/ant/runTomcatCore.xml"/>
+ </copy>
<!-- build the project templates in dist/ -->
+ <echo>Create the Beehive webapp template</echo>
+ <copy todir="build/tmp-dist/netui-webapp">
+ <fileset dir="${os.BEEHIVE_HOME}/netui/build/dist/webapp"/>
+ </copy>
+
+ <ant dir="build/tmp-dist/netui-webapp" antfile="build.xml" target="build.webapp">
+ <property name="webapp.dir" location="${os.BEEHIVE_HOME}/build/tmp-dist/netui-webapp"/>
+ </ant>
+
+ <jar destfile="${dist.dir}/templates/netui-blank.war" basedir="build/tmp-dist/netui-webapp"/>
+
+ </target>
+
+ <target name="clean.dist">
+ <delete dir="build/dist"/>
+ <delete dir="build/tmp-dist"/>
</target>
<!-- ============================================= -->
Modified: incubator/beehive/trunk/netui/ant/webappTemplate.xml
==============================================================================
--- incubator/beehive/trunk/netui/ant/webappTemplate.xml (original)
+++ incubator/beehive/trunk/netui/ant/webappTemplate.xml Tue Oct 12 14:41:35 2004
@@ -109,6 +109,7 @@
<copy file="${template.root.dir}/default/index.jsp" todir="${webapp.dir}"/>
<copy file="${template.root.dir}/default/error.jsp" todir="${webapp.dir}"/>
<copy file="${template.root.dir}/default/error-header.jpg" todir="${webapp.dir}/${resource.dir.name}/images"/>
+ <copy file="${template.root.dir}/default/build.xml" todir="${webapp.dir}"/>
<!-- copy the javascript files to the javavscript directory -->
<copy file="${src.javascript}/netui-tree.js" todir="${javascript.dir}"/>
Added: incubator/beehive/trunk/netui/src/webapp-template/default/build.xml
==============================================================================
--- (empty file)
+++ incubator/beehive/trunk/netui/src/webapp-template/default/build.xml Tue Oct 12 14:41:35 2004
@@ -0,0 +1,17 @@
+<?xml version="1.0"?>
+
+<!--
+ Webapp build file.
+-->
+<project name="Webapp Build" default="usage" basedir=".">
+
+ <import file="${os.BEEHIVE_DIST_HOME}/ant/buildWebappCore.xml"/>
+ <import file="${os.BEEHIVE_DIST_HOME}/ant/runTomcatCore.xml"/>
+
+ <target name="usage" description="Print the usage for this build.xml">
+ <java fork="no" classname="org.apache.tools.ant.Main">
+ <arg line="-projecthelp"/>
+ </java>
+ </target>
+
+</project>
Modified: incubator/beehive/trunk/test/ant/runTomcatCore.xml
==============================================================================
--- incubator/beehive/trunk/test/ant/runTomcatCore.xml (original)
+++ incubator/beehive/trunk/test/ant/runTomcatCore.xml Tue Oct 12 14:41:35 2004
@@ -37,7 +37,7 @@
<tomcatreload path="/${context.path}" username="${catalina.username}" password="${catalina.password}"/>
</target>
- <target name="start" depends="ensure.tomcat" description="Start a Tomcat instance.">
+ <target name="start" description="Start a Tomcat instance.">
<condition property="cmdline.options" value="">
<not><isset property="cmdline.options"/></not>