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/06/25 07:15:44 UTC
cvs commit: jakarta-turbine/src/java/org/apache/turbine/om/security/peer GroupPeer.java PermissionPeer.java RolePeer.java RolePermissionPeer.java TurbineUserPeer.java UserGroupRolePeer.java
jvanzyl 01/06/24 22:15:44
Modified: src/java/org/apache/turbine/om OMTool.java
src/java/org/apache/turbine/om/security SecurityObject.java
src/java/org/apache/turbine/om/security/peer GroupPeer.java
PermissionPeer.java RolePeer.java
RolePermissionPeer.java TurbineUserPeer.java
UserGroupRolePeer.java
Log:
- updating security code with new torque/om class locations
Revision Changes Path
1.4 +2 -1 jakarta-turbine/src/java/org/apache/turbine/om/OMTool.java
Index: OMTool.java
===================================================================
RCS file: /home/cvs/jakarta-turbine/src/java/org/apache/turbine/om/OMTool.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- OMTool.java 2001/05/05 18:00:44 1.3
+++ OMTool.java 2001/06/25 05:15:38 1.4
@@ -64,12 +64,13 @@
import org.apache.turbine.services.resources.TurbineResources;
import org.apache.turbine.services.pull.ApplicationTool;
import org.apache.turbine.util.pool.Recyclable;
+import org.apache.turbine.services.db.om.RetrieverFactory;
/**
* A Pull tool to make om objects available to a template
*
* @author <a href="mailto:jmcnally@collab.net">John D. McNally</a>
- * @version $Id: OMTool.java,v 1.3 2001/05/05 18:00:44 jvanzyl Exp $
+ * @version $Id: OMTool.java,v 1.4 2001/06/25 05:15:38 jvanzyl Exp $
*/
public class OMTool
implements ApplicationTool, Recyclable
1.10 +5 -3 jakarta-turbine/src/java/org/apache/turbine/om/security/SecurityObject.java
Index: SecurityObject.java
===================================================================
RCS file: /home/cvs/jakarta-turbine/src/java/org/apache/turbine/om/security/SecurityObject.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- SecurityObject.java 2001/05/05 21:00:55 1.9
+++ SecurityObject.java 2001/06/25 05:15:39 1.10
@@ -57,7 +57,7 @@
import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
-import org.apache.turbine.om.BaseObject;
+import org.apache.turbine.services.db.om.BaseObject;
/**
* This class represents a generic object used in the Access Control Lists.
@@ -66,9 +66,11 @@
* @author <a href="mailto:john.mcnally@clearink.com">John D. McNally</a>
* @author <a href="mailto:bmclaugh@algx.net">Brett McLaughlin</a>
* @author <a href="mailto:Rafal.Krzewski@e-point.pl">Rafal Krzewski</a>
- * @version $Id: SecurityObject.java,v 1.9 2001/05/05 21:00:55 dlr Exp $
+ * @version $Id: SecurityObject.java,v 1.10 2001/06/25 05:15:39 jvanzyl Exp $
*/
-public abstract class SecurityObject extends BaseObject implements Comparable
+public abstract class SecurityObject
+ extends BaseObject
+ implements Comparable
{
/** The name of this object. */
private String name;
1.14 +6 -6 jakarta-turbine/src/java/org/apache/turbine/om/security/peer/GroupPeer.java
Index: GroupPeer.java
===================================================================
RCS file: /home/cvs/jakarta-turbine/src/java/org/apache/turbine/om/security/peer/GroupPeer.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- GroupPeer.java 2001/05/23 18:53:05 1.13
+++ GroupPeer.java 2001/06/25 05:15:40 1.14
@@ -58,17 +58,17 @@
import com.workingdogs.village.Value;
import java.util.Map;
import java.util.Vector;
-import org.apache.turbine.om.BaseObject;
-import org.apache.turbine.om.ObjectKey;
-import org.apache.turbine.om.peer.BasePeer;
+import org.apache.turbine.services.db.om.BaseObject;
+import org.apache.turbine.services.db.om.ObjectKey;
+import org.apache.turbine.services.db.om.peer.BasePeer;
import org.apache.turbine.om.security.Group;
import org.apache.turbine.om.security.SecurityObject;
import org.apache.turbine.om.security.TurbineGroup;
import org.apache.turbine.services.security.TurbineSecurity;
import org.apache.turbine.util.ObjectUtils;
import org.apache.turbine.util.StringStackBuffer;
-import org.apache.turbine.util.db.Criteria;
-import org.apache.turbine.util.db.map.MapBuilder;
+import org.apache.turbine.services.db.util.Criteria;
+import org.apache.turbine.services.db.map.MapBuilder;
import org.apache.turbine.util.db.map.TurbineMapBuilder;
import org.apache.turbine.util.security.DataBackendException;
import org.apache.turbine.util.security.GroupSet;
@@ -81,7 +81,7 @@
* @author <a href="mailto:john.mcnally@clearink.com">John D. McNally</a>
* @author <a href="mailto:bmclaugh@algx.net">Brett McLaughlin</a>
* @author <a href="mailto:Rafal.Krzewski@e-point.pl">Rafal Krzewski</a>
- * @version $Id: GroupPeer.java,v 1.13 2001/05/23 18:53:05 mikeh Exp $
+ * @version $Id: GroupPeer.java,v 1.14 2001/06/25 05:15:40 jvanzyl Exp $
*/
public class GroupPeer extends BasePeer
{
1.15 +6 -6 jakarta-turbine/src/java/org/apache/turbine/om/security/peer/PermissionPeer.java
Index: PermissionPeer.java
===================================================================
RCS file: /home/cvs/jakarta-turbine/src/java/org/apache/turbine/om/security/peer/PermissionPeer.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- PermissionPeer.java 2001/05/23 18:53:07 1.14
+++ PermissionPeer.java 2001/06/25 05:15:40 1.15
@@ -59,9 +59,9 @@
import java.util.Enumeration;
import java.util.Map;
import java.util.Vector;
-import org.apache.turbine.om.BaseObject;
-import org.apache.turbine.om.ObjectKey;
-import org.apache.turbine.om.peer.BasePeer;
+import org.apache.turbine.services.db.om.BaseObject;
+import org.apache.turbine.services.db.om.ObjectKey;
+import org.apache.turbine.services.db.om.peer.BasePeer;
import org.apache.turbine.om.security.Permission;
import org.apache.turbine.om.security.Role;
import org.apache.turbine.om.security.SecurityObject;
@@ -69,8 +69,8 @@
import org.apache.turbine.services.security.TurbineSecurity;
import org.apache.turbine.util.ObjectUtils;
import org.apache.turbine.util.StringStackBuffer;
-import org.apache.turbine.util.db.Criteria;
-import org.apache.turbine.util.db.map.MapBuilder;
+import org.apache.turbine.services.db.util.Criteria;
+import org.apache.turbine.services.db.map.MapBuilder;
import org.apache.turbine.util.db.map.TurbineMapBuilder;
import org.apache.turbine.util.security.DataBackendException;
import org.apache.turbine.util.security.PermissionSet;
@@ -83,7 +83,7 @@
* @author <a href="mailto:frank.kim@clearink.com">Frank Y. Kim</a>
* @author <a href="mailto:john.mcnally@clearink.com">John D. McNally</a>
* @author <a href="mailto:bmclaugh@algx.net">Brett McLaughlin</a>
- * @version $Id: PermissionPeer.java,v 1.14 2001/05/23 18:53:07 mikeh Exp $
+ * @version $Id: PermissionPeer.java,v 1.15 2001/06/25 05:15:40 jvanzyl Exp $
*/
public class PermissionPeer extends BasePeer
{
1.16 +7 -7 jakarta-turbine/src/java/org/apache/turbine/om/security/peer/RolePeer.java
Index: RolePeer.java
===================================================================
RCS file: /home/cvs/jakarta-turbine/src/java/org/apache/turbine/om/security/peer/RolePeer.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- RolePeer.java 2001/05/30 22:43:30 1.15
+++ RolePeer.java 2001/06/25 05:15:41 1.16
@@ -58,10 +58,10 @@
import com.workingdogs.village.Value;
import java.util.Map;
import java.util.Vector;
-import org.apache.turbine.om.BaseObject;
-import org.apache.turbine.om.ObjectKey;
-import org.apache.turbine.om.Persistent;
-import org.apache.turbine.om.peer.BasePeer;
+import org.apache.turbine.services.db.om.BaseObject;
+import org.apache.turbine.services.db.om.ObjectKey;
+import org.apache.turbine.services.db.om.Persistent;
+import org.apache.turbine.services.db.om.peer.BasePeer;
import org.apache.turbine.om.security.Group;
import org.apache.turbine.om.security.Role;
import org.apache.turbine.om.security.SecurityEntity;
@@ -73,8 +73,8 @@
import org.apache.turbine.services.security.db.DBSecurityService;
import org.apache.turbine.util.ObjectUtils;
import org.apache.turbine.util.StringStackBuffer;
-import org.apache.turbine.util.db.Criteria;
-import org.apache.turbine.util.db.map.MapBuilder;
+import org.apache.turbine.services.db.util.Criteria;
+import org.apache.turbine.services.db.map.MapBuilder;
import org.apache.turbine.util.db.map.TurbineMapBuilder;
import org.apache.turbine.util.security.DataBackendException;
import org.apache.turbine.util.security.RoleSet;
@@ -86,7 +86,7 @@
* @author <a href="mailto:frank.kim@clearink.com">Frank Y. Kim</a>
* @author <a href="mailto:john.mcnally@clearink.com">John D. McNally</a>
* @author <a href="mailto:bmclaugh@algx.net">Brett McLaughlin</a>
- * @version $Id: RolePeer.java,v 1.15 2001/05/30 22:43:30 jmcnally Exp $
+ * @version $Id: RolePeer.java,v 1.16 2001/06/25 05:15:41 jvanzyl Exp $
*/
public class RolePeer extends BasePeer
{
1.7 +4 -4 jakarta-turbine/src/java/org/apache/turbine/om/security/peer/RolePermissionPeer.java
Index: RolePermissionPeer.java
===================================================================
RCS file: /home/cvs/jakarta-turbine/src/java/org/apache/turbine/om/security/peer/RolePermissionPeer.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- RolePermissionPeer.java 2001/05/23 18:53:13 1.6
+++ RolePermissionPeer.java 2001/06/25 05:15:41 1.7
@@ -54,9 +54,9 @@
* <http://www.apache.org/>.
*/
-import org.apache.turbine.om.peer.BasePeer;
-import org.apache.turbine.util.db.Criteria;
-import org.apache.turbine.util.db.map.MapBuilder;
+import org.apache.turbine.services.db.om.peer.BasePeer;
+import org.apache.turbine.services.db.util.Criteria;
+import org.apache.turbine.services.db.map.MapBuilder;
import org.apache.turbine.util.db.map.TurbineMapBuilder;
/**
@@ -68,7 +68,7 @@
* @author <a href="mailto:bmclaugh@algx.net">Brett McLaughlin</a>
* @author <a href="mailto:john.mcnally@clearink.com">John D. McNally</a>
* @author <a href="mailto:jon@collab.net">Jon S. Stevens</a>
- * @version $Id: RolePermissionPeer.java,v 1.6 2001/05/23 18:53:13 mikeh Exp $
+ * @version $Id: RolePermissionPeer.java,v 1.7 2001/06/25 05:15:41 jvanzyl Exp $
*/
public class RolePermissionPeer extends BasePeer
{
1.20 +9 -9 jakarta-turbine/src/java/org/apache/turbine/om/security/peer/TurbineUserPeer.java
Index: TurbineUserPeer.java
===================================================================
RCS file: /home/cvs/jakarta-turbine/src/java/org/apache/turbine/om/security/peer/TurbineUserPeer.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- TurbineUserPeer.java 2001/05/31 00:30:37 1.19
+++ TurbineUserPeer.java 2001/06/25 05:15:41 1.20
@@ -64,19 +64,19 @@
import java.util.Date;
import java.util.Hashtable;
import java.util.Vector;
-import org.apache.turbine.om.Persistent;
-import org.apache.turbine.om.NumberKey;
-import org.apache.turbine.om.ObjectKey;
-import org.apache.turbine.om.peer.BasePeer;
+import org.apache.turbine.services.db.om.Persistent;
+import org.apache.turbine.services.db.om.NumberKey;
+import org.apache.turbine.services.db.om.ObjectKey;
+import org.apache.turbine.services.db.om.peer.BasePeer;
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.StringStackBuffer;
-import org.apache.turbine.util.db.Criteria;
-import org.apache.turbine.util.db.map.TableMap;
-import org.apache.turbine.util.db.map.MapBuilder;
+import org.apache.turbine.services.db.util.Criteria;
+import org.apache.turbine.services.db.map.TableMap;
+import org.apache.turbine.services.db.map.MapBuilder;
import org.apache.turbine.util.db.map.TurbineMapBuilder;
-import org.apache.turbine.util.db.pool.DBConnection;
+import org.apache.turbine.services.db.pool.DBConnection;
import org.apache.turbine.util.security.DataBackendException;
/**
@@ -86,7 +86,7 @@
* @author <a href="mailto:frank.kim@clearink.com">Frank Y. Kim</a>
* @author <a href="mailto:john.mcnally@clearink.com">John D. McNally</a>
* @author <a href="mailto:bmclaugh@algx.net">Brett McLaughlin</a>
- * @version $Id: TurbineUserPeer.java,v 1.19 2001/05/31 00:30:37 jmcnally Exp $
+ * @version $Id: TurbineUserPeer.java,v 1.20 2001/06/25 05:15:41 jvanzyl Exp $
*/
public class TurbineUserPeer extends BasePeer implements UserPeer
{
1.9 +3 -3 jakarta-turbine/src/java/org/apache/turbine/om/security/peer/UserGroupRolePeer.java
Index: UserGroupRolePeer.java
===================================================================
RCS file: /home/cvs/jakarta-turbine/src/java/org/apache/turbine/om/security/peer/UserGroupRolePeer.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- UserGroupRolePeer.java 2001/05/23 18:53:18 1.8
+++ UserGroupRolePeer.java 2001/06/25 05:15:42 1.9
@@ -54,8 +54,8 @@
* <http://www.apache.org/>.
*/
-import org.apache.turbine.om.peer.BasePeer;
-import org.apache.turbine.util.db.map.MapBuilder;
+import org.apache.turbine.services.db.om.peer.BasePeer;
+import org.apache.turbine.services.db.map.MapBuilder;
import org.apache.turbine.util.db.map.TurbineMapBuilder;
/**
@@ -65,7 +65,7 @@
* @author <a href="mailto:frank.kim@clearink.com">Frank Y. Kim</a>
* @author <a href="mailto:john.mcnally@clearink.com">John D. McNally</a>
* @author <a href="mailto:bmclaugh@algx.net">Brett McLaughlin</a>
- * @version $Id: UserGroupRolePeer.java,v 1.8 2001/05/23 18:53:18 mikeh Exp $
+ * @version $Id: UserGroupRolePeer.java,v 1.9 2001/06/25 05:15:42 jvanzyl Exp $
*/
public class UserGroupRolePeer extends BasePeer
{
---------------------------------------------------------------------
To unsubscribe, e-mail: turbine-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: turbine-dev-help@jakarta.apache.org