jvanzyl 01/09/19 09:37:14
Modified: . build-turbine2.xml build-turbine3.xml
build.properties build.xml
Log:
- starting to prefix all the tdk properties with "tdk" to give them
their own namespace so they don't clash with other properties that
may have been set in ${user.home}/build.properties. ${servlet.container}
for example could potentially be used by tomcat or who knows what else.
just trying to keep things of the tdk isolated.
Revision Changes Path
1.4 +6 -6 jakarta-turbine-tdk/build-turbine2.xml
Index: build-turbine2.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-tdk/build-turbine2.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- build-turbine2.xml 2001/09/19 14:55:24 1.3
+++ build-turbine2.xml 2001/09/19 16:37:14 1.4
@@ -16,29 +16,29 @@
+----------------------------------------------------------------+
</echo>
- <copy todir="${ancillary2.dir}/src/conf">
+ <copy todir="${tdk.ancillary2.dir}/src/conf">
<fileset dir="${turbine2.home}/conf"/>
</copy>
<copy
- todir="${app2.template.dir}/src/conf"
+ todir="${tdk.app2.template.dir}/src/conf"
file="${turbine2.home}/conf/master/turbine-schema.xml"
/>
<copy
- todir="${app2.template.dir}/src/conf"
+ todir="${tdk.app2.template.dir}/src/conf"
file="${torque.home}/src/schema/id-table-schema.xml"
/>
- <copy todir="${ancillary2.dir}/src/conf/database">
+ <copy todir="${tdk.ancillary2.dir}/src/conf/database">
<fileset dir="${torque.home}/src/conf/database"/>
</copy>
- <copy todir="${app2.template.dir}/src/conf">
+ <copy todir="${tdk.app2.template.dir}/src/conf">
<fileset dir="${flux2.home}/conf"/>
</copy>
- <copy todir="${app2.template.dir}/templates/flux">
+ <copy todir="${tdk.app2.template.dir}/templates/flux">
<fileset dir="${flux2.home}/src/templates"/>
</copy>
</target>
1.4 +7 -7 jakarta-turbine-tdk/build-turbine3.xml
Index: build-turbine3.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-tdk/build-turbine3.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- build-turbine3.xml 2001/09/19 14:55:24 1.3
+++ build-turbine3.xml 2001/09/19 16:37:14 1.4
@@ -16,34 +16,34 @@
+----------------------------------------------------------------+
</echo>
- <copy todir="${ancillary3.dir}/src/conf">
+ <copy todir="${tdk.ancillary3.dir}/src/conf">
<fileset dir="${turbine3.home}/conf"/>
</copy>
<copy
- todir="${app3.template.dir}/src/conf"
+ todir="${tdk.app3.template.dir}/src/conf"
file="${fulcrum.home}/turbine-schema.xml"
/>
<copy
- todir="${app3.template.dir}/src/conf"
+ todir="${tdk.app3.template.dir}/src/conf"
file="${fulcrum.home}/scheduler-schema.xml"
/>
<copy
- todir="${app3.template.dir}/src/conf"
+ todir="${tdk.app3.template.dir}/src/conf"
file="${torque.home}/src/schema/id-table-schema.xml"
/>
- <copy todir="${ancillary3.dir}/src/conf/database">
+ <copy todir="${tdk.ancillary3.dir}/src/conf/database">
<fileset dir="${torque.home}/src/conf/database"/>
</copy>
- <copy todir="${app3.template.dir}/src/conf">
+ <copy todir="${tdk.app3.template.dir}/src/conf">
<fileset dir="${flux3.home}/conf"/>
</copy>
- <copy todir="${app3.template.dir}/templates/flux">
+ <copy todir="${tdk.app3.template.dir}/templates/flux">
<fileset dir="${flux3.home}/src/templates"/>
</copy>
</target>
1.11 +5 -5 jakarta-turbine-tdk/build.properties
Index: build.properties
===================================================================
RCS file: /home/cvs/jakarta-turbine-tdk/build.properties,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- build.properties 2001/09/19 15:16:38 1.10
+++ build.properties 2001/09/19 16:37:14 1.11
@@ -7,12 +7,12 @@
tdk.target.dir = ./target
tdk.root.dir = ${tdk.target.dir}/tdk
tdk.share.dir = ${tdk.root.dir}/tdk
-app2.template.dir = ${tdk.share.dir}/apps/2
-app3.template.dir = ${tdk.share.dir}/apps/3
-ancillary2.dir = ${tdk.share.dir}/ancillary/2
-ancillary3.dir = ${tdk.share.dir}/ancillary/3
+tdk.app2.template.dir = ${tdk.share.dir}/apps/2
+tdk.app3.template.dir = ${tdk.share.dir}/apps/3
+tdk.ancillary2.dir = ${tdk.share.dir}/ancillary/2
+tdk.ancillary3.dir = ${tdk.share.dir}/ancillary/3
tdk.site = ${tdk.dist}/webapps/site
-servlet.container = tomcat4
+tdk.servlet.container = tomcat4
# -------------------------------------------------------------------
# T U R B I N E P R O P E R T I E S
1.14 +2 -2 jakarta-turbine-tdk/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-tdk/build.xml,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- build.xml 2001/09/19 15:16:38 1.13
+++ build.xml 2001/09/19 16:37:14 1.14
@@ -38,7 +38,7 @@
<move file="${tdk.share.dir}/build.xml" todir="${tdk.root.dir}"/>
<move file="${tdk.share.dir}/GETTING_STARTED.txt" todir="${tdk.root.dir}"/>
- <ant antfile="build-${servlet.container}.xml"/>
+ <ant antfile="build-${tdk.servlet.container}.xml"/>
<ant antfile="build-libs.xml"/>
<ant antfile="build-turbine2.xml"/>
<ant antfile="build-turbine3.xml"/>
@@ -54,7 +54,7 @@
name="production-dist"
depends="docs,test-dist"
description="--> generates the full TDK distribution">
- <ant antfile="build-${servlet.container}.xml" target="production-dist"/>
+ <ant antfile="build-${tdk.servlet.container}.xml" target="production-dist"/>
</target>
<!-- =================================================================== -->
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
