kschrader 02/04/16 14:22:49
Modified: . build.xml default.properties project.xml
src/java/org/apache/torque Torque.java
src/java/org/apache/torque/adapter DBFactory.java
src/java/org/apache/torque/oid IDBroker.java
xdocs changes.xml
Log:
Moving to commons-configuration
Revision Changes Path
1.41 +1 -0 jakarta-turbine-torque/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-torque/build.xml,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- build.xml 15 Apr 2002 16:24:05 -0000 1.40
+++ build.xml 16 Apr 2002 21:22:48 -0000 1.41
@@ -19,6 +19,7 @@
<pathelement location="${jcs.jar}"/>
<pathelement location="${log4j.jar}"/>
<pathelement location="${commons-collections.jar}"/>
+ <pathelement location="${commons-configuration.jar}"/>
<pathelement location="${commons-lang.jar}"/>
<pathelement location="${commons-pool.jar}"/>
<pathelement location="${junit.jar}"/>
1.24 +1 -0 jakarta-turbine-torque/default.properties
Index: default.properties
===================================================================
RCS file: /home/cvs/jakarta-turbine-torque/default.properties,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- default.properties 15 Apr 2002 16:24:05 -0000 1.23
+++ default.properties 16 Apr 2002 21:22:49 -0000 1.24
@@ -52,6 +52,7 @@
village.jar = ${lib.repo}/village-1.5.3.jar
log4j.jar = ${lib.repo}/log4j-1.1.3.jar
commons-collections.jar = ${lib.repo}/commons-collections.jar
+commons-configuration.jar = ${lib.repo}/commons-configuration-1.0-dev.jar
commons-lang.jar = ${lib.repo}/commons-lang-0.1-dev.jar
commons-pool.jar = ${lib.repo}/commons-pool.jar
jdbc.jar = ${lib.repo}/jdbc2_0-stdext.jar
1.20 +7 -0 jakarta-turbine-torque/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-torque/project.xml,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- project.xml 15 Apr 2002 16:24:05 -0000 1.19
+++ project.xml 16 Apr 2002 21:22:49 -0000 1.20
@@ -96,6 +96,13 @@
</dependency>
<dependency>
+ <name>commons-configuration</name>
+ <type>required</type>
+ <version>1.0-dev</version>
+ <jar>commons-configuration-1.0-dev.jar</jar>
+ </dependency>
+
+ <dependency>
<name>commons-lang</name>
<type>required</type>
<version>0.1</version>
1.52 +3 -3 jakarta-turbine-torque/src/java/org/apache/torque/Torque.java
Index: Torque.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-torque/src/java/org/apache/torque/Torque.java,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- Torque.java 27 Mar 2002 23:41:32 -0000 1.51
+++ Torque.java 16 Apr 2002 21:22:49 -0000 1.52
@@ -77,8 +77,8 @@
import org.apache.torque.pool.DBConnection;
import org.apache.torque.util.BasePeer;
import org.apache.torque.manager.AbstractBaseManager;
-import org.apache.stratum.configuration.Configuration;
-import org.apache.stratum.configuration.PropertiesConfiguration;
+import org.apache.commons.configuration.Configuration;
+import org.apache.commons.configuration.PropertiesConfiguration;
import org.apache.stratum.lifecycle.Configurable;
import org.apache.stratum.lifecycle.Initializable;
@@ -90,7 +90,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]";>Jason van Zyl</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Rafal Krzewski</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Martin Poeschl</a>
- * @version $Id: Torque.java,v 1.51 2002/03/27 23:41:32 jmcnally Exp $
+ * @version $Id: Torque.java,v 1.52 2002/04/16 21:22:49 kschrader Exp $
*/
public class Torque implements Initializable, Configurable
{
1.26 +2 -2
jakarta-turbine-torque/src/java/org/apache/torque/adapter/DBFactory.java
Index: DBFactory.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-torque/src/java/org/apache/torque/adapter/DBFactory.java,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- DBFactory.java 3 Apr 2002 01:46:21 -0000 1.25
+++ DBFactory.java 16 Apr 2002 21:22:49 -0000 1.26
@@ -57,7 +57,7 @@
import java.util.Hashtable;
import java.util.Iterator;
import org.apache.log4j.Category;
-import org.apache.stratum.configuration.Configuration;
+import org.apache.commons.configuration.Configuration;
/**
@@ -69,7 +69,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]";>Brett McLaughlin</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Ralf Stranzenbach</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Daniel Rall</a>
- * @version $Id: DBFactory.java,v 1.25 2002/04/03 01:46:21 dlr Exp $
+ * @version $Id: DBFactory.java,v 1.26 2002/04/16 21:22:49 kschrader Exp $
*/
public class DBFactory
{
1.14 +6 -6
jakarta-turbine-torque/src/java/org/apache/torque/oid/IDBroker.java
Index: IDBroker.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-torque/src/java/org/apache/torque/oid/IDBroker.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- IDBroker.java 11 Apr 2002 07:36:11 -0000 1.13
+++ IDBroker.java 16 Apr 2002 21:22:49 -0000 1.14
@@ -65,7 +65,7 @@
import java.util.Hashtable;
import java.util.List;
import org.apache.log4j.Category;
-import org.apache.stratum.configuration.Configuration;
+import org.apache.commons.configuration.Configuration;
import org.apache.torque.Torque;
import org.apache.torque.TorqueException;
import org.apache.torque.map.DatabaseMap;
@@ -113,7 +113,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Frank Y. Kim</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>John D. McNally</a>
- * @version $Id: IDBroker.java,v 1.13 2002/04/11 07:36:11 jmcnally Exp $
+ * @version $Id: IDBroker.java,v 1.14 2002/04/16 21:22:49 kschrader Exp $
*/
public class IDBroker
implements Runnable, IdGenerator
@@ -286,7 +286,7 @@
* property torque.idbroker.usenewconnection = false
*
* @param connection A Connection.
- * @param keyInfo, an Object that contains additional info.
+ * @param tableName, an Object that contains additional info.
* @return An int with the value for the id.
* @exception Exception Database error.
*/
@@ -631,7 +631,7 @@
*
* @param tableName The name of the table for which we want an id.
* @param adjustQuantity True if amount should be adjusted.
- * @exception Exception, a generic exception.
+ * @exception Exception a generic exception.
*/
private void storeIDs(String tableName,
boolean adjustQuantity,
@@ -806,7 +806,7 @@
* @param tableName The properly escaped name of the table to
* identify the row.
* @return A BigDecimal[].
- * @exception Exception, a generic exception.
+ * @exception Exception a generic exception.
*/
private BigDecimal[] selectRow(Connection con,
String tableName)
@@ -896,7 +896,7 @@
* @param con A Connection.
* @param tableName The properly escaped name of the table to identify the
* row.
- * @param id An int with the value to set for the id.
+ * @param quantity An int with the value of the quantity.
* @exception Exception Database error.
*/
private void updateQuantity(Connection con,
1.27 +10 -0 jakarta-turbine-torque/xdocs/changes.xml
Index: changes.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-torque/xdocs/changes.xml,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- changes.xml 18 Mar 2002 18:27:33 -0000 1.26
+++ changes.xml 16 Apr 2002 21:22:49 -0000 1.27
@@ -25,6 +25,16 @@
</li>
-->
<li>
+ <strong>16 Apr 2002</strong>
+ <ul>
+ <li>
+ Use JCS instead of stratum.JCS and
+ commons.configuration instead of
+ stratum.configuration. (ks)
+ </li>
+ </ul>
+ </li>
+ <li>
<strong>17 Mar 2002</strong>
<ul>
<li>
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
