jvanzyl 01/09/21 09:32:55
Modified: . build.properties build.xml
src/tdk build.xml
src/tdk/apps/2 build.properties build.xml
src/tdk/apps/3 build.properties
Log:
- database properties are now obeyed in the profile
i've tested the flipping between hsqldb and mysql and everything
is looking good.
kurt: do you think you could pop in an oracle profile?
jeff: do you think you could pop in a sybase profile?
Revision Changes Path
1.17 +1 -1 jakarta-turbine-tdk/build.properties
Index: build.properties
===================================================================
RCS file: /home/cvs/jakarta-turbine-tdk/build.properties,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- build.properties 2001/09/21 14:13:13 1.16
+++ build.properties 2001/09/21 16:32:54 1.17
@@ -13,7 +13,7 @@
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 = t3-tc4-hsqldb.profile
# -------------------------------------------------------------------
# T U R B I N E P R O P E R T I E S
1.20 +3 -4 jakarta-turbine-tdk/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-tdk/build.xml,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- build.xml 2001/09/21 14:13:13 1.19
+++ build.xml 2001/09/21 16:32:54 1.20
@@ -109,16 +109,15 @@
<!-- =================================================================== -->
<target name="test">
+
+ <echo message="${database}"/>
+
<antcall target="test-dist"/>
<ant dir="${tdk.home}"/>
<ant dir="${tdk.home}/webapps/newapp/WEB-INF/build" target="init">
<property
name="build.properties"
value="${tdk.home}/webapps/newapp/WEB-INF/build/build.properties"
- />
- <property
- name="build.webappRoot"
- value="${tdk.home}/webapps/newapp"
/>
</ant>
</target>
1.14 +8 -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.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- build.xml 2001/09/21 06:49:00 1.13
+++ build.xml 2001/09/21 16:32:54 1.14
@@ -203,7 +203,6 @@
<target name="application-template">
<filter token="PROJECT" value="${turbine.app}"/>
- <filter token="DATABASE" value="${database}"/>
<filter token="TEMPLATE_PATH" value="${template.path}"/>
<filter token="OUTPUT_DIRECTORY" value="${output.directory}"/>
<filter token="SCHEMA_DIRECTORY" value="${schema.directory}"/>
@@ -215,7 +214,14 @@
<filter token="CONF_DIR" value="${conf.dir}"/>
<filter token="TURBINE_VERSION" value="${tdk.turbineVersion}"/>
- <echo message="${app.home}"/>
+ <filter token="DATABASE" value="${database}"/>
+ <filter token="DATABASE_DRIVER" value="${databaseDriver}"/>
+ <filter token="DATABASE_URL" value="${databaseUrl}"/>
+ <filter token="DATABASE_BUILD_URL" value="${build.databaseUrl}"/>
+ <filter token="DATABASE_USER" value="${databaseUser}"/>
+ <filter token="DATABASE_PASSWORD" value="${databasePassword}"/>
+ <filter token="DATABASE_HOST" value="${databaseHost}"/>
+ <filter token="DATABASE_DEFAULT" value="default"/>
<copy todir="${app.home}" filtering="yes">
<fileset dir="${app.src}">
1.9 +7 -7 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.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- build.properties 2001/09/21 06:49:00 1.8
+++ build.properties 2001/09/21 16:32:54 1.9
@@ -27,13 +27,13 @@
#
# -------------------------------------------------------------------
-database=hypersonic
-databaseUrl = jdbc:hsqldb:${webappRoot}/WEB-INF/db/@PROJECT@
-build.databaseUrl = jdbc:hsqldb:${build.webappRoot}/WEB-INF/db/@PROJECT@
-databaseDriver = org.hsqldb.jdbcDriver
-databaseUser = sa
-databasePassword =
-databaseHost = 127.0.0.1
+database = @DATABASE@
+databaseUrl = @DATABASE_URL@
+build.databaseUrl = @DATABASE_BUILD_URL@
+databaseDriver = @DATABASE_DRIVER@
+databaseUser = @DATABASE_USER@
+databasePassword = @DATABASE_PASSWORD@
+databaseHost = @DATABASE_HOST@
# -------------------------------------------------------------------
#
1.16 +3 -0 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.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- build.xml 2001/09/21 06:49:00 1.15
+++ build.xml 2001/09/21 16:32:54 1.16
@@ -430,10 +430,13 @@
<target name="update-tr-props">
+ <filter token="DATABASE" value="${database}"/>
<filter token="DATABASE_DRIVER" value="${databaseDriver}"/>
<filter token="DATABASE_URL" value="${databaseUrl}"/>
+ <filter token="DATABASE_BUILD_URL" value="${build.databaseUrl}"/>
<filter token="DATABASE_USER" value="${databaseUser}"/>
<filter token="DATABASE_PASSWORD" value="${databasePassword}"/>
+ <filter token="DATABASE_HOST" value="${databaseHost}"/>
<filter token="DATABASE_DEFAULT" value="default"/>
<property name="database.descriptor"
value="${master.conf.dir}/database/${database}"/>
1.7 +7 -7 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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- build.properties 2001/09/21 06:49:00 1.6
+++ build.properties 2001/09/21 16:32:55 1.7
@@ -27,13 +27,13 @@
#
# -------------------------------------------------------------------
-database=hypersonic
-databaseUrl = jdbc:hsqldb:${webappRoot}/WEB-INF/db/@PROJECT@
-build.databaseUrl = jdbc:hsqldb:${build.webappRoot}/WEB-INF/db/@PROJECT@
-databaseDriver = org.hsqldb.jdbcDriver
-databaseUser = sa
-databasePassword =
-databaseHost = 127.0.0.1
+database = @DATABASE@
+databaseUrl = @DATABASE_URL@
+build.databaseUrl = @DATABASE_BUILD_URL@
+databaseDriver = @DATABASE_DRIVER@
+databaseUser = @DATABASE_USER@
+databasePassword = @DATABASE_PASSWORD@
+databaseHost = @DATABASE_HOST@
# -------------------------------------------------------------------
#
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
