Author: ekoneil
Date: Sun Mar 13 07:50:49 2005
New Revision: 157334
URL: http://svn.apache.org/viewcvs?view=rev&rev=157334
Log:
Rename "webappRuntimeCore.xml" to "beehive-runtime.xml". All of the build file
distributed as part of Beehive in the distribution are now called
"beehive-*.xml".
There is still one issue around "beehive-runtime.xml" -- it uses <target>s
instead of <macrodef>s. Then, the targets are exposed as <macrodef>s in
beehive-imports.xml.
Would be great to have some feedback around this issue. Personally, I'd like
to have beehive-runtime.xml expose <macrodef>s just as the beehive-tools.xml
file does; presenents a consistent user model this way.
Any thoughts about this?
BB: self
DRT: Beehive pass
Tests: test-dist pass
Added:
incubator/beehive/trunk/ant/beehive-runtime.xml
- copied unchanged from r157282,
incubator/beehive/trunk/ant/webappRuntimeCore.xml
incubator/beehive/trunk/user/beehive-runtime.xml
- copied, changed from r157282,
incubator/beehive/trunk/user/webappRuntimeCore.xml
Removed:
incubator/beehive/trunk/ant/webappRuntimeCore.xml
incubator/beehive/trunk/user/webappRuntimeCore.xml
Modified:
incubator/beehive/trunk/beehive-imports.xml
incubator/beehive/trunk/distribution.xml
incubator/beehive/trunk/test/dist-test/ant/test-imports.xml
incubator/beehive/trunk/user/beehive-imports.xml
Modified: incubator/beehive/trunk/beehive-imports.xml
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/beehive-imports.xml?view=diff&r1=157333&r2=157334
==============================================================================
--- incubator/beehive/trunk/beehive-imports.xml (original)
+++ incubator/beehive/trunk/beehive-imports.xml Sun Mar 13 07:50:49 2005
@@ -192,7 +192,7 @@
<attribute name="webappDir"/>
<sequential>
<echo>Deploy NetUI to webapp @{webappDir}</echo>
- <ant antfile="${beehive.home}/ant/webappRuntimeCore.xml"
target="deploy.beehive.webapp.runtime" inheritAll="false">
+ <ant antfile="${beehive.home}/ant/beehive-runtime.xml"
target="deploy.beehive.webapp.runtime" inheritAll="false">
<property name="webapp.dir" location="@{webappDir}"/>
</ant>
</sequential>
@@ -202,7 +202,7 @@
<attribute name="webappDir"/>
<sequential>
<echo>Deploy WSM to webapp @{webappDir}</echo>
- <ant antfile="${beehive.home}/ant/webappRuntimeCore.xml"
target="deploy.wsm.webapp.runtime" inheritAll="false">
+ <ant antfile="${beehive.home}/ant/beehive-runtime.xml"
target="deploy.wsm.webapp.runtime" inheritAll="false">
<property name="webapp.dir" location="@{webappDir}"/>
</ant>
</sequential>
@@ -211,7 +211,7 @@
<macrodef name="undeploy-netui">
<attribute name="webappDir"/>
<sequential>
- <ant antfile="${beehive.home}/ant/webappRuntimeCore.xml"
target="undeploy.beehive.webapp.runtime" inheritAll="false">
+ <ant antfile="${beehive.home}/ant/beehive-runtime.xml"
target="undeploy.beehive.webapp.runtime" inheritAll="false">
<property name="webapp.dir" location="@{webappDir}"/>
</ant>
</sequential>
Modified: incubator/beehive/trunk/distribution.xml
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/distribution.xml?view=diff&r1=157333&r2=157334
==============================================================================
--- incubator/beehive/trunk/distribution.xml (original)
+++ incubator/beehive/trunk/distribution.xml Sun Mar 13 07:50:49 2005
@@ -293,7 +293,7 @@
<!-- copy the required Ant build files dist/ -->
<copy todir="${dist.dir}/ant" failOnError="true">
<fileset file="ant/beehive-tools.xml"/>
- <fileset file="user/webappRuntimeCore.xml"/>
+ <fileset file="user/beehive-runtime.xml"/>
</copy>
<copy todir="${dist.dir}" file="user/beehive-imports.xml"
failOnError="true"/>
Modified: incubator/beehive/trunk/test/dist-test/ant/test-imports.xml
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/test/dist-test/ant/test-imports.xml?view=diff&r1=157333&r2=157334
==============================================================================
--- incubator/beehive/trunk/test/dist-test/ant/test-imports.xml (original)
+++ incubator/beehive/trunk/test/dist-test/ant/test-imports.xml Sun Mar 13
07:50:49 2005
@@ -66,7 +66,7 @@
<attribute name="webappDir"/>
<sequential>
<echo>Deploy NetUI to webapp ${webapp.dir}</echo>
- <ant dir="${dist.home}/ant" antfile="webappRuntimeCore.xml"
+ <ant dir="${dist.home}/ant" antfile="beehive-runtime.xml"
target="deploy.beehive.webapp.runtime" inheritAll="false">
<property name="webapp.dir" location="@{webappDir}"/>
</ant>
@@ -77,27 +77,12 @@
<attribute name="webappDir"/>
<sequential>
<echo>Deploy WSM to webapp ${webapp.dir}</echo>
- <ant dir="${dist.home}/ant" antfile="webappRuntimeCore.xml"
+ <ant dir="${dist.home}/ant" antfile="beehive-runtime.xml"
target="deploy.wsm.webapp.runtime" inheritAll="false">
<property name="webapp.dir" location="@{webappDir}"/>
</ant>
</sequential>
</macrodef>
-
- <!--
- Target not available in distribution
- -->
- <!--
- <macrodef name="undeploy-netui">
- <attribute name="webappDir"/>
- <sequential>
- <ant dir="${dist.home}/ant" antfile="webappRuntimeCore.xml"
- target="undeploy.beehive.webapp.runtime" inheritAll="false">
- <property name="webapp.dir" location="@{webappDir}"/>
- </ant>
- </sequential>
- </macrodef>
- -->
<macrodef name="deploy-webapp">
<attribute name="webappDir"/>
Modified: incubator/beehive/trunk/user/beehive-imports.xml
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/user/beehive-imports.xml?view=diff&r1=157333&r2=157334
==============================================================================
--- incubator/beehive/trunk/user/beehive-imports.xml (original)
+++ incubator/beehive/trunk/user/beehive-imports.xml Sun Mar 13 07:50:49 2005
@@ -48,7 +48,7 @@
<attribute name="webappDir"/>
<sequential>
<echo>Deploy NetUI to webapp @{webappDir}</echo>
- <ant antfile="${this.dir}/ant/webappRuntimeCore.xml"
target="deploy.beehive.webapp.runtime" inheritAll="false">
+ <ant antfile="${this.dir}/ant/beehive-runtime.xml"
target="deploy.beehive.webapp.runtime" inheritAll="false">
<property name="webapp.dir" location="@{webappDir}"/>
</ant>
</sequential>
@@ -58,7 +58,7 @@
<attribute name="webappDir"/>
<sequential>
<echo>Deploy WSM to webapp @{webappDir}</echo>
- <ant antfile="${this.dir}/ant/webappRuntimeCore.xml"
target="deploy.wsm.webapp.runtime" inheritAll="false">
+ <ant antfile="${this.dir}/ant/beehive-runtime.xml"
target="deploy.wsm.webapp.runtime" inheritAll="false">
<property name="webapp.dir" location="@{webappDir}"/>
</ant>
</sequential>
Copied: incubator/beehive/trunk/user/beehive-runtime.xml (from r157282,
incubator/beehive/trunk/user/webappRuntimeCore.xml)
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/user/beehive-runtime.xml?view=diff&rev=157334&p1=incubator/beehive/trunk/user/webappRuntimeCore.xml&r1=157282&p2=incubator/beehive/trunk/user/beehive-runtime.xml&r2=157334
==============================================================================
--- incubator/beehive/trunk/user/webappRuntimeCore.xml (original)
+++ incubator/beehive/trunk/user/beehive-runtime.xml Sun Mar 13 07:50:49 2005
@@ -24,12 +24,6 @@
</fileset>
</copy>
- <copy todir="${webapp.dir}/WEB-INF/">
- <fileset dir="../lib/netui">
- <include name="**.tld*"/>
- </fileset>
- </copy>
-
<copy todir="${webapp.dir}/resources/">
<fileset dir="../lib/netui/resources">
<include name="**/*"/>
