mpoeschl 2002/07/11 00:34:31
Modified: src/java/org/apache/turbine/om/security SecurityObject.java
TurbinePermission.java TurbineGroup.java
TurbineRole.java TurbineUser.java
src/java/org/apache/turbine/om/security/peer GroupPeer.java
PermissionPeer.java RolePeer.java
TurbineUserPeer.java
src/java/org/apache/turbine/services/schedule JobEntry.java
JobEntryPeer.java
src/java/org/apache/turbine/services/security/db
DBSecurityService.java DBUserManager.java
src/java/org/apache/turbine/services/security/ldap
LDAPUser.java
Removed: src/java/org/apache/turbine/om BaseObject.java
Persistent.java
Log:
replace BaseObject and Persistent with the torque versions
Revision Changes Path
1.2 +10 -10
jakarta-turbine-2/src/java/org/apache/turbine/om/security/SecurityObject.java
Index: SecurityObject.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/om/security/SecurityObject.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SecurityObject.java 16 Aug 2001 05:08:42 -0000 1.1
+++ SecurityObject.java 11 Jul 2002 07:34:30 -0000 1.2
@@ -25,13 +25,13 @@
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
*
- * 4. The names "Apache" and "Apache Software Foundation" and
- * "Apache Turbine" must not be used to endorse or promote products
- * derived from this software without prior written permission. For
+ * 4. The names "Apache" and "Apache Software Foundation" and
+ * "Apache Turbine" must not be used to endorse or promote products
+ * derived from this software without prior written permission. For
* written permission, please contact [EMAIL PROTECTED]
*
* 5. Products derived from this software may not be called "Apache",
- * "Apache Turbine", nor may "Apache" appear in their name, without
+ * "Apache Turbine", nor may "Apache" appear in their name, without
* prior written permission of the Apache Software Foundation.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
@@ -57,10 +57,10 @@
import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
-import org.apache.turbine.om.BaseObject;
+import org.apache.torque.om.BaseObject;
/**
- * This class represents a generic object used in the Access Control Lists.
+ * This class represents a generic object used in the Access Control Lists.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Frank Y. Kim</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>John D. McNally</a>
@@ -84,7 +84,7 @@
this("");
}
- /**
+ /**
* Constructs a new SecurityObject with the specified name.
*
* @param name The name of the new object.
@@ -121,7 +121,7 @@
* @param name the name of the attribute
* @return the value of the attribute
*/
- public Object getAttribute( String name )
+ public Object getAttribute( String name )
{
return attributes.get(name);
}
@@ -175,7 +175,7 @@
}
/**
- * Returns a textual representation of this object, consisted by
+ * Returns a textual representation of this object, consisted by
* it's name and attributes.
*
* @return a textual representation of this group.
1.2 +31 -8
jakarta-turbine-2/src/java/org/apache/turbine/om/security/TurbinePermission.java
Index: TurbinePermission.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/om/security/TurbinePermission.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TurbinePermission.java 16 Aug 2001 05:08:43 -0000 1.1
+++ TurbinePermission.java 11 Jul 2002 07:34:30 -0000 1.2
@@ -25,13 +25,13 @@
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
*
- * 4. The names "Apache" and "Apache Software Foundation" and
- * "Apache Turbine" must not be used to endorse or promote products
- * derived from this software without prior written permission. For
+ * 4. The names "Apache" and "Apache Software Foundation" and
+ * "Apache Turbine" must not be used to endorse or promote products
+ * derived from this software without prior written permission. For
* written permission, please contact [EMAIL PROTECTED]
*
* 5. Products derived from this software may not be called "Apache",
- * "Apache Turbine", nor may "Apache" appear in their name, without
+ * "Apache Turbine", nor may "Apache" appear in their name, without
* prior written permission of the Apache Software Foundation.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
@@ -54,6 +54,7 @@
* <http://www.apache.org/>.
*/
+import java.sql.Connection;
import org.apache.turbine.services.security.TurbineSecurity;
import org.apache.turbine.util.security.TurbineSecurityException;
@@ -70,7 +71,7 @@
*/
public class TurbinePermission extends SecurityObject implements Permission
{
- /**
+ /**
* Constructs a new TurbinePermission.
*/
public TurbinePermission()
@@ -78,7 +79,7 @@
super();
}
- /**
+ /**
* Constructs a new TurbinePermission with the sepcified name.
*
* @param name The name of the new object.
@@ -90,7 +91,7 @@
/**
* Creates a new Permission in the system.
- *
+ *
* @param name The name of the new Permission.
* @return An object representing the new Permission.
* @throws TurbineSecurityException if the Permission could not be created.
@@ -112,6 +113,28 @@
throws TurbineSecurityException
{
TurbineSecurity.savePermission(this);
+ }
+
+ /**
+ * not implemented
+ *
+ * @param conn
+ * @throws Exception
+ */
+ public void save(Connection conn) throws Exception
+ {
+ throw new Exception("not implemented");
+ }
+
+ /**
+ * not implemented
+ *
+ * @param dbname
+ * @throws Exception
+ */
+ public void save(String dbname) throws Exception
+ {
+ throw new Exception("not implemented");
}
/**
1.2 +36 -13
jakarta-turbine-2/src/java/org/apache/turbine/om/security/TurbineGroup.java
Index: TurbineGroup.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/om/security/TurbineGroup.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TurbineGroup.java 16 Aug 2001 05:08:42 -0000 1.1
+++ TurbineGroup.java 11 Jul 2002 07:34:30 -0000 1.2
@@ -25,13 +25,13 @@
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
*
- * 4. The names "Apache" and "Apache Software Foundation" and
- * "Apache Turbine" must not be used to endorse or promote products
- * derived from this software without prior written permission. For
+ * 4. The names "Apache" and "Apache Software Foundation" and
+ * "Apache Turbine" must not be used to endorse or promote products
+ * derived from this software without prior written permission. For
* written permission, please contact [EMAIL PROTECTED]
*
* 5. Products derived from this software may not be called "Apache",
- * "Apache Turbine", nor may "Apache" appear in their name, without
+ * "Apache Turbine", nor may "Apache" appear in their name, without
* prior written permission of the Apache Software Foundation.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
@@ -54,6 +54,7 @@
* <http://www.apache.org/>.
*/
+import java.sql.Connection;
import java.util.Iterator;
import org.apache.turbine.services.security.TurbineSecurity;
import org.apache.turbine.util.security.RoleSet;
@@ -64,11 +65,11 @@
* with specific entity or resource. The users belonging to the Group may have
* various Roles. The Permissions to perform actions upon the resource depend
* on the Roles in the Group that they are assigned.
- *
+ *
* <a name="global">
* <p> Certain Roles that the Users may have in the system may are not related
- * to any specific resource nor entity.
- * They are assigned within a special group named 'global' that can be
+ * to any specific resource nor entity.
+ * They are assigned within a special group named 'global' that can be
* referenced in the code as {@link #GLOBAL_GROUP_NAME}.
* <br>
*
@@ -85,7 +86,7 @@
super();
}
- /**
+ /**
* Constructs a new Group with the specified name.
*
* @param name The name of the new object.
@@ -96,9 +97,9 @@
}
/**
- * Provides a reference to the Group object that represents the
- * <a href="#global">global group</a>.
- *
+ * Provides a reference to the Group object that represents the
+ * <a href="#global">global group</a>.
+ *
* @return a Group object that represents the global group.
* @deprecated Please use the method in TurbineSecurity now.
*/
@@ -109,7 +110,7 @@
/**
* Creates a new Group in the system.
- *
+ *
* @param name The name of the new Group.
* @return An object representing the new Group.
* @throws TurbineSecurityException if the Group could not be created.
@@ -133,6 +134,28 @@
throws TurbineSecurityException
{
TurbineSecurity.saveGroup(this);
+ }
+
+ /**
+ * not implemented
+ *
+ * @param conn
+ * @throws Exception
+ */
+ public void save(Connection conn) throws Exception
+ {
+ throw new Exception("not implemented");
+ }
+
+ /**
+ * not implemented
+ *
+ * @param dbname
+ * @throws Exception
+ */
+ public void save(String dbname) throws Exception
+ {
+ throw new Exception("not implemented");
}
/**
1.2 +30 -7
jakarta-turbine-2/src/java/org/apache/turbine/om/security/TurbineRole.java
Index: TurbineRole.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/om/security/TurbineRole.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TurbineRole.java 16 Aug 2001 05:08:43 -0000 1.1
+++ TurbineRole.java 11 Jul 2002 07:34:30 -0000 1.2
@@ -25,13 +25,13 @@
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
*
- * 4. The names "Apache" and "Apache Software Foundation" and
- * "Apache Turbine" must not be used to endorse or promote products
- * derived from this software without prior written permission. For
+ * 4. The names "Apache" and "Apache Software Foundation" and
+ * "Apache Turbine" must not be used to endorse or promote products
+ * derived from this software without prior written permission. For
* written permission, please contact [EMAIL PROTECTED]
*
* 5. Products derived from this software may not be called "Apache",
- * "Apache Turbine", nor may "Apache" appear in their name, without
+ * "Apache Turbine", nor may "Apache" appear in their name, without
* prior written permission of the Apache Software Foundation.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
@@ -54,6 +54,7 @@
* <http://www.apache.org/>.
*/
+import java.sql.Connection;
import java.util.Iterator;
import org.apache.turbine.services.security.TurbineSecurity;
import org.apache.turbine.util.security.PermissionSet;
@@ -78,7 +79,7 @@
super();
}
- /**
+ /**
* Constructs a new Role with the sepcified name.
*
* @param name The name of the new object.
@@ -117,7 +118,7 @@
/**
* Creates a new Role in the system.
- *
+ *
* @param name The name of the new Role.
* @return An object representing the new Role.
* @throws TurbineSecurityException if the Role could not be created.
@@ -141,6 +142,28 @@
throws TurbineSecurityException
{
TurbineSecurity.saveRole(this);
+ }
+
+ /**
+ * not implemented
+ *
+ * @param conn
+ * @throws Exception
+ */
+ public void save(Connection conn) throws Exception
+ {
+ throw new Exception("not implemented");
+ }
+
+ /**
+ * not implemented
+ *
+ * @param dbname
+ * @throws Exception
+ */
+ public void save(String dbname) throws Exception
+ {
+ throw new Exception("not implemented");
}
/**
1.2 +25 -1
jakarta-turbine-2/src/java/org/apache/turbine/om/security/TurbineUser.java
Index: TurbineUser.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/om/security/TurbineUser.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TurbineUser.java 16 Aug 2001 05:08:43 -0000 1.1
+++ TurbineUser.java 11 Jul 2002 07:34:30 -0000 1.2
@@ -56,6 +56,7 @@
import java.io.ByteArrayOutputStream;
import java.io.PrintWriter;
+import java.sql.Connection;
import java.util.Date;
import java.util.Hashtable;
import javax.servlet.http.HttpSessionBindingEvent;
@@ -681,4 +682,27 @@
TurbineSecurity.addUser(this, getPassword());
}
}
+
+ /**
+ * not implemented
+ *
+ * @param conn
+ * @throws Exception
+ */
+ public void save(Connection conn) throws Exception
+ {
+ throw new Exception("not implemented");
+ }
+
+ /**
+ * not implemented
+ *
+ * @param dbname
+ * @throws Exception
+ */
+ public void save(String dbname) throws Exception
+ {
+ throw new Exception("not implemented");
+ }
+
}
1.3 +6 -9
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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- GroupPeer.java 11 Jul 2002 07:16:42 -0000 1.2
+++ GroupPeer.java 11 Jul 2002 07:34:30 -0000 1.3
@@ -55,24 +55,21 @@
*/
import com.workingdogs.village.Record;
-import com.workingdogs.village.Value;
+import java.util.ArrayList;
+import java.util.List;
import java.util.Map;
-import java.util.*;
-import org.apache.turbine.om.BaseObject;
-import org.apache.torque.om.ObjectKey;
+import org.apache.torque.TorqueException;
+import org.apache.torque.om.BaseObject;
import org.apache.torque.util.BasePeer;
+import org.apache.torque.util.Criteria;
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.torque.util.Criteria;
-import org.apache.torque.map.MapBuilder;
import org.apache.turbine.util.db.map.TurbineMapBuilder;
import org.apache.turbine.util.security.DataBackendException;
import org.apache.turbine.util.security.GroupSet;
-import org.apache.torque.TorqueException;
/**
* This class handles all the database access for the Group table.
1.3 +7 -9
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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- PermissionPeer.java 11 Jul 2002 07:16:42 -0000 1.2
+++ PermissionPeer.java 11 Jul 2002 07:34:30 -0000 1.3
@@ -55,26 +55,24 @@
*/
import com.workingdogs.village.Record;
-import com.workingdogs.village.Value;
+import java.util.ArrayList;
import java.util.Enumeration;
-import java.util.*;
+import java.util.List;
+import java.util.Map;
import java.util.Vector;
-import org.apache.turbine.om.BaseObject;
-import org.apache.torque.om.ObjectKey;
+import org.apache.torque.TorqueException;
+import org.apache.torque.om.BaseObject;
import org.apache.torque.util.BasePeer;
+import org.apache.torque.util.Criteria;
import org.apache.turbine.om.security.Permission;
import org.apache.turbine.om.security.Role;
import org.apache.turbine.om.security.SecurityObject;
import org.apache.turbine.om.security.TurbineRole;
import org.apache.turbine.services.security.TurbineSecurity;
import org.apache.turbine.util.ObjectUtils;
-import org.apache.turbine.util.StringStackBuffer;
-import org.apache.torque.util.Criteria;
-import org.apache.torque.map.MapBuilder;
import org.apache.turbine.util.db.map.TurbineMapBuilder;
import org.apache.turbine.util.security.DataBackendException;
import org.apache.turbine.util.security.PermissionSet;
-import org.apache.torque.TorqueException;
/**
* This class handles all the database access for the PERMISSION
1.3 +7 -13
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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- RolePeer.java 11 Jul 2002 07:16:42 -0000 1.2
+++ RolePeer.java 11 Jul 2002 07:34:30 -0000 1.3
@@ -55,30 +55,24 @@
*/
import com.workingdogs.village.Record;
-import com.workingdogs.village.Value;
+import java.util.ArrayList;
+import java.util.List;
import java.util.Map;
-import java.util.*;
-import org.apache.turbine.om.BaseObject;
-import org.apache.torque.om.ObjectKey;
-import org.apache.turbine.om.Persistent;
+import org.apache.torque.TorqueException;
+import org.apache.torque.om.BaseObject;
+import org.apache.torque.om.Persistent;
import org.apache.torque.util.BasePeer;
+import org.apache.torque.util.Criteria;
import org.apache.turbine.om.security.Group;
import org.apache.turbine.om.security.Role;
-import org.apache.turbine.om.security.SecurityEntity;
-import org.apache.turbine.om.security.SecurityObject;
import org.apache.turbine.om.security.TurbineRole;
import org.apache.turbine.om.security.User;
-import org.apache.turbine.services.security.SecurityService;
import org.apache.turbine.services.security.TurbineSecurity;
import org.apache.turbine.services.security.db.DBSecurityService;
import org.apache.turbine.util.ObjectUtils;
-import org.apache.turbine.util.StringStackBuffer;
-import org.apache.torque.util.Criteria;
-import org.apache.torque.map.MapBuilder;
import org.apache.turbine.util.db.map.TurbineMapBuilder;
import org.apache.turbine.util.security.DataBackendException;
import org.apache.turbine.util.security.RoleSet;
-import org.apache.torque.TorqueException;
/**
1.3 +8 -15
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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TurbineUserPeer.java 11 Jul 2002 07:16:42 -0000 1.2
+++ TurbineUserPeer.java 11 Jul 2002 07:34:30 -0000 1.3
@@ -54,31 +54,24 @@
* <http://www.apache.org/>.
*/
-import com.workingdogs.village.Column;
import com.workingdogs.village.Record;
import com.workingdogs.village.Schema;
import com.workingdogs.village.Value;
-import java.math.BigDecimal;
-import java.sql.Time;
-import java.sql.Timestamp;
-import java.util.*;
+import java.sql.Connection;
+import java.util.ArrayList;
import java.util.Hashtable;
-import java.util.Vector;
-import org.apache.turbine.om.Persistent;
+import java.util.List;
+import org.apache.torque.TorqueException;
+import org.apache.torque.map.TableMap;
import org.apache.torque.om.NumberKey;
-import org.apache.torque.om.ObjectKey;
+import org.apache.torque.om.Persistent;
import org.apache.torque.util.BasePeer;
+import org.apache.torque.util.Criteria;
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.torque.util.Criteria;
-import org.apache.torque.map.TableMap;
-import org.apache.torque.map.MapBuilder;
import org.apache.turbine.util.db.map.TurbineMapBuilder;
-import java.sql.Connection;
import org.apache.turbine.util.security.DataBackendException;
-import org.apache.torque.TorqueException;
/**
1.8 +26 -2
jakarta-turbine-2/src/java/org/apache/turbine/services/schedule/JobEntry.java
Index: JobEntry.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/schedule/JobEntry.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- JobEntry.java 11 Jul 2002 07:18:13 -0000 1.7
+++ JobEntry.java 11 Jul 2002 07:34:30 -0000 1.8
@@ -54,10 +54,11 @@
* <http://www.apache.org/>.
*/
+import java.sql.Connection;
import java.util.Calendar;
import java.util.Date;
import java.util.Hashtable;
-import org.apache.turbine.om.BaseObject;
+import org.apache.torque.om.BaseObject;
import org.apache.torque.om.NumberKey;
import org.apache.torque.util.Criteria;
@@ -483,6 +484,29 @@
setPrimaryKey( JobEntryPeer.doInsert(criteria) );
}
}
+
+ /**
+ * not implemented
+ *
+ * @param conn
+ * @throws Exception
+ */
+ public void save(Connection conn) throws Exception
+ {
+ throw new Exception("not implemented");
+ }
+
+ /**
+ * not implemented
+ *
+ * @param dbname
+ * @throws Exception
+ */
+ public void save(String dbname) throws Exception
+ {
+ throw new Exception("not implemented");
+ }
+
/**
* What schedule am I on?
1.3 +6 -10
jakarta-turbine-2/src/java/org/apache/turbine/services/schedule/JobEntryPeer.java
Index: JobEntryPeer.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/schedule/JobEntryPeer.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- JobEntryPeer.java 11 Jul 2002 07:18:13 -0000 1.2
+++ JobEntryPeer.java 11 Jul 2002 07:34:30 -0000 1.3
@@ -55,20 +55,16 @@
*/
import com.workingdogs.village.Record;
-import com.workingdogs.village.Value;
+import java.sql.Connection;
+import java.util.ArrayList;
import java.util.Hashtable;
-import java.util.*;
-import org.apache.turbine.om.BaseObject;
+import java.util.List;
+import org.apache.torque.TorqueException;
import org.apache.torque.om.ObjectKey;
import org.apache.torque.util.BasePeer;
-import org.apache.turbine.util.ObjectUtils;
import org.apache.torque.util.Criteria;
-import org.apache.torque.map.DatabaseMap;
-import org.apache.torque.map.MapBuilder;
+import org.apache.turbine.util.ObjectUtils;
import org.apache.turbine.util.db.map.TurbineMapBuilder;
-import java.sql.Connection;
-import org.apache.torque.TorqueException;
-import com.workingdogs.village.DataSetException;
/**
* Peer class for JobEntry database access.
1.6 +6 -12
jakarta-turbine-2/src/java/org/apache/turbine/services/security/db/DBSecurityService.java
Index: DBSecurityService.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/security/db/DBSecurityService.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- DBSecurityService.java 11 Jul 2002 07:16:42 -0000 1.5
+++ DBSecurityService.java 11 Jul 2002 07:34:31 -0000 1.6
@@ -54,20 +54,16 @@
* <http://www.apache.org/>.
*/
-import java.util.Collection;
+import java.util.ArrayList;
import java.util.Hashtable;
import java.util.Iterator;
-import java.util.Map;
-import java.util.Properties;
-import java.util.Set;
-import java.util.*;
-import org.apache.turbine.om.BaseObject;
-import org.apache.torque.om.ObjectKey;
-import org.apache.torque.util.BasePeer;
+import java.util.List;
+import java.util.Vector;
+import org.apache.torque.om.BaseObject;
+import org.apache.torque.util.Criteria;
import org.apache.turbine.om.security.Group;
import org.apache.turbine.om.security.Permission;
import org.apache.turbine.om.security.Role;
-import org.apache.turbine.om.security.SecurityEntity;
import org.apache.turbine.om.security.SecurityObject;
import org.apache.turbine.om.security.TurbineGroup;
import org.apache.turbine.om.security.TurbinePermission;
@@ -79,11 +75,9 @@
import org.apache.turbine.om.security.peer.RolePermissionPeer;
import org.apache.turbine.om.security.peer.UserGroupRolePeer;
import org.apache.turbine.om.security.peer.UserPeer;
-import org.apache.turbine.services.BaseService;
import org.apache.turbine.services.security.BaseSecurityService;
import org.apache.turbine.services.security.TurbineSecurity;
import org.apache.turbine.util.Log;
-import org.apache.torque.util.Criteria;
import org.apache.turbine.util.security.AccessControlList;
import org.apache.turbine.util.security.DataBackendException;
import org.apache.turbine.util.security.EntityExistsException;
1.3 +8 -13
jakarta-turbine-2/src/java/org/apache/turbine/services/security/db/DBUserManager.java
Index: DBUserManager.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/security/db/DBUserManager.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- DBUserManager.java 11 Jul 2002 07:16:43 -0000 1.2
+++ DBUserManager.java 11 Jul 2002 07:34:31 -0000 1.3
@@ -54,24 +54,19 @@
* <http://www.apache.org/>.
*/
-import java.util.*;
+import java.util.ArrayList;
import java.util.Iterator;
-
-import org.apache.turbine.om.BaseObject;
-import org.apache.torque.om.ObjectKey;
+import java.util.List;
+import org.apache.torque.om.BaseObject;
+import org.apache.torque.util.Criteria;
import org.apache.turbine.om.security.User;
import org.apache.turbine.om.security.peer.TurbineUserPeer;
-
+import org.apache.turbine.services.security.TurbineSecurity;
+import org.apache.turbine.services.security.UserManager;
import org.apache.turbine.util.security.DataBackendException;
-import org.apache.turbine.util.security.UnknownEntityException;
import org.apache.turbine.util.security.EntityExistsException;
import org.apache.turbine.util.security.PasswordMismatchException;
-
-import org.apache.turbine.util.Log;
-import org.apache.torque.util.Criteria;
-
-import org.apache.turbine.services.security.UserManager;
-import org.apache.turbine.services.security.TurbineSecurity;
+import org.apache.turbine.util.security.UnknownEntityException;
/**
* An UserManager performs {@link org.apache.turbine.om.security.User} objects
1.3 +26 -6
jakarta-turbine-2/src/java/org/apache/turbine/services/security/ldap/LDAPUser.java
Index: LDAPUser.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/security/ldap/LDAPUser.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- LDAPUser.java 7 Dec 2001 02:29:32 -0000 1.2
+++ LDAPUser.java 11 Jul 2002 07:34:31 -0000 1.3
@@ -55,16 +55,13 @@
*/
import java.io.ByteArrayOutputStream;
-import java.io.OutputStream;
-import java.io.PrintStream;
import java.io.PrintWriter;
-import java.util.Date;
+import java.sql.Connection;
import java.util.Hashtable;
import javax.servlet.http.HttpSessionBindingEvent;
-import org.apache.turbine.om.BaseObject;
+import org.apache.torque.om.BaseObject;
import org.apache.turbine.om.security.User;
import org.apache.turbine.services.security.TurbineSecurity;
-import org.apache.turbine.util.Log;
/**
* LDAPUser implements User and provides access to a user who accesses the
@@ -690,7 +687,7 @@
{
return null;
}
-
+
public void setName(String name)
{
}
@@ -710,4 +707,27 @@
TurbineSecurity.addUser(this, getPassword());
}
}
+
+ /**
+ * not implemented
+ *
+ * @param conn
+ * @throws Exception
+ */
+ public void save(Connection conn) throws Exception
+ {
+ throw new Exception("not implemented");
+ }
+
+ /**
+ * not implemented
+ *
+ * @param dbname
+ * @throws Exception
+ */
+ public void save(String dbname) throws Exception
+ {
+ throw new Exception("not implemented");
+ }
+
}
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
