You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@turbine.apache.org by jv...@apache.org on 2001/07/26 21:14:16 UTC
cvs commit: jakarta-turbine-torque/src/templates/om MapBuilder.vm Object.vm Peer.vm
jvanzyl 01/07/26 12:14:16
Modified: src/templates/om MapBuilder.vm Object.vm Peer.vm
Log:
- updating templates to reflect the separation of torque
Revision Changes Path
1.2 +2 -5 jakarta-turbine-torque/src/templates/om/MapBuilder.vm
Index: MapBuilder.vm
===================================================================
RCS file: /home/cvs/jakarta-turbine-torque/src/templates/om/MapBuilder.vm,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- MapBuilder.vm 2001/07/18 12:54:16 1.1
+++ MapBuilder.vm 2001/07/26 19:14:16 1.2
@@ -1,11 +1,8 @@
package ${package}.map;
-// JDK classes
import java.util.*;
import java.math.*;
-
-// Turbine classes
-import org.apache.turbine.services.db.TurbineDB;
+import org.apache.turbine.torque.Torque;
import org.apache.turbine.services.db.map.MapBuilder;
import org.apache.turbine.services.db.map.DatabaseMap;
import org.apache.turbine.services.db.map.TableMap;
@@ -79,7 +76,7 @@
*/
public void doBuild ( ) throws Exception
{
- dbMap = TurbineDB.getDatabaseMap("$table.Database.Name");
+ dbMap = Torque.getDatabaseMap("$table.Database.Name");
dbMap.addTable(getTable());
TableMap tMap = dbMap.getTable(getTable());
1.2 +3 -3 jakarta-turbine-torque/src/templates/om/Object.vm
Index: Object.vm
===================================================================
RCS file: /home/cvs/jakarta-turbine-torque/src/templates/om/Object.vm,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Object.vm 2001/07/18 12:54:17 1.1
+++ Object.vm 2001/07/26 19:14:16 1.2
@@ -22,7 +22,7 @@
import org.apache.turbine.util.ObjectUtils;
#end
#if (!$complexObjectModel)
-import org.apache.turbine.services.db.TurbineDB;
+import org.apache.turbine.torque.Torque;
#end
/**
@@ -830,7 +830,7 @@
{
try
{
- dbCon = TurbineDB.getConnection( dbName );
+ dbCon = Torque.getConnection( dbName );
if (isNew())
{
${table.JavaName}Peer
@@ -845,7 +845,7 @@
}
finally
{
- TurbineDB.releaseConnection(dbCon);
+ Torque.releaseConnection(dbCon);
}
}
1.3 +7 -12 jakarta-turbine-torque/src/templates/om/Peer.vm
Index: Peer.vm
===================================================================
RCS file: /home/cvs/jakarta-turbine-torque/src/templates/om/Peer.vm,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Peer.vm 2001/07/19 11:52:47 1.2
+++ Peer.vm 2001/07/26 19:14:16 1.3
@@ -6,22 +6,17 @@
#end
package ${package};
-// JDK classes
import java.util.*;
import java.math.*;
import java.sql.*;
-
-// Village classes
import com.workingdogs.village.*;
-
-// Turbine classes
+import org.apache.turbine.torque.Torque;
import org.apache.turbine.services.db.util.BasePeer;
import org.apache.turbine.services.db.om.*;
import org.apache.turbine.services.db.util.*;
import org.apache.turbine.services.db.map.*;
import org.apache.turbine.services.db.pool.DBConnection;
-import org.apache.turbine.services.db.TurbineDB;
-import org.apache.turbine.services.ServiceException;
+import org.apache.turbine.torque.TorqueException;
// Local classes
import ${package}.map.*;
@@ -552,7 +547,7 @@
error += " Peer object in order for things to work properly.";
error += " This method should return the proper Class that";
error += " represents the Peer's Business Object.";
- throw new ServiceException (error);
+ throw new TorqueException (error);
#else
return CLASS_DEFAULT;
#end
@@ -880,13 +875,13 @@
$table.JavaName retVal = null;
try
{
- db = TurbineDB.getConnection( mapBuilder.getDatabaseMap().getName() );
+ db = Torque.getConnection( mapBuilder.getDatabaseMap().getName() );
retVal = ${retrieveMethod}( pk, db );
}
finally
{
if (db != null)
- TurbineDB.releaseConnection(db);
+ Torque.releaseConnection(db);
}
return(retVal);
}
@@ -949,7 +944,7 @@
$table.JavaName retVal = null;
try
{
- db = TurbineDB.getConnection( mapBuilder.getDatabaseMap().getName() );
+ db = Torque.getConnection( mapBuilder.getDatabaseMap().getName() );
retVal = retrieveByPK(
#set ( $comma = false )
#foreach ($col in $table.PrimaryKeys)
@@ -962,7 +957,7 @@
finally
{
if (db != null)
- TurbineDB.releaseConnection(db);
+ Torque.releaseConnection(db);
}
return(retVal);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: turbine-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: turbine-dev-help@jakarta.apache.org