jmcnally 02/03/01 10:35:18
Modified: src/services/java/org/apache/fulcrum/security/impl/db
DBSecurityService.java DBUserManager.java
src/services/java/org/apache/fulcrum/security/impl/db/entity
TurbineGroupPeer.java TurbinePermissionPeer.java
TurbineRolePeer.java TurbineUserPeer.java
Log:
The Peers were hiding buildCriteria in the base class, with one that takes
an instance of an interface. The argument was then cast to the type expected
by the torque generated class. This only served to move the cast from the
class using the Peer into the Peer, which is a small reduction in code.
But it makes using buildCriteria method in other generated code
difficult/impossible.
Revision Changes Path
1.7 +28 -13
jakarta-turbine-fulcrum/src/services/java/org/apache/fulcrum/security/impl/db/DBSecurityService.java
Index: DBSecurityService.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-fulcrum/src/services/java/org/apache/fulcrum/security/impl/db/DBSecurityService.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- DBSecurityService.java 26 Dec 2001 21:09:15 -0000 1.6
+++ DBSecurityService.java 1 Mar 2002 18:35:18 -0000 1.7
@@ -72,6 +72,9 @@
import org.apache.fulcrum.security.impl.db.entity.TurbinePermission;
import org.apache.fulcrum.security.impl.db.entity.TurbineRole;
import org.apache.fulcrum.security.entity.User;
+import org.apache.fulcrum.security.impl.db.entity.TurbineGroup;
+import org.apache.fulcrum.security.impl.db.entity.TurbinePermission;
+import org.apache.fulcrum.security.impl.db.entity.TurbineRole;
import org.apache.fulcrum.security.impl.db.entity.TurbineGroupPeer;
import org.apache.fulcrum.security.impl.db.entity.TurbinePermissionPeer;
import org.apache.fulcrum.security.impl.db.entity.TurbineRolePeer;
@@ -95,7 +98,7 @@
* An implementation of SecurityService that uses a database as backend.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Rafal Krzewski</a>
- * @version $Id: DBSecurityService.java,v 1.6 2001/12/26 21:09:15 jmcnally Exp $
+ * @version $Id: DBSecurityService.java,v 1.7 2002/03/01 18:35:18 jmcnally Exp $
*/
public class DBSecurityService
extends BaseSecurityService
@@ -654,7 +657,8 @@
groupExists = checkExists(group);
if(groupExists)
{
- Criteria criteria = TurbineGroupPeer.buildCriteria(group);
+ Criteria criteria = TurbineGroupPeer
+ .buildCriteria((TurbineGroup)group);
TurbineGroupPeer.doUpdate(criteria);
return;
}
@@ -683,7 +687,8 @@
roleExists = checkExists(role);
if(roleExists)
{
- Criteria criteria = TurbineRolePeer.buildCriteria(role);
+ Criteria criteria = TurbineRolePeer
+ .buildCriteria((TurbineRole)role);
TurbineRolePeer.doUpdate(criteria);
return;
}
@@ -713,7 +718,8 @@
permissionExists = checkExists(permission);
if(permissionExists)
{
- Criteria criteria = TurbinePermissionPeer.buildCriteria(permission);
+ Criteria criteria = TurbinePermissionPeer
+ .buildCriteria((TurbinePermission)permission);
TurbinePermissionPeer.doUpdate(criteria);
return;
}
@@ -781,7 +787,8 @@
if(!groupExists)
{
// add a row to the table
- Criteria criteria = TurbineGroupPeer.buildCriteria(group);
+ Criteria criteria = TurbineGroupPeer
+ .buildCriteria((TurbineGroup)group);
TurbineGroupPeer.doInsert(criteria);
// try to get the object back using the name as key.
criteria = new Criteria();
@@ -835,7 +842,8 @@
if(!roleExists)
{
// add a row to the table
- Criteria criteria = TurbineRolePeer.buildCriteria(role);
+ Criteria criteria = TurbineRolePeer
+ .buildCriteria((TurbineRole)role);
TurbineRolePeer.doInsert(criteria);
// try to get the object back using the name as key.
criteria = new Criteria();
@@ -887,7 +895,8 @@
if(!permissionExists)
{
// add a row to the table
- Criteria criteria = TurbinePermissionPeer.buildCriteria(permission);
+ Criteria criteria = TurbinePermissionPeer
+ .buildCriteria((TurbinePermission)permission);
TurbinePermissionPeer.doInsert(criteria);
// try to get the object back using the name as key.
criteria = new Criteria();
@@ -939,7 +948,8 @@
groupExists = checkExists(group);
if(groupExists)
{
- Criteria criteria = TurbineGroupPeer.buildCriteria(group);
+ Criteria criteria = TurbineGroupPeer
+ .buildCriteria((TurbineGroup)group);
TurbineGroupPeer.doDelete(criteria);
getAllGroups().remove(group);
return;
@@ -978,7 +988,8 @@
{
// revoke all permissions from the role to be deleted
revokeAll(role);
- Criteria criteria = TurbineRolePeer.buildCriteria(role);
+ Criteria criteria = TurbineRolePeer
+ .buildCriteria((TurbineRole)role);
TurbineRolePeer.doDelete(criteria);
getAllRoles().remove(role);
return;
@@ -1013,7 +1024,8 @@
permissionExists = checkExists(permission);
if(permissionExists)
{
- Criteria criteria = TurbinePermissionPeer.buildCriteria(permission);
+ Criteria criteria = TurbinePermissionPeer
+ .buildCriteria((TurbinePermission)permission);
TurbinePermissionPeer.doDelete(criteria);
getAllPermissions().remove(permission);
return;
@@ -1051,7 +1063,8 @@
if(groupExists)
{
((SecurityEntity)group).setName(name);
- Criteria criteria = TurbineGroupPeer.buildCriteria(group);
+ Criteria criteria = TurbineGroupPeer
+ .buildCriteria((TurbineGroup)group);
TurbineGroupPeer.doUpdate(criteria);
return;
}
@@ -1087,7 +1100,8 @@
if(roleExists)
{
role.setName(name);
- Criteria criteria = TurbineRolePeer.buildCriteria(role);
+ Criteria criteria = TurbineRolePeer
+ .buildCriteria((TurbineRole)role);
TurbineRolePeer.doUpdate(criteria);
return;
}
@@ -1123,7 +1137,8 @@
if(permissionExists)
{
((SecurityEntity)permission).setName(name);
- Criteria criteria = TurbinePermissionPeer.buildCriteria(permission);
+ Criteria criteria = TurbinePermissionPeer
+ .buildCriteria((TurbinePermission)permission);
TurbinePermissionPeer.doUpdate(criteria);
return;
}
1.5 +4 -3
jakarta-turbine-fulcrum/src/services/java/org/apache/fulcrum/security/impl/db/DBUserManager.java
Index: DBUserManager.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-fulcrum/src/services/java/org/apache/fulcrum/security/impl/db/DBUserManager.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- DBUserManager.java 31 Oct 2001 00:56:34 -0000 1.4
+++ DBUserManager.java 1 Mar 2002 18:35:18 -0000 1.5
@@ -60,6 +60,7 @@
import org.apache.torque.om.BaseObject;
import org.apache.torque.om.ObjectKey;
import org.apache.fulcrum.security.entity.User;
+import org.apache.fulcrum.security.impl.db.entity.TurbineUser;
import org.apache.fulcrum.security.impl.db.entity.TurbineUserPeer;
import org.apache.fulcrum.security.util.DataBackendException;
@@ -86,7 +87,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]";>Frank Y. Kim</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Craig D. Berry</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Rafal Krzewski</a>
- * @version $Id: DBUserManager.java,v 1.4 2001/10/31 00:56:34 mpoeschl Exp $
+ * @version $Id: DBUserManager.java,v 1.5 2002/03/01 18:35:18 jmcnally Exp $
*/
public class DBUserManager implements UserManager
{
@@ -270,7 +271,7 @@
throw new UnknownEntityException("The account '" +
user.getUserName() + "' does not exist");
}
- Criteria criteria = TurbineUserPeer.buildCriteria(user);
+ Criteria criteria = TurbineUserPeer.buildCriteria((TurbineUser)user);
try
{
TurbineUserPeer.doUpdate(criteria);
@@ -402,7 +403,7 @@
}
String encrypted = TurbineSecurity.encryptPassword(initialPassword);
user.setPassword(encrypted);
- Criteria criteria = TurbineUserPeer.buildCriteria(user);
+ Criteria criteria = TurbineUserPeer.buildCriteria((TurbineUser)user);
try
{
// we can safely assume that BaseObject derivate is used as User
1.3 +1 -8
jakarta-turbine-fulcrum/src/services/java/org/apache/fulcrum/security/impl/db/entity/TurbineGroupPeer.java
Index: TurbineGroupPeer.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-fulcrum/src/services/java/org/apache/fulcrum/security/impl/db/entity/TurbineGroupPeer.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TurbineGroupPeer.java 2 Aug 2001 05:31:12 -0000 1.2
+++ TurbineGroupPeer.java 1 Mar 2002 18:35:18 -0000 1.3
@@ -74,7 +74,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]";>Brett McLaughlin</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Rafal Krzewski</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Martin Poeschl</a>
- * @version $Id: TurbineGroupPeer.java,v 1.2 2001/08/02 05:31:12 jvanzyl Exp $
+ * @version $Id: TurbineGroupPeer.java,v 1.3 2002/03/01 18:35:18 jmcnally Exp $
*/
public class TurbineGroupPeer
extends org.apache.fulcrum.security.impl.db.entity.BaseTurbineGroupPeer
@@ -129,13 +129,6 @@
public static String getTableName()
{
return TABLE_NAME;
- }
-
- /**
- * Builds a criteria object based upon an Group object
- */
- public static Criteria buildCriteria(Group group) {
- return BaseTurbineGroupPeer.buildCriteria((TurbineGroup)group);
}
/**
1.3 +1 -9
jakarta-turbine-fulcrum/src/services/java/org/apache/fulcrum/security/impl/db/entity/TurbinePermissionPeer.java
Index: TurbinePermissionPeer.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-fulcrum/src/services/java/org/apache/fulcrum/security/impl/db/entity/TurbinePermissionPeer.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TurbinePermissionPeer.java 2 Aug 2001 05:31:12 -0000 1.2
+++ TurbinePermissionPeer.java 1 Mar 2002 18:35:18 -0000 1.3
@@ -76,21 +76,13 @@
* @author <a href="mailto:[EMAIL PROTECTED]";>John D. McNally</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Brett McLaughlin</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Martin Poeschl</a>
- * @version $Id: TurbinePermissionPeer.java,v 1.2 2001/08/02 05:31:12 jvanzyl Exp $
+ * @version $Id: TurbinePermissionPeer.java,v 1.3 2002/03/01 18:35:18 jmcnally Exp $
*/
public class TurbinePermissionPeer
extends org.apache.fulcrum.security.impl.db.entity.BaseTurbinePermissionPeer
{
/** The column name for the name field. */
public static final String NAME = PERMISSION_NAME;
-
- /**
- * Builds a criteria object based upon an Permission object
- */
- public static Criteria buildCriteria( Permission permission )
- {
- return
BaseTurbinePermissionPeer.buildCriteria((TurbinePermission)permission);
- }
/**
* Checks if a Permission is defined in the system. The name
1.3 +1 -9
jakarta-turbine-fulcrum/src/services/java/org/apache/fulcrum/security/impl/db/entity/TurbineRolePeer.java
Index: TurbineRolePeer.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-fulcrum/src/services/java/org/apache/fulcrum/security/impl/db/entity/TurbineRolePeer.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TurbineRolePeer.java 2 Aug 2001 05:31:12 -0000 1.2
+++ TurbineRolePeer.java 1 Mar 2002 18:35:18 -0000 1.3
@@ -77,21 +77,13 @@
* @author <a href="mailto:[EMAIL PROTECTED]";>John D. McNally</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Brett McLaughlin</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Martin Poeschl</a>
- * @version $Id: TurbineRolePeer.java,v 1.2 2001/08/02 05:31:12 jvanzyl Exp $
+ * @version $Id: TurbineRolePeer.java,v 1.3 2002/03/01 18:35:18 jmcnally Exp $
*/
public class TurbineRolePeer
extends org.apache.fulcrum.security.impl.db.entity.BaseTurbineRolePeer
{
/** The column name for the name field. */
public static final String NAME = ROLE_NAME;
-
- /**
- * Builds a criteria object based upon an Role object
- */
- public static Criteria buildCriteria(Role role)
- {
- return BaseTurbineRolePeer.buildCriteria((TurbineRole)role);
- }
/**
* Checks if a Role is defined in the system. The name
1.4 +1 -11
jakarta-turbine-fulcrum/src/services/java/org/apache/fulcrum/security/impl/db/entity/TurbineUserPeer.java
Index: TurbineUserPeer.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-fulcrum/src/services/java/org/apache/fulcrum/security/impl/db/entity/TurbineUserPeer.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- TurbineUserPeer.java 9 Aug 2001 01:39:41 -0000 1.3
+++ TurbineUserPeer.java 1 Mar 2002 18:35:18 -0000 1.4
@@ -70,7 +70,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]";>John D. McNally</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Brett McLaughlin</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Martin Poeschl</a>
- * @version $Id: TurbineUserPeer.java,v 1.3 2001/08/09 01:39:41 jon Exp $
+ * @version $Id: TurbineUserPeer.java,v 1.4 2002/03/01 18:35:18 jmcnally Exp $
*/
public class TurbineUserPeer
extends org.apache.fulcrum.security.impl.db.entity.BaseTurbineUserPeer
@@ -102,16 +102,6 @@
}
return userClass;
- }
-
-
-
- /**
- * Builds a criteria object based upon an User object
- */
- public static Criteria buildCriteria(User user)
- {
- return BaseTurbineUserPeer.buildCriteria((TurbineUser)user);
}
/**
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
