stephenh 2002/09/27 17:44:45
Modified: src/conf/master build.xml default.properties
Log:
Moved to the torque.xxx properties per suggested by Scott Eade
<[EMAIL PROTECTED]>.
Revision Changes Path
1.3 +7 -7 jakarta-turbine-torque/src/conf/master/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-torque/src/conf/master/build.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- build.xml 11 Sep 2002 13:53:26 -0000 1.2
+++ build.xml 28 Sep 2002 00:44:45 -0000 1.3
@@ -37,13 +37,13 @@
<target name="configure">
- <filter token="DATABASE_DRIVER" value="${database.driver}"/>
- <filter token="DATABASE_URL" value="${database.url}"/>
- <filter token="DATABASE_ADAPTOR" value="${database.adaptor}"/>
- <filter token="DATABASE_USER" value="${database.user}"/>
- <filter token="DATABASE_PASSWORD" value="${database.password}"/>
- <filter token="DATABASE_DEFAULT" value="${database.name}"/>
- <filter token="PROJECT" value="${project}"/>
+ <filter token="DATABASE_DRIVER" value="${torque.database.driver}"/>
+ <filter token="DATABASE_URL" value="${torque.database.url}"/>
+ <filter token="DATABASE_ADAPTOR" value="${torque.database.adaptor}"/>
+ <filter token="DATABASE_USER" value="${torque.database.user}"/>
+ <filter token="DATABASE_PASSWORD" value="${torque.database.password}"/>
+ <filter token="DATABASE_DEFAULT" value="${torque.database.name}"/>
+ <filter token="PROJECT" value="${torque.project}"/>
<filter token="APPLICATION_ROOT" value="${application.root}"/>
</target>
1.4 +6 -6 jakarta-turbine-torque/src/conf/master/default.properties
Index: default.properties
===================================================================
RCS file: /home/cvs/jakarta-turbine-torque/src/conf/master/default.properties,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- default.properties 11 Sep 2002 13:53:26 -0000 1.3
+++ default.properties 28 Sep 2002 00:44:45 -0000 1.4
@@ -1,8 +1,8 @@
application.root = .
-database.name = bookstore
-database.type = mysql
-database.user = user
-database.password = password
-database.driver = org.gjt.mm.mysql.Driver
-database.url = jdbc:mysql://localhost:3306/torque
+torque.database.name = bookstore
+torque.database.type = mysql
+torque.database.user = user
+torque.database.password = password
+torque.database.driver = org.gjt.mm.mysql.Driver
+torque.database.url = jdbc:mysql://localhost:3306/torque
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
