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/02/13 19:37:02 UTC
svn commit: r153651 - in incubator/beehive/trunk: ant/axis-import.xml
ant/buildWebapp.xml ant/tomcat-imports.xml ant/webappRuntimeCore.xml
beehive-imports.xml distribution.xml
Author: ekoneil
Date: Sun Feb 13 10:37:01 2005
New Revision: 153651
URL: http://svn.apache.org/viewcvs?view=rev&rev=153651
Log:
SVN webapp bug fixes.
Ran across several issues while working on the petstoreWeb:
- start deleting the .pageflow-struts-generated directory during a "clean"
- fixup Ant <echo> statements that were printing an invalid property
- fixup project names
BB: self
DRT: Beehive pass
Modified:
incubator/beehive/trunk/ant/axis-import.xml
incubator/beehive/trunk/ant/buildWebapp.xml
incubator/beehive/trunk/ant/tomcat-imports.xml
incubator/beehive/trunk/ant/webappRuntimeCore.xml
incubator/beehive/trunk/beehive-imports.xml
incubator/beehive/trunk/distribution.xml
Modified: incubator/beehive/trunk/ant/axis-import.xml
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/ant/axis-import.xml?view=diff&r1=153650&r2=153651
==============================================================================
--- incubator/beehive/trunk/ant/axis-import.xml (original)
+++ incubator/beehive/trunk/ant/axis-import.xml Sun Feb 13 10:37:01 2005
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
-<project name="axis-imports" default="" basedir=".">
+<project name="Beehive/SVN/AxisImports" default="" basedir=".">
<import file="../beehive-imports.xml"/>
Modified: incubator/beehive/trunk/ant/buildWebapp.xml
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/ant/buildWebapp.xml?view=diff&r1=153650&r2=153651
==============================================================================
--- incubator/beehive/trunk/ant/buildWebapp.xml (original)
+++ incubator/beehive/trunk/ant/buildWebapp.xml Sun Feb 13 10:37:01 2005
@@ -1,8 +1,9 @@
<?xml version="1.0"?>
-<project name="Beehive/WebappBuild" default="usage">
+<project name="Beehive/SVN/WebappBuild" default="usage">
<property name="tmp.sourcegen.dir" value=".tmpbeansrc"/>
+ <property name="tmp.jpfgen.dir" value=".pageflow-struts-generated"/>
<import file="../beehive-imports.xml"/>
<import file="buildWebappCore.xml"/>
@@ -63,12 +64,7 @@
<delete dir="${webapp.dir}/WEB-INF/classes" includeEmptyDirs="true"/>
<delete dir="${webapp.dir}/WEB-INF/${tmp.sourcegen.dir}" includeEmptyDirs="true"/>
- </target>
-
- <target name="usage" description="">
- <java fork="no" classname="org.apache.tools.ant.Main">
- <arg line="-projecthelp"/>
- </java>
+ <delete dir="${webapp.dir}/WEB-INF/${tmp.jpfgen.dir}" includeEmptyDirs="true" failOnError="false"/>
</target>
</project>
Modified: incubator/beehive/trunk/ant/tomcat-imports.xml
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/ant/tomcat-imports.xml?view=diff&r1=153650&r2=153651
==============================================================================
--- incubator/beehive/trunk/ant/tomcat-imports.xml (original)
+++ incubator/beehive/trunk/ant/tomcat-imports.xml Sun Feb 13 10:37:01 2005
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
-<project name="tomcat-imports" default="" basedir=".">
+<project name="Beehive/SVN/TomcatImports" default="usage" basedir=".">
<property environment="os"/>
<property name="tomcat.home" location="${os.CATALINA_HOME}"/>
@@ -108,6 +108,12 @@
<exec os="Linux,SunOS,Solaris,Mac OS X" dir="${tomcat.home}/bin" executable="sh">
<arg line="shutdown.sh"/>
</exec>
+ </target>
+
+ <target name="usage" description="Print the usage for this build.xml">
+ <java fork="no" classname="org.apache.tools.ant.Main">
+ <arg line="-f ${ant.file} -projecthelp"/>
+ </java>
</target>
</project>
Modified: incubator/beehive/trunk/ant/webappRuntimeCore.xml
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/ant/webappRuntimeCore.xml?view=diff&r1=153650&r2=153651
==============================================================================
--- incubator/beehive/trunk/ant/webappRuntimeCore.xml (original)
+++ incubator/beehive/trunk/ant/webappRuntimeCore.xml Sun Feb 13 10:37:01 2005
@@ -1,23 +1,24 @@
<?xml version="1.0"?>
-<project name="Beehive/DeployWebappRuntime" default="usage" basedir=".">
+<project name="Beehive/SVN/DeployWebappRuntime" default="usage" basedir=".">
<import file="../beehive-imports.xml"/>
<!-- ================================================================ -->
<!-- -->
- <!-- Targets for deploying the NetUI runtime into a web application -->
+ <!-- Targets for deploying the Beehive runtime into a web application -->
<!-- -->
<!-- ================================================================ -->
+
<!-- params (location webapp.dir) -->
- <target name="deploy.beehive.webapp.runtime" description="Deploy the Beehive webapp runtime into a webapp rooted at ${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}"/>
</ant>
</target>
<!-- params (location webapp.dir) -->
- <target name="undeploy.beehive.webapp.runtime" description="Clean the Beehive webapp runtime from a webapp rooted at ${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}"/>
</ant>
@@ -25,16 +26,10 @@
<!-- params (location webapp.dir) -->
<!-- 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 into a webapp rooted at ${webapp.dir}">
+ <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}"/>
</ant>
- </target>
-
- <target name="usage" description="">
- <java fork="no" classname="org.apache.tools.ant.Main">
- <arg line="-projecthelp"/>
- </java>
</target>
</project>
Modified: incubator/beehive/trunk/beehive-imports.xml
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/beehive-imports.xml?view=diff&r1=153650&r2=153651
==============================================================================
--- incubator/beehive/trunk/beehive-imports.xml (original)
+++ incubator/beehive/trunk/beehive-imports.xml Sun Feb 13 10:37:01 2005
@@ -171,7 +171,7 @@
<macrodef name="build-webapp">
<attribute name="webappDir"/>
<sequential>
- <echo>Build webapp ${webapp.dir}</echo>
+ <echo>Build webapp @{webappDir}</echo>
<ant antfile="${beehive.home}/ant/buildWebapp.xml" target="build" inheritAll="false">
<property name="webapp.dir" location="@{webappDir}"/>
</ant>
@@ -181,7 +181,7 @@
<macrodef name="clean-webapp">
<attribute name="webappDir"/>
<sequential>
- <echo>Clean webapp ${webapp.dir}</echo>
+ <echo>Clean webapp @{webappDir}</echo>
<ant antfile="${beehive.home}/ant/buildWebapp.xml" target="clean" inheritAll="false">
<property name="webapp.dir" location="@{webappDir}"/>
</ant>
@@ -191,7 +191,7 @@
<macrodef name="deploy-netui">
<attribute name="webappDir"/>
<sequential>
- <echo>Deploy NetUI to webapp ${webapp.dir}</echo>
+ <echo>Deploy NetUI to webapp @{webappDir}</echo>
<ant antfile="${beehive.home}/ant/webappRuntimeCore.xml" target="deploy.beehive.webapp.runtime" inheritAll="false">
<property name="webapp.dir" location="@{webappDir}"/>
</ant>
@@ -201,7 +201,7 @@
<macrodef name="deploy-wsm">
<attribute name="webappDir"/>
<sequential>
- <echo>Deploy WSM to webapp ${webapp.dir}</echo>
+ <echo>Deploy WSM to webapp @{webappDir}</echo>
<ant antfile="${beehive.home}/ant/webappRuntimeCore.xml" target="deploy.wsm.webapp.runtime" inheritAll="false">
<property name="webapp.dir" location="@{webappDir}"/>
</ant>
@@ -352,12 +352,12 @@
<mkdir dir="${beehive.home}/build/lib/"/>
<!-- ======================================================================== -->
- <!-- Output a summary -->
+ <!-- Common targets -->
<!-- ======================================================================== -->
<target name="usage" description="Print the usage for this build.xml">
<java fork="no" classname="org.apache.tools.ant.Main">
- <arg line="-projecthelp"/>
+ <arg line="-f ${ant.file} -projecthelp"/>
</java>
</target>
Modified: incubator/beehive/trunk/distribution.xml
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/distribution.xml?view=diff&r1=153650&r2=153651
==============================================================================
--- incubator/beehive/trunk/distribution.xml (original)
+++ incubator/beehive/trunk/distribution.xml Sun Feb 13 10:37:01 2005
@@ -275,17 +275,15 @@
</copy>
<!-- Build the petstore distro -->
- <!-- copy the webapp itself -->
<ant antfile="${beehive.home}/ant/buildWebapp.xml" target="clean">
<property name="webapp.dir" location="${beehive.home}/samples/petstoreWeb"/>
</ant>
<copy todir="${dist.dir}/samples/petstoreWeb" failOnError="true">
<fileset dir="samples/petstoreWeb">
- <exclude name="WEB-INF/src/petstore-build.xml"/>
+ <exclude name="WEB-INF/src/build.xml"/>
+ <exclude name="WEB-INF/src/build-dist.xml"/>
<exclude name="WEB-INF/lib/*.jar"/>
- <exclude name="WEB-INF/*.tld"/>
- <exclude name="WEB-INF/*.tldx"/>
</fileset>
</copy>