mpoeschl 2002/11/28 06:06:12 Modified: src/conf/master Torque.master build.xml Log: TRQS86: uses @DATABASE@ variable for default database adapter instead of mysql Revision Changes Path 1.5 +2 -2 jakarta-turbine-torque/src/conf/master/Torque.master Index: Torque.master =================================================================== RCS file: /home/cvs/jakarta-turbine-torque/src/conf/master/Torque.master,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- Torque.master 11 Sep 2002 13:53:26 -0000 1.4 +++ Torque.master 28 Nov 2002 14:06:12 -0000 1.5 @@ -43,7 +43,7 @@ # ------------------------------------------------------------------- torque.database.default=@DATABASE_DEFAULT@ -torque.database.@[email protected]=mysql +torque.database.@[email protected]=@DATABASE@ ## Using torque's old pool torque.dsfactory.@[email protected]=org.apache.torque.dsfactory.TorqueDataSourceFactory 1.4 +1 -0 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.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- build.xml 28 Sep 2002 00:44:45 -0000 1.3 +++ build.xml 28 Nov 2002 14:06:12 -0000 1.4 @@ -37,6 +37,7 @@ <target name="configure"> + <filter token="DATABASE" value="${torque.database.type}"/> <filter token="DATABASE_DRIVER" value="${torque.database.driver}"/> <filter token="DATABASE_URL" value="${torque.database.url}"/> <filter token="DATABASE_ADAPTOR" value="${torque.database.adaptor}"/>
-- To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]> For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
