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/09/21 17:19:37 UTC
svn commit: r290722 - in /beehive/trunk: beehive-imports.xml
external/velocity/velocity-1.4.jar user/beehive-imports.xml
Author: ekoneil
Date: Wed Sep 21 08:19:33 2005
New Revision: 290722
URL: http://svn.apache.org/viewcvs?rev=290722&view=rev
Log:
Two infra changes:
- remove the velocity-1.4.jar file which is a subset of the stuff available in the 1.4-dep.jar.
- remove references to 1.4.jar in the Ant files
- fixup the <ant> calls using antfile="..." to use dir="..." and antfile="..."
BB: self
Test: Beehive pass
Removed:
beehive/trunk/external/velocity/velocity-1.4.jar
Modified:
beehive/trunk/beehive-imports.xml
beehive/trunk/user/beehive-imports.xml
Modified: beehive/trunk/beehive-imports.xml
URL: http://svn.apache.org/viewcvs/beehive/trunk/beehive-imports.xml?rev=290722&r1=290721&r2=290722&view=diff
==============================================================================
--- beehive/trunk/beehive-imports.xml (original)
+++ beehive/trunk/beehive-imports.xml Wed Sep 21 08:19:33 2005
@@ -48,7 +48,6 @@
<fileset id="system-controls.fileset" file="${beehive.home}/system-controls/build/jars/*.jar"/>
<fileset id="velocity.fileset" dir="${beehive.home}/external/velocity">
- <include name="velocity-1.4.jar"/>
<include name="velocity-dep-1.4.jar"/>
</fileset>
@@ -200,7 +199,7 @@
<attribute name="webappDir"/>
<sequential>
<echo>Build webapp @{webappDir}</echo>
- <ant antfile="${beehive.home}/ant/buildWebapp.xml" target="build" inheritAll="false">
+ <ant dir="${beehive.home}/ant" antfile="buildWebapp.xml" target="build" inheritAll="false">
<property name="webapp.dir" location="@{webappDir}"/>
</ant>
</sequential>
@@ -210,7 +209,7 @@
<attribute name="webappDir"/>
<sequential>
<echo>Clean webapp @{webappDir}</echo>
- <ant antfile="${beehive.home}/ant/buildWebapp.xml" target="clean" inheritAll="false">
+ <ant dir="${beehive.home}/ant" antfile="buildWebapp.xml" target="clean" inheritAll="false">
<property name="webapp.dir" location="@{webappDir}"/>
</ant>
</sequential>
@@ -220,7 +219,7 @@
<attribute name="webappDir"/>
<sequential>
<echo>Deploy NetUI to webapp @{webappDir}</echo>
- <ant antfile="${beehive.home}/ant/beehive-runtime.xml" target="deploy.beehive.webapp.runtime" inheritAll="false">
+ <ant dir="${beehive.home}/ant/" antfile="beehive-runtime.xml" target="deploy.beehive.webapp.runtime" inheritAll="false">
<property name="webapp.dir" location="@{webappDir}"/>
</ant>
</sequential>
@@ -230,7 +229,7 @@
<attribute name="webappDir"/>
<sequential>
<echo>Deploy WSM to webapp @{webappDir}</echo>
- <ant antfile="${beehive.home}/ant/beehive-runtime.xml" target="deploy.wsm.webapp.runtime" inheritAll="false">
+ <ant dir="${beehive.home}/ant" antfile="beehive-runtime.xml" target="deploy.wsm.webapp.runtime" inheritAll="false">
<property name="webapp.dir" location="@{webappDir}"/>
</ant>
</sequential>
@@ -240,7 +239,7 @@
<attribute name="destDir"/>
<sequential>
<echo>Deploy Controls to directory @{destDir}</echo>
- <ant antfile="${beehive.home}/ant/beehive-runtime.xml" target="deploy.controls.webapp.runtime" inheritAll="false">
+ <ant dir="${beehive.home}/ant" antfile="beehive-runtime.xml" target="deploy.controls.webapp.runtime" inheritAll="false">
<property name="dest.dir" location="@{destDir}"/>
</ant>
</sequential>
@@ -249,7 +248,7 @@
<macrodef name="undeploy-netui">
<attribute name="webappDir"/>
<sequential>
- <ant antfile="${beehive.home}/ant/beehive-runtime.xml" target="undeploy.beehive.webapp.runtime" inheritAll="false">
+ <ant dir="${beehive.home}/ant" antfile="beehive-runtime.xml" target="undeploy.beehive.webapp.runtime" inheritAll="false">
<property name="webapp.dir" location="@{webappDir}"/>
</ant>
</sequential>
@@ -259,7 +258,7 @@
<attribute name="webappDir"/>
<attribute name="contextPath"/>
<sequential>
- <ant antfile="${beehive.home}/ant/${servlet.runtime}-imports.xml" target="deploy" inheritAll="false">
+ <ant dir="${beehive.home}/ant" antfile="${servlet.runtime}-imports.xml" target="deploy" inheritAll="false">
<property name="webapp.dir" location="@{webappDir}"/>
<property name="context.path" value="@{contextPath}"/>
</ant>
@@ -269,7 +268,7 @@
<macrodef name="undeploy-webapp">
<attribute name="contextPath"/>
<sequential>
- <ant antfile="${beehive.home}/ant/${servlet.runtime}-imports.xml" target="undeploy" inheritAll="false">
+ <ant dir="${beehive.home}/ant" antfile="${servlet.runtime}-imports.xml" target="undeploy" inheritAll="false">
<property name="context.path" value="@{contextPath}"/>
</ant>
</sequential>
@@ -278,7 +277,7 @@
<macrodef name="redeploy-webapp">
<attribute name="contextPath"/>
<sequential>
- <ant antfile="${beehive.home}/ant/${servlet.runtime}-imports.xml" target="redeploy" inheritAll="false">
+ <ant dir="${beehive.home}/ant" antfile="${servlet.runtime}-imports.xml" target="redeploy" inheritAll="false">
<property name="context.path" value="@{contextPath}"/>
</ant>
</sequential>
@@ -296,7 +295,7 @@
<isfalse value="@{shmem}"/>
</condition>
- <ant antfile="${beehive.home}/ant/${servlet.runtime}-imports.xml" target="${start.target}" inheritAll="false">
+ <ant dir="${beehive.home}/ant" antfile="${servlet.runtime}-imports.xml" target="${start.target}" inheritAll="false">
<property name="java.options" value="@{javaOptions}"/>
</ant>
</sequential>
@@ -304,7 +303,7 @@
<macrodef name="stop-server">
<sequential>
- <ant antfile="${beehive.home}/ant/${servlet.runtime}-imports.xml" target="stop" inheritAll="false"/>
+ <ant dir="${beehive.home}/ant" antfile="${servlet.runtime}-imports.xml" target="stop" inheritAll="false"/>
</sequential>
</macrodef>
Modified: beehive/trunk/user/beehive-imports.xml
URL: http://svn.apache.org/viewcvs/beehive/trunk/user/beehive-imports.xml?rev=290722&r1=290721&r2=290722&view=diff
==============================================================================
--- beehive/trunk/user/beehive-imports.xml (original)
+++ beehive/trunk/user/beehive-imports.xml Wed Sep 21 08:19:33 2005
@@ -36,22 +36,14 @@
</path>
<path id="velocity.dependency.path">
- <pathelement location="${this.dir}/lib/common/velocity-1.4.jar"/>
<pathelement location="${this.dir}/lib/common/velocity-dep-1.4.jar"/>
</path>
-<!--
- <path id="xbean.dependency.path">
- <pathelement location="${this.dir}/lib/common/apache-xbean.jar"/>
- <pathelement location="${this.dir}/lib/common/jsr173_1.0_api.jar"/>
- </path>
--->
-
<macrodef name="deploy-netui">
<attribute name="webappDir"/>
<sequential>
<echo>Deploy NetUI to webapp @{webappDir}</echo>
- <ant antfile="${this.dir}/ant/beehive-runtime.xml" target="deploy.beehive.webapp.runtime" inheritAll="false">
+ <ant dir="${this.dir}/ant" antfile="beehive-runtime.xml" target="deploy.beehive.webapp.runtime" inheritAll="false">
<property name="webapp.dir" location="@{webappDir}"/>
</ant>
</sequential>
@@ -61,7 +53,7 @@
<attribute name="webappDir"/>
<sequential>
<echo>Deploy WSM to webapp @{webappDir}</echo>
- <ant antfile="${this.dir}/ant/beehive-runtime.xml" target="deploy.wsm.webapp.runtime" inheritAll="false">
+ <ant dir="${this.dir}/ant" antfile="beehive-runtime.xml" target="deploy.wsm.webapp.runtime" inheritAll="false">
<property name="webapp.dir" location="@{webappDir}"/>
</ant>
</sequential>
@@ -71,7 +63,7 @@
<attribute name="destDir"/>
<sequential>
<echo>Deploy Controls runtime to destination directory @{destDir}</echo>
- <ant antfile="${this.dir}/ant/beehive-runtime.xml" target="deploy.beehive.controls.runtime" inheritAll="false">
+ <ant dir="${this.dir}/ant" antfile="beehive-runtime.xml" target="deploy.beehive.controls.runtime" inheritAll="false">
<property name="dest.dir" location="@{destDir}"/>
</ant>
</sequential>