diff --git a/openam-console/src/main/java/com/sun/identity/console/agentconfig/model/AgentDumpModelImpl.java b/openam-console/src/main/java/com/sun/identity/console/agentconfig/model/AgentDumpModelImpl.java index bb6290287a..4a85eee927 100644 --- a/openam-console/src/main/java/com/sun/identity/console/agentconfig/model/AgentDumpModelImpl.java +++ b/openam-console/src/main/java/com/sun/identity/console/agentconfig/model/AgentDumpModelImpl.java @@ -44,8 +44,6 @@ public class AgentDumpModelImpl extends AMModelBase implements AgentDumpModel { - private static SSOToken adminSSOToken = AMAdminUtils.getSuperAdminSSOToken(); - public AgentDumpModelImpl(HttpServletRequest req, Map map) { super(req, map); } @@ -53,6 +51,7 @@ public AgentDumpModelImpl(HttpServletRequest req, Map map) { public Map getAttributeValues(String universalId) throws AMConsoleException { try { + final SSOToken adminSSOToken = AMAdminUtils.getSuperAdminSSOToken(); AMIdentity amid = IdUtils.getIdentity(adminSSOToken, universalId); Map values = AgentConfiguration.getAgentAttributes(amid, true); return values; diff --git a/openam-console/src/main/java/com/sun/identity/console/agentconfig/model/AgentExportPolicyModelImpl.java b/openam-console/src/main/java/com/sun/identity/console/agentconfig/model/AgentExportPolicyModelImpl.java index 126cb8258b..050f380d5a 100644 --- a/openam-console/src/main/java/com/sun/identity/console/agentconfig/model/AgentExportPolicyModelImpl.java +++ b/openam-console/src/main/java/com/sun/identity/console/agentconfig/model/AgentExportPolicyModelImpl.java @@ -44,7 +44,6 @@ public class AgentExportPolicyModelImpl extends AMModelBase implements AgentExportPolicyModel { - // private static SSOToken adminSSOToken = AMAdminUtils.getSuperAdminSSOToken(); public AgentExportPolicyModelImpl(HttpServletRequest req, Map map) { super(req, map); } diff --git a/openam-console/src/main/java/com/sun/identity/console/base/model/AMCommonNameGenerator.java b/openam-console/src/main/java/com/sun/identity/console/base/model/AMCommonNameGenerator.java index f495f8f713..f6b8518ccb 100644 --- a/openam-console/src/main/java/com/sun/identity/console/base/model/AMCommonNameGenerator.java +++ b/openam-console/src/main/java/com/sun/identity/console/base/model/AMCommonNameGenerator.java @@ -60,8 +60,6 @@ public class AMCommonNameGenerator implements AMAdminConstants, ServiceListener { - private static SSOToken adminSSOToken = - AMAdminUtils.getSuperAdminSSOToken(); private static final String DEFAULT_FORMAT = "{cn}"; @@ -82,6 +80,8 @@ private AMCommonNameGenerator() { private void initialize() { try { + SSOToken adminSSOToken = + AMAdminUtils.getSuperAdminSSOToken(); serviceSchemaManager = new ServiceSchemaManager( G11N_SERVICE_NAME, adminSSOToken); serviceConfigManager = new ServiceConfigManager( @@ -172,6 +172,8 @@ public String generateCommonName(String univId, AMModel model) private Map getUserAttributeValues(String univId) { Map values = null; try { + SSOToken adminSSOToken = + AMAdminUtils.getSuperAdminSSOToken(); AMIdentity amid = IdUtils.getIdentity(adminSSOToken, univId); if (amid != null) { Map map = amid.getAttributes(); @@ -208,6 +210,8 @@ private Map getAttributeSchemaExactNames(String idType) Map mapping = new HashMap(); String serviceName = IdUtils.getServiceName(IdUtils.getType(idType)); if (serviceName != null) { + SSOToken adminSSOToken = + AMAdminUtils.getSuperAdminSSOToken(); ServiceSchemaManager svcSchemaMgr = new ServiceSchemaManager( serviceName, adminSSOToken); ServiceSchema svcSchema = svcSchemaMgr.getSchema(idType); @@ -291,6 +295,8 @@ private Map addFormats(String realm) { Map map = null; try { + SSOToken adminSSOToken = + AMAdminUtils.getSuperAdminSSOToken(); AMIdentityRepository repo = new AMIdentityRepository( adminSSOToken, realm); AMIdentity realmIdentity = repo.getRealmIdentity(); diff --git a/openam-console/src/main/java/com/sun/identity/console/base/model/SubConfigMeta.java b/openam-console/src/main/java/com/sun/identity/console/base/model/SubConfigMeta.java index 5809e83018..6b1b5a7a7a 100644 --- a/openam-console/src/main/java/com/sun/identity/console/base/model/SubConfigMeta.java +++ b/openam-console/src/main/java/com/sun/identity/console/base/model/SubConfigMeta.java @@ -60,8 +60,6 @@ public class SubConfigMeta { public static final String SUBCONFIG_ID_DELIMITER = "/"; - private static SSOToken adminSSOToken = - AMAdminUtils.getSuperAdminSSOToken(); private String serviceName; private AMModel amModel; @@ -173,6 +171,8 @@ public Map getServiceSchemaDefaultValues(String name) private void initialize() { try { + SSOToken adminSSOToken = + AMAdminUtils.getSuperAdminSSOToken(); ServiceConfigManager mgr = new ServiceConfigManager( serviceName, adminSSOToken); globalConfig = mgr.getGlobalConfig(null); diff --git a/openam-console/src/main/java/com/sun/identity/console/idm/model/EntitiesModelImpl.java b/openam-console/src/main/java/com/sun/identity/console/idm/model/EntitiesModelImpl.java index f6fe8a78d2..95c8a02e55 100644 --- a/openam-console/src/main/java/com/sun/identity/console/idm/model/EntitiesModelImpl.java +++ b/openam-console/src/main/java/com/sun/identity/console/idm/model/EntitiesModelImpl.java @@ -96,8 +96,7 @@ public class EntitiesModelImpl private static boolean isWSSEnabled = false; private boolean endUser = false; - private static SSOToken adminSSOToken = - AMAdminUtils.getSuperAdminSSOToken(); + private static RequiredValueValidator reqValidator = new RequiredValueValidator(); private Map requiredAttributeNames = new HashMap(); @@ -821,6 +820,8 @@ public boolean canAssignService(String realmName, String idType) { boolean can = false; try { + SSOToken adminSSOToken = + AMAdminUtils.getSuperAdminSSOToken(); AMIdentityRepository repo = new AMIdentityRepository( adminSSOToken, realmName); Set allowedOperations = repo.getAllowedIdOperations( @@ -1642,6 +1643,8 @@ public void unassignServices(String universalId, Set serviceNames) public String getPropertiesViewBean(String name) { String url = null; try { + SSOToken adminSSOToken = + AMAdminUtils.getSuperAdminSSOToken(); ServiceSchemaManager mgr = new ServiceSchemaManager( name, adminSSOToken); ServiceSchema schema = mgr.getSchema(SchemaType.USER); diff --git a/openam-console/src/main/java/com/sun/identity/console/policy/model/PolicyModelImpl.java b/openam-console/src/main/java/com/sun/identity/console/policy/model/PolicyModelImpl.java index 8582eff805..6f562f0a4b 100644 --- a/openam-console/src/main/java/com/sun/identity/console/policy/model/PolicyModelImpl.java +++ b/openam-console/src/main/java/com/sun/identity/console/policy/model/PolicyModelImpl.java @@ -101,8 +101,6 @@ public class PolicyModelImpl private Map mapSvcNameToManagedResource = new HashMap(); private Set requiredResourceNameService = new HashSet(); private Set notRequiredResourceNameService = new HashSet(); - private static SSOToken adminSSOToken = - AMAdminUtils.getSuperAdminSSOToken(); /** * Creates a simple model using default resource bundle. @@ -1815,6 +1813,8 @@ public String canCreatePolicy(String realmName) { private boolean hasPolicyConfigSvcRegistered(String realmName) { try { + SSOToken adminSSOToken = + AMAdminUtils.getSuperAdminSSOToken(); OrganizationConfigManager orgCfgMgr = new OrganizationConfigManager( adminSSOToken, realmName); Set names = orgCfgMgr.getAssignedServices(); @@ -1905,6 +1905,8 @@ public Set getAuthInstances(String realmName) { Set instances = null; try { + SSOToken adminSSOToken = + AMAdminUtils.getSuperAdminSSOToken(); AMAuthenticationManager mgr = new AMAuthenticationManager( adminSSOToken, realmName); Set inst = mgr.getAuthenticationInstances(); @@ -1934,6 +1936,8 @@ public String getAuthenticationLevel(String realmName, String name) { String level = "0"; try { + SSOToken adminSSOToken = + AMAdminUtils.getSuperAdminSSOToken(); AMAuthenticationManager mgr = new AMAuthenticationManager( adminSSOToken, realmName); AMAuthenticationInstance ai = mgr.getAuthenticationInstance(name); @@ -1971,6 +1975,8 @@ public Set getRealmNames(String base, String filter) logEvent("ATTEMPT_GET_REALM_NAMES", param); try { + SSOToken adminSSOToken = + AMAdminUtils.getSuperAdminSSOToken(); OrganizationConfigManager orgMgr = new OrganizationConfigManager( adminSSOToken, base); logEvent("SUCCEED_GET_REALM_NAMES", param); diff --git a/openam-console/src/main/java/com/sun/identity/console/user/model/UMUserPasswordResetOptionsModelImpl.java b/openam-console/src/main/java/com/sun/identity/console/user/model/UMUserPasswordResetOptionsModelImpl.java index 3f9aa2fc37..a96e051102 100644 --- a/openam-console/src/main/java/com/sun/identity/console/user/model/UMUserPasswordResetOptionsModelImpl.java +++ b/openam-console/src/main/java/com/sun/identity/console/user/model/UMUserPasswordResetOptionsModelImpl.java @@ -69,8 +69,6 @@ public class UMUserPasswordResetOptionsModelImpl implements UMUserPasswordResetOptionsModel { private OrganizationConfigManager orgCfgMgr; - private static SSOToken adminSSOToken = - AMAdminUtils.getSuperAdminSSOToken(); public UMUserPasswordResetOptionsModelImpl( HttpServletRequest req, @@ -500,6 +498,8 @@ private OrganizationConfigManager getOrganizationConfigManager( String realmName) { if (orgCfgMgr == null) { try { + SSOToken adminSSOToken = + AMAdminUtils.getSuperAdminSSOToken(); orgCfgMgr = new OrganizationConfigManager( adminSSOToken, realmName); } catch (SMSException e) {