You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@turbine.apache.org by he...@apache.org on 2003/04/11 16:04:26 UTC
cvs commit: jakarta-turbine-2/src/java/org/apache/turbine/util/db TableColumn.java
henning 2003/04/11 07:04:25
Modified: src/java/org/apache/turbine/om/security/peer GroupPeer.java
PermissionPeer.java RolePeer.java
RolePermissionPeer.java TurbineUserPeer.java
UserGroupRolePeer.java
src/java/org/apache/turbine/util/db TableColumn.java
Log:
- Deprecate TableColumn (seems to be a remnant from the Torque
decoupling)
- Make the Peers reference the MapBuilder not only by name but by
pulling the name out of a the class object.
- Clean up a missing import
Revision Changes Path
1.8 +4 -3 jakarta-turbine-2/src/java/org/apache/turbine/om/security/peer/GroupPeer.java
Index: GroupPeer.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/om/security/peer/GroupPeer.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- GroupPeer.java 11 Apr 2003 11:39:09 -0000 1.7
+++ GroupPeer.java 11 Apr 2003 14:04:19 -0000 1.8
@@ -84,8 +84,9 @@
*/
public class GroupPeer extends BasePeer
{
- private static final TurbineMapBuilder mapBuilder =
- (TurbineMapBuilder) getMapBuilder("org.apache.turbine.util.db.map.TurbineMapBuilder");
+ /** The map builder for this Peer. */
+ private static final TurbineMapBuilder mapBuilder = (TurbineMapBuilder)
+ getMapBuilder(TurbineMapBuilder.class.getName());
/** The table name for this peer. */
private static final String TABLE_NAME = mapBuilder.getTableGroup();
1.8 +3 -3 jakarta-turbine-2/src/java/org/apache/turbine/om/security/peer/PermissionPeer.java
Index: PermissionPeer.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/om/security/peer/PermissionPeer.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- PermissionPeer.java 11 Apr 2003 11:39:09 -0000 1.7
+++ PermissionPeer.java 11 Apr 2003 14:04:19 -0000 1.8
@@ -87,9 +87,9 @@
*/
public class PermissionPeer extends BasePeer
{
- /** The mapBuilder for this Peer. */
+ /** The map builder for this Peer. */
private static final TurbineMapBuilder mapBuilder = (TurbineMapBuilder)
- getMapBuilder("org.apache.turbine.util.db.map.TurbineMapBuilder");
+ getMapBuilder(TurbineMapBuilder.class.getName());
/** The table name for this peer. */
private static final String TABLE_NAME = mapBuilder.getTablePermission();
1.9 +3 -3 jakarta-turbine-2/src/java/org/apache/turbine/om/security/peer/RolePeer.java
Index: RolePeer.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/om/security/peer/RolePeer.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- RolePeer.java 9 Mar 2003 02:45:16 -0000 1.8
+++ RolePeer.java 11 Apr 2003 14:04:19 -0000 1.9
@@ -85,9 +85,9 @@
*/
public class RolePeer extends BasePeer
{
- /** The mapBuilder for this Peer. */
+ /** The map builder for this Peer. */
private static final TurbineMapBuilder mapBuilder = (TurbineMapBuilder)
- getMapBuilder("org.apache.turbine.util.db.map.TurbineMapBuilder");
+ getMapBuilder(TurbineMapBuilder.class.getName());
/** The table name for this peer. */
private static final String TABLE_NAME = mapBuilder.getTableRole();
1.5 +3 -3 jakarta-turbine-2/src/java/org/apache/turbine/om/security/peer/RolePermissionPeer.java
Index: RolePermissionPeer.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/om/security/peer/RolePermissionPeer.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- RolePermissionPeer.java 9 Mar 2003 02:45:16 -0000 1.4
+++ RolePermissionPeer.java 11 Apr 2003 14:04:21 -0000 1.5
@@ -71,9 +71,9 @@
*/
public class RolePermissionPeer extends BasePeer
{
- /** The mapBuilder for this Peer. */
+ /** The map builder for this Peer. */
private static final TurbineMapBuilder mapBuilder = (TurbineMapBuilder)
- getMapBuilder("org.apache.turbine.util.db.map.TurbineMapBuilder");
+ getMapBuilder(TurbineMapBuilder.class.getName());
/** The table name for this peer. */
public static final String TABLE_NAME = mapBuilder.getTableRolePermission();
1.11 +11 -7 jakarta-turbine-2/src/java/org/apache/turbine/om/security/peer/TurbineUserPeer.java
Index: TurbineUserPeer.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/om/security/peer/TurbineUserPeer.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- TurbineUserPeer.java 11 Apr 2003 11:39:09 -0000 1.10
+++ TurbineUserPeer.java 11 Apr 2003 14:04:21 -0000 1.11
@@ -54,26 +54,30 @@
* <http://www.apache.org/>.
*/
-import com.workingdogs.village.Record;
-import com.workingdogs.village.Schema;
-import com.workingdogs.village.Value;
import java.sql.Connection;
+
import java.util.ArrayList;
import java.util.Hashtable;
import java.util.List;
+
+import com.workingdogs.village.Column;
+import com.workingdogs.village.Record;
+import com.workingdogs.village.Schema;
+import com.workingdogs.village.Value;
+
import org.apache.torque.TorqueException;
import org.apache.torque.map.TableMap;
import org.apache.torque.om.NumberKey;
import org.apache.torque.om.Persistent;
import org.apache.torque.util.BasePeer;
import org.apache.torque.util.Criteria;
+
import org.apache.turbine.om.security.User;
import org.apache.turbine.services.security.TurbineSecurity;
import org.apache.turbine.util.ObjectUtils;
import org.apache.turbine.util.db.map.TurbineMapBuilder;
import org.apache.turbine.util.security.DataBackendException;
-
/**
* This class handles all the database access for the User/User
* table. This table contains all the information for a given user.
@@ -87,7 +91,7 @@
{
/** The mapBuilder for this Peer. */
private static final TurbineMapBuilder mapBuilder = (TurbineMapBuilder)
- getMapBuilder("org.apache.turbine.util.db.map.TurbineMapBuilder");
+ getMapBuilder(TurbineMapBuilder.class.getName());
// column names
/** The column name for the visitor id field. */
@@ -142,7 +146,7 @@
private static Schema schema = initTableSchema(TABLE_NAME);
/** The columns. */
- private static com.workingdogs.village.Column[] columns
+ private static Column[] columns
= initTableColumns(schema);
/** The names of the columns. */
1.5 +3 -2 jakarta-turbine-2/src/java/org/apache/turbine/om/security/peer/UserGroupRolePeer.java
Index: UserGroupRolePeer.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/om/security/peer/UserGroupRolePeer.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- UserGroupRolePeer.java 9 Mar 2003 02:45:16 -0000 1.4
+++ UserGroupRolePeer.java 11 Apr 2003 14:04:21 -0000 1.5
@@ -55,6 +55,7 @@
*/
import org.apache.torque.util.BasePeer;
+
import org.apache.turbine.util.db.map.TurbineMapBuilder;
/**
@@ -70,7 +71,7 @@
{
/** The map builder for this Peer. */
private static final TurbineMapBuilder mapBuilder = (TurbineMapBuilder)
- getMapBuilder("org.apache.turbine.util.db.map.TurbineMapBuilder");
+ getMapBuilder(TurbineMapBuilder.class.getName());
/** The table name for this peer. */
public static final String TABLE_NAME = mapBuilder.getTableUserGroupRole();
1.4 +1 -0 jakarta-turbine-2/src/java/org/apache/turbine/util/db/TableColumn.java
Index: TableColumn.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/util/db/TableColumn.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- TableColumn.java 9 Mar 2003 02:54:12 -0000 1.3
+++ TableColumn.java 11 Apr 2003 14:04:23 -0000 1.4
@@ -59,6 +59,7 @@
*
* @author <a href="mailto:dlr@collab.net">Daniel Rall</a>
* @author <a href="mailto:jmcnally@collab.net">John McNally</a>
+ * @deprecated Use <a href="http://db.apache.org/torque/">Torque</a>.
*/
public class TableColumn
{
---------------------------------------------------------------------
To unsubscribe, e-mail: turbine-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: turbine-dev-help@jakarta.apache.org