diff options
Diffstat (limited to 'base/server/cmscore/src')
5 files changed, 4 insertions, 12 deletions
diff --git a/base/server/cmscore/src/com/netscape/cmscore/apps/CMSEngine.java b/base/server/cmscore/src/com/netscape/cmscore/apps/CMSEngine.java index b6750c615..729fb4a80 100644 --- a/base/server/cmscore/src/com/netscape/cmscore/apps/CMSEngine.java +++ b/base/server/cmscore/src/com/netscape/cmscore/apps/CMSEngine.java @@ -321,6 +321,7 @@ public class CMSEngine implements ICMSEngine { try { mPasswordStore = (IPasswordStore) Class.forName(pwdClass).newInstance(); mPasswordStore.init(pwdPath); + mPasswordStore.setId(instanceId); } catch (Exception e) { System.out.println("Cannot get password store: " + e); throw new EBaseException(e); @@ -467,6 +468,9 @@ public class CMSEngine implements ICMSEngine { serverStatus = "starting"; + instanceDir = config.getString("instanceRoot"); + instanceId = config.getString("instanceId"); + if (state == 1) { // configuration is complete, initialize password store try { @@ -497,9 +501,6 @@ public class CMSEngine implements ICMSEngine { mTimeSource = new SimpleTimeSource(); } - instanceDir = config.getString("instanceRoot"); - instanceId = config.getString("instanceId"); - loadDynSubsystems(); java.security.Security.addProvider( diff --git a/base/server/cmscore/src/com/netscape/cmscore/base/LDAPConfigStore.java b/base/server/cmscore/src/com/netscape/cmscore/base/LDAPConfigStore.java index a9a6536f0..b7b4ca46e 100644 --- a/base/server/cmscore/src/com/netscape/cmscore/base/LDAPConfigStore.java +++ b/base/server/cmscore/src/com/netscape/cmscore/base/LDAPConfigStore.java @@ -18,13 +18,9 @@ package com.netscape.cmscore.base; -import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; -import java.io.InputStream; -import java.io.IOException; import java.io.OutputStream; import java.io.PrintWriter; -import java.util.Enumeration; import java.util.Map; import netscape.ldap.LDAPAttribute; diff --git a/base/server/cmscore/src/com/netscape/cmscore/profile/AbstractProfileSubsystem.java b/base/server/cmscore/src/com/netscape/cmscore/profile/AbstractProfileSubsystem.java index 238816ff0..cf5d77f19 100644 --- a/base/server/cmscore/src/com/netscape/cmscore/profile/AbstractProfileSubsystem.java +++ b/base/server/cmscore/src/com/netscape/cmscore/profile/AbstractProfileSubsystem.java @@ -21,7 +21,6 @@ import java.util.Collections; import java.util.Enumeration; import java.util.Hashtable; import java.util.LinkedHashMap; -import java.util.Vector; import com.netscape.certsrv.base.EBaseException; import com.netscape.certsrv.base.IConfigStore; diff --git a/base/server/cmscore/src/com/netscape/cmscore/profile/LDAPProfileSubsystem.java b/base/server/cmscore/src/com/netscape/cmscore/profile/LDAPProfileSubsystem.java index 199a5576e..83ae5078d 100644 --- a/base/server/cmscore/src/com/netscape/cmscore/profile/LDAPProfileSubsystem.java +++ b/base/server/cmscore/src/com/netscape/cmscore/profile/LDAPProfileSubsystem.java @@ -18,13 +18,10 @@ package com.netscape.cmscore.profile; import java.io.ByteArrayInputStream; -import java.io.IOException; import java.io.InputStream; -import java.lang.Thread; import java.util.Enumeration; import java.util.Hashtable; import java.util.LinkedHashMap; -import java.util.Vector; import netscape.ldap.LDAPAttribute; import netscape.ldap.LDAPConnection; diff --git a/base/server/cmscore/src/com/netscape/cmscore/profile/ProfileSubsystem.java b/base/server/cmscore/src/com/netscape/cmscore/profile/ProfileSubsystem.java index 10bc50cda..90d7479e4 100644 --- a/base/server/cmscore/src/com/netscape/cmscore/profile/ProfileSubsystem.java +++ b/base/server/cmscore/src/com/netscape/cmscore/profile/ProfileSubsystem.java @@ -22,7 +22,6 @@ import java.util.Enumeration; import java.util.Hashtable; import java.util.LinkedHashMap; import java.util.StringTokenizer; -import java.util.Vector; import com.netscape.certsrv.apps.CMS; import com.netscape.certsrv.base.EBaseException; |