jvanzyl 01/08/01 22:31:13
Modified: . build-om.xml build.xml
src/services/java/org/apache/fulcrum/db DatabaseService.java
TurbineDB.java TurbineDatabaseService.java
src/services/java/org/apache/fulcrum/schedule JobEntry.java
TurbineNonPersistentSchedulerService.java
TurbineSchedulerService.java
src/services/java/org/apache/fulcrum/security
BaseSecurityService.java SecurityService.java
TurbineSecurity.java UserManager.java
src/services/java/org/apache/fulcrum/security/impl/db
DBSecurityService.java DBUserManager.java
src/services/java/org/apache/fulcrum/security/impl/db/entity
SecurityObject.java TurbineGroupPeer.java
TurbinePermissionPeer.java TurbineRolePeer.java
TurbineUser.java TurbineUserPeer.java
src/services/java/org/apache/fulcrum/security/impl/passive
PassiveUserManager.java
Log:
- reflect changes in torque
Revision Changes Path
1.3 +1 -1 jakarta-turbine-fulcrum/build-om.xml
Index: build-om.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-fulcrum/build-om.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- build-om.xml 2001/08/01 15:53:55 1.2
+++ build-om.xml 2001/08/02 05:31:12 1.3
@@ -20,7 +20,7 @@
<target name="init">
<taskdef name="torque-om"
- classname="org.apache.turbine.torque.TorqueObjectModelTask">
+ classname="org.apache.torque.task.TorqueObjectModelTask">
<classpath>
<pathelement location="${velocity.jar}"/>
<pathelement location="${torque.jar}"/>
1.4 +1 -1 jakarta-turbine-fulcrum/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-fulcrum/build.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- build.xml 2001/08/01 19:10:20 1.3
+++ build.xml 2001/08/02 05:31:12 1.4
@@ -93,7 +93,7 @@
/>
<available
- classname="org.apache.turbine.torque.TorqueObjectModelTask"
+ classname="org.apache.torque.Torque"
property="torque.present"
classpathref="classpath"
/>
1.2 +4 -4
jakarta-turbine-fulcrum/src/services/java/org/apache/fulcrum/db/DatabaseService.java
Index: DatabaseService.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-fulcrum/src/services/java/org/apache/fulcrum/db/DatabaseService.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DatabaseService.java 2001/08/01 15:51:06 1.1
+++ DatabaseService.java 2001/08/02 05:31:12 1.2
@@ -55,9 +55,9 @@
*/
import org.apache.fulcrum.Service;
-import org.apache.turbine.services.db.map.DatabaseMap;
-import org.apache.turbine.services.db.pool.DBConnection;
-import org.apache.turbine.services.db.adapter.DB;
+import org.apache.torque.map.DatabaseMap;
+import org.apache.torque.pool.DBConnection;
+import org.apache.torque.adapter.DB;
/**
* This service provides database connection pooling and manages
@@ -83,7 +83,7 @@
* to the pool.<br>
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Rafal Krzewski</a>
- * @version $Id: DatabaseService.java,v 1.1 2001/08/01 15:51:06 jvanzyl Exp $
+ * @version $Id: DatabaseService.java,v 1.2 2001/08/02 05:31:12 jvanzyl Exp $
*/
public interface DatabaseService extends Service
{
1.2 +4 -4
jakarta-turbine-fulcrum/src/services/java/org/apache/fulcrum/db/TurbineDB.java
Index: TurbineDB.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-fulcrum/src/services/java/org/apache/fulcrum/db/TurbineDB.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TurbineDB.java 2001/08/01 15:51:07 1.1
+++ TurbineDB.java 2001/08/02 05:31:12 1.2
@@ -55,10 +55,10 @@
*/
import org.apache.fulcrum.ServiceException;
-import org.apache.turbine.services.db.adapter.DB;
-import org.apache.turbine.services.db.map.DatabaseMap;
-import org.apache.turbine.services.db.pool.DBConnection;
import org.apache.fulcrum.TurbineServices;
+import org.apache.torque.adapter.DB;
+import org.apache.torque.map.DatabaseMap;
+import org.apache.torque.pool.DBConnection;
/**
* This class provides a common front end to the DatabaseService in Turbine.
@@ -93,7 +93,7 @@
* </pre></code></blockquote>
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Rafal Krzewski</a>
- * @version $Id: TurbineDB.java,v 1.1 2001/08/01 15:51:07 jvanzyl Exp $
+ * @version $Id: TurbineDB.java,v 1.2 2001/08/02 05:31:12 jvanzyl Exp $
*/
public abstract class TurbineDB
{
1.2 +6 -6
jakarta-turbine-fulcrum/src/services/java/org/apache/fulcrum/db/TurbineDatabaseService.java
Index: TurbineDatabaseService.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-fulcrum/src/services/java/org/apache/fulcrum/db/TurbineDatabaseService.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TurbineDatabaseService.java 2001/08/01 15:51:07 1.1
+++ TurbineDatabaseService.java 2001/08/02 05:31:12 1.2
@@ -54,20 +54,20 @@
* <http://www.apache.org/>.
*/
-import org.apache.turbine.torque.Torque;
-import org.apache.turbine.torque.TorqueException;
import org.apache.fulcrum.BaseService;
import org.apache.fulcrum.InitializationException;
-import org.apache.turbine.services.db.adapter.DB;
-import org.apache.turbine.services.db.map.DatabaseMap;
-import org.apache.turbine.services.db.pool.DBConnection;
import org.apache.fulcrum.TurbineServices;
+import org.apache.torque.Torque;
+import org.apache.torque.TorqueException;
+import org.apache.torque.adapter.DB;
+import org.apache.torque.map.DatabaseMap;
+import org.apache.torque.pool.DBConnection;
/**
* Turbine's default implementation of {@link DatabaseService}.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Jason van Zyl</a>
- * @version $Id: TurbineDatabaseService.java,v 1.1 2001/08/01 15:51:07 jvanzyl Exp $
+ * @version $Id: TurbineDatabaseService.java,v 1.2 2001/08/02 05:31:12 jvanzyl Exp $
*/
public class TurbineDatabaseService
extends BaseService
1.2 +2 -2
jakarta-turbine-fulcrum/src/services/java/org/apache/fulcrum/schedule/JobEntry.java
Index: JobEntry.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-fulcrum/src/services/java/org/apache/fulcrum/schedule/JobEntry.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- JobEntry.java 2001/08/01 15:51:12 1.1
+++ JobEntry.java 2001/08/02 05:31:12 1.2
@@ -56,14 +56,14 @@
import java.util.Calendar;
import java.util.Date;
-import org.apache.turbine.services.db.om.Persistent;
+import org.apache.torque.om.Persistent;
/**
* This is a wrapper for a scheduled job. It is modeled after the
* Unix scheduler cron.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Dave Bryson</a>
- * @version $Id: JobEntry.java,v 1.1 2001/08/01 15:51:12 jvanzyl Exp $
+ * @version $Id: JobEntry.java,v 1.2 2001/08/02 05:31:12 jvanzyl Exp $
*/
public class JobEntry
extends org.apache.fulcrum.schedule.BaseJobEntry
1.2 +2 -2
jakarta-turbine-fulcrum/src/services/java/org/apache/fulcrum/schedule/TurbineNonPersistentSchedulerService.java
Index: TurbineNonPersistentSchedulerService.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-fulcrum/src/services/java/org/apache/fulcrum/schedule/TurbineNonPersistentSchedulerService.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TurbineNonPersistentSchedulerService.java 2001/08/01 15:51:13 1.1
+++ TurbineNonPersistentSchedulerService.java 2001/08/02 05:31:12 1.2
@@ -56,8 +56,8 @@
import java.util.List;
import java.util.Vector;
-import org.apache.turbine.services.db.om.NumberKey;
-import org.apache.turbine.services.db.om.ObjectKey;
+import org.apache.torque.om.NumberKey;
+import org.apache.torque.om.ObjectKey;
import org.apache.fulcrum.InitializationException;
/**
1.2 +3 -3
jakarta-turbine-fulcrum/src/services/java/org/apache/fulcrum/schedule/TurbineSchedulerService.java
Index: TurbineSchedulerService.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-fulcrum/src/services/java/org/apache/fulcrum/schedule/TurbineSchedulerService.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TurbineSchedulerService.java 2001/08/01 15:51:13 1.1
+++ TurbineSchedulerService.java 2001/08/02 05:31:12 1.2
@@ -58,14 +58,14 @@
import java.util.Vector;
import org.apache.fulcrum.BaseService;
import org.apache.fulcrum.InitializationException;
-import org.apache.turbine.services.db.om.NumberKey;
-import org.apache.turbine.services.db.util.Criteria;
+import org.apache.torque.om.NumberKey;
+import org.apache.torque.util.Criteria;
/**
* Service for a cron like scheduler.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Dave Bryson</a>
- * @version $Id: TurbineSchedulerService.java,v 1.1 2001/08/01 15:51:13 jvanzyl Exp
$
+ * @version $Id: TurbineSchedulerService.java,v 1.2 2001/08/02 05:31:12 jvanzyl Exp
$
*/
public class TurbineSchedulerService
extends BaseService
1.2 +6 -8
jakarta-turbine-fulcrum/src/services/java/org/apache/fulcrum/security/BaseSecurityService.java
Index: BaseSecurityService.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-fulcrum/src/services/java/org/apache/fulcrum/security/BaseSecurityService.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- BaseSecurityService.java 2001/08/01 15:51:14 1.1
+++ BaseSecurityService.java 2001/08/02 05:31:12 1.2
@@ -54,26 +54,24 @@
* <http://www.apache.org/>.
*/
-import org.apache.turbine.services.db.util.Criteria;
-
+import org.apache.fulcrum.BaseService;
+import org.apache.fulcrum.InitializationException;
+import org.apache.fulcrum.security.UserManager;
import org.apache.fulcrum.security.entity.User;
import org.apache.fulcrum.security.entity.Group;
import org.apache.fulcrum.security.entity.Role;
import org.apache.fulcrum.security.entity.Permission;
-
-import org.apache.fulcrum.BaseService;
-import org.apache.fulcrum.InitializationException;
-import org.apache.fulcrum.security.UserManager;
import org.apache.fulcrum.security.util.GroupSet;
import org.apache.fulcrum.security.util.RoleSet;
import org.apache.fulcrum.security.util.PermissionSet;
-
import org.apache.fulcrum.security.util.DataBackendException;
import org.apache.fulcrum.security.util.UnknownEntityException;
import org.apache.fulcrum.security.util.EntityExistsException;
import org.apache.fulcrum.security.util.PasswordMismatchException;
import org.apache.fulcrum.security.util.TurbineSecurityException;
+import org.apache.torque.util.Criteria;
+
// Classes needed for password encryption
import javax.mail.internet.MimeUtility;
import java.security.MessageDigest;
@@ -96,7 +94,7 @@
* </ul>
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Rafal Krzewski</a>
- * @version $Id: BaseSecurityService.java,v 1.1 2001/08/01 15:51:14 jvanzyl Exp $
+ * @version $Id: BaseSecurityService.java,v 1.2 2001/08/02 05:31:12 jvanzyl Exp $
*/
public abstract class BaseSecurityService
extends BaseService
1.2 +2 -6
jakarta-turbine-fulcrum/src/services/java/org/apache/fulcrum/security/SecurityService.java
Index: SecurityService.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-fulcrum/src/services/java/org/apache/fulcrum/security/SecurityService.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SecurityService.java 2001/08/01 15:51:14 1.1
+++ SecurityService.java 2001/08/02 05:31:12 1.2
@@ -55,25 +55,21 @@
*/
import org.apache.fulcrum.Service;
-
import org.apache.fulcrum.security.entity.User;
import org.apache.fulcrum.security.entity.Group;
import org.apache.fulcrum.security.entity.Role;
import org.apache.fulcrum.security.entity.Permission;
import org.apache.fulcrum.security.impl.db.entity.UserPeer;
-
import org.apache.fulcrum.security.util.GroupSet;
import org.apache.fulcrum.security.util.RoleSet;
import org.apache.fulcrum.security.util.PermissionSet;
import org.apache.fulcrum.security.util.AccessControlList;
-
import org.apache.fulcrum.security.util.DataBackendException;
import org.apache.fulcrum.security.util.UnknownEntityException;
import org.apache.fulcrum.security.util.EntityExistsException;
import org.apache.fulcrum.security.util.PasswordMismatchException;
import org.apache.fulcrum.security.util.TurbineSecurityException;
-
-import org.apache.turbine.services.db.util.Criteria;
+import org.apache.torque.util.Criteria;
/**
* The Security Service manages Users, Groups Roles and Permissions in the
@@ -89,7 +85,7 @@
* and directory server as the data backend.<br>
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Rafal Krzewski</a>
- * @version $Id: SecurityService.java,v 1.1 2001/08/01 15:51:14 jvanzyl Exp $
+ * @version $Id: SecurityService.java,v 1.2 2001/08/02 05:31:12 jvanzyl Exp $
*/
public interface SecurityService
extends Service
1.2 +2 -2
jakarta-turbine-fulcrum/src/services/java/org/apache/fulcrum/security/TurbineSecurity.java
Index: TurbineSecurity.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-fulcrum/src/services/java/org/apache/fulcrum/security/TurbineSecurity.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TurbineSecurity.java 2001/08/01 15:51:15 1.1
+++ TurbineSecurity.java 2001/08/02 05:31:12 1.2
@@ -69,7 +69,7 @@
import org.apache.fulcrum.security.util.EntityExistsException;
import org.apache.fulcrum.security.util.PasswordMismatchException;
import org.apache.fulcrum.security.util.TurbineSecurityException;
-import org.apache.turbine.services.db.util.Criteria;
+import org.apache.torque.util.Criteria;
/**
* This is a Facade class for SecurityService.
@@ -85,7 +85,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.1 2001/08/01 15:51:15 jvanzyl Exp $
+ * @version $Id: TurbineSecurity.java,v 1.2 2001/08/02 05:31:12 jvanzyl Exp $
*/
public abstract class TurbineSecurity
{
1.2 +2 -2
jakarta-turbine-fulcrum/src/services/java/org/apache/fulcrum/security/UserManager.java
Index: UserManager.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-fulcrum/src/services/java/org/apache/fulcrum/security/UserManager.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- UserManager.java 2001/08/01 15:51:16 1.1
+++ UserManager.java 2001/08/02 05:31:12 1.2
@@ -60,7 +60,7 @@
import org.apache.fulcrum.security.util.EntityExistsException;
import org.apache.fulcrum.security.util.PasswordMismatchException;
-import org.apache.turbine.services.db.util.Criteria;
+import org.apache.torque.util.Criteria;
/**
* An UserManager performs {@link org.apache.fulcrum.security.entity.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.1 2001/08/01 15:51:16 jvanzyl Exp $
+ * @version $Id: UserManager.java,v 1.2 2001/08/02 05:31:12 jvanzyl Exp $
*/
public interface UserManager
{
1.2 +5 -5
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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DBSecurityService.java 2001/08/01 15:51:17 1.1
+++ DBSecurityService.java 2001/08/02 05:31:12 1.2
@@ -60,9 +60,9 @@
import java.util.Map;
import java.util.Set;
import java.util.Vector;
-import org.apache.turbine.services.db.om.BaseObject;
-import org.apache.turbine.services.db.om.ObjectKey;
-import org.apache.turbine.services.db.util.BasePeer;
+import org.apache.torque.om.BaseObject;
+import org.apache.torque.om.ObjectKey;
+import org.apache.torque.util.BasePeer;
import org.apache.fulcrum.security.entity.Group;
import org.apache.fulcrum.security.entity.Permission;
import org.apache.fulcrum.security.entity.Role;
@@ -81,7 +81,7 @@
import org.apache.fulcrum.security.BaseSecurityService;
import org.apache.fulcrum.security.TurbineSecurity;
import org.apache.fulcrum.Log;
-import org.apache.turbine.services.db.util.Criteria;
+import org.apache.torque.util.Criteria;
import org.apache.fulcrum.security.util.AccessControlList;
import org.apache.fulcrum.security.util.DataBackendException;
import org.apache.fulcrum.security.util.EntityExistsException;
@@ -94,7 +94,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.1 2001/08/01 15:51:17 jvanzyl Exp $
+ * @version $Id: DBSecurityService.java,v 1.2 2001/08/02 05:31:12 jvanzyl Exp $
*/
public class DBSecurityService
extends BaseSecurityService
1.2 +4 -4
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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DBUserManager.java 2001/08/01 15:51:17 1.1
+++ DBUserManager.java 2001/08/02 05:31:12 1.2
@@ -57,8 +57,8 @@
import java.util.Vector;
import java.util.Iterator;
-import org.apache.turbine.services.db.om.BaseObject;
-import org.apache.turbine.services.db.om.ObjectKey;
+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.TurbineUserPeer;
@@ -68,7 +68,7 @@
import org.apache.fulcrum.security.util.PasswordMismatchException;
import org.apache.fulcrum.Log;
-import org.apache.turbine.services.db.util.Criteria;
+import org.apache.torque.util.Criteria;
import org.apache.fulcrum.security.UserManager;
import org.apache.fulcrum.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.1 2001/08/01 15:51:17 jvanzyl Exp $
+ * @version $Id: DBUserManager.java,v 1.2 2001/08/02 05:31:12 jvanzyl Exp $
*/
public class DBUserManager implements UserManager
{
1.2 +2 -2
jakarta-turbine-fulcrum/src/services/java/org/apache/fulcrum/security/impl/db/entity/SecurityObject.java
Index: SecurityObject.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-fulcrum/src/services/java/org/apache/fulcrum/security/impl/db/entity/SecurityObject.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SecurityObject.java 2001/08/01 15:51:17 1.1
+++ SecurityObject.java 2001/08/02 05:31:12 1.2
@@ -57,7 +57,7 @@
import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
-import org.apache.turbine.services.db.om.BaseObject;
+import org.apache.torque.om.BaseObject;
/**
* This class represents a generic object used in the Access Control Lists.
@@ -66,7 +66,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]";>Rafal Krzewski</a>
- * @version $Id: SecurityObject.java,v 1.1 2001/08/01 15:51:17 jvanzyl Exp $
+ * @version $Id: SecurityObject.java,v 1.2 2001/08/02 05:31:12 jvanzyl Exp $
*/
public abstract class SecurityObject
extends BaseObject
1.2 +4 -4
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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TurbineGroupPeer.java 2001/08/01 15:51:18 1.1
+++ TurbineGroupPeer.java 2001/08/02 05:31:12 1.2
@@ -57,9 +57,9 @@
// JDK classes
import java.util.Vector;
import org.apache.fulcrum.security.impl.db.entity.map.TurbineGroupMapBuilder;
-import org.apache.turbine.services.db.util.BasePeer;
-import org.apache.turbine.services.db.pool.DBConnection;
-import org.apache.turbine.services.db.util.Criteria;
+import org.apache.torque.util.BasePeer;
+import org.apache.torque.pool.DBConnection;
+import org.apache.torque.util.Criteria;
import org.apache.fulcrum.security.entity.Group;
import org.apache.fulcrum.security.entity.SecurityEntity;
import org.apache.fulcrum.security.util.GroupSet;
@@ -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.1 2001/08/01 15:51:18 jvanzyl Exp $
+ * @version $Id: TurbineGroupPeer.java,v 1.2 2001/08/02 05:31:12 jvanzyl Exp $
*/
public class TurbineGroupPeer
extends org.apache.fulcrum.security.impl.db.entity.BaseTurbineGroupPeer
1.2 +5 -5
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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TurbinePermissionPeer.java 2001/08/01 15:51:18 1.1
+++ TurbinePermissionPeer.java 2001/08/02 05:31:12 1.2
@@ -57,10 +57,10 @@
import java.util.Vector;
import java.util.Enumeration;
import org.apache.fulcrum.security.impl.db.entity.map.TurbinePermissionMapBuilder;
-import org.apache.turbine.services.db.om.BaseObject;
-import org.apache.turbine.services.db.util.BasePeer;
-import org.apache.turbine.services.db.pool.DBConnection;
-import org.apache.turbine.services.db.util.Criteria;
+import org.apache.torque.om.BaseObject;
+import org.apache.torque.util.BasePeer;
+import org.apache.torque.pool.DBConnection;
+import org.apache.torque.util.Criteria;
import org.apache.fulcrum.security.entity.Permission;
import org.apache.fulcrum.security.entity.Role;
import org.apache.fulcrum.security.entity.SecurityEntity;
@@ -76,7 +76,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: TurbinePermissionPeer.java,v 1.1 2001/08/01 15:51:18 jvanzyl Exp $
+ * @version $Id: TurbinePermissionPeer.java,v 1.2 2001/08/02 05:31:12 jvanzyl Exp $
*/
public class TurbinePermissionPeer
extends org.apache.fulcrum.security.impl.db.entity.BaseTurbinePermissionPeer
1.2 +5 -5
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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TurbineRolePeer.java 2001/08/01 15:51:18 1.1
+++ TurbineRolePeer.java 2001/08/02 05:31:12 1.2
@@ -57,10 +57,10 @@
import java.util.Vector;
import org.apache.fulcrum.security.impl.db.entity.map.TurbineRoleMapBuilder;
import org.apache.fulcrum.security.impl.db.entity.UserPeer;
-import org.apache.turbine.services.db.om.Persistent;
-import org.apache.turbine.services.db.util.BasePeer;
-import org.apache.turbine.services.db.pool.DBConnection;
-import org.apache.turbine.services.db.util.Criteria;
+import org.apache.torque.om.Persistent;
+import org.apache.torque.util.BasePeer;
+import org.apache.torque.pool.DBConnection;
+import org.apache.torque.util.Criteria;
import org.apache.fulcrum.security.TurbineSecurity;
import org.apache.fulcrum.security.entity.Group;
import org.apache.fulcrum.security.entity.Role;
@@ -77,7 +77,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: TurbineRolePeer.java,v 1.1 2001/08/01 15:51:18 jvanzyl Exp $
+ * @version $Id: TurbineRolePeer.java,v 1.2 2001/08/02 05:31:12 jvanzyl Exp $
*/
public class TurbineRolePeer
extends org.apache.fulcrum.security.impl.db.entity.BaseTurbineRolePeer
1.2 +28 -5
jakarta-turbine-fulcrum/src/services/java/org/apache/fulcrum/security/impl/db/entity/TurbineUser.java
Index: TurbineUser.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-fulcrum/src/services/java/org/apache/fulcrum/security/impl/db/entity/TurbineUser.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TurbineUser.java 2001/08/01 15:51:19 1.1
+++ TurbineUser.java 2001/08/02 05:31:12 1.2
@@ -61,8 +61,6 @@
import javax.servlet.http.HttpSessionBindingEvent;
import org.apache.fulcrum.security.TurbineSecurity;
import org.apache.fulcrum.security.entity.User;
-//import org.apache.turbine.util.Log;
-import org.apache.turbine.util.ObjectUtils;
/**
* A generic implementation of User interface.
@@ -77,7 +75,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]";>Craig D. Berry</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Martin Poeschl</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Daniel Rall</a>
- * @version $Id: TurbineUser.java,v 1.1 2001/08/01 15:51:19 jvanzyl Exp $
+ * @version $Id: TurbineUser.java,v 1.2 2001/08/02 05:31:12 jvanzyl Exp $
*/
public class TurbineUser
extends org.apache.fulcrum.security.impl.db.entity.BaseTurbineUser
@@ -305,7 +303,7 @@
*/
public void setPerm(String name, Object value)
{
- ObjectUtils.safeAddToHashtable(getPermStorage(), name, value);
+ safeAddToHashtable(getPermStorage(), name, value);
}
/**
@@ -393,7 +391,7 @@
*/
public void setTemp(String name, Object value)
{
- ObjectUtils.safeAddToHashtable(tempStorage, name, value);
+ safeAddToHashtable(tempStorage, name, value);
}
/**
@@ -472,5 +470,30 @@
public String getName()
{
return getUserName();
+ }
+
+ /**
+ * Nice method for adding data to a Hashtable in such a way
+ * as to not get NPE's. The point being that if the
+ * value is null, Hashtable.put() will throw an exception.
+ * That blows in the case of this class cause you may want to
+ * essentially treat put("Not Null", null ) == put("Not Null", "")
+ * We will still throw a NPE if the key is null cause that should
+ * never happen.
+ *
+ * !! Maybe a hashtable isn't the best option here and we
+ * should use a Map. This was taken from ObjectUtils.
+ */
+ public static final void safeAddToHashtable(Hashtable hash, Object key, Object
value)
+ throws NullPointerException
+ {
+ if (value == null)
+ {
+ hash.put ( key, "" );
+ }
+ else
+ {
+ hash.put ( key, value );
+ }
}
}
1.2 +4 -4
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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TurbineUserPeer.java 2001/08/01 15:51:19 1.1
+++ TurbineUserPeer.java 2001/08/02 05:31:12 1.2
@@ -55,9 +55,9 @@
*/
import java.util.Vector;
-import org.apache.turbine.services.db.util.BasePeer;
-import org.apache.turbine.services.db.pool.DBConnection;
-import org.apache.turbine.services.db.util.Criteria;
+import org.apache.torque.util.BasePeer;
+import org.apache.torque.pool.DBConnection;
+import org.apache.torque.util.Criteria;
import org.apache.fulcrum.security.TurbineSecurity;
import org.apache.fulcrum.security.entity.User;
import org.apache.fulcrum.security.util.DataBackendException;
@@ -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.1 2001/08/01 15:51:19 jvanzyl Exp $
+ * @version $Id: TurbineUserPeer.java,v 1.2 2001/08/02 05:31:12 jvanzyl Exp $
*/
public class TurbineUserPeer
extends org.apache.fulcrum.security.impl.db.entity.BaseTurbineUserPeer
1.2 +2 -2
jakarta-turbine-fulcrum/src/services/java/org/apache/fulcrum/security/impl/passive/PassiveUserManager.java
Index: PassiveUserManager.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-fulcrum/src/services/java/org/apache/fulcrum/security/impl/passive/PassiveUserManager.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- PassiveUserManager.java 2001/08/01 15:51:19 1.1
+++ PassiveUserManager.java 2001/08/02 05:31:13 1.2
@@ -56,7 +56,7 @@
import org.apache.fulcrum.security.entity.User;
-import org.apache.turbine.services.db.util.Criteria;
+import org.apache.torque.util.Criteria;
import org.apache.fulcrum.security.util.DataBackendException;
import org.apache.fulcrum.security.util.UnknownEntityException;
import org.apache.fulcrum.security.util.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.1 2001/08/01 15:51:19 jvanzyl Exp $
+ * @version $Id: PassiveUserManager.java,v 1.2 2001/08/02 05:31:13 jvanzyl Exp $
*/
public class PassiveUserManager implements UserManager
{
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
