jvanzyl 01/06/24 22:02:49
Modified: src/java/org/apache/turbine/services/security
BaseSecurityService.java SecurityService.java
TurbineSecurity.java UserManager.java
src/java/org/apache/turbine/services/security/db
DBSecurityService.java DBUserManager.java
src/java/org/apache/turbine/services/security/ldap
LDAPSecurityService.java LDAPUser.java
LDAPUserManager.java
src/java/org/apache/turbine/services/security/passive
PassiveUserManager.java
Log:
- updating for movement of the torque/om classes.
Revision Changes Path
1.25 +3 -2
jakarta-turbine/src/java/org/apache/turbine/services/security/BaseSecurityService.java
Index: BaseSecurityService.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/security/BaseSecurityService.java,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- BaseSecurityService.java 2001/06/14 14:43:33 1.24
+++ BaseSecurityService.java 2001/06/25 05:02:40 1.25
@@ -54,7 +54,8 @@
* <http://www.apache.org/>.
*/
-import org.apache.turbine.util.db.Criteria;
+import org.apache.turbine.services.db.util.Criteria;
+
import org.apache.turbine.om.security.User;
import org.apache.turbine.om.security.Group;
import org.apache.turbine.om.security.Role;
@@ -96,7 +97,7 @@
* </ul>
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Rafal Krzewski</a>
- * @version $Id: BaseSecurityService.java,v 1.24 2001/06/14 14:43:33 jvanzyl Exp $
+ * @version $Id: BaseSecurityService.java,v 1.25 2001/06/25 05:02:40 jvanzyl Exp $
*/
public abstract class BaseSecurityService
extends BaseService
1.21 +2 -2
jakarta-turbine/src/java/org/apache/turbine/services/security/SecurityService.java
Index: SecurityService.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/security/SecurityService.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- SecurityService.java 2001/05/30 23:41:12 1.20
+++ SecurityService.java 2001/06/25 05:02:40 1.21
@@ -73,7 +73,7 @@
import org.apache.turbine.util.security.PasswordMismatchException;
import org.apache.turbine.util.security.TurbineSecurityException;
-import org.apache.turbine.util.db.Criteria;
+import org.apache.turbine.services.db.util.Criteria;
/**
* The Security Service manages Users, Groups Roles and Permissions in the
@@ -89,7 +89,7 @@
* and directory server as the data backend.<br>
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Rafal Krzewski</a>
- * @version $Id: SecurityService.java,v 1.20 2001/05/30 23:41:12 jvanzyl Exp $
+ * @version $Id: SecurityService.java,v 1.21 2001/06/25 05:02:40 jvanzyl Exp $
*/
public interface SecurityService
extends Service
1.18 +2 -2
jakarta-turbine/src/java/org/apache/turbine/services/security/TurbineSecurity.java
Index: TurbineSecurity.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/security/TurbineSecurity.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- TurbineSecurity.java 2001/04/30 22:13:02 1.17
+++ TurbineSecurity.java 2001/06/25 05:02:41 1.18
@@ -73,7 +73,7 @@
import org.apache.turbine.util.security.PasswordMismatchException;
import org.apache.turbine.util.security.TurbineSecurityException;
-import org.apache.turbine.util.db.Criteria;
+import org.apache.turbine.services.db.util.Criteria;
/**
* This is a Facade class for SecurityService.
@@ -89,7 +89,7 @@
* named 'global' that can be referenced in the code as {@link
org.apache.turbine.om.security.Group#GLOBAL_GROUP_NAME}.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Rafal Krzewski</a>
- * @version $Id: TurbineSecurity.java,v 1.17 2001/04/30 22:13:02 dlr Exp $
+ * @version $Id: TurbineSecurity.java,v 1.18 2001/06/25 05:02:41 jvanzyl Exp $
*/
public abstract class TurbineSecurity
{
1.6 +2 -2
jakarta-turbine/src/java/org/apache/turbine/services/security/UserManager.java
Index: UserManager.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/security/UserManager.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- UserManager.java 2001/03/06 06:12:47 1.5
+++ UserManager.java 2001/06/25 05:02:41 1.6
@@ -60,7 +60,7 @@
import org.apache.turbine.util.security.EntityExistsException;
import org.apache.turbine.util.security.PasswordMismatchException;
-import org.apache.turbine.util.db.Criteria;
+import org.apache.turbine.services.db.util.Criteria;
/**
* An UserManager performs {@link org.apache.turbine.om.security.User} objects
@@ -71,7 +71,7 @@
* saving those data to the permanent storage, and authenticating users.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Rafal Krzewski</a>
- * @version $Id: UserManager.java,v 1.5 2001/03/06 06:12:47 chrise Exp $
+ * @version $Id: UserManager.java,v 1.6 2001/06/25 05:02:41 jvanzyl Exp $
*/
public interface UserManager
{
1.7 +5 -5
jakarta-turbine/src/java/org/apache/turbine/services/security/db/DBSecurityService.java
Index: DBSecurityService.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/security/db/DBSecurityService.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- DBSecurityService.java 2001/05/30 22:52:52 1.6
+++ DBSecurityService.java 2001/06/25 05:02:43 1.7
@@ -61,9 +61,9 @@
import java.util.Properties;
import java.util.Set;
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.Permission;
import org.apache.turbine.om.security.Role;
@@ -83,7 +83,7 @@
import org.apache.turbine.services.security.BaseSecurityService;
import org.apache.turbine.services.security.TurbineSecurity;
import org.apache.turbine.util.Log;
-import org.apache.turbine.util.db.Criteria;
+import org.apache.turbine.services.db.util.Criteria;
import org.apache.turbine.util.security.AccessControlList;
import org.apache.turbine.util.security.DataBackendException;
import org.apache.turbine.util.security.EntityExistsException;
@@ -96,7 +96,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/05/30 22:52:52 jmcnally Exp $
+ * @version $Id: DBSecurityService.java,v 1.7 2001/06/25 05:02:43 jvanzyl Exp $
*/
public class DBSecurityService extends BaseSecurityService
{
1.7 +4 -4
jakarta-turbine/src/java/org/apache/turbine/services/security/db/DBUserManager.java
Index: DBUserManager.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/security/db/DBUserManager.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- DBUserManager.java 2001/05/30 22:27:53 1.6
+++ DBUserManager.java 2001/06/25 05:02:44 1.7
@@ -57,8 +57,8 @@
import java.util.Vector;
import java.util.Iterator;
-import org.apache.turbine.om.BaseObject;
-import org.apache.turbine.om.ObjectKey;
+import org.apache.turbine.services.db.om.BaseObject;
+import org.apache.turbine.services.db.om.ObjectKey;
import org.apache.turbine.om.security.User;
import org.apache.turbine.om.security.peer.TurbineUserPeer;
@@ -68,7 +68,7 @@
import org.apache.turbine.util.security.PasswordMismatchException;
import org.apache.turbine.util.Log;
-import org.apache.turbine.util.db.Criteria;
+import org.apache.turbine.services.db.util.Criteria;
import org.apache.turbine.services.security.UserManager;
import org.apache.turbine.services.security.TurbineSecurity;
@@ -87,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.6 2001/05/30 22:27:53 jmcnally Exp $
+ * @version $Id: DBUserManager.java,v 1.7 2001/06/25 05:02:44 jvanzyl Exp $
*/
public class DBUserManager implements UserManager
{
1.6 +2 -2
jakarta-turbine/src/java/org/apache/turbine/services/security/ldap/LDAPSecurityService.java
Index: LDAPSecurityService.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/security/ldap/LDAPSecurityService.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- LDAPSecurityService.java 2001/06/13 17:22:12 1.5
+++ LDAPSecurityService.java 2001/06/25 05:02:45 1.6
@@ -62,7 +62,7 @@
import org.apache.turbine.om.security.Role;
import org.apache.turbine.om.security.Permission;
-import org.apache.turbine.util.db.Criteria;
+import org.apache.turbine.services.db.util.Criteria;
import org.apache.turbine.util.security.AccessControlList;
import org.apache.turbine.util.security.GroupSet;
@@ -81,7 +81,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]";>Tracy M. Adewunmi </a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Leonard J. Flournoy </a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Jason van Zyl</a>
- * @version $Id: LDAPSecurityService.java,v 1.5 2001/06/13 17:22:12 mpoeschl Exp $
+ * @version $Id: LDAPSecurityService.java,v 1.6 2001/06/25 05:02:45 jvanzyl Exp $
*/
public class LDAPSecurityService extends BaseSecurityService
{
1.8 +1 -1
jakarta-turbine/src/java/org/apache/turbine/services/security/ldap/LDAPUser.java
Index: LDAPUser.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/security/ldap/LDAPUser.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- LDAPUser.java 2001/05/05 14:03:44 1.7
+++ LDAPUser.java 2001/06/25 05:02:45 1.8
@@ -61,7 +61,7 @@
import java.util.Date;
import java.util.Hashtable;
import javax.servlet.http.HttpSessionBindingEvent;
-import org.apache.turbine.om.BaseObject;
+import org.apache.turbine.services.db.om.BaseObject;
import org.apache.turbine.om.security.User;
import org.apache.turbine.services.security.TurbineSecurity;
import org.apache.turbine.util.Log;
1.7 +2 -2
jakarta-turbine/src/java/org/apache/turbine/services/security/ldap/LDAPUserManager.java
Index: LDAPUserManager.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/security/ldap/LDAPUserManager.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- LDAPUserManager.java 2001/04/20 18:35:25 1.6
+++ LDAPUserManager.java 2001/06/25 05:02:46 1.7
@@ -71,7 +71,7 @@
import org.apache.turbine.om.security.User;
import org.apache.turbine.util.Log;
-import org.apache.turbine.util.db.Criteria;
+import org.apache.turbine.services.db.util.Criteria;
import org.apache.turbine.util.security.DataBackendException;
import org.apache.turbine.util.security.UnknownEntityException;
import org.apache.turbine.util.security.EntityExistsException;
@@ -99,7 +99,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]";>Leonard J. Flournoy</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Jason van Zyl</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Daniel Rall</a>
- * @version $Id: LDAPUserManager.java,v 1.6 2001/04/20 18:35:25 dlr Exp $
+ * @version $Id: LDAPUserManager.java,v 1.7 2001/06/25 05:02:46 jvanzyl Exp $
*/
public class LDAPUserManager implements UserManager, LDAPSecurityConstants
{
1.4 +2 -2
jakarta-turbine/src/java/org/apache/turbine/services/security/passive/PassiveUserManager.java
Index: PassiveUserManager.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/security/passive/PassiveUserManager.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- PassiveUserManager.java 2001/04/14 19:20:13 1.3
+++ PassiveUserManager.java 2001/06/25 05:02:48 1.4
@@ -56,7 +56,7 @@
import org.apache.turbine.om.security.User;
-import org.apache.turbine.util.db.Criteria;
+import org.apache.turbine.services.db.util.Criteria;
import org.apache.turbine.util.security.DataBackendException;
import org.apache.turbine.util.security.UnknownEntityException;
import org.apache.turbine.util.security.EntityExistsException;
@@ -72,7 +72,7 @@
* anonymous User objects when this UserManager is used.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Rafal Krzewski</a>
- * @version $Id: PassiveUserManager.java,v 1.3 2001/04/14 19:20:13 jvanzyl Exp $
+ * @version $Id: PassiveUserManager.java,v 1.4 2001/06/25 05:02:48 jvanzyl Exp $
*/
public class PassiveUserManager implements UserManager
{
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
