You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@turbine.apache.org by jo...@apache.org on 2002/04/30 05:39:28 UTC
cvs commit: jakarta-turbine-fulcrum/src/services/org/apache/fulcrum/security/impl/db/entity TurbineGroupPeer.java TurbinePermission.java TurbinePermissionPeer.java TurbineRolePeer.java TurbineUserPeer.java
jon 02/04/29 20:39:28
Modified: src/services/org/apache/fulcrum/schedule
ScheduleService.java TurbineSchedulerService.java
src/services/org/apache/fulcrum/security/impl/db
DBSecurityService.java DBUserManager.java
src/services/org/apache/fulcrum/security/impl/db/entity
TurbineGroupPeer.java TurbinePermission.java
TurbinePermissionPeer.java TurbineRolePeer.java
TurbineUserPeer.java
Log:
updated classes to work with latest torque cvs head.
-jon
Revision Changes Path
1.3 +4 -4 jakarta-turbine-fulcrum/src/services/org/apache/fulcrum/schedule/ScheduleService.java
Index: ScheduleService.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-fulcrum/src/services/org/apache/fulcrum/schedule/ScheduleService.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ScheduleService.java 10 Aug 2001 11:46:24 -0000 1.2
+++ ScheduleService.java 30 Apr 2002 03:39:27 -0000 1.3
@@ -54,14 +54,14 @@
* <http://www.apache.org/>.
*/
-import java.util.Vector;
+import java.util.List;
import org.apache.fulcrum.Service;
/**
* ScheduleService interface.
*
* @author <a href="mailto:mbryson@mont.mindspring.com">Dave Bryson</a>
- * @version $Id: ScheduleService.java,v 1.2 2001/08/10 11:46:24 knielsen Exp $
+ * @version $Id: ScheduleService.java,v 1.3 2002/04/30 03:39:27 jon Exp $
*/
public interface ScheduleService
extends Service
@@ -108,7 +108,7 @@
/**
* List jobs in the queue. This is used by the scheduler UI.
*
- * @return A Vector of jobs.
+ * @return A List of jobs.
*/
- public Vector listJobs();
+ public List listJobs();
}
1.4 +4 -5 jakarta-turbine-fulcrum/src/services/org/apache/fulcrum/schedule/TurbineSchedulerService.java
Index: TurbineSchedulerService.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-fulcrum/src/services/org/apache/fulcrum/schedule/TurbineSchedulerService.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- TurbineSchedulerService.java 26 Dec 2001 21:32:09 -0000 1.3
+++ TurbineSchedulerService.java 30 Apr 2002 03:39:27 -0000 1.4
@@ -55,7 +55,6 @@
*/
import java.util.List;
-import java.util.Vector;
import java.util.Iterator;
import org.apache.fulcrum.BaseService;
import org.apache.fulcrum.InitializationException;
@@ -66,7 +65,7 @@
* Service for a cron like scheduler.
*
* @author <a href="mailto:mbryson@mont.mindspring.com">Dave Bryson</a>
- * @version $Id: TurbineSchedulerService.java,v 1.3 2001/12/26 21:32:09 jmcnally Exp $
+ * @version $Id: TurbineSchedulerService.java,v 1.4 2002/04/30 03:39:27 jon Exp $
*/
public class TurbineSchedulerService
extends BaseService
@@ -114,7 +113,7 @@
mainLoop = new MainLoop();
// Load all from cold storage.
- Vector jobs = JobEntryPeer.doSelect(new Criteria());
+ List jobs = JobEntryPeer.doSelect(new Criteria());
if ( jobs != null && jobs.size() > 0 )
{
@@ -244,9 +243,9 @@
/**
* List jobs in the queue. This is used by the scheduler UI.
*
- * @return A Vector of jobs.
+ * @return A List of jobs.
*/
- public Vector listJobs()
+ public List listJobs()
{
return scheduleQueue.list();
}
1.8 +42 -40 jakarta-turbine-fulcrum/src/services/org/apache/fulcrum/security/impl/db/DBSecurityService.java
Index: DBSecurityService.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-fulcrum/src/services/org/apache/fulcrum/security/impl/db/DBSecurityService.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- DBSecurityService.java 1 Mar 2002 18:35:18 -0000 1.7
+++ DBSecurityService.java 30 Apr 2002 03:39:27 -0000 1.8
@@ -56,8 +56,10 @@
import java.math.BigDecimal;
import java.util.Collection;
+import java.util.ArrayList;
import java.util.Hashtable;
import java.util.Iterator;
+import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.Vector;
@@ -98,7 +100,7 @@
* An implementation of SecurityService that uses a database as backend.
*
* @author <a href="mailto:Rafal.Krzewski@e-point.pl">Rafal Krzewski</a>
- * @version $Id: DBSecurityService.java,v 1.7 2002/03/01 18:35:18 jmcnally Exp $
+ * @version $Id: DBSecurityService.java,v 1.8 2002/04/30 03:39:27 jon Exp $
*/
public class DBSecurityService
extends BaseSecurityService
@@ -140,7 +142,7 @@
public AccessControlList getACL( User user )
throws DataBackendException, UnknownEntityException
{
- if(!TurbineSecurity.accountExists(user))
+ if (!TurbineSecurity.accountExists(user))
{
throw new UnknownEntityException("The account '" +
user.getUserName() + "' does not exist");
@@ -220,7 +222,7 @@
userExists=TurbineSecurity.accountExists(user);
groupExists=checkExists(group);
roleExists=checkExists(role);
- if(userExists && groupExists && roleExists)
+ if (userExists && groupExists && roleExists)
{
Criteria criteria = new Criteria();
criteria.add(TurbineUserGroupRolePeer.USER_ID,
@@ -241,17 +243,17 @@
{
unlockExclusive();
}
- if(!userExists)
+ if (!userExists)
{
throw new UnknownEntityException("Unknown user '" +
user.getUserName() + "'");
}
- if(!groupExists)
+ if (!groupExists)
{
throw new UnknownEntityException("Unknown group '" +
((SecurityEntity)group).getName() + "'");
}
- if(!roleExists)
+ if (!roleExists)
{
throw new UnknownEntityException("Unknown role '" +
role.getName() + "'");
@@ -281,7 +283,7 @@
userExists=TurbineSecurity.accountExists(user);
groupExists=checkExists(group);
roleExists=checkExists(role);
- if(userExists && groupExists && roleExists)
+ if (userExists && groupExists && roleExists)
{
Criteria criteria = new Criteria();
criteria.add(TurbineUserGroupRolePeer.USER_ID,
@@ -302,17 +304,17 @@
{
unlockExclusive();
}
- if(!userExists)
+ if (!userExists)
{
throw new UnknownEntityException("Unknown user '" +
user.getUserName() + "'");
}
- if(!groupExists)
+ if (!groupExists)
{
throw new UnknownEntityException("Unknown group '" +
((SecurityEntity)group).getName() + "'");
}
- if(!roleExists)
+ if (!roleExists)
{
throw new UnknownEntityException("Unknown role '" +
role.getName() + "'");
@@ -337,7 +339,7 @@
{
lockExclusive();
userExists=TurbineSecurity.accountExists(user);
- if(userExists)
+ if (userExists)
{
// The following would not work, due to an annoying misfeature
// of Village.
@@ -387,7 +389,7 @@
lockExclusive();
roleExists=checkExists(role);
permissionExists=checkExists(permission);
- if(roleExists && permissionExists)
+ if (roleExists && permissionExists)
{
Criteria criteria = new Criteria();
criteria.add(TurbineRolePermissionPeer.ROLE_ID,
@@ -406,12 +408,12 @@
{
unlockExclusive();
}
- if(!roleExists)
+ if (!roleExists)
{
throw new UnknownEntityException("Unknown role '" +
role.getName() + "'");
}
- if(!permissionExists)
+ if (!permissionExists)
{
throw new UnknownEntityException("Unknown permission '" +
((SecurityEntity)permission).getName() + "'");
@@ -437,7 +439,7 @@
lockExclusive();
roleExists=checkExists(role);
permissionExists=checkExists(permission);
- if(roleExists && permissionExists)
+ if (roleExists && permissionExists)
{
Criteria criteria = new Criteria();
criteria.add(TurbineRolePermissionPeer.ROLE_ID,
@@ -456,12 +458,12 @@
{
unlockExclusive();
}
- if(!roleExists)
+ if (!roleExists)
{
throw new UnknownEntityException("Unknown role '" +
role.getName() + "'");
}
- if(!permissionExists)
+ if (!permissionExists)
{
throw new UnknownEntityException("Unknown permission '" +
((SecurityEntity)permission).getName() + "'");
@@ -486,7 +488,7 @@
{
lockExclusive();
roleExists=checkExists(role);
- if(roleExists)
+ if (roleExists)
{
// The following would not work, due to an annoying misfeature
// of Village.
@@ -537,7 +539,7 @@
dbCriteria.put(TurbineGroupPeer.getColumnName(key),
criteria.get(key));
}
- Vector groups = new Vector(0);
+ List groups = new ArrayList(0);
try
{
groups = TurbineGroupPeer.doSelect(criteria);
@@ -566,7 +568,7 @@
dbCriteria.put(TurbineRolePeer.getColumnName(key),
criteria.get(key));
}
- Vector roles = new Vector(0);
+ List roles = new ArrayList(0);
try
{
roles = TurbineRolePeer.doSelect(criteria);
@@ -595,7 +597,7 @@
dbCriteria.put(TurbinePermissionPeer.getColumnName(key),
criteria.get(key));
}
- Vector permissions = new Vector(0);
+ List permissions = new ArrayList(0);
try
{
permissions = TurbinePermissionPeer.doSelect(criteria);
@@ -623,7 +625,7 @@
{
lockShared();
roleExists = checkExists(role);
- if(roleExists)
+ if (roleExists)
{
return TurbinePermissionPeer.retrieveSet(role);
}
@@ -655,7 +657,7 @@
try
{
groupExists = checkExists(group);
- if(groupExists)
+ if (groupExists)
{
Criteria criteria = TurbineGroupPeer
.buildCriteria((TurbineGroup)group);
@@ -685,7 +687,7 @@
try
{
roleExists = checkExists(role);
- if(roleExists)
+ if (roleExists)
{
Criteria criteria = TurbineRolePeer
.buildCriteria((TurbineRole)role);
@@ -716,7 +718,7 @@
try
{
permissionExists = checkExists(permission);
- if(permissionExists)
+ if (permissionExists)
{
Criteria criteria = TurbinePermissionPeer
.buildCriteria((TurbinePermission)permission);
@@ -784,7 +786,7 @@
{
lockExclusive();
groupExists = checkExists(group);
- if(!groupExists)
+ if (!groupExists)
{
// add a row to the table
Criteria criteria = TurbineGroupPeer
@@ -794,8 +796,8 @@
criteria = new Criteria();
criteria.add(TurbineGroupPeer.NAME,
((SecurityEntity)group).getName());
- Vector results = TurbineGroupPeer.doSelect(criteria);
- if(results.size() != 1)
+ List results = TurbineGroupPeer.doSelect(criteria);
+ if (results.size() != 1)
{
throw new DataBackendException(
"Internal error - query returned " +
@@ -839,7 +841,7 @@
{
lockExclusive();
roleExists = checkExists(role);
- if(!roleExists)
+ if (!roleExists)
{
// add a row to the table
Criteria criteria = TurbineRolePeer
@@ -848,8 +850,8 @@
// try to get the object back using the name as key.
criteria = new Criteria();
criteria.add(TurbineRolePeer.NAME, role.getName());
- Vector results = TurbineRolePeer.doSelect(criteria);
- if(results.size() != 1)
+ List results = TurbineRolePeer.doSelect(criteria);
+ if (results.size() != 1)
{
throw new DataBackendException(
"Internal error - query returned " +
@@ -892,7 +894,7 @@
{
lockExclusive();
permissionExists = checkExists(permission);
- if(!permissionExists)
+ if (!permissionExists)
{
// add a row to the table
Criteria criteria = TurbinePermissionPeer
@@ -902,8 +904,8 @@
criteria = new Criteria();
criteria.add(TurbinePermissionPeer.NAME,
((SecurityEntity)permission).getName());
- Vector results = TurbinePermissionPeer.doSelect(criteria);
- if(results.size() != 1)
+ List results = TurbinePermissionPeer.doSelect(criteria);
+ if (results.size() != 1)
{
throw new DataBackendException(
"Internal error - query returned " +
@@ -946,7 +948,7 @@
{
lockExclusive();
groupExists = checkExists(group);
- if(groupExists)
+ if (groupExists)
{
Criteria criteria = TurbineGroupPeer
.buildCriteria((TurbineGroup)group);
@@ -984,7 +986,7 @@
{
lockExclusive();
roleExists = checkExists(role);
- if(roleExists)
+ if (roleExists)
{
// revoke all permissions from the role to be deleted
revokeAll(role);
@@ -1022,7 +1024,7 @@
{
lockExclusive();
permissionExists = checkExists(permission);
- if(permissionExists)
+ if (permissionExists)
{
Criteria criteria = TurbinePermissionPeer
.buildCriteria((TurbinePermission)permission);
@@ -1060,7 +1062,7 @@
{
lockExclusive();
groupExists = checkExists(group);
- if(groupExists)
+ if (groupExists)
{
((SecurityEntity)group).setName(name);
Criteria criteria = TurbineGroupPeer
@@ -1097,7 +1099,7 @@
{
lockExclusive();
roleExists = checkExists(role);
- if(roleExists)
+ if (roleExists)
{
role.setName(name);
Criteria criteria = TurbineRolePeer
@@ -1134,7 +1136,7 @@
{
lockExclusive();
permissionExists = checkExists(permission);
- if(permissionExists)
+ if (permissionExists)
{
((SecurityEntity)permission).setName(name);
Criteria criteria = TurbinePermissionPeer
1.6 +14 -13 jakarta-turbine-fulcrum/src/services/org/apache/fulcrum/security/impl/db/DBUserManager.java
Index: DBUserManager.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-fulcrum/src/services/org/apache/fulcrum/security/impl/db/DBUserManager.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- DBUserManager.java 1 Mar 2002 18:35:18 -0000 1.5
+++ DBUserManager.java 30 Apr 2002 03:39:28 -0000 1.6
@@ -54,7 +54,8 @@
* <http://www.apache.org/>.
*/
-import java.util.Vector;
+import java.util.ArrayList;
+import java.util.List;
import java.util.Iterator;
import org.apache.torque.om.BaseObject;
@@ -87,7 +88,7 @@
* @author <a href="mailto:frank.kim@clearink.com">Frank Y. Kim</a>
* @author <a href="mailto:cberry@gluecode.com">Craig D. Berry</a>
* @author <a href="mailto:Rafal.Krzewski@e-point.pl">Rafal Krzewski</a>
- * @version $Id: DBUserManager.java,v 1.5 2002/03/01 18:35:18 jmcnally Exp $
+ * @version $Id: DBUserManager.java,v 1.6 2002/04/30 03:39:28 jon Exp $
*/
public class DBUserManager implements UserManager
{
@@ -127,7 +128,7 @@
{
Criteria criteria = new Criteria();
criteria.add(TurbineUserPeer.USERNAME, username);
- Vector users;
+ List users;
try
{
users = TurbineUserPeer.doSelect(criteria);
@@ -161,7 +162,7 @@
{
Criteria criteria = new Criteria();
criteria.add( TurbineUserPeer.USERNAME, username );
- Vector users;
+ List users;
try
{
users = TurbineUserPeer.doSelect(criteria);
@@ -216,7 +217,7 @@
}
}
}
- Vector users = new Vector(0);
+ List users = new ArrayList(0);
try
{
users = TurbineUserPeer.doSelect(criteria);
@@ -266,7 +267,7 @@
public void store(User user)
throws UnknownEntityException, DataBackendException
{
- if(!accountExists(user))
+ if (!accountExists(user))
{
throw new UnknownEntityException("The account '" +
user.getUserName() + "' does not exist");
@@ -300,7 +301,7 @@
throws PasswordMismatchException, UnknownEntityException,
DataBackendException
{
- if(!accountExists(user))
+ if (!accountExists(user))
{
throw new UnknownEntityException("The account '" +
user.getUserName() + "' does not exist");
@@ -313,7 +314,7 @@
System.out.println ("User Pass: " + user.getPassword());
System.out.println ("Encrypted Pass: " + encrypted );
}
- if(!user.getPassword().equals(encrypted))
+ if (!user.getPassword().equals(encrypted))
{
throw new PasswordMismatchException("The passwords do not match");
}
@@ -337,12 +338,12 @@
DataBackendException
{
String encrypted = TurbineSecurity.encryptPassword(oldPassword);
- if(!accountExists(user))
+ if (!accountExists(user))
{
throw new UnknownEntityException("The account '" +
user.getUserName() + "' does not exist");
}
- if(!user.getPassword().equals(encrypted))
+ if (!user.getPassword().equals(encrypted))
{
throw new PasswordMismatchException(
"The supplied old password for '" + user.getUserName() +
@@ -373,7 +374,7 @@
public void forcePassword( User user, String password )
throws UnknownEntityException, DataBackendException
{
- if(!accountExists(user))
+ if (!accountExists(user))
{
throw new UnknownEntityException("The account '" +
user.getUserName() + "' does not exist");
@@ -396,7 +397,7 @@
public void createAccount( User user, String initialPassword )
throws EntityExistsException, DataBackendException
{
- if(accountExists(user))
+ if (accountExists(user))
{
throw new EntityExistsException("The account '" +
user.getUserName() + "' already exists");
@@ -429,7 +430,7 @@
public void removeAccount( User user )
throws UnknownEntityException, DataBackendException
{
- if(!accountExists(user))
+ if (!accountExists(user))
{
throw new UnknownEntityException("The account '" +
user.getUserName() + "' does not exist");
1.5 +6 -6 jakarta-turbine-fulcrum/src/services/org/apache/fulcrum/security/impl/db/entity/TurbineGroupPeer.java
Index: TurbineGroupPeer.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-fulcrum/src/services/org/apache/fulcrum/security/impl/db/entity/TurbineGroupPeer.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- TurbineGroupPeer.java 7 Mar 2002 20:42:30 -0000 1.4
+++ TurbineGroupPeer.java 30 Apr 2002 03:39:28 -0000 1.5
@@ -55,7 +55,7 @@
*/
// JDK classes
-import java.util.Vector;
+import java.util.List;
import org.apache.fulcrum.security.impl.db.entity.map.TurbineGroupMapBuilder;
import org.apache.torque.util.BasePeer;
import org.apache.torque.pool.DBConnection;
@@ -74,7 +74,7 @@
* @author <a href="mailto:bmclaugh@algx.net">Brett McLaughlin</a>
* @author <a href="mailto:Rafal.Krzewski@e-point.pl">Rafal Krzewski</a>
* @author <a href="mailto:mpoeschl@marmot.at">Martin Poeschl</a>
- * @version $Id: TurbineGroupPeer.java,v 1.4 2002/03/07 20:42:30 mpoeschl Exp $
+ * @version $Id: TurbineGroupPeer.java,v 1.5 2002/04/30 03:39:28 jon Exp $
*/
public class TurbineGroupPeer
extends org.apache.fulcrum.security.impl.db.entity.BaseTurbineGroupPeer
@@ -112,8 +112,8 @@
Criteria criteria = new Criteria();
criteria.addSelectColumn(GROUP_ID);
criteria.add(NAME, ((SecurityEntity)group).getName());
- Vector results = BasePeer.doSelect(criteria);
- if(results.size() > 1)
+ List results = BasePeer.doSelect(criteria);
+ if (results.size() > 1)
{
throw new DataBackendException("Multiple groups named '" +
((TurbineGroup)group).getName() + "' exist!");
@@ -148,11 +148,11 @@
*/
public static GroupSet retrieveSet(Criteria criteria) throws Exception
{
- Vector results = doSelect(criteria);
+ List results = doSelect(criteria);
GroupSet rs = new GroupSet();
for (int i = 0; i < results.size(); i++)
{
- rs.add((Group)results.elementAt(i));
+ rs.add((Group)results.get(i));
}
return rs;
}
1.2 +4 -2 jakarta-turbine-fulcrum/src/services/org/apache/fulcrum/security/impl/db/entity/TurbinePermission.java
Index: TurbinePermission.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-fulcrum/src/services/org/apache/fulcrum/security/impl/db/entity/TurbinePermission.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TurbinePermission.java 1 Aug 2001 15:51:18 -0000 1.1
+++ TurbinePermission.java 30 Apr 2002 03:39:28 -0000 1.2
@@ -69,7 +69,7 @@
* @author <a href="mailto:jmcnally@collab.net">John D. McNally</a>
* @author <a href="mailto:bmclaugh@algx.net">Brett McLaughlin</a>
* @author <a href="mailto:mpoeschl@marmot.at">Martin Poeschl</a>
- * @version $Id: TurbinePermission.java,v 1.1 2001/08/01 15:51:18 jvanzyl Exp $
+ * @version $Id: TurbinePermission.java,v 1.2 2002/04/30 03:39:28 jon Exp $
*/
public class TurbinePermission
extends org.apache.fulcrum.security.impl.db.entity.BaseTurbinePermission
@@ -151,8 +151,10 @@
*/
public int compareTo(Object obj)
{
- if(this.getClass() != obj.getClass())
+ if (this.getClass() != obj.getClass())
+ {
throw new ClassCastException();
+ }
String name1 = ((SecurityEntity)obj).getName();
String name2 = this.getName();
return name2.compareTo(name1);
1.5 +6 -5 jakarta-turbine-fulcrum/src/services/org/apache/fulcrum/security/impl/db/entity/TurbinePermissionPeer.java
Index: TurbinePermissionPeer.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-fulcrum/src/services/org/apache/fulcrum/security/impl/db/entity/TurbinePermissionPeer.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- TurbinePermissionPeer.java 7 Mar 2002 20:42:30 -0000 1.4
+++ TurbinePermissionPeer.java 30 Apr 2002 03:39:28 -0000 1.5
@@ -54,6 +54,7 @@
* <http://www.apache.org/>.
*/
+import java.util.List;
import java.util.Vector;
import java.util.Enumeration;
import org.apache.fulcrum.security.impl.db.entity.map.TurbinePermissionMapBuilder;
@@ -76,7 +77,7 @@
* @author <a href="mailto:jmcnally@collab.net">John D. McNally</a>
* @author <a href="mailto:bmclaugh@algx.net">Brett McLaughlin</a>
* @author <a href="mailto:mpoeschl@marmot.at">Martin Poeschl</a>
- * @version $Id: TurbinePermissionPeer.java,v 1.4 2002/03/07 20:42:30 mpoeschl Exp $
+ * @version $Id: TurbinePermissionPeer.java,v 1.5 2002/04/30 03:39:28 jon Exp $
*/
public class TurbinePermissionPeer
extends org.apache.fulcrum.security.impl.db.entity.BaseTurbinePermissionPeer
@@ -100,8 +101,8 @@
Criteria criteria = new Criteria();
criteria.addSelectColumn(PERMISSION_ID);
criteria.add(NAME, ((SecurityEntity)permission).getName());
- Vector results = BasePeer.doSelect(criteria);
- if(results.size() > 1)
+ List results = BasePeer.doSelect(criteria);
+ if (results.size() > 1)
{
throw new DataBackendException("Multiple permissions named '" +
((SecurityEntity)permission).getName() + "' exist!");
@@ -143,11 +144,11 @@
public static PermissionSet retrieveSet(Criteria criteria)
throws Exception
{
- Vector results = doSelect(criteria);
+ List results = doSelect(criteria);
PermissionSet ps = new PermissionSet();
for (int i=0; i<results.size(); i++)
{
- ps.add( (Permission)results.elementAt(i) );
+ ps.add( (Permission)results.get(i) );
}
return ps;
}
1.5 +6 -6 jakarta-turbine-fulcrum/src/services/org/apache/fulcrum/security/impl/db/entity/TurbineRolePeer.java
Index: TurbineRolePeer.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-fulcrum/src/services/org/apache/fulcrum/security/impl/db/entity/TurbineRolePeer.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- TurbineRolePeer.java 7 Mar 2002 20:42:30 -0000 1.4
+++ TurbineRolePeer.java 30 Apr 2002 03:39:28 -0000 1.5
@@ -54,7 +54,7 @@
* <http://www.apache.org/>.
*/
-import java.util.Vector;
+import java.util.List;
import org.apache.fulcrum.security.impl.db.entity.map.TurbineRoleMapBuilder;
import org.apache.fulcrum.security.impl.db.entity.UserPeer;
import org.apache.torque.om.Persistent;
@@ -77,7 +77,7 @@
* @author <a href="mailto:jmcnally@collab.net">John D. McNally</a>
* @author <a href="mailto:bmclaugh@algx.net">Brett McLaughlin</a>
* @author <a href="mailto:mpoeschl@marmot.at">Martin Poeschl</a>
- * @version $Id: TurbineRolePeer.java,v 1.4 2002/03/07 20:42:30 mpoeschl Exp $
+ * @version $Id: TurbineRolePeer.java,v 1.5 2002/04/30 03:39:28 jon Exp $
*/
public class TurbineRolePeer
extends org.apache.fulcrum.security.impl.db.entity.BaseTurbineRolePeer
@@ -101,8 +101,8 @@
Criteria criteria = new Criteria();
criteria.addSelectColumn(ROLE_ID);
criteria.add(NAME, role.getName());
- Vector results = BasePeer.doSelect(criteria);
- if(results.size() > 1)
+ List results = BasePeer.doSelect(criteria);
+ if (results.size() > 1)
{
throw new DataBackendException("Multiple roles named '" +
role.getName() + "' exist!");
@@ -139,11 +139,11 @@
*/
public static RoleSet retrieveSet(Criteria criteria) throws Exception
{
- Vector results = doSelect(criteria);
+ List results = doSelect(criteria);
RoleSet rs = new RoleSet();
for (int i=0; i<results.size(); i++)
{
- rs.add( (Role)results.elementAt(i) );
+ rs.add( (Role)results.get(i) );
}
return rs;
}
1.6 +10 -10 jakarta-turbine-fulcrum/src/services/org/apache/fulcrum/security/impl/db/entity/TurbineUserPeer.java
Index: TurbineUserPeer.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-fulcrum/src/services/org/apache/fulcrum/security/impl/db/entity/TurbineUserPeer.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- TurbineUserPeer.java 2 Mar 2002 02:25:52 -0000 1.5
+++ TurbineUserPeer.java 30 Apr 2002 03:39:28 -0000 1.6
@@ -54,7 +54,7 @@
* <http://www.apache.org/>.
*/
-import java.util.Vector;
+import java.util.List;
import org.apache.torque.TorqueException;
import org.apache.torque.util.BasePeer;
import org.apache.torque.pool.DBConnection;
@@ -71,7 +71,7 @@
* @author <a href="mailto:jmcnally@collab.net">John D. McNally</a>
* @author <a href="mailto:bmclaugh@algx.net">Brett McLaughlin</a>
* @author <a href="mailto:mpoeschl@marmot.at">Martin Poeschl</a>
- * @version $Id: TurbineUserPeer.java,v 1.5 2002/03/02 02:25:52 jmcnally Exp $
+ * @version $Id: TurbineUserPeer.java,v 1.6 2002/04/30 03:39:28 jon Exp $
*/
public class TurbineUserPeer
extends org.apache.fulcrum.security.impl.db.entity.BaseTurbineUserPeer
@@ -163,8 +163,8 @@
Criteria criteria = new Criteria();
criteria.addSelectColumn(USER_ID);
criteria.add(TurbineUserPeer.USERNAME, user.getUserName());
- Vector results = BasePeer.doSelect(criteria);
- if(results.size() > 1)
+ List results = BasePeer.doSelect(criteria);
+ if (results.size() > 1)
{
throw new DataBackendException("Multiple users named '" +
user.getUserName() + "' exist!");
@@ -173,12 +173,12 @@
}
/**
- * Returns a vector of all User objects.
+ * Returns a List of all User objects.
*
- * @return A Vector with all users in the system.
+ * @return A List with all users in the system.
* @exception Exception, a generic exception.
*/
- public static Vector selectAllUsers()
+ public static List selectAllUsers()
throws Exception
{
Criteria criteria = new Criteria();
@@ -189,12 +189,12 @@
}
/**
- * Returns a vector of all confirmed User objects.
+ * Returns a List of all confirmed User objects.
*
- * @return A Vector with all confirmed users in the system.
+ * @return A List with all confirmed users in the system.
* @exception Exception, a generic exception.
*/
- public static Vector selectAllConfirmedUsers()
+ public static List selectAllConfirmedUsers()
throws Exception
{
Criteria criteria = new Criteria();
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>