jvanzyl 01/09/15 09:12:21
Modified: src/tdk/apps/3 build.properties build.xml
Log:
- aligning the 3.x build with the 2.x build for cvslayout mode.
Revision Changes Path
1.2 +14 -27 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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- build.properties 2001/09/07 01:40:06 1.1
+++ build.properties 2001/09/15 16:12:21 1.2
@@ -7,14 +7,22 @@
# in this file will override properties set anywhere else.
# -------------------------------------------------------------------
-project=newapp
+turbine.version=@TURBINE_VERSION@
+tdk.home=@TDK_HOME@
+project=@PROJECT@
+turbine.app = @PROJECT@
+app.root = ../@PROJECT@
+webapp.root = ${tdk.home}/webapps/${turbine.app}
+target.package = @TARGET_PACKAGE@
+target.directory = @TARGET_DIRECTORY@
+classes = ${webapp.root}/WEB-INF/classes
+build.dest = ${webapp.root}/WEB-INF/classes
version=0.1
-build.dest=../classes
-src.dir=../src/java
-test.src.dir=../src/test
-conf.dir=../conf
-master.conf.dir=@MASTER_CONF_DIR@
+src.dir=@SRC_DIR@
+conf.dir=@CONF_DIR@
+master.conf.dir=${tdk.home}/tdk/ancillary/${turbine.version}/src/conf
+templatePath=${master.conf.dir}/torque/templates
debug=on
optimize=off
deprecation=on
@@ -100,24 +108,3 @@
OMControlTemplate = om/Control.vm
idTableControlTemplate = sql/id-table/Control.vm
securityControlTemplate = sql/security/Control.vm
-
-# -------------------------------------------------------------------
-#
-# O U T P U T D I R E C T O R Y
-#
-# -------------------------------------------------------------------
-# The two properties are identical but they are like this for
-# a reason. They are for testing the TDK, the reason they
-# are duplicated is due to a bug in Ant with the <exec> task.
-# -------------------------------------------------------------------
-
-outputDirectory = ../src
-fullPathOutputDirectory = ../src
-
-# -------------------------------------------------------------------
-#
-# S C H E M A D I R E C T O R Y
-#
-# -------------------------------------------------------------------
-
-schemaDirectory = ../conf
1.2 +35 -39 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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- build.xml 2001/09/07 01:40:07 1.1
+++ build.xml 2001/09/15 16:12:21 1.2
@@ -1,28 +1,21 @@
<?xml version="1.0"?>
-<!-- Build file for application -->
<project name="peer" default="compile" basedir=".">
+ <property file="build.properties"/>
+ <property file="${user.home}/build.properties"/>
+ <property name="build.properties" value="build.properties"/>
+
<!-- Build classpath -->
<path id="classpath">
- <fileset dir="../lib">
+ <fileset dir="${tdk.home}/webapps/${project}/WEB-INF/lib">
<include name="**/*.jar"/>
</fileset>
- <fileset dir="../../../../common/lib">
+ <fileset dir="${tdk.home}/common/lib">
<include name="**/servlet*.jar"/>
</fileset>
</path>
- <!-- 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 name="final.name" value="${project}-${version}"/>
- <property name="final.dir" value="../${final.name}/"/>
-
<!-- ================================================================ -->
<!-- I N I T T A S K T A R G E T -->
<!-- ================================================================ -->
@@ -126,7 +119,7 @@
<torque-create-db
controlTemplate="sql/db-init/Control.vm"
- outputDirectory="${outputDirectory}/sql"
+ outputDirectory="${src.dir}/sql"
useClasspath="true"
outputFile="${script}"
targetPlatform="${platform}"
@@ -136,10 +129,13 @@
databasePassword="${databasePassword}"
databaseHost="${databaseHost}"
/>
+
+ <chmod file="${src.dir}/sql/${script}" perm="+x"/>
- <chmod file="${outputDirectory}/sql/${script}" perm="+x"/>
- <exec executable="${fullPathOutputDirectory}/sql/${script}"
- failonerror="yes"/>
+ <exec
+ executable="${src.dir}/sql/${script}"
+ failonerror="yes"
+ />
</target>
@@ -164,10 +160,10 @@
<torque-sql
contextProperties="${build.properties}"
controlTemplate="${SQLControlTemplate}"
- outputDirectory="${outputDirectory}/sql"
+ outputDirectory="${src.dir}/sql"
useClasspath="true"
outputFile="report.${project}.sql.generation"
- xmlFile="${schemaDirectory}/${project}-schema.xml"
+ xmlFile="${conf.dir}/${project}-schema.xml"
targetDatabase="${database}"
/>
@@ -193,11 +189,11 @@
<torque-om
contextProperties="${build.properties}"
controlTemplate="${OMControlTemplate}"
- outputDirectory="${outputDirectory}/java"
+ outputDirectory="${src.dir}/java"
useClasspath="true"
outputFile="report.${project}.om.generation"
targetPackage="${targetPackage}.om"
- xmlFile="${schemaDirectory}/${project}-schema.xml"
+ xmlFile="${conf.dir}/${project}-schema.xml"
/>
<!--
@@ -230,10 +226,10 @@
<torque-sql
controlTemplate="${SQLControlTemplate}"
- outputDirectory="${outputDirectory}/sql"
+ outputDirectory="${src.dir}/sql"
useClasspath="true"
outputFile="turbine-schema.sql"
- xmlFile="${schemaDirectory}/turbine-schema.xml"
+ xmlFile="${conf.dir}/turbine-schema.xml"
targetDatabase="${database}"
/>
@@ -258,10 +254,10 @@
<torque-sql
controlTemplate="${SQLControlTemplate}"
- outputDirectory="${outputDirectory}/sql"
+ outputDirectory="${src.dir}/sql"
useClasspath="true"
outputFile="id-table-schema.sql"
- xmlFile="${schemaDirectory}/id-table-schema.xml"
+ xmlFile="${conf.dir}/id-table-schema.xml"
targetDatabase="${database}"
/>
@@ -283,10 +279,10 @@
<torque-sql
contextProperties="sql/id-table/turbine.props"
controlTemplate="${idTableControlTemplate}"
- outputDirectory="${outputDirectory}/sql"
+ outputDirectory="${src.dir}/sql"
useClasspath="true"
outputFile="turbine-id-table-init.sql"
- xmlFile="${schemaDirectory}/turbine-schema.xml"
+ xmlFile="${conf.dir}/turbine-schema.xml"
targetDatabase="${database}"
/>
@@ -309,9 +305,9 @@
contextProperties="sql/id-table/project.props"
controlTemplate="${idTableControlTemplate}"
useClasspath="true"
- outputDirectory="${outputDirectory}/sql"
+ outputDirectory="${src.dir}/sql"
outputFile="${project}-id-table-init.sql"
- xmlFile="${schemaDirectory}/${project}-schema.xml"
+ xmlFile="${conf.dir}/${project}-schema.xml"
targetDatabase="${database}"
/>
@@ -335,9 +331,9 @@
contextProperties="sql/id-table/project.props"
controlTemplate="${securityControlTemplate}"
useClasspath="true"
- outputDirectory="${outputDirectory}/sql"
+ outputDirectory="${src.dir}/sql"
outputFile="turbine-security.sql"
- xmlFile="${schemaDirectory}/${project}-schema.xml"
+ xmlFile="${conf.dir}/${project}-schema.xml"
targetDatabase="${database}"
/>
@@ -350,19 +346,19 @@
<target name="turbine-insert-sql" description="--> insert turbine sql">
<antcall target="insert-sql-file">
- <param name="sqlFile" value="${outputDirectory}/sql/turbine-schema.sql"/>
+ <param name="sqlFile" value="${src.dir}/sql/turbine-schema.sql"/>
</antcall>
<antcall target="insert-sql-file">
- <param name="sqlFile" value="${outputDirectory}/sql/turbine-security.sql"/>
+ <param name="sqlFile" value="${src.dir}/sql/turbine-security.sql"/>
</antcall>
<antcall target="insert-sql-file">
- <param name="sqlFile" value="${outputDirectory}/sql/id-table-schema.sql"/>
+ <param name="sqlFile" value="${src.dir}/sql/id-table-schema.sql"/>
</antcall>
<antcall target="insert-sql-file">
- <param name="sqlFile"
value="${outputDirectory}/sql/turbine-id-table-init.sql"/>
+ <param name="sqlFile" value="${src.dir}/sql/turbine-id-table-init.sql"/>
</antcall>
</target>
@@ -374,11 +370,11 @@
<target name="project-insert-sql" description="--> insert project sql">
<antcall target="insert-sql-file">
- <param name="sqlFile" value="${outputDirectory}/sql/${project}-schema.sql"/>
+ <param name="sqlFile" value="${src.dir}/sql/${project}-schema.sql"/>
</antcall>
<antcall target="insert-sql-file">
- <param name="sqlFile"
value="${outputDirectory}/sql/${project}-id-table-init.sql"/>
+ <param name="sqlFile" value="${src.dir}/sql/${project}-id-table-init.sql"/>
</antcall>
</target>
@@ -532,8 +528,8 @@
<target name="sql2xml">
<sql-xml
- inputFile="${schemaDirectory}/schema.sql"
- outputFile="${schemaDirectory}/schema.xml"
+ inputFile="${conf.dir}/schema.sql"
+ outputFile="${conf.dir}/schema.xml"
/>
</target>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
