[prev in list] [next in list] [prev in thread] [next in thread]
List: turbine-tdk-dev
Subject: cvs commit: jakarta-turbine-tdk/src/tdk/apps/3/src/conf project-schema.xml
From: jvanzyl () apache ! org
Date: 2001-09-27 6:18:00
[Download RAW message or body]
jvanzyl 01/09/26 23:18:00
Modified: . build-libs.xml build.properties build.xml
src/tdk/apps/3 build.xml
src/tdk/apps/3/src/conf project-schema.xml
Log:
- making sure everything is in. attempting to get the 3.x app
uptodate with the changes made on the 2.x side.
Revision Changes Path
1.5 +8 -0 jakarta-turbine-tdk/build-libs.xml
Index: build-libs.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-tdk/build-libs.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- build-libs.xml 2001/09/19 14:55:24 1.4
+++ build-libs.xml 2001/09/27 06:17:59 1.5
@@ -52,6 +52,14 @@
<copy file="${postgresql.jar}" todir="${tdk.share.dir}/lib"/>
<copy file="${sapdbc.jar}" todir="${tdk.share.dir}/lib"/>
+ <!-- JAR files for additional tasks and tools -->
+
+ <copy file="${bcel.jar}" todir="${tdk.share.dir}/lib"/>
+ <copy file="${digester.jar}" todir="${tdk.share.dir}/lib"/>
+ <copy file="${oro.jar}" todir="${tdk.share.dir}/lib"/>
+ <copy file="${digester.jar}" todir="${tdk.share.dir}/lib"/>
+ <copy file="${tdk.jar}" todir="${tdk.share.dir}/lib"/>
+
<copy todir="${tdk.share.dir}/lib">
<fileset dir="${lib.repo}">
<include name="turbine*.jar"/>
1.22 +1 -1 jakarta-turbine-tdk/build.properties
Index: build.properties
===================================================================
RCS file: /home/cvs/jakarta-turbine-tdk/build.properties,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- build.properties 2001/09/26 18:41:16 1.21
+++ build.properties 2001/09/27 06:17:59 1.22
@@ -17,7 +17,7 @@
tdk.defaultProfile = t2-tc4-mysql.profile
tdk.build.dir = ./bin
-tdk.jar.name = tdk.jar
+tdk.jar = ${tdk.build.dir}/tdk.jar
# -------------------------------------------------------------------
# T U R B I N E P R O P E R T I E S
1.26 +10 -3 jakarta-turbine-tdk/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-tdk/build.xml,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- build.xml 2001/09/26 18:41:16 1.25
+++ build.xml 2001/09/27 06:17:59 1.26
@@ -11,7 +11,9 @@
<!-- E N V I R O N M E N T -->
<!-- ================================================================== -->
- <target name="env">
+ <target
+ name="env">
+
<echo message="build.compiler = ${build.compiler}"/>
<echo message="java.class.path = ${java.class.path}"/>
<echo message="java.home = ${java.home}"/>
@@ -26,7 +28,11 @@
<!-- an attempt to keep the size down while testing. -->
<!-- =================================================================== -->
- <target name="test-dist" description="--> generates the TDK without docs">
+ <target
+ name="test-dist"
+ depends="jar"
+ description="--> generates the TDK without docs">
+
<delete dir="${tdk.target.dir}"/>
<mkdir dir="${tdk.root.dir}"/>
@@ -70,6 +76,7 @@
name="production-dist"
depends="docs,test-dist"
description="--> generates the full TDK distribution">
+
<ant antfile="build-${tdk.servletContainer}.xml" target="production-dist"/>
</target>
@@ -213,7 +220,7 @@
depends="compile">
<jar
- jarfile="${tdk.build.dir}/${tdk.jar.name}"
+ jarfile="${tdk.jar}"
basedir="${tdk.build.dir}/classes"
excludes="**/package.html"
/>
1.14 +2 -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.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- build.xml 2001/09/26 18:41:16 1.13
+++ build.xml 2001/09/27 06:17:59 1.14
@@ -332,11 +332,11 @@
<echo message="+------------------------------------------+"/>
<torque-sql
- contextProperties="sql/id-table/project.props"
+ contextProperties="sql/id-table/project.props,${build.properties}"
controlTemplate="${idTableControlTemplate}"
useClasspath="true"
outputDirectory="${src.dir}/sql"
- outputFile="${tdk.project}-id-table-init.sql"
+ outputFile="report.${tdk.project}.id-table-init.sql.generation"
xmlFile="${conf.dir}/${tdk.project}-schema.xml"
targetDatabase="${database}"
/>
1.3 +5 -3 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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- project-schema.xml 2001/09/26 18:41:16 1.2
+++ project-schema.xml 2001/09/27 06:17:59 1.3
@@ -7,7 +7,7 @@
<!-- ==================================================================== -->
<app-data>
- <database>
+ <database name="RDF">
<table name="RDF" idMethod="idbroker">
<column name="RDF_ID" required="true" primaryKey="true" type="INTEGER"/>
<column name="TITLE" size="255" type="VARCHAR"/>
@@ -17,8 +17,9 @@
<column name="DEPT" size="255" type="VARCHAR"/>
</table>
</database>
- <database>
- <table name="RDF2" idMethod="idbroker">
+ <!--
+ <database name="RDF2">
+ <table 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"/>
@@ -27,4 +28,5 @@
<column name="DEPT" size="255" type="VARCHAR"/>
</table>
</database>
+ -->
</app-data>
---------------------------------------------------------------------
To unsubscribe, e-mail: turbine-tdk-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: turbine-tdk-dev-help@jakarta.apache.org
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic