kschrader 02/04/15 09:24:06
Modified: . build-test.xml build.xml default.properties
deps.list project.xml
src/java/org/apache/torque/manager AbstractBaseManager.java
MethodCacheKey.java MethodResultCache.java
Added: profile kschrader.profile
Log:
Updating Torque to use the separated JCS classes.
Revision Changes Path
1.26 +3 -0 jakarta-turbine-torque/build-test.xml
Index: build-test.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-torque/build-test.xml,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- build-test.xml 1 Mar 2002 14:16:01 -0000 1.25
+++ build-test.xml 15 Apr 2002 16:24:05 -0000 1.26
@@ -259,6 +259,7 @@
<pathelement location="${village.jar}"/>
<pathelement location="${build.dest}"/>
<pathelement location="${stratum.jar}"/>
+ <pathelement location="${jcs.jar}"/>
<pathelement location="${torque.destDir}"/>
<pathelement location="${torque.testDatabaseJar}"/>
</path>
@@ -273,6 +274,7 @@
${commons-collections.jar}
${commons-lang.jar}
${village.jar}
+ ${jcs.jar}
${build.dest}
${torque.destDir}
${torque.testDatabaseJar}
@@ -309,6 +311,7 @@
<copy file="${build.dir}/${torque.jar}" todir="${test.libDir}"/>
<copy file="${torque.testDatabaseJar}" todir="${test.libDir}"/>
<copy file="${stratum.jar}" todir="${test.libDir}"/>
+ <copy file="${jcs.jar}" todir="${test.libDir}"/>
</target>
<target
1.40 +2 -0 jakarta-turbine-torque/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-torque/build.xml,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- build.xml 2 Apr 2002 20:50:10 -0000 1.39
+++ build.xml 15 Apr 2002 16:24:05 -0000 1.40
@@ -16,6 +16,7 @@
<pathelement location="${velocity.jar}"/>
<pathelement location="${village.jar}"/>
<pathelement location="${jdbc.jar}"/>
+ <pathelement location="${jcs.jar}"/>
<pathelement location="${log4j.jar}"/>
<pathelement location="${commons-collections.jar}"/>
<pathelement location="${commons-lang.jar}"/>
@@ -63,6 +64,7 @@
<echo message="xerces.jar = ${xerces.jar}"/>
<echo message="xmlParserAPIs.jar = ${xmlParserAPIs.jar}"/>
<echo message="log4j.jar = ${log4j.jar}"/>
+ <echo message="jcs.jar = ${jcs.jar}"/>
<echo message="jdbc.jar = ${jdbc.jar}"/>
<echo message="junit.jar = ${junit.jar}"/>
<echo message="commons-collections.jar = ${commons-collections.jar}"/>
1.23 +1 -0 jakarta-turbine-torque/default.properties
Index: default.properties
===================================================================
RCS file: /home/cvs/jakarta-turbine-torque/default.properties,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- default.properties 8 Apr 2002 14:09:17 -0000 1.22
+++ default.properties 15 Apr 2002 16:24:05 -0000 1.23
@@ -57,3 +57,4 @@
jdbc.jar = ${lib.repo}/jdbc2_0-stdext.jar
junit.jar = ${lib.repo}/junit-3.7.jar
stratum.jar = ${lib.repo}/stratum-1.0-b2-dev.jar
+jcs.jar = ${lib.repo}/jcs-1.0-dev.jar
1.9 +1 -0 jakarta-turbine-torque/deps.list
Index: deps.list
===================================================================
RCS file: /home/cvs/jakarta-turbine-torque/deps.list,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- deps.list 4 Apr 2002 19:44:53 -0000 1.8
+++ deps.list 15 Apr 2002 16:24:05 -0000 1.9
@@ -1,6 +1,7 @@
commons-collections.jar
commons-lang-0.1-dev.jar
commons-pool.jar
+jcs-1.0-dev.jar
jdbc2_0-stdext.jar
junit-3.7.jar
log4j-1.1.3.jar
1.19 +7 -0 jakarta-turbine-torque/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-torque/project.xml,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- project.xml 9 Apr 2002 17:47:54 -0000 1.18
+++ project.xml 15 Apr 2002 16:24:05 -0000 1.19
@@ -131,6 +131,13 @@
</dependency>
<dependency>
+ <name>jakarta-turbine-jcs</name>
+ <type>required</type>
+ <version>1.0-dev</version>
+ <jar>jcs-1.0-dev.jar</jar>
+ </dependency>
+
+ <dependency>
<name>jakarta-velocity</name>
<type>required</type>
<version>1.3-dev</version>
1.1 jakarta-turbine-torque/profile/kschrader.profile
Index: kschrader.profile
===================================================================
# location of jar that you will be using for testing
# so that it can be copied into the dist/lib directory.
torque.testDatabaseJar = ${lib.repo}/mm.mysql-2.0.12-bin.jar
torque.idMethod = idbroker
torque.defaultDatabase = bookstore
torque.sqlTest.defaultDatabase = sqltest
torque.sqlTest.databaseUrl = jdbc:mysql://localhost:3306/sqltest
lib.dir = ../lib
# -------------------------------------------------------------------
#
# T O R Q U E C O N F I G U R A T I O N F I L E
#
# -------------------------------------------------------------------
project = bookstore
# -------------------------------------------------------------------
#
# T A R G E T D A T A B A S E
#
# -------------------------------------------------------------------
database = mysql
# -------------------------------------------------------------------
#
# O B J E C T M O D E L I N F O R M A T I O N
#
# -------------------------------------------------------------------
# These settings will allow you to customize the way your
# Peer-based object model is created.
# -------------------------------------------------------------------
# addSaveMethod=true adds tracking code to determine how to save objects
#
# addGetByNameMethod=true adds methods to get fields by name/position
#
# complexObjectModel=true generates an om with collection support
#
# addTimeStamp=true puts time stamps in generated files
#
# addIntakeRetrievable=implement Intake's Retrievable interface
# -------------------------------------------------------------------
targetPackage=org.apache.torque.test
basePrefix=Base
addSaveMethod=true
addGetByNameMethod=true
complexObjectModel=true
addTimeStamp=true
addIntakeRetrievable=false
useManagers=true
# -------------------------------------------------------------------
#
# D A T A B A S E S E T T I N G S
#
# -------------------------------------------------------------------
# JDBC connection settings. This is used by the JDBCToXML task that
# will create an XML database schema from JDBC metadata. These
# settings are also used by the SQL Ant task to initialize your
# Turbine system with the generated SQL.
# -------------------------------------------------------------------
createDatabaseUrl = jdbc:mysql://localhost:3306/mysql
buildDatabaseUrl = jdbc:mysql://localhost:3306/bookstore
databaseUrl = jdbc:mysql://localhost:3306/bookstore
databaseDriver = org.gjt.mm.mysql.Driver
databaseUser = root
databasePassword =
databaseHost = 127.0.0.1
# Tells JDBC task that javaName attribute for the tables and columns
# should be made same as SQL name.
sameJavaName=false
# -------------------------------------------------------------------
#
# D O C U M E N T A T I O S E T T I N G S
#
# -------------------------------------------------------------------
# These settings will allow you to customize the way your schema
# documentation is created.
# Valid formats are: html, anakia (for use with jakarta-site2)
# -------------------------------------------------------------------
documentationFormat=html
# -------------------------------------------------------------------
# You should NOT have to edit anything below here.
# -------------------------------------------------------------------
# -------------------------------------------------------------------
#
# T E M P L A T E P A T H
#
# -------------------------------------------------------------------
templatePath = ../templates
# -------------------------------------------------------------------
#
# C O N T R O L T E M P L A T E S
#
# -------------------------------------------------------------------
SQLControlTemplate = sql/base/Control.vm
OMControlTemplate = om/Control.vm
idTableControlTemplate = sql/id-table/Control.vm
DataDTDControlTemplate = data/Control.vm
DataDumpControlTemplate = data/dump/Control.vm
DataSQLControlTemplate = sql/load/Control.vm
DocControlTemplate = doc/Control.vm
# -------------------------------------------------------------------
#
# O U T P U T D I R E C T O R Y
#
# -------------------------------------------------------------------
outputDirectory=src
# -------------------------------------------------------------------
#
# S C H E M A D I R E C T O R Y
#
# -------------------------------------------------------------------
schemaDirectory=schema
1.5 +4 -4
jakarta-turbine-torque/src/java/org/apache/torque/manager/AbstractBaseManager.java
Index: AbstractBaseManager.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-torque/src/java/org/apache/torque/manager/AbstractBaseManager.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- AbstractBaseManager.java 13 Apr 2002 04:55:33 -0000 1.4
+++ AbstractBaseManager.java 15 Apr 2002 16:24:06 -0000 1.5
@@ -66,9 +66,9 @@
import java.io.IOException;
import org.apache.commons.collections.FastArrayList;
-import org.apache.stratum.jcs.JCS;
-import org.apache.stratum.jcs.access.GroupCacheAccess;
-import org.apache.stratum.jcs.access.exception.CacheException;
+import org.apache.jcs.JCS;
+import org.apache.jcs.access.GroupCacheAccess;
+import org.apache.jcs.access.exception.CacheException;
import org.apache.torque.TorqueException;
import org.apache.torque.om.ObjectKey;
@@ -80,7 +80,7 @@
* instantiating OM's.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>John McNally</a>
- * @version $Id: AbstractBaseManager.java,v 1.4 2002/04/13 04:55:33 jmcnally Exp $
+ * @version $Id: AbstractBaseManager.java,v 1.5 2002/04/15 16:24:06 kschrader Exp $
*/
public abstract class AbstractBaseManager
implements Serializable
1.4 +1 -2
jakarta-turbine-torque/src/java/org/apache/torque/manager/MethodCacheKey.java
Index: MethodCacheKey.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-torque/src/java/org/apache/torque/manager/MethodCacheKey.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- MethodCacheKey.java 2 Apr 2002 18:41:29 -0000 1.3
+++ MethodCacheKey.java 15 Apr 2002 16:24:06 -0000 1.4
@@ -48,7 +48,6 @@
import java.io.Serializable;
import org.apache.commons.lang.Objects;
-import org.apache.log4j.Category;
import org.apache.commons.pool.BasePoolableObjectFactory;
public class MethodCacheKey
@@ -172,7 +171,7 @@
/**
* Initialize key for method with more than two arguments.
*
- * @param Serializable[] where
+ * @param Serializable[] where
* [0]=>the Object on which the method is invoked
* if the method is static, a String representing the class name is used.
* [1]=>the method name
1.6 +3 -4
jakarta-turbine-torque/src/java/org/apache/torque/manager/MethodResultCache.java
Index: MethodResultCache.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-torque/src/java/org/apache/torque/manager/MethodResultCache.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- MethodResultCache.java 6 Apr 2002 01:38:28 -0000 1.5
+++ MethodResultCache.java 15 Apr 2002 16:24:06 -0000 1.6
@@ -52,9 +52,8 @@
import java.util.Iterator;
import java.io.Serializable;
import org.apache.log4j.Category;
-import org.apache.stratum.jcs.access.GroupCacheAccess;
-import org.apache.stratum.jcs.access.exception.CacheException;
-import org.apache.commons.pool.PoolableObjectFactory;
+import org.apache.jcs.access.GroupCacheAccess;
+import org.apache.jcs.access.exception.CacheException;
import org.apache.commons.pool.ObjectPool;
import org.apache.commons.pool.impl.StackObjectPool;
@@ -64,7 +63,7 @@
* This class provides a cache for convenient storage of method results
*
* @author <a href="mailto:[EMAIL PROTECTED]";>John McNally</a>
- * @version $Id: MethodResultCache.java,v 1.5 2002/04/06 01:38:28 dlr Exp $
+ * @version $Id: MethodResultCache.java,v 1.6 2002/04/15 16:24:06 kschrader Exp $
*/
public class MethodResultCache
{
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
