jvanzyl 01/09/13 10:19:20
Modified: src/tdk/apps/2 build.properties build.xml
Log:
- turbine 2 now fully works from a cvs layout. things that have to be fixed
- copy the flux templates, i just wrecked this.
- images need to be copied.
- problem with the flux tool referencing t3 code. might be a mistake
in copying the jar, but i will track it down.
but the upshot is that a cvs layout works, and now that both 2 and 3 apps
can work with the same TDK it will be relatively easy to migrate a 2 cvs
layout to a 3 cvs layout.
this will be tested today at zenplex and phoenix color so things will
be corrected throughout the day. when this is working i will do the
same for 3 apps.
Revision Changes Path
1.4 +14 -28 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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- build.properties 2001/09/12 14:58:16 1.3
+++ build.properties 2001/09/13 17:19:20 1.4
@@ -7,15 +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=../../../../tdk/ancillary/2/src/conf
-templatePath=../../../../tdk/ancillary/2/src/conf/torque/templates
+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
@@ -101,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.4 +55 -53 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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- build.xml 2001/09/12 14:23:11 1.3
+++ build.xml 2001/09/13 17:19:20 1.4
@@ -1,18 +1,7 @@
<?xml version="1.0"?>
-<!-- Build file for application -->
<project name="peer" default="compile" basedir=".">
- <!-- Build classpath -->
- <path id="classpath">
- <fileset dir="../lib">
- <include name="**/*.jar"/>
- </fileset>
- <fileset dir="../../../../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) -->
@@ -23,6 +12,16 @@
<property name="final.name" value="${project}-${version}"/>
<property name="final.dir" value="../${final.name}/"/>
+ <!-- Build classpath -->
+ <path id="classpath">
+ <fileset dir="${tdk.home}/webapps/${project}/WEB-INF/lib">
+ <include name="**/*.jar"/>
+ </fileset>
+ <fileset dir="${tdk.home}/common/lib">
+ <include name="**/servlet*.jar"/>
+ </fileset>
+ </path>
+
<!-- ================================================================ -->
<!-- I N I T T A S K T A R G E T -->
<!-- ================================================================ -->
@@ -31,7 +30,6 @@
<!-- ================================================================ -->
<target name="init-tasks">
-
<taskdef name="torque-sql"
classname="org.apache.turbine.torque.TorqueSQLTask">
<classpath refid="classpath"/>
@@ -61,7 +59,6 @@
classname="jstyle.FormatTask">
<classpath refid="classpath"/>
</taskdef>
-
</target>
<!-- ================================================================ -->
@@ -72,25 +69,27 @@
<!-- ================================================================ -->
<target name="init" description="--> generates the full application">
-
<antcall target="create-database"/>
-
<antcall target="turbine-sql"/>
<antcall target="turbine-id-table-sql"/>
<antcall target="turbine-id-table-init-sql"/>
<antcall target="turbine-security-sql"/>
<antcall target="turbine-insert-sql"/>
-
<antcall target="update-tr-props"/>
-
<antcall target="project"/>
-
- <!--
- <antcall target="compile-tests"/>
- -->
-
+ <!-- <antcall target="compile-tests"/> -->
</target>
+ <target name="setup" depends="compile">
+ <ant dir="${tdk.home}" target="setup">
+ <property file="build.properties"/>
+ </ant>
+ <copy todir="${webapp.root}/WEB-INF/lib">
+ <fileset dir="${lib.dir}">
+ <include name="**/*.jar"/>
+ </fileset>
+ </copy>
+ </target>
<!-- ================================================================ -->
<!-- P R O J E C T -->
@@ -100,13 +99,11 @@
<!-- ================================================================ -->
<target name="project" description="--> run when XML schema is changed">
-
<antcall target="project-sql"/>
<antcall target="project-id-table-init-sql"/>
<antcall target="project-insert-sql"/>
<antcall target="project-om"/>
<antcall target="compile"/>
-
</target>
<!-- ================================================================ -->
@@ -116,9 +113,11 @@
<!-- that is capable of performing the task. -->
<!-- ================================================================ -->
- <target name="create-database" depends="init-tasks,ext"
- unless="database.manual.creation"
- description="--> generates the target database">
+ <target
+ name="create-database"
+ depends="init-tasks,ext"
+ unless="database.manual.creation"
+ description="--> generates the target database">
<property name="script" value="create-database.${ext}"/>
@@ -126,7 +125,7 @@
<torque-create-db
controlTemplate="sql/db-init/Control.vm"
- outputDirectory="${outputDirectory}/sql"
+ outputDirectory="${src.dir}/sql"
templatePath="${templatePath}"
outputFile="${script}"
targetPlatform="${platform}"
@@ -137,9 +136,12 @@
databaseHost="${databaseHost}"
/>
- <chmod file="${outputDirectory}/sql/${script}" perm="+x"/>
- <exec executable="${fullPathOutputDirectory}/sql/${script}"
- failonerror="yes"/>
+ <chmod file="${src.dir}/sql/${script}" perm="+x"/>
+
+ <exec
+ executable="${src.dir}/sql/${script}"
+ failonerror="yes"
+ />
</target>
@@ -164,10 +166,10 @@
<torque-sql
contextProperties="${build.properties}"
controlTemplate="${SQLControlTemplate}"
- outputDirectory="${outputDirectory}/sql"
+ outputDirectory="${src.dir}/sql"
templatePath="${templatePath}"
outputFile="report.${project}.sql.generation"
- xmlFile="${schemaDirectory}/${project}-schema.xml"
+ xmlFile="${conf.dir}/${project}-schema.xml"
targetDatabase="${database}"
/>
@@ -193,11 +195,11 @@
<torque-om
contextProperties="${build.properties}"
controlTemplate="${OMControlTemplate}"
- outputDirectory="${outputDirectory}/java"
+ outputDirectory="${src.dir}/java"
templatePath="${templatePath}"
outputFile="report.${project}.om.generation"
targetPackage="${targetPackage}.om"
- xmlFile="${schemaDirectory}/${project}-schema.xml"
+ xmlFile="${conf.dir}/${project}-schema.xml"
/>
<!--
@@ -230,10 +232,10 @@
<torque-sql
controlTemplate="${SQLControlTemplate}"
- outputDirectory="${outputDirectory}/sql"
+ outputDirectory="${src.dir}/sql"
templatePath="${templatePath}"
outputFile="turbine-schema.sql"
- xmlFile="${schemaDirectory}/turbine-schema.xml"
+ xmlFile="${conf.dir}/turbine-schema.xml"
targetDatabase="${database}"
/>
@@ -258,10 +260,10 @@
<torque-sql
controlTemplate="${SQLControlTemplate}"
- outputDirectory="${outputDirectory}/sql"
+ outputDirectory="${src.dir}/sql"
templatePath="${templatePath}"
outputFile="id-table-schema.sql"
- xmlFile="${schemaDirectory}/id-table-schema.xml"
+ xmlFile="${conf.dir}/id-table-schema.xml"
targetDatabase="${database}"
/>
@@ -283,10 +285,10 @@
<torque-sql
contextProperties="sql/id-table/turbine.props"
controlTemplate="${idTableControlTemplate}"
- outputDirectory="${outputDirectory}/sql"
+ outputDirectory="${src.dir}/sql"
templatePath="${templatePath}"
outputFile="turbine-id-table-init.sql"
- xmlFile="${schemaDirectory}/turbine-schema.xml"
+ xmlFile="${conf.dir}/turbine-schema.xml"
targetDatabase="${database}"
/>
@@ -309,9 +311,9 @@
contextProperties="sql/id-table/project.props"
controlTemplate="${idTableControlTemplate}"
templatePath="${templatePath}"
- 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 +337,9 @@
contextProperties="sql/id-table/project.props"
controlTemplate="${securityControlTemplate}"
templatePath="${templatePath}"
- 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 +352,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 +376,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 +534,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]
