svn commit: rev 55561 - in incubator/beehive/trunk: . test/ant user

[ek...@apache.org]

Author: ekoneil
Date: Mon Oct 25 20:09:45 2004
New Revision: 55561

Added:
   incubator/beehive/trunk/test/ant/webappRuntimeCore.xml
      - copied unchanged from rev 55528, incubator/beehive/trunk/test/ant/deployNetui.xml
Removed:
   incubator/beehive/trunk/test/ant/deployNetui.xml
   incubator/beehive/trunk/user/buildWebapp.xml
Modified:
   incubator/beehive/trunk/beehive.properties
   incubator/beehive/trunk/build.xml
   incubator/beehive/trunk/test/ant/buildWebapp.xml
   incubator/beehive/trunk/test/ant/runTomcat.xml
   incubator/beehive/trunk/user/beehive.properties
   incubator/beehive/trunk/user/webappRuntimeCore.xml
Log:
Fixes to previous checkin reated to the relationship between the dev and distribution builds.

- remove the user/buildWebapp.xml file; this functionality is now provided by test/ant/buildWebapp.xml
- re-jigger the Tomcat deploy / undeploy functionality to be available via buildWebapp.xml

BB: self
DRT: Beehive pass
Tests: build.dist test.dist



Modified: incubator/beehive/trunk/beehive.properties
==============================================================================
--- incubator/beehive/trunk/beehive.properties	(original)
+++ incubator/beehive/trunk/beehive.properties	Mon Oct 25 20:09:45 2004
@@ -22,10 +22,6 @@
 
 ant.jar=${ant.dir}/lib/ant.jar
 
-dist.dir=${beehive.dir}/build/dist
-dist.docs.dir=${beehive.dir}/build/dist-docs
-dist.name=apache-beehive
-
 #
 # While still in the Workshop source tree, these reference
 # JARs that are statically checked-in.
@@ -34,6 +30,7 @@
 # that are installed in the build (or by Maven) from
 # the various installers.
 #
+catalina-ant.jar=${tomcat.dir}/server/lib/catalina-ant.jar
 log4j.jar=${log4j.dir}/dist/lib/log4j-1.2.8.jar
 servlet24.jar=${tomcat.dir}/common/lib/servlet-api.jar
 jsp20.jar=${tomcat.dir}/common/lib//jsp-api.jar
@@ -51,6 +48,17 @@
 # projects in Beehive for interacting with a Tomcat
 # instance.
 #
-runTomcat.ant=${beehive.test.dir}/ant/runTomcat.xml
+appserver.ant=${beehive.test.dir}/ant/runTomcat.xml
+
 buildWebapp.ant=${beehive.test.dir}/ant/buildWebapp.xml
-deployNetui.ant=${beehive.test.dir}/ant/deployNetui.xml
\ No newline at end of file
+
+# todo: need to whack both of these
+runTomcat.ant=${beehive.test.dir}/ant/buildWebapp.xml
+deployNetui.ant=${beehive.test.dir}/ant/buildWebapp.xml
+
+#
+# Properties related to building a Beehive distribution.
+#
+dist.dir=${beehive.dir}/build/dist
+dist.docs.dir=${beehive.dir}/build/dist-docs
+dist.name=apache-beehive

Modified: incubator/beehive/trunk/build.xml
==============================================================================
--- incubator/beehive/trunk/build.xml	(original)
+++ incubator/beehive/trunk/build.xml	Mon Oct 25 20:09:45 2004
@@ -295,7 +295,7 @@
         <!-- copy the required Ant build files dist/ -->
         <copy todir="${dist.dir}/ant" failOnError="true">
             <fileset file="${beehive.user.dir}/webappRuntimeCore.xml"/>
-            <fileset file="${beehive.user.dir}/buildWebapp.xml"/>
+            <fileset file="${beehive.test.dir}/ant/buildWebapp.xml"/>
             <fileset file="${beehive.test.dir}/ant/buildWebappCore.xml"/>
             <fileset file="${beehive.test.dir}/ant/runTomcatCore.xml"/>
         </copy>

