[jboss-cvs] jboss-seam/src/main/org/jboss/seam/security/management ...
Shane Bryzak
sbryzak at redhat.com
Wed Jan 2 22:51:04 EST 2008
User: sbryzak2
Date: 08/01/02 22:51:04
Modified: src/main/org/jboss/seam/security/management
IdentityManager.java IdentityStore.java
JpaIdentityStore.java
Log:
extend EntityController
Revision Changes Path
1.4 +1 -1 jboss-seam/src/main/org/jboss/seam/security/management/IdentityManager.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: IdentityManager.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/security/management/IdentityManager.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
1.5 +13 -13 jboss-seam/src/main/org/jboss/seam/security/management/IdentityStore.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: IdentityStore.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/security/management/IdentityStore.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- IdentityStore.java 14 Dec 2007 02:36:38 -0000 1.4
+++ IdentityStore.java 3 Jan 2008 03:51:04 -0000 1.5
@@ -8,23 +8,23 @@
*
* @author Shane Bryzak
*/
-public abstract class IdentityStore
+public interface IdentityStore
{
- protected abstract boolean createAccount(String username, String password);
- protected abstract boolean deleteAccount(String name);
+ boolean createAccount(String username, String password);
+ boolean deleteAccount(String name);
- protected abstract boolean grantRole(String name, String role);
- protected abstract boolean revokeRole(String name, String role);
+ boolean grantRole(String name, String role);
+ boolean revokeRole(String name, String role);
- protected abstract boolean enableAccount(String name);
- protected abstract boolean disableAccount(String name);
+ boolean enableAccount(String name);
+ boolean disableAccount(String name);
- protected abstract List<String> listUsers();
- protected abstract List<String> listUsers(String filter);
- protected abstract List<String> listRoles();
+ List<String> listUsers();
+ List<String> listUsers(String filter);
+ List<String> listRoles();
- protected abstract List<String> getGrantedRoles(String name);
- protected abstract List<String> getImpliedRoles(String name);
+ List<String> getGrantedRoles(String name);
+ List<String> getImpliedRoles(String name);
- protected abstract boolean authenticate(String username, String password);
+ boolean authenticate(String username, String password);
}
1.5 +3 -33 jboss-seam/src/main/org/jboss/seam/security/management/JpaIdentityStore.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: JpaIdentityStore.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/security/management/JpaIdentityStore.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- JpaIdentityStore.java 14 Dec 2007 02:36:38 -0000 1.4
+++ JpaIdentityStore.java 3 Jan 2008 03:51:04 -0000 1.5
@@ -1,7 +1,6 @@
package org.jboss.seam.security.management;
import static org.jboss.seam.ScopeType.APPLICATION;
-import static org.jboss.seam.security.management.UserAccount.AccountType;
import java.security.MessageDigest;
import java.util.ArrayList;
@@ -9,14 +8,14 @@
import java.util.List;
import java.util.Set;
-import javax.persistence.EntityManager;
import javax.persistence.NoResultException;
-import org.jboss.seam.Component;
import org.jboss.seam.annotations.Create;
import org.jboss.seam.annotations.Scope;
import org.jboss.seam.annotations.intercept.BypassInterceptors;
import org.jboss.seam.core.Events;
+import org.jboss.seam.framework.EntityController;
+import org.jboss.seam.security.management.UserAccount.AccountType;
import org.jboss.seam.util.Hex;
/**
@@ -26,7 +25,7 @@
*/
@Scope(APPLICATION)
@BypassInterceptors
-public class JpaIdentityStore extends IdentityStore
+public class JpaIdentityStore extends EntityController implements IdentityStore
{
public static final String EVENT_ACCOUNT_CREATED = "org.jboss.seam.security.management.accountCreated";
public static final String EVENT_ACCOUNT_AUTHENTICATED = "org.jboss.seam.security.management.accountAuthenticated";
@@ -36,8 +35,6 @@
private Class<? extends UserAccount> accountClass;
- private String entityManagerName = "entityManager";
-
private Set<UserAccount> roleCache;
@Create
@@ -57,7 +54,6 @@
roleCache.addAll(roles);
}
- @Override
public boolean createAccount(String username, String password)
{
try
@@ -100,7 +96,6 @@
}
}
- @Override
public boolean deleteAccount(String name)
{
UserAccount account = validateUser(name);
@@ -108,7 +103,6 @@
return true;
}
- @Override
public boolean grantRole(String name, String role)
{
UserAccount account = validateUser(name);
@@ -129,7 +123,6 @@
return true;
}
- @Override
public boolean revokeRole(String name, String role)
{
UserAccount account = validateUser(name);
@@ -139,7 +132,6 @@
return success;
}
- @Override
public boolean enableAccount(String name)
{
UserAccount account = validateUser(name);
@@ -156,7 +148,6 @@
return true;
}
- @Override
public boolean disableAccount(String name)
{
UserAccount account = validateUser(name);
@@ -173,7 +164,6 @@
return true;
}
- @Override
public List<String> getGrantedRoles(String name)
{
UserAccount account = validateUser(name);
@@ -191,7 +181,6 @@
return roles;
}
- @Override
public List<String> getImpliedRoles(String name)
{
UserAccount account = validateUser(name);
@@ -223,7 +212,6 @@
}
}
- @Override
public boolean authenticate(String username, String password)
{
UserAccount account = validateUser(username);
@@ -306,7 +294,6 @@
}
}
- @Override
public List<String> listUsers()
{
return getEntityManager().createQuery(
@@ -316,7 +303,6 @@
.getResultList();
}
- @Override
public List<String> listUsers(String filter)
{
return getEntityManager().createQuery(
@@ -328,7 +314,6 @@
.getResultList();
}
- @Override
public List<String> listRoles()
{
return getEntityManager().createQuery(
@@ -348,21 +333,6 @@
return getEntityManager().merge(account);
}
- private EntityManager getEntityManager()
- {
- return (EntityManager) Component.getInstance(entityManagerName);
- }
-
- public String getEntityManagerName()
- {
- return entityManagerName;
- }
-
- public void setEntityManagerName(String name)
- {
- this.entityManagerName = name;
- }
-
public Class<? extends UserAccount> getAccountClass()
{
return accountClass;
More information about the jboss-cvs-commits
mailing list