Author: thomas.heute(a)jboss.com Date: 2009-04-21 06:46:09 -0400 (Tue, 21 Apr 2009) New Revision: 13248 Modified: modules/identity/tags/JBP_IDENTITY_1_1_0/identity/src/main/java/org/jboss/portal/identity/IdentityConfiguration.java modules/identity/tags/JBP_IDENTITY_1_1_0/identity/src/main/java/org/jboss/portal/identity/RoleModule.java modules/identity/tags/JBP_IDENTITY_1_1_0/identity/src/main/java/org/jboss/portal/identity/UserModule.java modules/identity/tags/JBP_IDENTITY_1_1_0/identity/src/main/java/org/jboss/portal/identity/service/RoleModuleService.java modules/identity/tags/JBP_IDENTITY_1_1_0/identity/src/main/java/org/jboss/portal/identity/service/UserModuleService.java modules/identity/tags/JBP_IDENTITY_1_1_0/identity/src/test/java/org/jboss/portal/test/identity/db/DBGenericTest.java modules/identity/tags/JBP_IDENTITY_1_1_0/identity/src/test/java/org/jboss/portal/test/identity/ldap/LDAPExtRoleModuleTest.java modules/identity/tags/JBP_IDENTITY_1_1_0/identity/src/test/java/org/jboss/portal/test/identity/ldap/LDAPExtUserModuleTest.java modules/identity/tags/JBP_IDENTITY_1_1_0/identity/src/test/resources/config/db-config.xml modules/identity/tags/JBP_IDENTITY_1_1_0/identity/src/test/resources/config/standardidentity-config.xml Log: Removed change in the API/SPI Modified: modules/identity/tags/JBP_IDENTITY_1_1_0/identity/src/main/java/org/jboss/portal/identity/IdentityConfiguration.java =================================================================== --- modules/identity/tags/JBP_IDENTITY_1_1_0/identity/src/main/java/org/jboss/portal/identity/IdentityConfiguration.java 2009-04-21 10:11:03 UTC (rev 13247) +++ modules/identity/tags/JBP_IDENTITY_1_1_0/identity/src/main/java/org/jboss/portal/identity/IdentityConfiguration.java 2009-04-21 10:46:09 UTC (rev 13248) @@ -99,12 +99,8 @@ 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/tags/JBP_IDENTITY_1_1_0/identity/src/main/java/org/jboss/portal/identity/RoleModule.java =================================================================== --- modules/identity/tags/JBP_IDENTITY_1_1_0/identity/src/main/java/org/jboss/portal/identity/RoleModule.java 2009-04-21 10:11:03 UTC (rev 13247) +++ modules/identity/tags/JBP_IDENTITY_1_1_0/identity/src/main/java/org/jboss/portal/identity/RoleModule.java 2009-04-21 10:46:09 UTC (rev 13248) @@ -97,13 +97,6 @@ * @return the roles */ Set findRoles() throws IdentityException; - - /** - * Get all the administrator roles - * - * @return the role names - */ - Set<String> getAdminRoles() throws IdentityException; } Modified: modules/identity/tags/JBP_IDENTITY_1_1_0/identity/src/main/java/org/jboss/portal/identity/UserModule.java =================================================================== --- modules/identity/tags/JBP_IDENTITY_1_1_0/identity/src/main/java/org/jboss/portal/identity/UserModule.java 2009-04-21 10:11:03 UTC (rev 13247) +++ modules/identity/tags/JBP_IDENTITY_1_1_0/identity/src/main/java/org/jboss/portal/identity/UserModule.java 2009-04-21 10:46:09 UTC (rev 13248) @@ -100,11 +100,4 @@ * @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/tags/JBP_IDENTITY_1_1_0/identity/src/main/java/org/jboss/portal/identity/service/RoleModuleService.java =================================================================== --- modules/identity/tags/JBP_IDENTITY_1_1_0/identity/src/main/java/org/jboss/portal/identity/service/RoleModuleService.java 2009-04-21 10:11:03 UTC (rev 13247) +++ modules/identity/tags/JBP_IDENTITY_1_1_0/identity/src/main/java/org/jboss/portal/identity/service/RoleModuleService.java 2009-04-21 10:46:09 UTC (rev 13248) @@ -21,9 +21,6 @@ */ 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; @@ -63,15 +60,5 @@ 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/tags/JBP_IDENTITY_1_1_0/identity/src/main/java/org/jboss/portal/identity/service/UserModuleService.java =================================================================== --- modules/identity/tags/JBP_IDENTITY_1_1_0/identity/src/main/java/org/jboss/portal/identity/service/UserModuleService.java 2009-04-21 10:11:03 UTC (rev 13247) +++ modules/identity/tags/JBP_IDENTITY_1_1_0/identity/src/main/java/org/jboss/portal/identity/service/UserModuleService.java 2009-04-21 10:46:09 UTC (rev 13248) @@ -21,9 +21,6 @@ */ 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; @@ -55,15 +52,5 @@ 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/tags/JBP_IDENTITY_1_1_0/identity/src/test/java/org/jboss/portal/test/identity/db/DBGenericTest.java =================================================================== --- modules/identity/tags/JBP_IDENTITY_1_1_0/identity/src/test/java/org/jboss/portal/test/identity/db/DBGenericTest.java 2009-04-21 10:11:03 UTC (rev 13247) +++ modules/identity/tags/JBP_IDENTITY_1_1_0/identity/src/test/java/org/jboss/portal/test/identity/db/DBGenericTest.java 2009-04-21 10:46:09 UTC (rev 13248) @@ -21,7 +21,6 @@ */ 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; @@ -189,30 +188,4 @@ { 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/tags/JBP_IDENTITY_1_1_0/identity/src/test/java/org/jboss/portal/test/identity/ldap/LDAPExtRoleModuleTest.java =================================================================== --- modules/identity/tags/JBP_IDENTITY_1_1_0/identity/src/test/java/org/jboss/portal/test/identity/ldap/LDAPExtRoleModuleTest.java 2009-04-21 10:11:03 UTC (rev 13247) +++ modules/identity/tags/JBP_IDENTITY_1_1_0/identity/src/test/java/org/jboss/portal/test/identity/ldap/LDAPExtRoleModuleTest.java 2009-04-21 10:46:09 UTC (rev 13248) @@ -203,17 +203,4 @@ } - - public void testGetAdminRoles() throws Exception - { - try - { - getRoleModule().getAdminRoles(); - } - catch (IdentityException e) - { - fail(); - } - - } } Modified: modules/identity/tags/JBP_IDENTITY_1_1_0/identity/src/test/java/org/jboss/portal/test/identity/ldap/LDAPExtUserModuleTest.java =================================================================== --- modules/identity/tags/JBP_IDENTITY_1_1_0/identity/src/test/java/org/jboss/portal/test/identity/ldap/LDAPExtUserModuleTest.java 2009-04-21 10:11:03 UTC (rev 13247) +++ modules/identity/tags/JBP_IDENTITY_1_1_0/identity/src/test/java/org/jboss/portal/test/identity/ldap/LDAPExtUserModuleTest.java 2009-04-21 10:46:09 UTC (rev 13248) @@ -1,7 +1,6 @@ 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; @@ -146,17 +145,4 @@ assertTrue(roleNames.contains("Echo")); } - - public void testGetAdminUsers() throws Exception - { - try - { - getUserModule().getAdminUsers(); - } - catch (IdentityException e) - { - fail(); - } - - } } Modified: modules/identity/tags/JBP_IDENTITY_1_1_0/identity/src/test/resources/config/db-config.xml =================================================================== --- modules/identity/tags/JBP_IDENTITY_1_1_0/identity/src/test/resources/config/db-config.xml 2009-04-21 10:11:03 UTC (rev 13247) +++ modules/identity/tags/JBP_IDENTITY_1_1_0/identity/src/test/resources/config/db-config.xml 2009-04-21 10:46:09 UTC (rev 13248) @@ -65,5 +65,5 @@ <config/> </module> </modules> -<!-- <options/> --> + <options/> </identity-configuration> Modified: modules/identity/tags/JBP_IDENTITY_1_1_0/identity/src/test/resources/config/standardidentity-config.xml =================================================================== --- modules/identity/tags/JBP_IDENTITY_1_1_0/identity/src/test/resources/config/standardidentity-config.xml 2009-04-21 10:11:03 UTC (rev 13247) +++ modules/identity/tags/JBP_IDENTITY_1_1_0/identity/src/test/resources/config/standardidentity-config.xml 2009-04-21 10:46:09 UTC (rev 13248) @@ -335,14 +335,6 @@ <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>