jvanzyl 01/09/24 20:00:20
Modified: . build.xml
profile t2-tc4-hsqldb.profile t2-tc4-mysql.profile
t2-tc4-oracle.profile t2-tc4-postgresql.profile
t3-tc4-hsqldb.profile t3-tc4-mysql.profile
t3-tc4-oracle.profile
Log:
- adding test.databaseUrl to the profile to overcome some variable
substition problems. During the testing all the values from the
profile are thrown into the mix. many of these properties require
the value of
${tdk.home}
But the literal ${tdk.home} needs to end up in the generated project
properties file and Ant will expand the literal ${tdk.home} to the
actual value which is not what is required.
so the test.databaseUrl is used for testing everything with
the top-level build.xml file but it doesn't show up in any
of the generated project files. and the build.databaseUrl
value is correct has the literal ${tdk.home} value in it
so that a project wishing to regenerate the hsql database
can do so instead of the process trying to generate the database
in my ${tdk.home} :-)
sounds convoluted doesn't it. the problem arises because ant
expands ${variable} references during copies. oh well. but the
whole thing is actually working well so that i can test a profile
with the files that will be used by a project and still make the
project portable i.e. i could generate the app on my machine using
the test profile and than tgz up the app and give it to joe blow
and it will work on his machine. needs a little documentation ...
our documentation which art in heaven, hallowed be thy name.
thy documentation come. they will be documented on earth as it is
in documentation heaven. give us this day our daily documentation.
and forgive us our lack of documentation as we forgive who those who
document not for us. and lead us not into lack of documentation. but
deliver us from curious newbies. amen.
Revision Changes Path
1.24 +8 -0 jakarta-turbine-tdk/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-tdk/build.xml,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- build.xml 2001/09/23 01:33:10 1.23
+++ build.xml 2001/09/25 03:00:20 1.24
@@ -117,6 +117,10 @@
name="build.properties"
value="${tdk.home}/webapps/${tdk.project}/WEB-INF/build/build.properties"
/>
+ <property
+ name="build.databaseUrl"
+ value="${test.databaseUrl}"
+ />
</ant>
</target>
@@ -127,6 +131,10 @@
<property
name="build.properties"
value="${tdk.home}/../${tdk.project}/build.properties"
+ />
+ <property
+ name="build.databaseUrl"
+ value="${test.databaseUrl}"
/>
</ant>
</target>
1.6 +2 -2 jakarta-turbine-tdk/profile/t2-tc4-hsqldb.profile
Index: t2-tc4-hsqldb.profile
===================================================================
RCS file: /home/cvs/jakarta-turbine-tdk/profile/t2-tc4-hsqldb.profile,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- t2-tc4-hsqldb.profile 2001/09/23 01:33:10 1.5
+++ t2-tc4-hsqldb.profile 2001/09/25 03:00:20 1.6
@@ -5,12 +5,12 @@
tdk.profileName = t2-tc4-hsqldb
tdk.profileDescription = Turbine 2.x / Tomcat 4.0 / HsqlDb
tdk.turbineVersion = 2
-#tdk.project = ${tdk.profileName}
tdk.project = newapp
tdk.servletContainer = tomcat4
database = hypersonic
databaseUrl = jdbc:hsqldb:${webappRoot}/WEB-INF/db/${tdk.project}
-build.databaseUrl =
jdbc:hsqldb:${tdk.home}/webapps/${tdk.project}/WEB-INF/db/${tdk.project}
+build.databaseUrl =
jdbc:hsqldb:@TDK_HOME@/webapps/${tdk.project}/WEB-INF/db/${tdk.project}
+test.databaseUrl =
jdbc:hsqldb:${tdk.home}/webapps/${tdk.project}/WEB-INF/db/${tdk.project}
databaseDriver = org.hsqldb.jdbcDriver
databaseUser = sa
databasePassword =
1.6 +1 -0 jakarta-turbine-tdk/profile/t2-tc4-mysql.profile
Index: t2-tc4-mysql.profile
===================================================================
RCS file: /home/cvs/jakarta-turbine-tdk/profile/t2-tc4-mysql.profile,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- t2-tc4-mysql.profile 2001/09/22 18:13:27 1.5
+++ t2-tc4-mysql.profile 2001/09/25 03:00:20 1.6
@@ -10,6 +10,7 @@
database = mysql
databaseUrl = jdbc:mysql://127.0.0.1/${tdk.project}
build.databaseUrl = jdbc:mysql://127.0.0.1/${tdk.project}
+test.databaseUrl = jdbc:mysql://127.0.0.1/${tdk.project}
databaseDriver = org.gjt.mm.mysql.Driver
databaseUser = turbine
databasePassword = turbine
1.4 +1 -0 jakarta-turbine-tdk/profile/t2-tc4-oracle.profile
Index: t2-tc4-oracle.profile
===================================================================
RCS file: /home/cvs/jakarta-turbine-tdk/profile/t2-tc4-oracle.profile,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- t2-tc4-oracle.profile 2001/09/22 18:13:49 1.3
+++ t2-tc4-oracle.profile 2001/09/25 03:00:20 1.4
@@ -10,6 +10,7 @@
database = oracle
databaseUrl = jdbc:oracle:thin:@127.0.0.1:1521:${tdk.project}
build.databaseUrl = jdbc:oracle:thin:@127.0.0.1:1521:${tdk.project}
+test.databaseUrl = jdbc:oracle:thin:@127.0.0.1:1521:${tdk.project}
databaseDriver = oracle.jdbc.driver.OracleDriver
databaseUser = turbine
databasePassword = turbine
1.6 +1 -0 jakarta-turbine-tdk/profile/t2-tc4-postgresql.profile
Index: t2-tc4-postgresql.profile
===================================================================
RCS file: /home/cvs/jakarta-turbine-tdk/profile/t2-tc4-postgresql.profile,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- t2-tc4-postgresql.profile 2001/09/22 18:13:49 1.5
+++ t2-tc4-postgresql.profile 2001/09/25 03:00:20 1.6
@@ -10,6 +10,7 @@
database = postgresql
databaseUrl = jdbc:postgresql://localhost:5432/${tdk.project}
build.databaseUrl = jdbc:postgresql://localhost:5432/${tdk.project}
+test.databaseUrl = jdbc:postgresql://localhost:5432/${tdk.project}
databaseDriver = org.postgresql.Driver
databaseUser = turbine
databasePassword = turbine
1.5 +2 -1 jakarta-turbine-tdk/profile/t3-tc4-hsqldb.profile
Index: t3-tc4-hsqldb.profile
===================================================================
RCS file: /home/cvs/jakarta-turbine-tdk/profile/t3-tc4-hsqldb.profile,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- t3-tc4-hsqldb.profile 2001/09/22 18:13:49 1.4
+++ t3-tc4-hsqldb.profile 2001/09/25 03:00:20 1.5
@@ -9,7 +9,8 @@
tdk.servletContainer = tomcat4
database = hypersonic
databaseUrl = jdbc:hsqldb:${webappRoot}/WEB-INF/db/${tdk.project}
-build.databaseUrl =
jdbc:hsqldb:${tdk.home}/webapps/${tdk.project}/WEB-INF/db/${tdk.project}
+build.databaseUrl =
jdbc:hsqldb:@TDK_HOME@/webapps/${tdk.project}/WEB-INF/db/${tdk.project}
+test.databaseUrl =
jdbc:hsqldb:${tdk.home}/webapps/${tdk.project}/WEB-INF/db/${tdk.project}
databaseDriver = org.hsqldb.jdbcDriver
databaseUser = sa
databasePassword =
1.4 +1 -0 jakarta-turbine-tdk/profile/t3-tc4-mysql.profile
Index: t3-tc4-mysql.profile
===================================================================
RCS file: /home/cvs/jakarta-turbine-tdk/profile/t3-tc4-mysql.profile,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- t3-tc4-mysql.profile 2001/09/22 18:13:49 1.3
+++ t3-tc4-mysql.profile 2001/09/25 03:00:20 1.4
@@ -10,6 +10,7 @@
database = mysql
databaseUrl = jdbc:mysql://127.0.0.1/${tdk.project}
build.databaseUrl = jdbc:mysql://127.0.0.1/${tdk.project}
+test.databaseUrl = jdbc:mysql://127.0.0.1/${tdk.project}
databaseDriver = org.gjt.mm.mysql.Driver
databaseUser = turbine
databasePassword = turbine
1.4 +1 -0 jakarta-turbine-tdk/profile/t3-tc4-oracle.profile
Index: t3-tc4-oracle.profile
===================================================================
RCS file: /home/cvs/jakarta-turbine-tdk/profile/t3-tc4-oracle.profile,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- t3-tc4-oracle.profile 2001/09/22 18:13:49 1.3
+++ t3-tc4-oracle.profile 2001/09/25 03:00:20 1.4
@@ -10,6 +10,7 @@
database = oracle
databaseUrl = jdbc:oracle:thin:@127.0.0.1:1521:${tdk.project}
build.databaseUrl = jdbc:oracle:thin:@127.0.0.1:1521:${tdk.project}
+test.databaseUrl = jdbc:oracle:thin:@127.0.0.1:1521:${tdk.project}
databaseDriver = oracle.jdbc.driver.OracleDriver
databaseUser = turbine
databasePassword = turbine
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
