mpoeschl 2003/06/27 14:53:23
Modified: src/java/org/apache/turbine/om/security/peer
RolePermissionPeer.java UserGroupRolePeer.java
RolePeer.java PermissionPeer.java GroupPeer.java
TurbineUserPeer.java
Log:
change name for private static final mapBuilder --> MAP_BUILDER
Revision Changes Path
1.6 +5 -5
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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- RolePermissionPeer.java 11 Apr 2003 14:04:21 -0000 1.5
+++ RolePermissionPeer.java 27 Jun 2003 21:53:23 -0000 1.6
@@ -72,18 +72,18 @@
public class RolePermissionPeer extends BasePeer
{
/** The map builder for this Peer. */
- private static final TurbineMapBuilder mapBuilder = (TurbineMapBuilder)
+ private static final TurbineMapBuilder MAP_BUILDER = (TurbineMapBuilder)
getMapBuilder(TurbineMapBuilder.class.getName());
/** The table name for this peer. */
- public static final String TABLE_NAME = mapBuilder.getTableRolePermission();
+ public static final String TABLE_NAME = MAP_BUILDER.getTableRolePermission();
/** The column name for the permission id field. */
public static final String PERMISSION_ID
- = mapBuilder.getRolePermission_PermissionId();
+ = MAP_BUILDER.getRolePermission_PermissionId();
/** The column name for the role id field. */
- public static final String ROLE_ID = mapBuilder.getRolePermission_RoleId();
+ public static final String ROLE_ID = MAP_BUILDER.getRolePermission_RoleId();
/**
1.6 +6 -6
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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- UserGroupRolePeer.java 11 Apr 2003 14:04:21 -0000 1.5
+++ UserGroupRolePeer.java 27 Jun 2003 21:53:23 -0000 1.6
@@ -70,20 +70,20 @@
public class UserGroupRolePeer extends BasePeer
{
/** The map builder for this Peer. */
- private static final TurbineMapBuilder mapBuilder = (TurbineMapBuilder)
+ private static final TurbineMapBuilder MAP_BUILDER = (TurbineMapBuilder)
getMapBuilder(TurbineMapBuilder.class.getName());
/** The table name for this peer. */
- public static final String TABLE_NAME = mapBuilder.getTableUserGroupRole();
+ public static final String TABLE_NAME = MAP_BUILDER.getTableUserGroupRole();
/** The column name for the visitor id field. */
- public static final String USER_ID = mapBuilder.getUserGroupRole_UserId();
+ public static final String USER_ID = MAP_BUILDER.getUserGroupRole_UserId();
/** The column name for the group id field. */
- public static final String GROUP_ID = mapBuilder.getUserGroupRole_GroupId();
+ public static final String GROUP_ID = MAP_BUILDER.getUserGroupRole_GroupId();
/** The column name for the role id field. */
- public static final String ROLE_ID = mapBuilder.getUserGroupRole_RoleId();
+ public static final String ROLE_ID = MAP_BUILDER.getUserGroupRole_RoleId();
/**
* Get the name of this table.
1.10 +6 -6
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.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- RolePeer.java 11 Apr 2003 14:04:19 -0000 1.9
+++ RolePeer.java 27 Jun 2003 21:53:23 -0000 1.10
@@ -86,20 +86,20 @@
public class RolePeer extends BasePeer
{
/** The map builder for this Peer. */
- private static final TurbineMapBuilder mapBuilder = (TurbineMapBuilder)
+ private static final TurbineMapBuilder MAP_BUILDER = (TurbineMapBuilder)
getMapBuilder(TurbineMapBuilder.class.getName());
/** The table name for this peer. */
- private static final String TABLE_NAME = mapBuilder.getTableRole();
+ private static final String TABLE_NAME = MAP_BUILDER.getTableRole();
/** The column name for the role id field. */
- public static final String ROLE_ID = mapBuilder.getRole_RoleId();
+ public static final String ROLE_ID = MAP_BUILDER.getRole_RoleId();
/** The column name for the name field. */
- public static final String NAME = mapBuilder.getRole_Name();
+ public static final String NAME = MAP_BUILDER.getRole_Name();
/** The column name for the ObjectData field */
- public static final String OBJECTDATA = mapBuilder.getRole_ObjectData();
+ public static final String OBJECTDATA = MAP_BUILDER.getRole_ObjectData();
/**
* Retrieves/assembles a RoleSet based on the Criteria passed in
1.9 +7 -7
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.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- PermissionPeer.java 11 Apr 2003 14:04:19 -0000 1.8
+++ PermissionPeer.java 27 Jun 2003 21:53:23 -0000 1.9
@@ -88,26 +88,26 @@
public class PermissionPeer extends BasePeer
{
/** The map builder for this Peer. */
- private static final TurbineMapBuilder mapBuilder = (TurbineMapBuilder)
+ private static final TurbineMapBuilder MAP_BUILDER = (TurbineMapBuilder)
getMapBuilder(TurbineMapBuilder.class.getName());
/** The table name for this peer. */
- private static final String TABLE_NAME = mapBuilder.getTablePermission();
+ private static final String TABLE_NAME = MAP_BUILDER.getTablePermission();
/** The column name for the permission id field. */
public static final String PERMISSION_ID
- = mapBuilder.getPermission_PermissionId();
+ = MAP_BUILDER.getPermission_PermissionId();
/** The column name for the name field. */
- public static final String NAME = mapBuilder.getPermission_Name();
+ public static final String NAME = MAP_BUILDER.getPermission_Name();
/** The column name for the ObjectData field */
public static final String OBJECTDATA
- = mapBuilder.getPermission_ObjectData();
+ = MAP_BUILDER.getPermission_ObjectData();
/** The Oracle sequence name for this peer. */
private static final String SEQUENCE_NAME
- = mapBuilder.getSequencePermission();
+ = MAP_BUILDER.getSequencePermission();
/**
1.9 +7 -7
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.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- GroupPeer.java 11 Apr 2003 14:04:19 -0000 1.8
+++ GroupPeer.java 27 Jun 2003 21:53:23 -0000 1.9
@@ -85,23 +85,23 @@
public class GroupPeer extends BasePeer
{
/** The map builder for this Peer. */
- private static final TurbineMapBuilder mapBuilder = (TurbineMapBuilder)
+ private static final TurbineMapBuilder MAP_BUILDER = (TurbineMapBuilder)
getMapBuilder(TurbineMapBuilder.class.getName());
/** The table name for this peer. */
- private static final String TABLE_NAME = mapBuilder.getTableGroup();
+ private static final String TABLE_NAME = MAP_BUILDER.getTableGroup();
/** The column name for the Group id field. */
- public static final String GROUP_ID = mapBuilder.getGroup_GroupId();
+ public static final String GROUP_ID = MAP_BUILDER.getGroup_GroupId();
/** The column name for the name field. */
- public static final String NAME = mapBuilder.getGroup_Name();
+ public static final String NAME = MAP_BUILDER.getGroup_Name();
/** The column name for the ObjectData field */
- public static final String OBJECTDATA = mapBuilder.getGroup_ObjectData();
+ public static final String OBJECTDATA = MAP_BUILDER.getGroup_ObjectData();
/** The Oracle sequence name for this peer. */
- private static final String SEQUENCE_NAME = mapBuilder.getSequenceGroup();
+ private static final String SEQUENCE_NAME = MAP_BUILDER.getSequenceGroup();
/**
* Retrieves/assembles a GroupSet of all of the Groups.
1.12 +17 -17
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.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- TurbineUserPeer.java 11 Apr 2003 14:04:21 -0000 1.11
+++ TurbineUserPeer.java 27 Jun 2003 21:53:23 -0000 1.12
@@ -90,57 +90,57 @@
public class TurbineUserPeer extends BasePeer implements UserPeer
{
/** The mapBuilder for this Peer. */
- private static final TurbineMapBuilder mapBuilder = (TurbineMapBuilder)
+ private static final TurbineMapBuilder MAP_BUILDER = (TurbineMapBuilder)
getMapBuilder(TurbineMapBuilder.class.getName());
// column names
/** The column name for the visitor id field. */
- private static final String USER_ID_COLUMN = mapBuilder.getUserId();
+ private static final String USER_ID_COLUMN = MAP_BUILDER.getUserId();
/** This is the value that is stored in the database for confirmed users. */
public static final String CONFIRM_DATA
= org.apache.turbine.om.security.User.CONFIRM_DATA;
/** The column name for the visitor id field. */
- private static final String OBJECT_DATA_COLUMN = mapBuilder.getObjectData();
+ private static final String OBJECT_DATA_COLUMN = MAP_BUILDER.getObjectData();
/** The table name for this peer. */
- private static final String TABLE_NAME = mapBuilder.getTableUser();
+ private static final String TABLE_NAME = MAP_BUILDER.getTableUser();
// Criteria Keys
/** The key name for the visitor id field. */
- public static final String USER_ID = mapBuilder.getUser_UserId();
+ public static final String USER_ID = MAP_BUILDER.getUser_UserId();
/** The key name for the username field. */
- public static final String USERNAME = mapBuilder.getUser_Username();
+ public static final String USERNAME = MAP_BUILDER.getUser_Username();
/** The key name for the password field. */
- public static final String PASSWORD = mapBuilder.getUser_Password();
+ public static final String PASSWORD = MAP_BUILDER.getUser_Password();
/** The key name for the first name field. */
- public static final String FIRST_NAME = mapBuilder.getUser_FirstName();
+ public static final String FIRST_NAME = MAP_BUILDER.getUser_FirstName();
/** The key name for the last name field. */
- public static final String LAST_NAME = mapBuilder.getUser_LastName();
+ public static final String LAST_NAME = MAP_BUILDER.getUser_LastName();
/** The key name for the modified field. */
- public static final String MODIFIED = mapBuilder.getUser_Modified();
+ public static final String MODIFIED = MAP_BUILDER.getUser_Modified();
/** The key name for the created field. */
- public static final String CREATED = mapBuilder.getUser_Created();
+ public static final String CREATED = MAP_BUILDER.getUser_Created();
/** The key name for the email field. */
- public static final String EMAIL = mapBuilder.getUser_Email();
+ public static final String EMAIL = MAP_BUILDER.getUser_Email();
/** The key name for the last_login field. */
- public static final String LAST_LOGIN = mapBuilder.getUser_LastLogin();
+ public static final String LAST_LOGIN = MAP_BUILDER.getUser_LastLogin();
/** The key name for the confirm_value field. */
public static final String CONFIRM_VALUE
- = mapBuilder.getUser_ConfirmValue();
+ = MAP_BUILDER.getUser_ConfirmValue();
/** The key name for the object_data field. */
- public static final String OBJECT_DATA = mapBuilder.getUser_ObjectData();
+ public static final String OBJECT_DATA = MAP_BUILDER.getUser_ObjectData();
/** The schema. */
private static Schema schema = initTableSchema(TABLE_NAME);
@@ -592,6 +592,6 @@
*/
protected static TableMap getTableMap()
{
- return mapBuilder.getDatabaseMap().getTable(TABLE_NAME);
+ return MAP_BUILDER.getDatabaseMap().getTable(TABLE_NAME);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
