Author: azeez
Date: Tue Mar 18 06:23:48 2008
New Revision: 14963
Log:
Adding get roles method to useradmin
Modified:
trunk/wsas/java/modules/admin/src/org/wso2/wsas/admin/service/UserAdmin.java
trunk/wsas/java/modules/core/src/org/wso2/wsas/persistence/PersistenceManager.java
trunk/wsas/java/modules/core/src/org/wso2/wsas/persistence/dao/UserDAO.java
Modified:
trunk/wsas/java/modules/admin/src/org/wso2/wsas/admin/service/UserAdmin.java
==============================================================================
---
trunk/wsas/java/modules/admin/src/org/wso2/wsas/admin/service/UserAdmin.java
(original)
+++
trunk/wsas/java/modules/admin/src/org/wso2/wsas/admin/service/UserAdmin.java
Tue Mar 18 06:23:48 2008
@@ -394,6 +394,10 @@
return rdata;
}
+ public String[] getUserRoles(String username)throws AxisFault {
+ return pm.getUserRoles(username);
+ }
+
public void deleteUser(String username) throws AxisFault {
pm.deleteUser(username);
}
Modified:
trunk/wsas/java/modules/core/src/org/wso2/wsas/persistence/PersistenceManager.java
==============================================================================
---
trunk/wsas/java/modules/core/src/org/wso2/wsas/persistence/PersistenceManager.java
(original)
+++
trunk/wsas/java/modules/core/src/org/wso2/wsas/persistence/PersistenceManager.java
Tue Mar 18 06:23:48 2008
@@ -576,6 +576,10 @@
return new UserDAO(hbConfig).getUserRoles(user);
}
+ public String[] getUserRoles(String user) {
+ return new UserDAO(hbConfig).getUserRoles(user);
+ }
+
public ServiceUserRoleDO[] getUserSpecificRoles(String user) {
return new UserDAO(hbConfig).getRoles(user);
}
Modified:
trunk/wsas/java/modules/core/src/org/wso2/wsas/persistence/dao/UserDAO.java
==============================================================================
--- trunk/wsas/java/modules/core/src/org/wso2/wsas/persistence/dao/UserDAO.java
(original)
+++ trunk/wsas/java/modules/core/src/org/wso2/wsas/persistence/dao/UserDAO.java
Tue Mar 18 06:23:48 2008
@@ -30,6 +30,7 @@
import java.util.Iterator;
import java.util.List;
import java.util.Set;
+import java.util.ArrayList;
/**
* Data access object managing persistence operations related to users
@@ -55,7 +56,7 @@
String msg = "Unable to retrieve all users";
log.error(msg, e);
throw new RuntimeException(msg, e);
- }
+ }
return users;
}
@@ -164,6 +165,28 @@
return serviceUserRoleDOs;
}
+ public String[] getUserRoles(String username) {
+ Session session = hbConfig.currentSession();
+ Transaction tx = session.beginTransaction();
+ ServiceUserRoleDO[] serviceUserRoleDOs;
+ List roleList = new ArrayList();
+ try {
+ ServiceUserDO user = getUser(username, session);
+ Set roles = user.getRoles();
+ for (Iterator iterator = roles.iterator(); iterator.hasNext();) {
+ ServiceUserRoleDO role = (ServiceUserRoleDO)iterator.next();
+ roleList.add(role.getRole());
+ }
+ tx.commit();
+ } catch (Throwable e) {
+ tx.rollback();
+ String msg = "Unable to get roles";
+ log.error(msg, e);
+ throw new RuntimeException(msg, e);
+ }
+ return (String[]) roleList.toArray(new String[roleList.size()]);
+ }
+
public void addRole(String userName, ServiceUserRoleDO role) {
Session session = hbConfig.currentSession();
Transaction tx = session.beginTransaction();
_______________________________________________
Wsas-java-dev mailing list
[email protected]
http://wso2.org/cgi-bin/mailman/listinfo/wsas-java-dev