[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/2 build.properties build.xml
From: jvanzyl () apache ! org
Date: 2002-03-14 0:43:38
[Download RAW message or body]
jvanzyl 02/03/13 16:43:38
Modified: . build.xml default.properties
src/tdk build.properties build.xml
src/tdk/apps/2 build.properties build.xml
Log:
Cleaning up the t2 portions of the TDK in prep for the 2.2b1 release.
Revision Changes Path
1.34 +14 -1 jakarta-turbine-tdk/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-tdk/build.xml,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- build.xml 14 Feb 2002 20:01:33 -0000 1.33
+++ build.xml 14 Mar 2002 00:43:38 -0000 1.34
@@ -6,7 +6,8 @@
<property file="${user.home}/build.properties" />
<property file="build.properties" />
<property file="default.properties" />
- <property file="${tdk.profileDirectory}/${tdk.defaultProfile}"/>
+ <property file="${tdk.testProfile}"/>
+ <property file="src/database/${database}"/>
<!-- ================================================================== -->
<!-- U P D A T E J A R S -->
@@ -80,6 +81,10 @@
<filter token="TURBINE_VERSION" value="${tdk.turbineVersion}"/>
<filter token="PROJECT" value="${tdk.project}"/>
+ <filter token="DATABASE" value="${database}"/>
+ <filter token="DATABASE_USER" value="${databaseUser}"/>
+ <filter token="DATABASE_PASSWORD" value="${databasePassword}"/>
+ <filter token="DATABASE_HOST" value="${databaseHost}"/>
<copy
todir="${tdk.share.dir}"
@@ -154,6 +159,14 @@
<!-- =================================================================== -->
<target name="test">
+
+ <echo>
+ database = ${database}
+ createDatabaseUrl = ${createDatabaseUrl}
+ buildDatabaseUrl = ${buildDatabaseUrl}
+ databaseUrl = ${databaseUrl}
+ </echo>
+
<antcall target="test-dist"/>
<ant dir="${tdk.home}"/>
<ant dir="${tdk.home}/webapps/${tdk.project}/WEB-INF/build" target="init">
1.7 +7 -12 jakarta-turbine-tdk/default.properties
Index: default.properties
===================================================================
RCS file: /home/cvs/jakarta-turbine-tdk/default.properties,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- default.properties 1 Mar 2002 19:49:47 -0000 1.6
+++ default.properties 14 Mar 2002 00:43:38 -0000 1.7
@@ -2,11 +2,11 @@
# T D K P R O P E R T I E S
# -------------------------------------------------------------------
-tdk.src = ./src/tdk
-tdk.containerSrc = ./src/container
-tdk.xdocs = ./xdocs
-tdk.docs = ./docs
-tdk.target.dir = ./target
+tdk.src = ${basedir}/src/tdk
+tdk.containerSrc = ${basedir}/src/container
+tdk.xdocs = ${basedir}/xdocs
+tdk.docs = ${basedir}/docs
+tdk.target.dir = ${basedir}/target
tdk.root.dir = ${tdk.target.dir}/tdk
tdk.share.dir = ${tdk.root.dir}/tdk
tdk.app2.template.dir = ${tdk.share.dir}/apps/2
@@ -15,12 +15,7 @@
tdk.ancillary3.dir = ${tdk.share.dir}/ancillary/3
tdk.ancillarytorque.dir = ${tdk.share.dir}/ancillary/torque
tdk.site = ${tdk.dist}/webapps/site
-tdk.profileDirectory = ./profile
-#tdk.defaultProfile = t2-tc3-hsqldb.profile
-tdk.defaultProfile = t2-tc4-mysql.profile
-#tdk.defaultProfile = t2-tc4-postgresql.profile
-
-tdk.build.dir = ./bin
+tdk.build.dir = ${basedir}/bin
tdk.jar = ${tdk.build.dir}/tdk.jar
# -------------------------------------------------------------------
@@ -71,7 +66,7 @@
commons-collections.jar = ${lib.repo}/commons-collections.jar
commons-email.jar = ${lib.repo}/commons-email-0.1-dev.jar
commons-lang.jar = ${lib.repo}/commons-lang-0.1-dev.jar
-commons-util.jar = ${lib.repo}/commons-util-0.1-dev.jar
+commons-util.jar = ${lib.repo}/commons-util-1.0-rc2-dev.jar
dom4j.jar = ${lib.repo}/dom4j-1.1.jar
ecs.jar = ${lib.repo}/ecs-1.4.1.jar
flux2.jar = ${lib.repo}/flux-2.1.jar
1.12 +0 -9 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.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- build.properties 16 Feb 2002 17:16:10 -0000 1.11
+++ build.properties 14 Mar 2002 00:43:38 -0000 1.12
@@ -7,12 +7,3 @@
tdk.project = @PROJECT@
target.package = org.mycompany.newapp
target.directory = org/mycompany/newapp
-
-# database settings
-# db2400 | db2app | db2net | hypersonic | instantdb | mssql | mysql | oracle |
-# postgresql | sapdb | sybase | weblogic
-
-target.database = mysql
-databaseUser = user
-databasePassword = password
-databaseHost = localhost
1.26 +3 -2 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.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- build.xml 16 Feb 2002 17:16:10 -0000 1.25
+++ build.xml 14 Mar 2002 00:43:38 -0000 1.26
@@ -241,8 +241,9 @@
<filter token="DATABASE" value="${target.database}"/>
<filter token="DATABASE_DRIVER" value="${database.driver}"/>
- <filter token="DATABASE_URL" value="${database.url}"/>
- <filter token="DATABASE_BUILD_URL" value="${database.url}"/>
+ <filter token="DATABASE_URL" value="${databaseUrl}"/>
+ <filter token="DATABASE_CREATE_URL" value="${createDatabaseUrl}"/>
+ <filter token="DATABASE_BUILD_URL" value="${buildDatabaseUrl}"/>
<filter token="DATABASE_USER" value="${databaseUser}"/>
<filter token="DATABASE_PASSWORD" value="${databasePassword}"/>
<filter token="DATABASE_HOST" value="${databaseHost}"/>
1.15 +2 -1 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.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- build.properties 22 Feb 2002 02:11:31 -0000 1.14
+++ build.properties 14 Mar 2002 00:43:38 -0000 1.15
@@ -37,8 +37,9 @@
database.name = @PROJECT@
database = @DATABASE@
+createDatabaseUrl = @DATABASE_CREATE_URL@
+buildDatabaseUrl = @DATABASE_BUILD_URL@
databaseUrl = @DATABASE_URL@
-createDatabaseUrl = @DATABASE_BUILD_URL@
databaseDriver = @DATABASE_DRIVER@
databaseUser = @DATABASE_USER@
databasePassword = @DATABASE_PASSWORD@
1.33 +1 -66 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.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- build.xml 16 Feb 2002 17:16:10 -0000 1.32
+++ build.xml 14 Mar 2002 00:43:38 -0000 1.33
@@ -173,14 +173,10 @@
<target
name="create-database"
- depends="init-tasks,ext"
+ depends="init-tasks"
unless="database.manual.creation"
description="--> generates the target database">
- <property name="script" value="create-database.${ext}"/>
-
- <echo message="${script}"/>
-
<ant
antfile="${torque.buildFile}"
target="project-create-db-classpath">
@@ -474,67 +470,6 @@
<delete dir="${build.dest}"/>
<mkdir dir="${build.dest}"/>
- </target>
-
- <!-- =================================================================== -->
- <!-- E X T E N S I O N F I N D E R -->
- <!-- =================================================================== -->
- <!-- Alleviate the user from having to type in the extension of scripts -->
- <!-- for their target platform. Ant can do it just peachy. -->
- <!-- =================================================================== -->
-
- <target
- name="ext"
- depends="set-os,windows-ext">
- <echo message="Platform = ${platform}"/>
- <echo message="Extension = ${ext}"/>
- </target>
- <target
- name="set-os">
- <property name="is${os.name}" value="true"/>
- </target>
- <target
- name="windows-ext"
- depends="unix-ext"
- unless="ext">
- <property name="platform" value="windows"/>
- <property name="ext" value="bat"/>
- </target>
- <target
- name="unix-ext"
- depends="set-unix"
- if="is.Unix">
- <property name="platform" value="unix"/>
- <property name="ext" value="sh"/>
- </target>
- <target
- name="set-unix"
- depends="set-windows98"
- unless="is.Windows">
- <property name="is.Unix" value="true" />
- </target>
- <target
- name="set-windows98"
- depends="set-windowsNT"
- if="isWindows 98">
- <property name="is.Windows" value="true" />
- </target>
- <target
- name="set-windowsNT"
- depends="set-windows2000"
- if="isWindows NT">
- <property name="is.Windows" value="true" />
- </target>
- <target
- name="set-windows2000"
- depends="set-windowsME"
- if="isWindows 2000">
- <property name="is.Windows" value="true" />
- </target>
- <target
- name="set-windowsME"
- if="isWindows Me">
- <property name="is.Windows" value="true" />
</target>
</project>
--
To unsubscribe, e-mail: <mailto:turbine-tdk-dev-unsubscribe@jakarta.apache.org>
For additional commands, e-mail: <mailto: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