jvanzyl 01/09/22 11:14:58
Modified: . build.properties build.xml
src/tdk build-classic.properties build-cvslayout.properties
build.properties build.xml
src/tdk/apps/2 build.properties build.xml
src/tdk/apps/3 build.properties build.xml
Log:
- namespacing the name of the project to be generated: ${tdk.project}
- everything to do with the project is now keyed off ${tdk.project} so
that we can use a profile to generate apps with different names.
Revision Changes Path
1.19 +1 -1 jakarta-turbine-tdk/build.properties
Index: build.properties
===================================================================
RCS file: /home/cvs/jakarta-turbine-tdk/build.properties,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- build.properties 2001/09/21 19:29:43 1.18
+++ build.properties 2001/09/22 18:14:58 1.19
@@ -13,7 +13,7 @@
tdk.ancillary3.dir = ${tdk.share.dir}/ancillary/3
tdk.site = ${tdk.dist}/webapps/site
tdk.profileDirectory = ./profile
-tdk.defaultProfile = t2-tc4-hsqldb.profile
+tdk.defaultProfile = t3-tc4-hsqldb.profile
# -------------------------------------------------------------------
# T U R B I N E P R O P E R T I E S
1.22 +5 -4 jakarta-turbine-tdk/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-tdk/build.xml,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- build.xml 2001/09/21 19:29:43 1.21
+++ build.xml 2001/09/22 18:14:58 1.22
@@ -38,6 +38,7 @@
specified profile. -->
<filter token="TURBINE_VERSION" value="${tdk.turbineVersion}"/>
+ <filter token="PROJECT" value="${tdk.project}"/>
<copy
todir="${tdk.share.dir}"
@@ -114,10 +115,10 @@
<antcall target="test-dist"/>
<ant dir="${tdk.home}"/>
- <ant dir="${tdk.home}/webapps/newapp/WEB-INF/build" target="init">
+ <ant dir="${tdk.home}/webapps/${tdk.project}/WEB-INF/build" target="init">
<property
name="build.properties"
- value="${tdk.home}/webapps/newapp/WEB-INF/build/build.properties"
+ value="${tdk.home}/webapps/${tdk.project}/WEB-INF/build/build.properties"
/>
</ant>
</target>
@@ -128,10 +129,10 @@
<antcall target="test-dist"/>
<ant dir="${tdk.home}" target="cvslayout"/>
- <ant dir="${tdk.home}/../newapp" target="init">
+ <ant dir="${tdk.home}/../${tdk.project}" target="init">
<property
name="build.properties"
- value="${tdk.home}/../newapp/build.properties"
+ value="${tdk.home}/../${tdk.project}/build.properties"
/>
</ant>
</target>
1.4 +6 -5 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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- build-classic.properties 2001/09/21 01:57:14 1.3
+++ build-classic.properties 2001/09/22 18:14:58 1.4
@@ -1,8 +1,9 @@
-app.home = webapps/${turbine.app}
+app.home = ${tdk.home}/webapps/${tdk.project}
app.conf = ${app.home}/WEB-INF/conf
-build.dest = @TDK_HOME@/webapps/${turbine.app}/WEB-INF/classes
-src.dir = @TDK_HOME@/webapps/${turbine.app}/WEB-INF/src
-conf.dir = @TDK_HOME@/webapps/${turbine.app}/WEB-INF/conf
+abs.conf.dir = ${tdk.home}/webapps/${tdk.project}/WEB-INF/conf
app.root = webContext
-abs.conf.dir = webapps/${turbine.app}/WEB-INF/conf
app.properties = /WEB-INF/conf/TurbineResources.properties
+
+build.dest = @TDK_HOME@/webapps/${tdk.project}/WEB-INF/classes
+src.dir = @TDK_HOME@/webapps/${tdk.project}/WEB-INF/src
+conf.dir = @TDK_HOME@/webapps/${tdk.project}/WEB-INF/conf
1.4 +7 -6 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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- build-cvslayout.properties 2001/09/21 19:29:43 1.3
+++ build-cvslayout.properties 2001/09/22 18:14:58 1.4
@@ -1,8 +1,9 @@
-app.home=${turbine.app.loc}/${turbine.app}
+app.home=${turbine.app.loc}/${tdk.project}
app.conf=${app.home}/src/conf
-build.dest = @TDK_HOME@/webapps/${turbine.app}/WEB-INF/classes
-src.dir=${turbine.app.loc}/${turbine.app}/src
-conf.dir=${turbine.app.loc}/${turbine.app}/src/conf
-app.root=${turbine.app.loc}/${turbine.app}
-abs.conf.dir=${turbine.app.loc}/${turbine.app}/src/conf
+abs.conf.dir=${turbine.app.loc}/${tdk.project}/src/conf
+app.root=${turbine.app.loc}/${tdk.project}
app.properties=/src/conf/TurbineResources.properties
+
+build.dest = @TDK_HOME@/webapps/${tdk.project}/WEB-INF/classes
+src.dir=${turbine.app.loc}/${tdk.project}/src
+conf.dir=${turbine.app.loc}/${tdk.project}/src/conf
1.9 +1 -1 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.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- build.properties 2001/09/22 00:56:48 1.8
+++ build.properties 2001/09/22 18:14:58 1.9
@@ -4,7 +4,7 @@
# -------------------------------------------------------------------------
tdk.turbineVersion = @TURBINE_VERSION@
-turbine.app = newapp
+tdk.project = @PROJECT@
target.package = org.mycompany.newapp
target.directory = org/mycompany/newapp
1.16 +26 -26 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.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- build.xml 2001/09/22 00:56:48 1.15
+++ build.xml 2001/09/22 18:14:58 1.16
@@ -47,8 +47,8 @@
<antcall target="deployment-descriptor"/>
<antcall target="turbine-resources"/>
<antcall target="message"/>
- <mkdir dir="webapps/${turbine.app}/WEB-INF/classes"/>
- <mkdir dir="webapps/${turbine.app}/WEB-INF/db"/>
+ <mkdir dir="webapps/${tdk.project}/WEB-INF/classes"/>
+ <mkdir dir="webapps/${tdk.project}/WEB-INF/db"/>
</target>
<target name="cvslayout-properties">
@@ -72,8 +72,8 @@
<antcall target="deployment-descriptor"/>
<antcall target="turbine-resources"/>
<antcall target="message"/>
- <mkdir dir="webapps/${turbine.app}/WEB-INF/db"/>
- <mkdir dir="webapps/${turbine.app}/WEB-INF/classes"/>
+ <mkdir dir="webapps/${tdk.project}/WEB-INF/db"/>
+ <mkdir dir="webapps/${tdk.project}/WEB-INF/classes"/>
</target>
<target name="adjust-for-classic">
@@ -84,35 +84,35 @@
<!-- Move build files into the WEB-INF/build directory -->
- <mkdir dir="webapps/${turbine.app}/WEB-INF/build"/>
+ <mkdir dir="webapps/${tdk.project}/WEB-INF/build"/>
<move
- file="webapps/${turbine.app}/build.properties"
- todir="webapps/${turbine.app}/WEB-INF/build"
+ file="webapps/${tdk.project}/build.properties"
+ todir="webapps/${tdk.project}/WEB-INF/build"
/>
<move
- file="webapps/${turbine.app}/build.xml"
- todir="webapps/${turbine.app}/WEB-INF/build"
+ file="webapps/${tdk.project}/build.xml"
+ todir="webapps/${tdk.project}/WEB-INF/build"
/>
<move
- file="webapps/${turbine.app}/GETTING_STARTED.txt"
- todir="webapps/${turbine.app}/WEB-INF/build"
+ file="webapps/${tdk.project}/GETTING_STARTED.txt"
+ todir="webapps/${tdk.project}/WEB-INF/build"
/>
<!-- Move src/conf into WEB-INF/conf -->
- <mkdir dir="webapps/${turbine.app}/WEB-INF/conf"/>
+ <mkdir dir="webapps/${tdk.project}/WEB-INF/conf"/>
- <move todir="webapps/${turbine.app}/WEB-INF/conf">
- <fileset dir="webapps/${turbine.app}/src/conf"/>
+ <move todir="webapps/${tdk.project}/WEB-INF/conf">
+ <fileset dir="webapps/${tdk.project}/src/conf"/>
</move>
<!-- Move src/java into WEB-INF/src/java -->
- <move todir="webapps/${turbine.app}/WEB-INF/src">
- <fileset dir="webapps/${turbine.app}/src"/>
+ <move todir="webapps/${tdk.project}/WEB-INF/src">
+ <fileset dir="webapps/${tdk.project}/src"/>
</move>
</target>
@@ -124,12 +124,12 @@
<move
file="${app.conf}/project-schema.xml"
- tofile="${app.conf}/${turbine.app}-schema.xml"
+ tofile="${app.conf}/${tdk.project}-schema.xml"
/>
<move
file="${app.conf}/project-intake.xml"
- tofile="${app.conf}/${turbine.app}-intake.xml"
+ tofile="${app.conf}/${tdk.project}-intake.xml"
/>
</target>
@@ -155,7 +155,7 @@
Detailed instructions on how to precede are outlined
outlined in the GETTING_STARTED.txt located in the
- webapps/${turbine.app}/WEB-INF/build directory
+ webapps/${tdk.project}/WEB-INF/build directory
</echo>
@@ -186,14 +186,14 @@
real app regularly used in conjunction with a turbine application. -->
<target name="libs">
- <copy todir="webapps/${turbine.app}/WEB-INF/lib">
+ <copy todir="webapps/${tdk.project}/WEB-INF/lib">
<fileset dir="${lib.dir}">
<exclude name="turbine*.jar"/>
<exclude name="flux*.jar"/>
</fileset>
</copy>
- <copy todir="webapps/${turbine.app}/WEB-INF/lib">
+ <copy todir="webapps/${tdk.project}/WEB-INF/lib">
<fileset dir="${lib.dir}">
<include name="turbine-${tdk.turbineVersion}*.jar"/>
<include name="flux-${tdk.turbineVersion}*.jar"/>
@@ -207,7 +207,7 @@
<target name="application-template">
- <filter token="PROJECT" value="${turbine.app}"/>
+ <filter token="PROJECT" value="${tdk.project}"/>
<filter token="TEMPLATE_PATH" value="${template.path}"/>
<filter token="OUTPUT_DIRECTORY" value="${output.directory}"/>
<filter token="SCHEMA_DIRECTORY" value="${schema.directory}"/>
@@ -281,13 +281,13 @@
<target name="deployment-descriptor">
- <filter token="PROJECT" value="${turbine.app}"/>
+ <filter token="PROJECT" value="${tdk.project}"/>
<filter token="APP_ROOT" value="${app.root}"/>
<filter token="APP_PROPERTIES" value="${app.properties}"/>
<copy
file="${ancillary.dir}/web.xml"
- tofile="webapps/${turbine.app}/WEB-INF/web.xml"
+ tofile="webapps/${tdk.project}/WEB-INF/web.xml"
filtering="yes"
/>
@@ -310,11 +310,11 @@
<property name="master.home"
value="${ancillary.dir}/${tdk.turbineVersion}/src/conf/master"/>
<property name="target.dir" value="${abs.conf.dir}"/>
<property name="turbine.log" value="/logs/turbine.log"/>
- <property name="database.name" value="${turbine.app}"/>
+ <property name="database.name" value="${tdk.project}"/>
<property name="module.packages"
value="${target.package}.modules,${flux.modules}"/>
<property name="include.file" value="include = Flux.properties"/>
<property name="template.path" value="/templates/app,/templates/flux"/>
- <property name="intake.descriptor"
value="WEB-INF/conf/${turbine.app}-intake.xml"/>
+ <property name="intake.descriptor"
value="WEB-INF/conf/${tdk.project}-intake.xml"/>
</ant>
</target>
</project>
1.10 +5 -3 jakarta-turbine-tdk/src/tdk/apps/2/build.properties
Index: build.properties
===================================================================
RCS file: /home/cvs/jakarta-turbine-tdk/src/tdk/apps/2/build.properties,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- build.properties 2001/09/21 16:32:54 1.9
+++ build.properties 2001/09/22 18:14:58 1.10
@@ -5,10 +5,12 @@
# -------------------------------------------------------------------
tdk.turbineVersion = 2
+tdk.project = @PROJECT@
+# This currently duplicated because the torque templates have
+# a dependency on $project.
project = @PROJECT@
-turbine.app = @PROJECT@
-app.root = ../@PROJECT@
-build.webappRoot = ${tdk.home}/webapps/${turbine.app}
+app.root = ../${tdk.project}
+build.webappRoot = ${tdk.home}/webapps/${tdk.project}
target.package = @TARGET_PACKAGE@
target.directory = @TARGET_DIRECTORY@
build.dest = ${build.webappRoot}/WEB-INF/classes
1.18 +12 -12 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.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- build.xml 2001/09/22 00:56:48 1.17
+++ build.xml 2001/09/22 18:14:58 1.18
@@ -14,7 +14,7 @@
<property name="build.properties" value="build.properties"/>
<path id="classpath">
- <fileset dir="${tdk.home}/webapps/${project}/WEB-INF/lib">
+ <fileset dir="${tdk.home}/webapps/${tdk.project}/WEB-INF/lib">
<include name="**/*.jar"/>
</fileset>
<fileset dir="${tdk.home}/common/lib">
@@ -146,7 +146,7 @@
outputFile="${script}"
targetPlatform="${platform}"
targetDatabase="${database}"
- databaseName="${project}"
+ databaseName="${tdk.project}"
databaseUser="${databaseUser}"
databasePassword="${databasePassword}"
databaseHost="${databaseHost}"
@@ -186,8 +186,8 @@
controlTemplate="${SQLControlTemplate}"
outputDirectory="${src.dir}/sql"
templatePath="${templatePath}"
- outputFile="report.${project}.sql.generation"
- xmlFile="${conf.dir}/${project}-schema.xml"
+ outputFile="report.${tdk.project}.sql.generation"
+ xmlFile="${conf.dir}/${tdk.project}-schema.xml"
targetDatabase="${database}"
/>
@@ -217,9 +217,9 @@
controlTemplate="${OMControlTemplate}"
outputDirectory="${src.dir}/java"
templatePath="${templatePath}"
- outputFile="report.${project}.om.generation"
+ outputFile="report.${tdk.project}.om.generation"
targetPackage="${targetPackage}"
- xmlFile="${conf.dir}/${project}-schema.xml"
+ xmlFile="${conf.dir}/${tdk.project}-schema.xml"
/>
<!--
@@ -340,8 +340,8 @@
controlTemplate="${idTableControlTemplate}"
templatePath="${templatePath}"
outputDirectory="${src.dir}/sql"
- outputFile="${project}-id-table-init.sql"
- xmlFile="${conf.dir}/${project}-schema.xml"
+ outputFile="${tdk.project}-id-table-init.sql"
+ xmlFile="${conf.dir}/${tdk.project}-schema.xml"
targetDatabase="${database}"
/>
@@ -369,7 +369,7 @@
templatePath="${templatePath}"
outputDirectory="${src.dir}/sql"
outputFile="turbine-security.sql"
- xmlFile="${conf.dir}/${project}-schema.xml"
+ xmlFile="${conf.dir}/${tdk.project}-schema.xml"
targetDatabase="${database}"
/>
@@ -410,11 +410,11 @@
description="--> insert project sql">
<antcall target="insert-sql-file">
- <param name="sqlFile" value="${src.dir}/sql/${project}-schema.sql"/>
+ <param name="sqlFile" value="${src.dir}/sql/${tdk.project}-schema.sql"/>
</antcall>
<antcall target="insert-sql-file">
- <param name="sqlFile" value="${src.dir}/sql/${project}-id-table-init.sql"/>
+ <param name="sqlFile"
value="${src.dir}/sql/${tdk.project}-id-table-init.sql"/>
</antcall>
</target>
@@ -471,7 +471,7 @@
<filter token="DATABASE_DEFAULT" value="default"/>
<property name="database.descriptor"
value="${master.conf.dir}/database/${database}"/>
- <property name="database.name" value="${project}"/>
+ <property name="database.name" value="${tdk.project}"/>
<property file="${database.descriptor}"/>
<filter token="DATABASE_ADAPTOR" value="${database.adaptor}"/>
1.8 +5 -3 jakarta-turbine-tdk/src/tdk/apps/3/build.properties
Index: build.properties
===================================================================
RCS file: /home/cvs/jakarta-turbine-tdk/src/tdk/apps/3/build.properties,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- build.properties 2001/09/21 16:32:55 1.7
+++ build.properties 2001/09/22 18:14:58 1.8
@@ -5,10 +5,12 @@
# -------------------------------------------------------------------
tdk.turbineVersion = 3
-project=@PROJECT@
-turbine.app = @PROJECT@
+tdk.project = @PROJECT@
+# This currently duplicated because the torque templates have
+# a dependency on $project.
+project = @PROJECT@
app.root = ../@PROJECT@
-build.webappRoot = ${tdk.home}/webapps/${turbine.app}
+build.webappRoot = ${tdk.home}/webapps/${tdk.project}
target.package = @TARGET_PACKAGE@
target.directory = @TARGET_DIRECTORY@
build.dest = ${build.webappRoot}/WEB-INF/classes
1.11 +12 -12 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.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- build.xml 2001/09/21 06:49:00 1.10
+++ build.xml 2001/09/22 18:14:58 1.11
@@ -15,7 +15,7 @@
<!-- Build classpath -->
<path id="classpath">
- <fileset dir="${tdk.home}/webapps/${project}/WEB-INF/lib">
+ <fileset dir="${tdk.home}/webapps/${tdk.project}/WEB-INF/lib">
<include name="**/*.jar"/>
</fileset>
<fileset dir="${tdk.home}/common/lib">
@@ -152,7 +152,7 @@
outputFile="${script}"
targetPlatform="${platform}"
targetDatabase="${database}"
- databaseName="${project}"
+ databaseName="${tdk.project}"
databaseUser="${databaseUser}"
databasePassword="${databasePassword}"
databaseHost="${databaseHost}"
@@ -190,8 +190,8 @@
controlTemplate="${SQLControlTemplate}"
outputDirectory="${src.dir}/sql"
useClasspath="true"
- outputFile="report.${project}.sql.generation"
- xmlFile="${conf.dir}/${project}-schema.xml"
+ outputFile="report.${tdk.project}.sql.generation"
+ xmlFile="${conf.dir}/${tdk.project}-schema.xml"
targetDatabase="${database}"
/>
@@ -219,9 +219,9 @@
controlTemplate="${OMControlTemplate}"
outputDirectory="${src.dir}/java"
useClasspath="true"
- outputFile="report.${project}.om.generation"
+ outputFile="report.${tdk.project}.om.generation"
targetPackage="${targetPackage}"
- xmlFile="${conf.dir}/${project}-schema.xml"
+ xmlFile="${conf.dir}/${tdk.project}-schema.xml"
/>
<!--
@@ -334,8 +334,8 @@
controlTemplate="${idTableControlTemplate}"
useClasspath="true"
outputDirectory="${src.dir}/sql"
- outputFile="${project}-id-table-init.sql"
- xmlFile="${conf.dir}/${project}-schema.xml"
+ outputFile="${tdk.project}-id-table-init.sql"
+ xmlFile="${conf.dir}/${tdk.project}-schema.xml"
targetDatabase="${database}"
/>
@@ -361,7 +361,7 @@
useClasspath="true"
outputDirectory="${src.dir}/sql"
outputFile="turbine-security.sql"
- xmlFile="${conf.dir}/${project}-schema.xml"
+ xmlFile="${conf.dir}/${tdk.project}-schema.xml"
targetDatabase="${database}"
/>
@@ -398,11 +398,11 @@
<target name="project-insert-sql" description="--> insert project sql">
<antcall target="insert-sql-file">
- <param name="sqlFile" value="${src.dir}/sql/${project}-schema.sql"/>
+ <param name="sqlFile" value="${src.dir}/sql/${tdk.project}-schema.sql"/>
</antcall>
<antcall target="insert-sql-file">
- <param name="sqlFile" value="${src.dir}/sql/${project}-id-table-init.sql"/>
+ <param name="sqlFile"
value="${src.dir}/sql/${tdk.project}-id-table-init.sql"/>
</antcall>
</target>
@@ -449,7 +449,7 @@
<filter token="DATABASE_DEFAULT" value="default"/>
<property name="database.descriptor"
value="${master.conf.dir}/database/${database}"/>
- <property name="database.name" value="${project}"/>
+ <property name="database.name" value="${tdk.project}"/>
<property file="${database.descriptor}"/>
<filter token="DATABASE_ADAPTOR" value="${database.adaptor}"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
