jvanzyl 01/06/08 11:40:12
Modified: conf TurbineResources.properties build.xml
conf/master TurbineResources.master meta.properties
conf/torque/schema project-schema.xml
Log:
- allow the default database to be configurable. right now the
TRP is hardcoded with database.default and i want this to
be configable so i can add something like
<database name="@PROJECT@">
in the xml database schema in the TDK so that it is
easy to add additional databases.
the standard TRP looks exactly the same but this will
help the TDK. this is the first step more steps will
have to be added to allow the generation of an app
that uses multiple dbs right from the start. this
will help a little for now.
Revision Changes Path
1.112 +1 -1 jakarta-turbine/conf/TurbineResources.properties
Index: TurbineResources.properties
===================================================================
RCS file: /home/cvs/jakarta-turbine/conf/TurbineResources.properties,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -r1.111 -r1.112
--- TurbineResources.properties 2001/05/30 22:47:47 1.111
+++ TurbineResources.properties 2001/06/08 18:40:08 1.112
@@ -1,5 +1,5 @@
# -------------------------------------------------------------------
-# $Id: TurbineResources.properties,v 1.111 2001/05/30 22:47:47 dlr Exp $
+# $Id: TurbineResources.properties,v 1.112 2001/06/08 18:40:08 jvanzyl Exp $
#
# This is the configuration file for Turbine.
#
1.2 +1 -0 jakarta-turbine/conf/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine/conf/build.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- build.xml 2001/05/10 17:08:07 1.1
+++ build.xml 2001/06/08 18:40:09 1.2
@@ -78,6 +78,7 @@
<filter token="DATABASE_USER" value="${database.user}"/>
<filter token="DATABASE_PASSWORD" value="${database.password}"/>
<filter token="DATABASE_NAME" value="${database.name}"/>
+ <filter token="DATABASE_DEFAULT" value="${database.default}"/>
</target>
1.77 +7 -7 jakarta-turbine/conf/master/TurbineResources.master
Index: TurbineResources.master
===================================================================
RCS file: /home/cvs/jakarta-turbine/conf/master/TurbineResources.master,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -r1.76 -r1.77
--- TurbineResources.master 2001/05/30 22:47:50 1.76
+++ TurbineResources.master 2001/06/08 18:40:10 1.77
@@ -1,5 +1,5 @@
# -------------------------------------------------------------------
-# $Id: TurbineResources.master,v 1.76 2001/05/30 22:47:50 dlr Exp $
+# $Id: TurbineResources.master,v 1.77 2001/06/08 18:40:10 jvanzyl Exp $
#
# This is the configuration file for Turbine.
#
@@ -167,22 +167,22 @@
# configure these properly.
# -------------------------------------------------------------------
-database.default.driver=@DATABASE_DRIVER@
-database.default.url=@DATABASE_URL@
-database.default.username=@DATABASE_USER@
-database.default.password=@DATABASE_PASSWORD@
+database.@[email protected]=@DATABASE_DRIVER@
+database.@[email protected]=@DATABASE_URL@
+database.@[email protected]=@DATABASE_USER@
+database.@[email protected]=@DATABASE_PASSWORD@
# The number of database connections to cache per ConnectionPool
# instance (specified per database).
-database.default.maxConnections=3
+database.@[email protected]=3
# The amount of time (in milliseconds) that database connections will be
# cached (specified per database).
#
# Default: one hour = 60 * 60 * 1000
-database.default.expiryTime=3600000
+database.@[email protected]=3600000
# The amount of time (in milliseconds) a connection request will have to wait
# before a time out occurs and an error is thrown.
1.13 +1 -0 jakarta-turbine/conf/master/meta.properties
Index: meta.properties
===================================================================
RCS file: /home/cvs/jakarta-turbine/conf/master/meta.properties,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- meta.properties 2001/03/26 16:48:03 1.12
+++ meta.properties 2001/06/08 18:40:10 1.13
@@ -3,6 +3,7 @@
database.name=Turbine
database.user=username
database.password=password
+database.default=default
#view.type=webmacro
view.type=velocity
1.13 +1 -2 jakarta-turbine/conf/torque/schema/project-schema.xml
Index: project-schema.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine/conf/torque/schema/project-schema.xml,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- project-schema.xml 2001/05/28 20:01:28 1.12
+++ project-schema.xml 2001/06/08 18:40:11 1.13
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="ISO-8859-1" standalone="no" ?>
-<!DOCTYPE app-data SYSTEM
- "http://jakarta.apache.org/turbine/dtd/database.dtd";>
+<!DOCTYPE app-data SYSTEM "http://jakarta.apache.org/turbine/dtd/database.dtd";>
<!-- ==================================================================== -->
<!-- -->
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
