[portal-commits] JBoss Portal SVN: r12952 - in modules/identity/trunk/identity/src: main/java/org/jboss/portal/identity/service and 3 other directories.
portal-commits at lists.jboss.org
portal-commits at lists.jboss.org
Thu Mar 5 16:13:02 EST 2009
Author: sviluppatorefico
Date: 2009-03-05 16:13:02 -0500 (Thu, 05 Mar 2009)
New Revision: 12952
Modified:
modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/IdentityConfiguration.java
modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/RoleModule.java
modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/UserModule.java
modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/service/RoleModuleService.java
modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/service/UserModuleService.java
modules/identity/trunk/identity/src/test/java/org/jboss/portal/test/identity/db/DBGenericTest.java
modules/identity/trunk/identity/src/test/java/org/jboss/portal/test/identity/ldap/LDAPExtRoleModuleTest.java
modules/identity/trunk/identity/src/test/java/org/jboss/portal/test/identity/ldap/LDAPExtUserModuleTest.java
modules/identity/trunk/identity/src/test/resources/config/db-config.xml
modules/identity/trunk/identity/src/test/resources/config/standardidentity-config.xml
Log:
see https://jira.jboss.org/jira/browse/JBPORTAL-2283
Modified: modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/IdentityConfiguration.java
===================================================================
--- modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/IdentityConfiguration.java 2009-03-05 16:56:55 UTC (rev 12951)
+++ modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/IdentityConfiguration.java 2009-03-05 21:13:02 UTC (rev 12952)
@@ -99,8 +99,12 @@
public static final String SEARCH_SCOPE = "searchScope";
+ public static final String ADMIN_ROLES = "adminRoles";
+ public static final String ADMIN_USERS = "adminUsers";
+
+
public Set getValues(String optionGroup, String option);
public String getValue(String optionGroup, String option);
Modified: modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/RoleModule.java
===================================================================
--- modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/RoleModule.java 2009-03-05 16:56:55 UTC (rev 12951)
+++ modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/RoleModule.java 2009-03-05 21:13:02 UTC (rev 12952)
@@ -97,6 +97,13 @@
* @return the roles
*/
Set findRoles() throws IdentityException;
+
+ /**
+ * Get all the administrator roles
+ *
+ * @return the role names
+ */
+ Set<String> getAdminRoles() throws IdentityException;
}
Modified: modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/UserModule.java
===================================================================
--- modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/UserModule.java 2009-03-05 16:56:55 UTC (rev 12951)
+++ modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/UserModule.java 2009-03-05 21:13:02 UTC (rev 12952)
@@ -100,4 +100,11 @@
* @return the number of users
*/
int getUserCount() throws IdentityException, IllegalArgumentException;
+
+ /**
+ * Get all the administrator roles
+ *
+ * @return the role names
+ */
+ Set<String> getAdminUsers() throws IdentityException;
}
Modified: modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/service/RoleModuleService.java
===================================================================
--- modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/service/RoleModuleService.java 2009-03-05 16:56:55 UTC (rev 12951)
+++ modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/service/RoleModuleService.java 2009-03-05 21:13:02 UTC (rev 12952)
@@ -21,6 +21,9 @@
*/
package org.jboss.portal.identity.service;
+import java.util.Set;
+
+import org.jboss.portal.identity.IdentityConfiguration;
import org.jboss.portal.identity.RoleModule;
import org.jboss.portal.identity.IdentityContext;
import org.jboss.portal.identity.IdentityException;
@@ -60,5 +63,15 @@
RoleUpdatedEvent event = new RoleUpdatedEvent(roleId, roleName, displayName);
getIdentityEventBroadcaster().fireEvent(event);
}
+
+ public Set<String> getAdminRoles() throws IdentityException
+ {
+ Set<String> adminRoles = (Set<String>)getIdentityConfiguration().getOptions(IdentityConfiguration.GROUP_COMMON).get(IdentityConfiguration.ADMIN_ROLES);
+ if (adminRoles == null)
+ {
+ throw new IdentityException("Configuration option missing: " + IdentityConfiguration.ADMIN_ROLES);
+ }
+ return adminRoles;
+ }
}
Modified: modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/service/UserModuleService.java
===================================================================
--- modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/service/UserModuleService.java 2009-03-05 16:56:55 UTC (rev 12951)
+++ modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/service/UserModuleService.java 2009-03-05 21:13:02 UTC (rev 12952)
@@ -21,6 +21,9 @@
*/
package org.jboss.portal.identity.service;
+import java.util.Set;
+
+import org.jboss.portal.identity.IdentityConfiguration;
import org.jboss.portal.identity.UserModule;
import org.jboss.portal.identity.IdentityContext;
import org.jboss.portal.identity.IdentityException;
@@ -52,5 +55,15 @@
IdentityEvent event = new UserDestroyedEvent(userId, userName);
getIdentityEventBroadcaster().fireEvent(event);
}
+
+ public Set<String> getAdminUsers() throws IdentityException
+ {
+ Set<String> adminUsers = (Set<String>)getIdentityConfiguration().getOptions(IdentityConfiguration.GROUP_COMMON).get(IdentityConfiguration.ADMIN_USERS);
+ if (adminUsers == null)
+ {
+ throw new IdentityException("Configuration option missing: " + IdentityConfiguration.ADMIN_USERS);
+ }
+ return adminUsers;
+ }
}
Modified: modules/identity/trunk/identity/src/test/java/org/jboss/portal/test/identity/db/DBGenericTest.java
===================================================================
--- modules/identity/trunk/identity/src/test/java/org/jboss/portal/test/identity/db/DBGenericTest.java 2009-03-05 16:56:55 UTC (rev 12951)
+++ modules/identity/trunk/identity/src/test/java/org/jboss/portal/test/identity/db/DBGenericTest.java 2009-03-05 21:13:02 UTC (rev 12952)
@@ -21,6 +21,7 @@
*/
package org.jboss.portal.test.identity.db;
+import org.jboss.portal.identity.IdentityException;
import org.jboss.portal.identity.ProfileMap;
import org.jboss.portal.identity.User;
import org.jboss.portal.identity.db.HibernateUserImpl;
@@ -188,4 +189,30 @@
{
genericTest.testStaticProperty();
}
+
+ public void testGetAdminUsers() throws Exception
+ {
+ try
+ {
+ getUserModule().getAdminUsers();
+ }
+ catch (IdentityException e)
+ {
+ fail();
+ }
+
+ }
+
+ public void testGetAdminRoles() throws Exception
+ {
+ try
+ {
+ getRoleModule().getAdminRoles();
+ }
+ catch (IdentityException e)
+ {
+ fail();
+ }
+
+ }
}
Modified: modules/identity/trunk/identity/src/test/java/org/jboss/portal/test/identity/ldap/LDAPExtRoleModuleTest.java
===================================================================
--- modules/identity/trunk/identity/src/test/java/org/jboss/portal/test/identity/ldap/LDAPExtRoleModuleTest.java 2009-03-05 16:56:55 UTC (rev 12951)
+++ modules/identity/trunk/identity/src/test/java/org/jboss/portal/test/identity/ldap/LDAPExtRoleModuleTest.java 2009-03-05 21:13:02 UTC (rev 12952)
@@ -203,4 +203,17 @@
}
+
+ public void testGetAdminRoles() throws Exception
+ {
+ try
+ {
+ getRoleModule().getAdminRoles();
+ }
+ catch (IdentityException e)
+ {
+ fail();
+ }
+
+ }
}
Modified: modules/identity/trunk/identity/src/test/java/org/jboss/portal/test/identity/ldap/LDAPExtUserModuleTest.java
===================================================================
--- modules/identity/trunk/identity/src/test/java/org/jboss/portal/test/identity/ldap/LDAPExtUserModuleTest.java 2009-03-05 16:56:55 UTC (rev 12951)
+++ modules/identity/trunk/identity/src/test/java/org/jboss/portal/test/identity/ldap/LDAPExtUserModuleTest.java 2009-03-05 21:13:02 UTC (rev 12952)
@@ -1,6 +1,7 @@
package org.jboss.portal.test.identity.ldap;
//import org.jboss.portal.identity.IdentityServiceControllerImpl;
+import org.jboss.portal.identity.IdentityException;
import org.jboss.portal.identity.User;
import org.jboss.portal.identity.Role;
import org.jboss.portal.identity.NoSuchUserException;
@@ -145,4 +146,17 @@
assertTrue(roleNames.contains("Echo"));
}
+
+ public void testGetAdminUsers() throws Exception
+ {
+ try
+ {
+ getUserModule().getAdminUsers();
+ }
+ catch (IdentityException e)
+ {
+ fail();
+ }
+
+ }
}
Modified: modules/identity/trunk/identity/src/test/resources/config/db-config.xml
===================================================================
--- modules/identity/trunk/identity/src/test/resources/config/db-config.xml 2009-03-05 16:56:55 UTC (rev 12951)
+++ modules/identity/trunk/identity/src/test/resources/config/db-config.xml 2009-03-05 21:13:02 UTC (rev 12952)
@@ -65,5 +65,5 @@
<config/>
</module>
</modules>
- <options/>
+<!-- <options/> -->
</identity-configuration>
Modified: modules/identity/trunk/identity/src/test/resources/config/standardidentity-config.xml
===================================================================
--- modules/identity/trunk/identity/src/test/resources/config/standardidentity-config.xml 2009-03-05 16:56:55 UTC (rev 12951)
+++ modules/identity/trunk/identity/src/test/resources/config/standardidentity-config.xml 2009-03-05 21:13:02 UTC (rev 12952)
@@ -335,6 +335,14 @@
<name>defaultAdminRole</name>
<value>Admin</value>
</option>
+ <option>
+ <name>adminUsers</name>
+ <value>admin</value>
+ </option>
+ <option>
+ <name>adminRoles</name>
+ <value>Admin</value>
+ </option>
</option-group>
<option-group>
<group-name>userCreateAttibutes</group-name>
More information about the portal-commits
mailing list