From b34e31ec70f72997d7e8b661a87f0cd1329e4d09 Mon Sep 17 00:00:00 2001 From: alee Date: Mon, 27 Oct 2008 16:07:19 +0000 Subject: Fix for Bugs: 223324, 430745, 224765, 223309 git-svn-id: svn+ssh://svn.fedorahosted.org/svn/pki/trunk@139 c9f7a03b-bd48-0410-a16d-cbbf54688b0b --- .../cms/servlet/csadmin/WizardPanelBase.java | 40 +++++++++++++--------- 1 file changed, 24 insertions(+), 16 deletions(-) (limited to 'pki/base/common/src/com/netscape/cms/servlet/csadmin/WizardPanelBase.java') diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/WizardPanelBase.java b/pki/base/common/src/com/netscape/cms/servlet/csadmin/WizardPanelBase.java index 09771b3ca..c6c786f55 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/WizardPanelBase.java +++ b/pki/base/common/src/com/netscape/cms/servlet/csadmin/WizardPanelBase.java @@ -546,26 +546,31 @@ public class WizardPanelBase implements IWizardPanel { config.putString("preop.internaldb.master.basedn", v); } else if (name.equals("internaldb.ldapauth.password")) { config.putString("preop.internaldb.master.bindpwd", v); + } else if (name.equals("internaldb.replication.password")) { + config.putString("preop.internaldb.master.replicationpwd", v); } else if (name.equals("instanceId")) { config.putString("preop.master.instanceId", v); - } else if (name.equals("preop.cert.signing.nickname")) { + } else if (name.equals("cloning.cert.signing.nickname")) { config.putString("preop.master.signing.nickname", v); - config.putString(name, v); - } else if (name.equals("preop.cert.ocsp_signing.nickname")) { + config.putString("preop.cert.signing.nickname", v); + } else if (name.equals("cloning.ocsp_signing.nickname")) { config.putString("preop.master.ocsp_signing.nickname", v); - config.putString(name, v); - } else if (name.equals("preop.cert.subsystem.nickname")) { + config.putString("preop.cert.ocsp_signing.nickname", v); + } else if (name.equals("cloning.subsystem.nickname")) { config.putString("preop.master.subsystem.nickname", v); - config.putString(name, v); - } else if (name.equals("preop.cert.transport.nickname")) { + config.putString("preop.cert.subsystem.nickname", v); + } else if (name.equals("cloning.transport.nickname")) { config.putString("preop.master.transport.nickname", v); config.putString("kra.transportUnit.nickName", v); - config.putString(name, v); - } else if (name.equals("preop.cert.storage.nickname")) { + config.putString("preop.cert.transport.nickname", v); + } else if (name.equals("cloning.storage.nickname")) { config.putString("preop.master.storage.nickname", v); config.putString("kra.storageUnit.nickName", v); - config.putString(name, v); - } else { + config.putString("preop.cert.storage.nickname", v); + } else if (name.startsWith("cloning")) { + config.putString(name.replaceFirst("cloning", "preop.cert"), v); + } + else { config.putString(name, v); } } @@ -1054,22 +1059,25 @@ public class WizardPanelBase implements IWizardPanel { break; } } - if (name.equals("preop.cert.signing.nickname")) { config.putString("preop.master.signing.nickname", v); + if (name.equals("cloning.signing.nickname")) { + config.putString("preop.master.signing.nickname", v); config.putString(name, v); - } else if (name.equals("preop.cert.ocsp_signing.nickname")) { + } else if (name.equals("cloning.ocsp_signing.nickname")) { config.putString("preop.master.ocsp_signing.nickname", v); config.putString(name, v); - } else if (name.equals("preop.cert.subsystem.nickname")) { + } else if (name.equals("cloning.subsystem.nickname")) { config.putString("preop.master.subsystem.nickname", v); config.putString(name, v); - } else if (name.equals("preop.cert.transport.nickname")) { + } else if (name.equals("cloning.cert.transport.nickname")) { config.putString("preop.master.transport.nickname", v); config.putString("kra.transportUnit.nickName", v); config.putString(name, v); - } else if (name.equals("preop.cert.storage.nickname")) { + } else if (name.equals("cloning.cert.storage.nickname")) { config.putString("preop.master.storage.nickname", v); config.putString("kra.storageUnit.nickName", v); config.putString(name, v); + } else if (name.equals("cloning.module.token")) { + config.putString("preop.module.token", v); } else { config.putString(name, v); } -- cgit