Author: ekoneil
Date: Wed Mar 16 13:25:43 2005
New Revision: 157807
URL: http://svn.apache.org/viewcvs?view=rev&rev=157807
Log:
Move the "contextPath" Ant property from the build files into the .properties
file.
Also changed the name to context.path so that the property names are consistent.
This makes it easier to take the netui-blank webapp template, change the
context path, and start building a new app.
BB: self
DRT: none
Test: build the distribution, build the petstoreWeb
Added:
incubator/beehive/trunk/samples/petstoreWeb/WEB-INF/src/build-dist.properties
- copied, changed from r157762,
incubator/beehive/trunk/samples/petstoreWeb/WEB-INF/src/build.properties
Removed:
incubator/beehive/trunk/samples/petstoreWeb/WEB-INF/src/build.properties
Modified:
incubator/beehive/trunk/distribution.xml
incubator/beehive/trunk/samples/petstoreWeb/WEB-INF/src/build-dist.xml
incubator/beehive/trunk/user/netui-blank/build.properties
incubator/beehive/trunk/user/netui-blank/build.xml
Modified: incubator/beehive/trunk/distribution.xml
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/distribution.xml?view=diff&r1=157806&r2=157807
==============================================================================
--- incubator/beehive/trunk/distribution.xml (original)
+++ incubator/beehive/trunk/distribution.xml Wed Mar 16 13:25:43 2005
@@ -347,12 +347,18 @@
<fileset dir="samples/petstoreWeb">
<exclude name="WEB-INF/src/build.xml"/>
<exclude name="WEB-INF/src/build-dist.xml"/>
+ <exclude name="WEB-INF/src/build-dist.properties.xml"/>
<exclude name="WEB-INF/lib/*.jar"/>
</fileset>
</copy>
+ <!-- rename build-dist.xml to build.xml -->
<copy tofile="${dist.dir}/samples/petstoreWeb/WEB-INF/src/build.xml"
file="${beehive.home}/samples/petstoreWeb/WEB-INF/src/build-dist.xml"
failOnError="true"/>
+
+ <!-- rename build-dist.properties to build.properties -->
+ <copy
tofile="${dist.dir}/samples/petstoreWeb/WEB-INF/src/build.properties"
+
file="${beehive.home}/samples/petstoreWeb/WEB-INF/src/build-dist.properties"
failOnError="true"/>
<!-- Build the controls blank template app distro -->
<copy todir="${dist.dir}/samples/controls-blank" failOnError="true">
Copied:
incubator/beehive/trunk/samples/petstoreWeb/WEB-INF/src/build-dist.properties
(from r157762,
incubator/beehive/trunk/samples/petstoreWeb/WEB-INF/src/build.properties)
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/petstoreWeb/WEB-INF/src/build-dist.properties?view=diff&rev=157807&p1=incubator/beehive/trunk/samples/petstoreWeb/WEB-INF/src/build.properties&r1=157762&p2=incubator/beehive/trunk/samples/petstoreWeb/WEB-INF/src/build-dist.properties&r2=157807
==============================================================================
--- incubator/beehive/trunk/samples/petstoreWeb/WEB-INF/src/build.properties
(original)
+++
incubator/beehive/trunk/samples/petstoreWeb/WEB-INF/src/build-dist.properties
Wed Mar 16 13:25:43 2005
@@ -4,4 +4,6 @@
beehive.home=../../../..
servlet-api.jar=${os.CATALINA_HOME}/common/lib/servlet-api.jar
-jsp-api.jar=${os.CATALINA_HOME}/common/lib/jsp-api.jar
\ No newline at end of file
+jsp-api.jar=${os.CATALINA_HOME}/common/lib/jsp-api.jar
+
+context.path=petstoreWeb
\ No newline at end of file
Modified: incubator/beehive/trunk/samples/petstoreWeb/WEB-INF/src/build-dist.xml
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/petstoreWeb/WEB-INF/src/build-dist.xml?view=diff&r1=157806&r2=157807
==============================================================================
--- incubator/beehive/trunk/samples/petstoreWeb/WEB-INF/src/build-dist.xml
(original)
+++ incubator/beehive/trunk/samples/petstoreWeb/WEB-INF/src/build-dist.xml Wed
Mar 16 13:25:43 2005
@@ -29,7 +29,6 @@
<import file="${beehive.home}/ant/beehive-tools.xml"/>
<property name="webapp.dir" location="${basedir}"/>
- <property name="contextPath" value="petstoreWeb"/>
<property name="tmp.sourcegen.dir" value=".tmpbeansrc"/>
<property name="tmp.jpfgen.dir" value=".pageflow-struts-generated"/>
@@ -95,7 +94,7 @@
<property name="archive.dir" value="${webapp.dir}/.."/>
<!-- this does *not* exclude source from the archive -->
- <war destfile="${archive.dir}/${contextPath}.war"
webxml="${webapp.dir}/WEB-INF/web.xml">
+ <war destfile="${archive.dir}/${context.path}.war"
webxml="${webapp.dir}/WEB-INF/web.xml">
<fileset dir="${webapp.dir}">
<exclude name="WEB-INF/src/**"/>
</fileset>
Modified: incubator/beehive/trunk/user/netui-blank/build.properties
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/user/netui-blank/build.properties?view=diff&r1=157806&r2=157807
==============================================================================
--- incubator/beehive/trunk/user/netui-blank/build.properties (original)
+++ incubator/beehive/trunk/user/netui-blank/build.properties Wed Mar 16
13:25:43 2005
@@ -4,4 +4,6 @@
beehive.home=../../../..
servlet-api.jar=${os.CATALINA_HOME}/common/lib/servlet-api.jar
-jsp-api.jar=${os.CATALINA_HOME}/common/lib/jsp-api.jar
\ No newline at end of file
+jsp-api.jar=${os.CATALINA_HOME}/common/lib/jsp-api.jar
+
+context.path=netui-blank
\ No newline at end of file
Modified: incubator/beehive/trunk/user/netui-blank/build.xml
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/user/netui-blank/build.xml?view=diff&r1=157806&r2=157807
==============================================================================
--- incubator/beehive/trunk/user/netui-blank/build.xml (original)
+++ incubator/beehive/trunk/user/netui-blank/build.xml Wed Mar 16 13:25:43 2005
@@ -29,7 +29,6 @@
<import file="${beehive.home}/ant/beehive-tools.xml"/>
<property name="webapp.dir" location="${basedir}"/>
- <property name="contextPath" value="netui-blank"/>
<property name="tmp.sourcegen.dir" value=".tmpbeansrc"/>
<property name="tmp.jpfgen.dir" value=".pageflow-struts-generated"/>
@@ -95,7 +94,7 @@
<property name="archive.dir" value="${webapp.dir}/.."/>
<!-- this does *not* exclude source from the archive -->
- <war destfile="${archive.dir}/${contextPath}.war"
webxml="${webapp.dir}/WEB-INF/web.xml">
+ <war destfile="${archive.dir}/${context.path}.war"
webxml="${webapp.dir}/WEB-INF/web.xml">
<fileset dir="${webapp.dir}">
<exclude name="WEB-INF/src/**"/>
</fileset>
