jvanzyl 01/09/26 11:41:16
Modified: . build.properties build.xml
src/tdk/apps/2 build.xml
src/tdk/apps/2/src/conf project-schema.xml
src/tdk/apps/3 build.xml
src/tdk/apps/3/src/conf project-schema.xml
Log:
- creating a build for the tdk tools and task code. this jar will
be included in the tdk. it includes specialized ant tasks and
the tools for migration.
- changing the sample app so that it corresponds to a 'real' application.
using a multiple db setup so that tambora, and any other multiple db
app can work easily with the tdk.
Revision Changes Path
1.21 +13 -1 jakarta-turbine-tdk/build.properties
Index: build.properties
===================================================================
RCS file: /home/cvs/jakarta-turbine-tdk/build.properties,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- build.properties 2001/09/23 01:33:10 1.20
+++ build.properties 2001/09/26 18:41:16 1.21
@@ -13,8 +13,12 @@
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 = t2-tc4-hsqldb.profile
+tdk.defaultProfile = t2-tc4-mysql.profile
+tdk.build.dir = ./bin
+tdk.jar.name = tdk.jar
+
# -------------------------------------------------------------------
# T U R B I N E P R O P E R T I E S
# -------------------------------------------------------------------
@@ -98,6 +102,14 @@
xerces.jar = ${lib.repo}/xerces-1.3.0.jar
xmlrpc.jar = ${lib.repo}/xmlrpc.jar
xmlrpc-helma.jar = ${lib.repo}/xmlrpc-helma.jar
+
+# -------------------------------------------------------------------
+# J A R S F O R T D K T O O L S A N D T A S K S
+# -------------------------------------------------------------------
+
+bcel.jar = ${lib.repo}/BCEL.jar
+digester.jar = ${lib.repo}/commons-digester.jar
+oro.jar = ${lib.repo}/oro.jar
# -------------------------------------------------------------------
# A D D I T I O N A L J A R S
1.25 +43 -0 jakarta-turbine-tdk/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-tdk/build.xml,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- build.xml 2001/09/25 03:00:20 1.24
+++ build.xml 2001/09/26 18:41:16 1.25
@@ -93,6 +93,7 @@
<target name="clean">
<delete dir="${tdk.target.dir}"/>
+ <delete dir="${tdk.build.dir}"/>
</target>
<!-- =================================================================== -->
@@ -175,4 +176,46 @@
</target>
+ <target name="prepare">
+ <copy todir="${tdk.build.dir}/src">
+ <fileset dir="${tdk.src}/tool"/>
+ <fileset dir="${tdk.src}/task"/>
+ </copy>
+ </target>
+
+ <!-- Build classpath -->
+ <path id="classpath">
+ <pathelement location="${bcel.jar}"/>
+ <pathelement location="${digester.jar}"/>
+ <pathelement location="${oro.jar}"/>
+ <pathelement location="${velocity.jar}"/>
+ </path>
+
+ <target
+ name="compile"
+ depends="prepare">
+
+ <mkdir dir="${tdk.build.dir}/classes"/>
+
+ <javac
+ debug="${debug}"
+ deprecation="${deprecation}"
+ srcdir="${tdk.build.dir}/src"
+ excludes="**/package.html"
+ destdir="${tdk.build.dir}/classes"
+ optimize="${optimize}">
+ <classpath refid="classpath"/>
+ </javac>
+ </target>
+
+ <target
+ name="jar"
+ depends="compile">
+
+ <jar
+ jarfile="${tdk.build.dir}/${tdk.jar.name}"
+ basedir="${tdk.build.dir}/classes"
+ excludes="**/package.html"
+ />
+ </target>
</project>
1.23 +3 -1 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.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- build.xml 2001/09/24 18:44:15 1.22
+++ build.xml 2001/09/26 18:41:16 1.23
@@ -210,12 +210,12 @@
<torque-create-db
controlTemplate="sql/db-init/Control.vm"
+ xmlFile="${conf.dir}/${tdk.project}-schema.xml"
outputDirectory="${src.dir}/sql"
templatePath="${templatePath}"
outputFile="${script}"
targetPlatform="${platform}"
targetDatabase="${database}"
- databaseName="${tdk.project}"
databaseUser="${databaseUser}"
databasePassword="${databasePassword}"
databaseHost="${databaseHost}"
@@ -502,6 +502,8 @@
<target
name="insert-sql-file"
depends="setDatabaseUrl">
+
+ <echo message="Inserting SQL file ---------> ${sqlFile}"/>
<property name="sqlInsert.databaseUrl" value="${databaseUrl}"/>
<sql
1.2 +20 -14 jakarta-turbine-tdk/src/tdk/apps/2/src/conf/project-schema.xml
Index: project-schema.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-tdk/src/tdk/apps/2/src/conf/project-schema.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- project-schema.xml 2001/09/07 01:40:09 1.1
+++ project-schema.xml 2001/09/26 18:41:16 1.2
@@ -7,18 +7,24 @@
<!-- ==================================================================== -->
<app-data>
-
-<database>
-
- <table name="RDF" idMethod="idbroker">
- <column name="RDF_ID" required="true" primaryKey="true" type="INTEGER"/>
- <column name="TITLE" size="255" type="VARCHAR"/>
- <column name="BODY" size="255" type="VARCHAR"/>
- <column name="URL" size="255" type="VARCHAR"/>
- <column name="AUTHOR" size="255" type="VARCHAR"/>
- <column name="DEPT" size="255" type="VARCHAR"/>
- </table>
-
-</database>
-
+ <database name="@PROJECT@">
+ <table name="RDF" idMethod="idbroker">
+ <column name="RDF_ID" required="true" primaryKey="true" type="INTEGER"/>
+ <column name="TITLE" size="255" type="VARCHAR"/>
+ <column name="BODY" size="255" type="VARCHAR"/>
+ <column name="URL" size="255" type="VARCHAR"/>
+ <column name="AUTHOR" size="255" type="VARCHAR"/>
+ <column name="DEPT" size="255" type="VARCHAR"/>
+ </table>
+ </database>
+ <database name="@PROJECT@2">
+ <table name="RDF" idMethod="idbroker">
+ <column name="RDF_ID" required="true" primaryKey="true" type="INTEGER"/>
+ <column name="TITLE" size="255" type="VARCHAR"/>
+ <column name="BODY" size="255" type="VARCHAR"/>
+ <column name="URL" size="255" type="VARCHAR"/>
+ <column name="AUTHOR" size="255" type="VARCHAR"/>
+ <column name="DEPT" size="255" type="VARCHAR"/>
+ </table>
+ </database>
</app-data>
1.13 +6 -4 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.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- build.xml 2001/09/24 18:44:15 1.12
+++ build.xml 2001/09/26 18:41:16 1.13
@@ -137,9 +137,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}"/>
@@ -147,12 +149,12 @@
<torque-create-db
controlTemplate="sql/db-init/Control.vm"
+ xmlFile="${conf.dir}/${tdk.project}-schema.xml"
outputDirectory="${src.dir}/sql"
useClasspath="true"
outputFile="${script}"
targetPlatform="${platform}"
targetDatabase="${database}"
- databaseName="${tdk.project}"
databaseUser="${databaseUser}"
databasePassword="${databasePassword}"
databaseHost="${databaseHost}"
1.2 +20 -14 jakarta-turbine-tdk/src/tdk/apps/3/src/conf/project-schema.xml
Index: project-schema.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-tdk/src/tdk/apps/3/src/conf/project-schema.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- project-schema.xml 2001/09/07 01:40:07 1.1
+++ project-schema.xml 2001/09/26 18:41:16 1.2
@@ -7,18 +7,24 @@
<!-- ==================================================================== -->
<app-data>
-
-<database>
-
- <table name="RDF" idMethod="idbroker">
- <column name="RDF_ID" required="true" primaryKey="true" type="INTEGER"/>
- <column name="TITLE" size="255" type="VARCHAR"/>
- <column name="BODY" size="255" type="VARCHAR"/>
- <column name="URL" size="255" type="VARCHAR"/>
- <column name="AUTHOR" size="255" type="VARCHAR"/>
- <column name="DEPT" size="255" type="VARCHAR"/>
- </table>
-
-</database>
-
+ <database>
+ <table name="RDF" idMethod="idbroker">
+ <column name="RDF_ID" required="true" primaryKey="true" type="INTEGER"/>
+ <column name="TITLE" size="255" type="VARCHAR"/>
+ <column name="BODY" size="255" type="VARCHAR"/>
+ <column name="URL" size="255" type="VARCHAR"/>
+ <column name="AUTHOR" size="255" type="VARCHAR"/>
+ <column name="DEPT" size="255" type="VARCHAR"/>
+ </table>
+ </database>
+ <database>
+ <table name="RDF2" idMethod="idbroker">
+ <column name="RDF_ID" required="true" primaryKey="true" type="INTEGER"/>
+ <column name="TITLE" size="255" type="VARCHAR"/>
+ <column name="BODY" size="255" type="VARCHAR"/>
+ <column name="URL" size="255" type="VARCHAR"/>
+ <column name="AUTHOR" size="255" type="VARCHAR"/>
+ <column name="DEPT" size="255" type="VARCHAR"/>
+ </table>
+ </database>
</app-data>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