Modified: incubator/beehive/trunk/test/ant/buildWebapp.xml
==============================================================================
--- incubator/beehive/trunk/test/ant/buildWebapp.xml	(original)
+++ incubator/beehive/trunk/test/ant/buildWebapp.xml	Mon Oct 25 20:09:45 2004
@@ -7,11 +7,18 @@
 
     <property name="tomcat.home" location="${tomcat.dir}"/>
 
+    <property name="catalina.username" value="manager"/>
+    <property name="catalina.password" value="manager"/>
+
     <path id="velocity.classpath">
         <fileset file="${velocity14.jar}"/>
         <fileset file="${velocitydep14.jar}"/>
     </path>
 
     <import file="buildWebappCore.xml"/>
+
+    <import file="webappRuntimeCore.xml"/>
+
+    <import file="${appserver.ant}"/>
 
 </project>

Modified: incubator/beehive/trunk/test/ant/runTomcat.xml
==============================================================================
--- incubator/beehive/trunk/test/ant/runTomcat.xml	(original)
+++ incubator/beehive/trunk/test/ant/runTomcat.xml	Mon Oct 25 20:09:45 2004
@@ -6,10 +6,7 @@
     <property file="${os.BEEHIVE_HOME}/beehive.properties"/>
 
     <!-- define properties needed for runTomcatCore -->
-    <property name="catalina.username" value="manager"/>
-    <property name="catalina.password" value="manager"/>
     <property name="tomcat.home" location="${tomcat.dir}"/>
-    <property name="catalina-ant.jar" location="${tomcat.dir}/server/lib/catalina-ant.jar"/>
 
     <!-- import runTomcatCore tasks -->
     <import file="runTomcatCore.xml"/>
@@ -47,18 +44,18 @@
         <copy file="${default.tomcat-users.xml}" tofile="${tomcat.dir}/conf/tomcat-users.xml"/>
     </target>
 
-    <target name="usage" description="">
-        <java fork="no" classname="org.apache.tools.ant.Main">
-            <arg line="-projecthelp"/>
-        </java>
-    </target>
-
     <target name="ensure.tomcat">
         <echo>Ensuring Tomcat Present in directory: ${tomcat.dir}</echo>
         <available file="${tomcat.dir}" type="dir" property="tomcat.present"/>
         <fail unless="tomcat.present" message="Could not find Tomcat installed in ${tomcat.dir}"/>
 
         <antcall target="reset.config"/>
+    </target>
+
+    <target name="usage" description="">
+        <java fork="no" classname="org.apache.tools.ant.Main">
+            <arg line="-projecthelp"/>
+        </java>
     </target>
 
 </project>

Modified: incubator/beehive/trunk/user/beehive.properties
==============================================================================
--- incubator/beehive/trunk/user/beehive.properties	(original)
+++ incubator/beehive/trunk/user/beehive.properties	Mon Oct 25 20:09:45 2004
@@ -24,3 +24,6 @@
 # Beehive JARs
 controls.jar=${beehive.dir}/lib/controls/controls.jar
 netui-compiler.jar=${beehive.dir}/lib/netui/beehive-netui-compiler.jar
+
+#
+appserver.ant=${beehive.dir}/ant/runTomcatCore.xml
\ No newline at end of file

Modified: incubator/beehive/trunk/user/webappRuntimeCore.xml
==============================================================================
--- incubator/beehive/trunk/user/webappRuntimeCore.xml	(original)
+++ incubator/beehive/trunk/user/webappRuntimeCore.xml	Mon Oct 25 20:09:45 2004
@@ -5,8 +5,6 @@
     <property environment="os"/>
     <property file="${os.BEEHIVE_HOME}/beehive.properties"/>
 
-    <property name="webappTemplate.dir" location="${os.BEEHIVE_HOME}/netui/build/dist/webapp"/>
-
     <target name="deploy.beehive.webapp.runtime" description="Deploy the Beehive webapp runtime given a webapp root as -Dwebapp.dir">
         <available property="webapp.dir.available" file="${webapp.dir}" type="dir"/>
         <fail unless="webapp.dir.available" message="Can't find the webapp directory ${webapp.dir}"/>