You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jetspeed-dev@portals.apache.org by ta...@apache.org on 2002/06/19 23:33:26 UTC
cvs commit: jakarta-jetspeed/src/java/org/apache/jetspeed/modules/actions/portlets/security UserBrowserAction.java UserUpdateAction.java
taylor 2002/06/19 14:33:26
Modified: src/java/org/apache/jetspeed/modules/actions/portlets/security
Tag: security_14 UserBrowserAction.java
UserUpdateAction.java
Log:
Removed unnecessary turbine imports
Changed EntityExistsException to NotUniqueUserException
Revision Changes Path
No revision
No revision
1.6.2.2 +2 -11 jakarta-jetspeed/src/java/org/apache/jetspeed/modules/actions/portlets/security/UserBrowserAction.java
Index: UserBrowserAction.java
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/modules/actions/portlets/security/UserBrowserAction.java,v
retrieving revision 1.6.2.1
retrieving revision 1.6.2.2
diff -u -r1.6.2.1 -r1.6.2.2
--- UserBrowserAction.java 7 Jun 2002 10:02:05 -0000 1.6.2.1
+++ UserBrowserAction.java 19 Jun 2002 21:33:26 -0000 1.6.2.2
@@ -64,15 +64,6 @@
import org.apache.turbine.util.StringUtils;
import org.apache.turbine.util.DynamicURI;
-import org.apache.turbine.util.security.RoleSet;
-
-// turbine om
-import org.apache.turbine.om.security.User;
-
-// turbine security
-import org.apache.turbine.util.security.EntityExistsException;
-import org.apache.turbine.util.security.DataBackendException;
-
// jetspeed services
import org.apache.jetspeed.services.JetspeedSecurity;
import org.apache.jetspeed.services.security.JetspeedSecurityException;
@@ -148,7 +139,7 @@
context.put("s_config", new FieldMethodizer( context.get("config") ) );
Iterator users = JetspeedSecurity.getUsers();
-
+
List userList = new ArrayList();
while (users.hasNext())
1.11.2.3 +3 -7 jakarta-jetspeed/src/java/org/apache/jetspeed/modules/actions/portlets/security/UserUpdateAction.java
Index: UserUpdateAction.java
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/modules/actions/portlets/security/UserUpdateAction.java,v
retrieving revision 1.11.2.2
retrieving revision 1.11.2.3
diff -u -r1.11.2.2 -r1.11.2.3
--- UserUpdateAction.java 7 Jun 2002 10:02:05 -0000 1.11.2.2
+++ UserUpdateAction.java 19 Jun 2002 21:33:26 -0000 1.11.2.3
@@ -76,9 +76,7 @@
// turbine om security
import org.apache.jetspeed.om.security.JetspeedUser;
-import org.apache.turbine.util.db.Criteria;
-import org.apache.turbine.util.security.DataBackendException;
-import org.apache.turbine.util.security.EntityExistsException;
+import org.apache.jetspeed.services.security.NotUniqueUserException;
//turbine email
import org.apache.turbine.util.mail.SimpleEmail;
@@ -251,10 +249,8 @@
///
user.setPassword(password);
JetspeedSecurity.addUser(user);
-
-
}
- catch (EntityExistsException e)
+ catch (NotUniqueUserException e)
{
// log the error msg
Log.error(e);
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>