jvanzyl 01/09/17 11:45:07
Modified: src/tdk build-classic.properties build-cvslayout.properties
build.properties build.xml
src/tdk/apps/2 build.xml
src/tdk/apps/3 build.xml
Log:
- fix the ordering of the loading of properties files,
${user.home}/build.properties before ${project}/build.properties
- remove Fulcrum.properties references from the 2.x build
Revision Changes Path
1.2 +0 -1 jakarta-turbine-tdk/src/tdk/build-classic.properties
Index: build-classic.properties
===================================================================
RCS file: /home/cvs/jakarta-turbine-tdk/src/tdk/build-classic.properties,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- build-classic.properties 2001/09/16 18:17:56 1.1
+++ build-classic.properties 2001/09/17 18:45:07 1.2
@@ -1,4 +1,3 @@
-tdk.home=../../../../../tdk
app.home=webapps/${turbine.app}
app.conf=${app.home}/WEB-INF/conf
build.dest=../classes
1.2 +3 -4 jakarta-turbine-tdk/src/tdk/build-cvslayout.properties
Index: build-cvslayout.properties
===================================================================
RCS file: /home/cvs/jakarta-turbine-tdk/src/tdk/build-cvslayout.properties,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- build-cvslayout.properties 2001/09/16 18:17:56 1.1
+++ build-cvslayout.properties 2001/09/17 18:45:07 1.2
@@ -1,9 +1,8 @@
-tdk.home=../tdk
-app.home=../${turbine.app}
+app.home=${turbine.app.loc}/${turbine.app}
app.conf=${app.home}/src/conf
build.dest=
src.dir=./src
conf.dir=./src/conf
-app.root=../${turbine.app}
-abs.conf.dir=../${turbine.app}/src/conf
+app.root=${turbine.app.loc}/${turbine.app}
+abs.conf.dir=${turbine.app.loc}/${turbine.app}/src/conf
app.properties=/src/conf/TurbineResources.properties
1.5 +9 -0 jakarta-turbine-tdk/src/tdk/build.properties
Index: build.properties
===================================================================
RCS file: /home/cvs/jakarta-turbine-tdk/src/tdk/build.properties,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- build.properties 2001/09/15 01:17:43 1.4
+++ build.properties 2001/09/17 18:45:07 1.5
@@ -9,6 +9,15 @@
target.directory = org/mycompany/newapp
# -------------------------------------------------------------------------
+# If you move the tdk location, define an absolute path here.
+# If you want to change where the generated applications are placed, use
+# and absolute path here.
+# -------------------------------------------------------------------------
+
+tdk.home = ${user.home}/tdk
+turbine.app.loc = ${tdk.home}/..
+
+# -------------------------------------------------------------------------
# As a user of the TDK you do not need to edit these.
# This is for external turbine app integration.
# -------------------------------------------------------------------------
1.9 +1 -1 jakarta-turbine-tdk/src/tdk/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-tdk/src/tdk/build.xml,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- build.xml 2001/09/15 15:42:26 1.8
+++ build.xml 2001/09/17 18:45:07 1.9
@@ -4,8 +4,8 @@
<project name="TDK" default="application" basedir=".">
- <property file="build.properties"/>
<property file="${user.home}/build.properties"/>
+ <property file="build.properties"/>
<!-- =================================================================== -->
<!-- P R O P E R T I E S -->
1.8 +1 -16 jakarta-turbine-tdk/src/tdk/apps/2/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-tdk/src/tdk/apps/2/build.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- build.xml 2001/09/17 05:18:55 1.7
+++ build.xml 2001/09/17 18:45:07 1.8
@@ -2,12 +2,8 @@
<project name="peer" default="compile" basedir=".">
- <!-- Give user a chance to override without editing this file
- (and without typing -D each time it compiles it) -->
-
- <property file="build.properties"/>
<property file="${user.home}/build.properties"/>
- <property name="build.properties" value="build.properties"/>
+ <property file="build.properties"/>
<path id="classpath">
<fileset dir="${tdk.home}/webapps/${project}/WEB-INF/lib">
@@ -421,17 +417,6 @@
<move
file="${conf.dir}/tmp"
tofile="${conf.dir}/TurbineResources.properties"
- />
-
- <copy
- file="${conf.dir}/Fulcrum.properties"
- tofile="${conf.dir}/tmp"
- filtering="yes"
- />
-
- <move
- file="${conf.dir}/tmp"
- tofile="${conf.dir}/Fulcrum.properties"
/>
</target>
1.5 +1 -2 jakarta-turbine-tdk/src/tdk/apps/3/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-tdk/src/tdk/apps/3/build.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- build.xml 2001/09/17 05:18:55 1.4
+++ build.xml 2001/09/17 18:45:07 1.5
@@ -2,9 +2,8 @@
<project name="peer" default="compile" basedir=".">
- <property file="build.properties"/>
<property file="${user.home}/build.properties"/>
- <property name="build.properties" value="build.properties"/>
+ <property file="build.properties"/>
<!-- Build classpath -->
<path id="classpath">
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
