Refactored NameValuePairs.

The NameValuePairs class has been modified to extend the Linked-
HashMap which preserves the order of elements as in the original
code. Some methods are renamed to match Java Map interface. The
NameValuePair class is no longer needed and has been removed.

Ticket #78

83 files changed, 853 insertions, 1045 deletions

diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/ACIDialog.java b/pki/base/console/src/com/netscape/admin/certsrv/config/ACIDialog.java
index 7c2948795..e6085f820 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/ACIDialog.java
+++ b/pki/base/console/src/com/netscape/admin/certsrv/config/ACIDialog.java
@@ -18,16 +18,12 @@
 package com.netscape.admin.certsrv.config;
 
 import com.netscape.admin.certsrv.*;
-import com.netscape.admin.certsrv.config.*;
 import com.netscape.admin.certsrv.connection.*;
 import javax.swing.*;
-import javax.swing.event.*;
-import javax.swing.table.*;
-import javax.swing.text.*;
 import java.awt.event.*;
 import java.awt.*;
 import java.util.*;
-import com.netscape.management.client.*;
+
 import com.netscape.management.client.util.*;
 import com.netscape.certsrv.common.*;
 
@@ -250,13 +246,11 @@ public class ACIDialog extends JDialog
     }
 
     private boolean validateSyntax(String str, NameValuePairs nvps) {
-        Enumeration names = nvps.getNames();
-        while (names.hasMoreElements()) {
-            String name = (String)names.nextElement();
+        for (String name : nvps.keySet()) {
             if (str.startsWith(name)) {
                 int len = name.length();
                 String leftover = str.substring(len).trim();
-                String operators = nvps.getValue(name);
+                String operators = nvps.get(name);
                 StringTokenizer st = new StringTokenizer(operators, ",");
                 while (st.hasMoreTokens()) {
                     String token = st.nextToken();
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/ACLEditDialog.java b/pki/base/console/src/com/netscape/admin/certsrv/config/ACLEditDialog.java
index 9aa392eaf..b3bcb72e1 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/ACLEditDialog.java
+++ b/pki/base/console/src/com/netscape/admin/certsrv/config/ACLEditDialog.java
@@ -18,16 +18,12 @@
 package com.netscape.admin.certsrv.config;
 
 import com.netscape.admin.certsrv.*;
-import com.netscape.admin.certsrv.config.*;
 import com.netscape.admin.certsrv.connection.*;
 import javax.swing.*;
-import javax.swing.event.*;
-import javax.swing.table.*;
-import javax.swing.text.*;
 import java.awt.event.*;
 import java.awt.*;
 import java.util.*;
-import com.netscape.management.client.*;
+
 import com.netscape.management.client.util.*;
 import com.netscape.certsrv.common.*;
 
@@ -145,9 +141,9 @@ public class ACLEditDialog extends JDialog
                     else
                         str = str+(String)mDataModel.elementAt(i);
                 }
-                pairs.add(Constants.PR_ACI, str);
-                pairs.add(Constants.PR_ACL_DESC, desc);
-                pairs.add(Constants.PR_ACL_RIGHTS, rights);
+                pairs.put(Constants.PR_ACI, str);
+                pairs.put(Constants.PR_ACL_DESC, desc);
+                pairs.put(Constants.PR_ACL_RIGHTS, rights);
             }
 
             try {
@@ -204,8 +200,8 @@ public class ACLEditDialog extends JDialog
     }
 
     public void showDialog(NameValuePairs data) {
-        String aci = data.getValue(Constants.PR_ACI);
-        mOperations = data.getValue(Constants.PR_ACL_OPS);
+        String aci = data.get(Constants.PR_ACI);
+        mOperations = data.get(Constants.PR_ACL_OPS);
 
         if ((aci != null) && (!aci.trim().equals(""))) {
             StringTokenizer tokenizer = new StringTokenizer(aci, ";");
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/ACLImplTab.java b/pki/base/console/src/com/netscape/admin/certsrv/config/ACLImplTab.java
index b0dd8bb9e..4693224b1 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/ACLImplTab.java
+++ b/pki/base/console/src/com/netscape/admin/certsrv/config/ACLImplTab.java
@@ -204,9 +204,8 @@ public class ACLImplTab extends CMSBaseUGTab {
         int i=0;
         String[] vals = new String[response.size()];
 
-        for (Enumeration e = response.getNames(); e.hasMoreElements() ;) {
-            String entry = ((String)e.nextElement()).trim();
-            vals[i++] = entry;
+        for (String entry : response.keySet()) {
+            vals[i++] = entry.trim();
         }
 
         CMSAdminUtil.bubbleSort(vals);
@@ -217,7 +216,7 @@ public class ACLImplTab extends CMSBaseUGTab {
             v.addElement(new JLabel(name,
                     CMSAdminUtil.getImage(CMSAdminResources.IMAGE_ACLPLUGIN),
                     JLabel.LEFT));
-            v.addElement(response.getValue(name));
+            v.addElement(response.get(name));
             mDataModel.addRow(v);
         }
 
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/ACLPanel.java b/pki/base/console/src/com/netscape/admin/certsrv/config/ACLPanel.java
index 3b3d8c529..2593e0c0b 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/ACLPanel.java
+++ b/pki/base/console/src/com/netscape/admin/certsrv/config/ACLPanel.java
@@ -202,9 +202,8 @@ public class ACLPanel extends CMSBaseUGTab {
         int i=0;
         String[] vals = new String[response.size()];
 
-        for (Enumeration e = response.getNames(); e.hasMoreElements() ;) {
-            String entry = ((String)e.nextElement()).trim();
-            vals[i++] = entry;
+        for (String entry : response.keySet()) {
+            vals[i++] = entry.trim();
         }
 
         CMSAdminUtil.bubbleSort(vals);
@@ -215,7 +214,7 @@ public class ACLPanel extends CMSBaseUGTab {
             v.addElement(new JLabel(name,
                     CMSAdminUtil.getImage(CMSAdminResources.IMAGE_ACL),
                     JLabel.LEFT));
-            v.addElement(response.getValue(name));
+            v.addElement(response.get(name));
             mDataModel.addRow(v);
         }
 
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/CACertsTab.java b/pki/base/console/src/com/netscape/admin/certsrv/config/CACertsTab.java
index e57c56271..18590747a 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/CACertsTab.java
+++ b/pki/base/console/src/com/netscape/admin/certsrv/config/CACertsTab.java
@@ -21,11 +21,10 @@ import com.netscape.admin.certsrv.*;
 import com.netscape.admin.certsrv.connection.*;
 import com.netscape.admin.certsrv.ug.*;
 import javax.swing.*;
-import javax.swing.event.*;
 import java.awt.event.*;
 import java.awt.*;
 import java.util.*;
-import com.netscape.management.client.*;
+
 import com.netscape.management.client.util.*;
 import com.netscape.management.client.console.*;
 import com.netscape.certsrv.common.*;
@@ -123,17 +122,16 @@ public class CACertsTab extends CMSBaseUGTab {
 
             try {
                 NameValuePairs nvps = new NameValuePairs();
-                nvps.add(Constants.PR_NICK_NAME, nickname);
-                nvps.add(Constants.PR_SERIAL_NUMBER, serialno);
-                nvps.add(Constants.PR_ISSUER_NAME, issuername);
+                nvps.put(Constants.PR_NICK_NAME, nickname);
+                nvps.put(Constants.PR_SERIAL_NUMBER, serialno);
+                nvps.put(Constants.PR_ISSUER_NAME, issuername);
                 NameValuePairs results = mConnection.process(
                   DestDef.DEST_SERVER_ADMIN, ScopeDef.SC_CERT_PRETTY_PRINT,
                   Constants.RS_ID_CONFIG, nvps);
                 if (nvps.size() <= 0)
                     return;
-                NameValuePair nvp = results.elementAt(0);
-                String name = nvp.getName();
-                String print = nvp.getValue();
+                String name = results.keySet().iterator().next(); // first element
+                String print = results.get(name);
                 CertViewDialog certdialog = new CertViewDialog(mModel.getFrame());
                 certdialog.showDialog(nickname, print);
             } catch (EAdminException ex) {
@@ -150,17 +148,16 @@ public class CACertsTab extends CMSBaseUGTab {
 
             try {
                 NameValuePairs nvps = new NameValuePairs();
-                nvps.add(Constants.PR_NICK_NAME, nickname);
-                nvps.add(Constants.PR_SERIAL_NUMBER, serialno);
-                nvps.add(Constants.PR_ISSUER_NAME, issuername);
+                nvps.put(Constants.PR_NICK_NAME, nickname);
+                nvps.put(Constants.PR_SERIAL_NUMBER, serialno);
+                nvps.put(Constants.PR_ISSUER_NAME, issuername);
                 NameValuePairs results = mConnection.process(
                   DestDef.DEST_SERVER_ADMIN, ScopeDef.SC_ROOTCERT_TRUSTBIT,
                   Constants.RS_ID_CONFIG, nvps);
                 if (nvps.size() <= 0)
                     return;
-                NameValuePair nvp = results.elementAt(0);
-                String name = nvp.getName();
-                String trust = nvp.getValue();
+                String name = results.keySet().iterator().next(); // first element
+                String trust = results.get(name);
                 int i;
                 String[] params = new String[2];
                 if (trust.equals("U")) {
@@ -174,7 +171,7 @@ public class CACertsTab extends CMSBaseUGTab {
                 }
 
                 if (i == JOptionPane.YES_OPTION) {
-                    nvps.add("trustbit", params[1]);
+                    nvps.put("trustbit", params[1]);
                     mConnection.modify(DestDef.DEST_SERVER_ADMIN, 
                       ScopeDef.SC_ROOTCERT_TRUSTBIT,
                       Constants.RS_ID_CONFIG, nvps);
@@ -333,9 +330,8 @@ public class CACertsTab extends CMSBaseUGTab {
         if (response != null) {
             String[] vals = new String[response.size()];
             int i=0;
-            for (Enumeration e = response.getNames(); e.hasMoreElements() ;) {
-                String entry = ((String)e.nextElement()).trim();
-                vals[i++] = entry;
+            for (String entry : response.keySet()) {
+                vals[i++] = entry.trim();
             }
 
             int sindex = 0;
@@ -344,7 +340,7 @@ public class CACertsTab extends CMSBaseUGTab {
             for (i=0; i<vals.length; i++) {
                 Vector v = new Vector();
                 String entry = vals[i];
-                String value = response.getValue(entry);
+                String value = response.get(entry);
 
                 // look for the comma separator
                 int lastindex = entry.lastIndexOf(",");
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/CMSAccessLogPanel.java b/pki/base/console/src/com/netscape/admin/certsrv/config/CMSAccessLogPanel.java
index 420711e40..8f1fc1f20 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/CMSAccessLogPanel.java
+++ b/pki/base/console/src/com/netscape/admin/certsrv/config/CMSAccessLogPanel.java
@@ -18,13 +18,10 @@
 package com.netscape.admin.certsrv.config;
 
 import com.netscape.admin.certsrv.*;
-import com.netscape.admin.certsrv.connection.*;
 import com.netscape.certsrv.common.*;
 import com.netscape.management.client.util.*;
-import java.awt.*;
+
 import java.awt.event.*;
-import java.util.*;
-import javax.swing.*;
 
 /**
  * Access Log Setting Tab to be displayed at the right hand side
@@ -66,24 +63,24 @@ public class CMSAccessLogPanel extends CMSBaseLogPanel {
     public void refresh() {
         mModel.progressStart();
         NameValuePairs nvp = new NameValuePairs();
-        nvp.add(Constants.PR_LOG_ENABLED, "");
-        nvp.add(Constants.PR_LOG_LEVEL, "");
-        nvp.add(Constants.PR_LOG_BUFFERSIZE, "");
+        nvp.put(Constants.PR_LOG_ENABLED, "");
+        nvp.put(Constants.PR_LOG_LEVEL, "");
+        nvp.put(Constants.PR_LOG_BUFFERSIZE, "");
         //nvp.add(Constants.PR_LOG_EXPIRED_TIME, "");
         //nvp.add(Constants.PR_LOG_FILENAME, "");
         //nvp.add(Constants.PR_LOG_FLUSHINTERVAL, "");
-        nvp.add(Constants.PR_LOG_MAXFILESIZE, "");
-        nvp.add(Constants.PR_LOG_ROLLEROVER_INTERVAL, "");
+        nvp.put(Constants.PR_LOG_MAXFILESIZE, "");
+        nvp.put(Constants.PR_LOG_ROLLEROVER_INTERVAL, "");
 
         try {
             NameValuePairs val = mAdmin.read(DestDef.DEST_LOG_ADMIN,
               ScopeDef.SC_SYSTEMLOG, Constants.RS_ID_CONFIG, nvp);
             parseVals(val);
             if (mIsNT) {
-                nvp.removeAllPairs();
-                nvp.add(Constants.PR_NT_EVENT_SOURCE, "");
-                nvp.add(Constants.PR_NT_LOG_LEVEL, "");
-                nvp.add(Constants.PR_NT_LOG_ENABLED, "");
+                nvp.clear();
+                nvp.put(Constants.PR_NT_EVENT_SOURCE, "");
+                nvp.put(Constants.PR_NT_LOG_LEVEL, "");
+                nvp.put(Constants.PR_NT_LOG_ENABLED, "");
                 val = mAdmin.read(DestDef.DEST_LOG_ADMIN,
                   ScopeDef.SC_NTSYSTEMLOG, Constants.RS_ID_CONFIG, nvp);
                 parseNTVals(val);
@@ -99,23 +96,23 @@ public class CMSAccessLogPanel extends CMSBaseLogPanel {
     }
 
     private void parseVals(NameValuePairs nvp) {
-        if (nvp.getValue(Constants.PR_LOG_ENABLED).equalsIgnoreCase(
+        if (nvp.get(Constants.PR_LOG_ENABLED).equalsIgnoreCase(
           Constants.TRUE)) 
             activateLog.setSelected(true);
         else
             activateLog.setSelected(false);
-        mLevel = Integer.parseInt(nvp.getValue(Constants.PR_LOG_LEVEL));
-        mlogBufSizTextData = nvp.getValue(Constants.PR_LOG_BUFFERSIZE);
-        mlogMaxSizTextData = nvp.getValue(Constants.PR_LOG_MAXFILESIZE);
+        mLevel = Integer.parseInt(nvp.get(Constants.PR_LOG_LEVEL));
+        mlogBufSizTextData = nvp.get(Constants.PR_LOG_BUFFERSIZE);
+        mlogMaxSizTextData = nvp.get(Constants.PR_LOG_MAXFILESIZE);
         int val = 
-          Integer.parseInt(nvp.getValue(Constants.PR_LOG_ROLLEROVER_INTERVAL));
+          Integer.parseInt(nvp.get(Constants.PR_LOG_ROLLEROVER_INTERVAL));
         mFrequency = getRollOverIndex(val);
     }
 
     private void parseNTVals(NameValuePairs nvp) {
-        mNTLevel = Integer.parseInt(nvp.getValue(Constants.PR_NT_LOG_LEVEL));
-        mSource = nvp.getValue(Constants.PR_NT_EVENT_SOURCE);
-        if (nvp.getValue(Constants.PR_NT_LOG_ENABLED).equalsIgnoreCase(
+        mNTLevel = Integer.parseInt(nvp.get(Constants.PR_NT_LOG_LEVEL));
+        mSource = nvp.get(Constants.PR_NT_EVENT_SOURCE);
+        if (nvp.get(Constants.PR_NT_LOG_ENABLED).equalsIgnoreCase(
           Constants.TRUE))
             mActivateNTLog.setSelected(true);
         else
@@ -152,33 +149,33 @@ public class CMSAccessLogPanel extends CMSBaseLogPanel {
         NameValuePairs nvp = new NameValuePairs();
         mModel.progressStart();
         if (activateLog.isSelected()) 
-            nvp.add(Constants.PR_LOG_ENABLED, Constants.TRUE);
+            nvp.put(Constants.PR_LOG_ENABLED, Constants.TRUE);
         else
-            nvp.add(Constants.PR_LOG_ENABLED, Constants.FALSE);
+            nvp.put(Constants.PR_LOG_ENABLED, Constants.FALSE);
         String str = "" + mLogLevel.getSelectedIndex();
-        nvp.add(Constants.PR_LOG_LEVEL, str);
-        nvp.add(Constants.PR_LOG_BUFFERSIZE, mlogBufSizText.getText().trim());
+        nvp.put(Constants.PR_LOG_LEVEL, str);
+        nvp.put(Constants.PR_LOG_BUFFERSIZE, mlogBufSizText.getText().trim());
         //nvp.add(Constants.PR_LOG_EXPIRED_TIME, "");
         //nvp.add(Constants.PR_LOG_FILENAME, "");
         //nvp.add(Constants.PR_LOG_FLUSHINTERVAL, "");
-        nvp.add(Constants.PR_LOG_MAXFILESIZE, mlogMaxSizText.getText().trim());
+        nvp.put(Constants.PR_LOG_MAXFILESIZE, mlogMaxSizText.getText().trim());
 
         str = "" + getRollOverTime(mlogFQC.getSelectedIndex());
-        nvp.add(Constants.PR_LOG_ROLLEROVER_INTERVAL, str);
+        nvp.put(Constants.PR_LOG_ROLLEROVER_INTERVAL, str);
 
         try {
             mAdmin.modify(DestDef.DEST_LOG_ADMIN,
               ScopeDef.SC_SYSTEMLOG, Constants.RS_ID_CONFIG, nvp);
             if (mIsNT) {
-                nvp.removeAllPairs();
-                nvp.add(Constants.PR_NT_LOG_LEVEL, 
-                  ""+mNTLogLevel.getSelectedIndex());
-                nvp.add(Constants.PR_NT_EVENT_SOURCE, 
-                  mEventSourceText.getText().trim());
+                nvp.clear();
+                nvp.put(Constants.PR_NT_LOG_LEVEL,
+                        "" + mNTLogLevel.getSelectedIndex());
+                nvp.put(Constants.PR_NT_EVENT_SOURCE,
+                        mEventSourceText.getText().trim());
                 if (mActivateNTLog.isSelected())
-                    nvp.add(Constants.PR_NT_LOG_ENABLED, Constants.TRUE);
+                    nvp.put(Constants.PR_NT_LOG_ENABLED, Constants.TRUE);
                 else
-                    nvp.add(Constants.PR_NT_LOG_ENABLED, Constants.FALSE);
+                    nvp.put(Constants.PR_NT_LOG_ENABLED, Constants.FALSE);
                 mAdmin.modify(DestDef.DEST_LOG_ADMIN,
                   ScopeDef.SC_NTSYSTEMLOG, Constants.RS_ID_CONFIG, nvp);
             }
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/CMSAuditLogPanel.java b/pki/base/console/src/com/netscape/admin/certsrv/config/CMSAuditLogPanel.java
index ba03e487b..067b954e8 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/CMSAuditLogPanel.java
+++ b/pki/base/console/src/com/netscape/admin/certsrv/config/CMSAuditLogPanel.java
@@ -18,13 +18,10 @@
 package com.netscape.admin.certsrv.config;
 
 import com.netscape.admin.certsrv.*;
-import com.netscape.admin.certsrv.connection.*;
 import com.netscape.certsrv.common.*;
 import com.netscape.management.client.util.*;
-import java.awt.*;
+
 import java.awt.event.*;
-import java.util.*;
-import javax.swing.*;
 
 /**
  * Audit Log Setting Tab to be displayed at the right hand side
@@ -66,24 +63,24 @@ public class CMSAuditLogPanel extends CMSBaseLogPanel {
     public void refresh() {
         mModel.progressStart();
         NameValuePairs nvp = new NameValuePairs();
-        nvp.add(Constants.PR_LOG_ENABLED, "");
-        nvp.add(Constants.PR_LOG_LEVEL, "");
-        nvp.add(Constants.PR_LOG_BUFFERSIZE, "");
+        nvp.put(Constants.PR_LOG_ENABLED, "");
+        nvp.put(Constants.PR_LOG_LEVEL, "");
+        nvp.put(Constants.PR_LOG_BUFFERSIZE, "");
         //nvp.add(Constants.PR_LOG_EXPIRED_TIME, "");
         //nvp.add(Constants.PR_LOG_FILENAME, "");
         //nvp.add(Constants.PR_LOG_FLUSHINTERVAL, "");
-        nvp.add(Constants.PR_LOG_MAXFILESIZE, "");
-        nvp.add(Constants.PR_LOG_ROLLEROVER_INTERVAL, "");
+        nvp.put(Constants.PR_LOG_MAXFILESIZE, "");
+        nvp.put(Constants.PR_LOG_ROLLEROVER_INTERVAL, "");
 
         try {
             NameValuePairs val = mAdmin.read(DestDef.DEST_LOG_ADMIN,
               ScopeDef.SC_AUDITLOG, Constants.RS_ID_CONFIG, nvp);
             parseVals(val);
             if (mIsNT) {
-                nvp.removeAllPairs();
-                nvp.add(Constants.PR_NT_EVENT_SOURCE, "");
-                nvp.add(Constants.PR_NT_LOG_LEVEL, "");
-                nvp.add(Constants.PR_NT_LOG_ENABLED, "");
+                nvp.clear();
+                nvp.put(Constants.PR_NT_EVENT_SOURCE, "");
+                nvp.put(Constants.PR_NT_LOG_LEVEL, "");
+                nvp.put(Constants.PR_NT_LOG_ENABLED, "");
                 val = mAdmin.read(DestDef.DEST_LOG_ADMIN,
                   ScopeDef.SC_NTAUDITLOG, Constants.RS_ID_CONFIG, nvp);
                 parseNTVals(val);
@@ -99,23 +96,23 @@ public class CMSAuditLogPanel extends CMSBaseLogPanel {
     }
 
     private void parseVals(NameValuePairs nvp) {
-        if (nvp.getValue(Constants.PR_LOG_ENABLED).equalsIgnoreCase(
+        if (nvp.get(Constants.PR_LOG_ENABLED).equalsIgnoreCase(
           Constants.TRUE)) 
             activateLog.setSelected(true);
         else
             activateLog.setSelected(false);
-        mLevel = Integer.parseInt(nvp.getValue(Constants.PR_LOG_LEVEL));
-        mlogBufSizTextData = nvp.getValue(Constants.PR_LOG_BUFFERSIZE);
-        mlogMaxSizTextData = nvp.getValue(Constants.PR_LOG_MAXFILESIZE);
+        mLevel = Integer.parseInt(nvp.get(Constants.PR_LOG_LEVEL));
+        mlogBufSizTextData = nvp.get(Constants.PR_LOG_BUFFERSIZE);
+        mlogMaxSizTextData = nvp.get(Constants.PR_LOG_MAXFILESIZE);
         int val = 
-          Integer.parseInt(nvp.getValue(Constants.PR_LOG_ROLLEROVER_INTERVAL));
+          Integer.parseInt(nvp.get(Constants.PR_LOG_ROLLEROVER_INTERVAL));
         mFrequency = getRollOverIndex(val);
     }
 
     private void parseNTVals(NameValuePairs nvp) {
-        mNTLevel = Integer.parseInt(nvp.getValue(Constants.PR_NT_LOG_LEVEL));
-        mSource = nvp.getValue(Constants.PR_NT_EVENT_SOURCE);
-        if (nvp.getValue(Constants.PR_NT_LOG_ENABLED).equalsIgnoreCase(
+        mNTLevel = Integer.parseInt(nvp.get(Constants.PR_NT_LOG_LEVEL));
+        mSource = nvp.get(Constants.PR_NT_EVENT_SOURCE);
+        if (nvp.get(Constants.PR_NT_LOG_ENABLED).equalsIgnoreCase(
           Constants.TRUE))
             mActivateNTLog.setSelected(true);
         else
@@ -152,33 +149,33 @@ public class CMSAuditLogPanel extends CMSBaseLogPanel {
         NameValuePairs nvp = new NameValuePairs();
         mModel.progressStart();
         if (activateLog.isSelected())
-            nvp.add(Constants.PR_LOG_ENABLED, Constants.TRUE);
+            nvp.put(Constants.PR_LOG_ENABLED, Constants.TRUE);
         else
-            nvp.add(Constants.PR_LOG_ENABLED, Constants.FALSE);
+            nvp.put(Constants.PR_LOG_ENABLED, Constants.FALSE);
         String str = "" + mLogLevel.getSelectedIndex();
-        nvp.add(Constants.PR_LOG_LEVEL, str);
-        nvp.add(Constants.PR_LOG_BUFFERSIZE, mlogBufSizText.getText().trim());
+        nvp.put(Constants.PR_LOG_LEVEL, str);
+        nvp.put(Constants.PR_LOG_BUFFERSIZE, mlogBufSizText.getText().trim());
         //nvp.add(Constants.PR_LOG_EXPIRED_TIME, "");
         //nvp.add(Constants.PR_LOG_FILENAME, "");
         //nvp.add(Constants.PR_LOG_FLUSHINTERVAL, "");
-        nvp.add(Constants.PR_LOG_MAXFILESIZE, mlogMaxSizText.getText().trim());
+        nvp.put(Constants.PR_LOG_MAXFILESIZE, mlogMaxSizText.getText().trim());
 
         str = "" + getRollOverTime(mlogFQC.getSelectedIndex());
-        nvp.add(Constants.PR_LOG_ROLLEROVER_INTERVAL, str);
+        nvp.put(Constants.PR_LOG_ROLLEROVER_INTERVAL, str);
 
         try {
             mAdmin.modify(DestDef.DEST_LOG_ADMIN,
               ScopeDef.SC_AUDITLOG, Constants.RS_ID_CONFIG, nvp);
             if (mIsNT) {
-                nvp.removeAllPairs();
-                nvp.add(Constants.PR_NT_LOG_LEVEL,
-                  ""+mNTLogLevel.getSelectedIndex());
-                nvp.add(Constants.PR_NT_EVENT_SOURCE,
-                  mEventSourceText.getText().trim());
+                nvp.clear();
+                nvp.put(Constants.PR_NT_LOG_LEVEL,
+                        "" + mNTLogLevel.getSelectedIndex());
+                nvp.put(Constants.PR_NT_EVENT_SOURCE,
+                        mEventSourceText.getText().trim());
                 if (mActivateNTLog.isSelected())
-                    nvp.add(Constants.PR_NT_LOG_ENABLED, Constants.TRUE);
+                    nvp.put(Constants.PR_NT_LOG_ENABLED, Constants.TRUE);
                 else
-                    nvp.add(Constants.PR_NT_LOG_ENABLED, Constants.FALSE);
+                    nvp.put(Constants.PR_NT_LOG_ENABLED, Constants.FALSE);
                 mAdmin.modify(DestDef.DEST_LOG_ADMIN,
                   ScopeDef.SC_NTAUDITLOG, Constants.RS_ID_CONFIG, nvp);
             }
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/CMSAutoRecovery.java b/pki/base/console/src/com/netscape/admin/certsrv/config/CMSAutoRecovery.java
index 3fcaedea6..ef55470c6 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/CMSAutoRecovery.java
+++ b/pki/base/console/src/com/netscape/admin/certsrv/config/CMSAutoRecovery.java
@@ -24,7 +24,7 @@ import javax.swing.*;
 import javax.swing.table.*;
 import javax.swing.text.*;
 import javax.swing.event.*;
-import javax.swing.border.*;
+
 import com.netscape.management.client.util.*;
 import com.netscape.admin.certsrv.connection.*;
 import com.netscape.certsrv.common.*;
@@ -88,8 +88,8 @@ public class CMSAutoRecovery extends JDialog implements ActionListener,
                 return;
             } else { 
                 NameValuePairs nvps = new NameValuePairs();
-                nvps.add(Constants.PR_RECOVERY_AGENT, val);
-                nvps.add(Constants.PR_AUTO_RECOVERY_ON, Constants.TRUE); 
+                nvps.put(Constants.PR_RECOVERY_AGENT, val);
+                nvps.put(Constants.PR_AUTO_RECOVERY_ON, Constants.TRUE);
                   
                 try {
                     mAdmin.modify(DestDef.DEST_KRA_ADMIN,
@@ -216,13 +216,13 @@ public class CMSAutoRecovery extends JDialog implements ActionListener,
     private void createTable() {
   
         NameValuePairs nvps = new NameValuePairs();
-        nvps.add(Constants.PR_RECOVERY_M, "");
+        nvps.put(Constants.PR_RECOVERY_M, "");
 
         int numUsers = 0;
         try {
             NameValuePairs val = mAdmin.read(DestDef.DEST_KRA_ADMIN,
               ScopeDef.SC_RECOVERY, Constants.RS_ID_CONFIG, nvps);
-            String str = val.getValue(Constants.PR_RECOVERY_M);
+            String str = val.get(Constants.PR_RECOVERY_M);
             numUsers = Integer.parseInt(str);
         } catch (EAdminException e) {
             //showErrorDialog(e.toString());
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/CMSBaseConfigDialog.java b/pki/base/console/src/com/netscape/admin/certsrv/config/CMSBaseConfigDialog.java
index 20116c54c..87562829b 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/CMSBaseConfigDialog.java
+++ b/pki/base/console/src/com/netscape/admin/certsrv/config/CMSBaseConfigDialog.java
@@ -20,13 +20,11 @@ package com.netscape.admin.certsrv.config;
 import com.netscape.admin.certsrv.*;
 import com.netscape.admin.certsrv.connection.*;
 import javax.swing.*;
-import javax.swing.event.*;
-import javax.swing.table.*;
 import javax.swing.text.*;
 import java.awt.event.*;
 import java.awt.*;
 import java.util.*;
-import com.netscape.management.client.*;
+
 import com.netscape.management.client.util.*;
 import com.netscape.certsrv.common.*;
 
@@ -177,30 +175,25 @@ public class CMSBaseConfigDialog extends JDialog
 	/* if the servlet or rule wasn't capable of handling the new style
 	 * of interface, just return the names from the name/value pairs that
 	 * were passed in 
-	 */
-
-		Enumeration enum1 = oldstyle.elements();
-
-	/* otherwise, for each parameter name, fetch the associated
+	 * otherwise, for each parameter name, fetch the associated
 	 * parameter type from the extendedPluginInfo that the server
 	 * returned
 	 */
-		while (enum1.hasMoreElements()) {
-			NameValuePair pair = (NameValuePair)enum1.nextElement();
-			NameValuePair epiNVPair = (NameValuePair)response.getPair(pair.getName());
-			if (epiNVPair != null) {
-				epis.add(pair.getName(), epiNVPair.getValue(),false);
+		for (String name : oldstyle.keySet()) {
+			String value = response.get(name);
+			if (value != null) {
+				epis.add(name, value,false);
 			}
 			else {
-				epis.add(pair.getName(), "",true);
+				epis.add(name, "",true);
 			}
 		}
 
 
-		String ht = response.getValue("HELP_TOKEN");
+		String ht = response.get("HELP_TOKEN");
 		if (ht != null) epis.setHelpToken(ht); 
 
-		String hs = response.getValue("HELP_TEXT");
+		String hs = response.get("HELP_TEXT");
 		if (hs != null) epis.setHelpSummary(hs); 
 
 		return epis;
@@ -223,11 +216,11 @@ public class CMSBaseConfigDialog extends JDialog
         GridBagConstraints gbc = new GridBagConstraints();
         p.setLayout(gb);
 
-		mRuleName = data.getValue(mImplName_token);
+		mRuleName = data.get(mImplName_token);
 		mEPIs = getExtendedPluginInfo(mRuleName,data);
 
-       	for (Enumeration e = data.getNames(); e.hasMoreElements() ;) {
-           	String entry = ((String)e.nextElement()).trim();
+        for (String entry : data.keySet()) {
+		entry = entry.trim();
 		Debug.println("in CMSBaseConfigDialog.showDialog() entry=" + entry);
            	if (!entry.equals(mImplName_token)) {
 				String labelname = entry;
@@ -238,7 +231,7 @@ public class CMSBaseConfigDialog extends JDialog
 				 */
 
 				JComponent comp = null;
-               	String stringvalue = data.getValue(entry);
+		String stringvalue = data.get(entry);
 				ExtendedPluginInfo epi = mEPIs.get(entry);
 				if (epi == null) {
 					Debug.println("no ExtendedPluginInfo for "+entry);
@@ -485,14 +478,14 @@ public class CMSBaseConfigDialog extends JDialog
 					String password = value;
 					value = "Rule "+mRuleName;
 					if (password != null && password.length() >0) {
-						nvp.add("PASSWORD_CACHE_ADD",value+";"+password);
+						nvp.put("PASSWORD_CACHE_ADD", value + ";" + password);
 					}
 				}
 				
-				nvp.add(paramName,value);
+				nvp.put(paramName, value);
 			}
-			nvp.add(PolicyRuleDataModel.RULE_NAME,mRuleName);
-			nvp.add(mImplName_token,mImplName.getText());
+			nvp.put(PolicyRuleDataModel.RULE_NAME, mRuleName);
+			nvp.put(mImplName_token, mImplName.getText());
 
 			mData = nvp;
 			try {
@@ -502,7 +495,7 @@ public class CMSBaseConfigDialog extends JDialog
 				}
 				else {
                     if (mId != null && mId.length() > 0) {
-                        nvp.add(Constants.PR_ID, mId);
+                        nvp.put(Constants.PR_ID, mId);
                     }
 					mAdminConnection.modify(mDest, mInstanceScope, mRuleName, nvp);
 				}
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/CMSBaseLDAPPanel.java b/pki/base/console/src/com/netscape/admin/certsrv/config/CMSBaseLDAPPanel.java
index cb8826d2a..dbba4a763 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/CMSBaseLDAPPanel.java
+++ b/pki/base/console/src/com/netscape/admin/certsrv/config/CMSBaseLDAPPanel.java
@@ -234,24 +234,24 @@ public abstract class CMSBaseLDAPPanel extends CMSBaseTab implements ItemListene
         mModel.progressStart();
         NameValuePairs nvps = new NameValuePairs();
         if (mPublishing)
-            nvps.add(Constants.PR_PUBLISHING_ENABLE,"");
+            nvps.put(Constants.PR_PUBLISHING_ENABLE, "");
         if (mLDAPPublishing)
-            nvps.add(Constants.PR_ENABLE,"");
-        nvps.add(Constants.PR_HOST_NAME, "");
-        nvps.add(Constants.PR_LDAP_PORT, "");
-        nvps.add(Constants.PR_SECURE_PORT_ENABLED, "");
+            nvps.put(Constants.PR_ENABLE, "");
+        nvps.put(Constants.PR_HOST_NAME, "");
+        nvps.put(Constants.PR_LDAP_PORT, "");
+        nvps.put(Constants.PR_SECURE_PORT_ENABLED, "");
         //nvps.add(Constants.PR_BASE_DN, "");
-        nvps.add(Constants.PR_BIND_DN, "");
-        nvps.add(Constants.PR_LDAP_VERSION, "");
-        nvps.add(Constants.PR_AUTH_TYPE, "");
-        nvps.add(Constants.PR_CERT_NAMES, "");
-        nvps.add(Constants.PR_LDAP_CLIENT_CERT, "");
-
-        nvps.add(Constants.PR_PUBLISHING_QUEUE_ENABLE, "");
-        nvps.add(Constants.PR_PUBLISHING_QUEUE_THREADS, "");
-        nvps.add(Constants.PR_PUBLISHING_QUEUE_PAGE_SIZE, "");
-        nvps.add(Constants.PR_PUBLISHING_QUEUE_PRIORITY, "");
-        nvps.add(Constants.PR_PUBLISHING_QUEUE_STATUS, "");
+        nvps.put(Constants.PR_BIND_DN, "");
+        nvps.put(Constants.PR_LDAP_VERSION, "");
+        nvps.put(Constants.PR_AUTH_TYPE, "");
+        nvps.put(Constants.PR_CERT_NAMES, "");
+        nvps.put(Constants.PR_LDAP_CLIENT_CERT, "");
+
+        nvps.put(Constants.PR_PUBLISHING_QUEUE_ENABLE, "");
+        nvps.put(Constants.PR_PUBLISHING_QUEUE_THREADS, "");
+        nvps.put(Constants.PR_PUBLISHING_QUEUE_PAGE_SIZE, "");
+        nvps.put(Constants.PR_PUBLISHING_QUEUE_PRIORITY, "");
+        nvps.put(Constants.PR_PUBLISHING_QUEUE_STATUS, "");
 
         try {
             NameValuePairs val = mAdmin.read(mServletName,
@@ -280,27 +280,26 @@ public abstract class CMSBaseLDAPPanel extends CMSBaseTab implements ItemListene
         int serverCertIndex = -1;
 
         String version = "";
-        for (int i=0; i<nvps.size(); i++) {
-            NameValuePair nvp = nvps.elementAt(i);
-            String name = nvp.getName();
+        for (String name : nvps.keySet()) {
+            String value = nvps.get(name);
             if (name.equals(Constants.PR_HOST_NAME)) {
-                mHostNameText.setText(nvp.getValue());
+                mHostNameText.setText(value);
             } else if (name.equals(Constants.PR_LDAP_PORT)) {
-                mPortText.setText(nvp.getValue());
+                mPortText.setText(value);
             } else if (name.equals(Constants.PR_SECURE_PORT_ENABLED)) {
-                if (nvp.getValue().equals(Constants.TRUE))
+                if (value.equals(Constants.TRUE))
                     mSecurePort.setSelected(true);
                 else
                     mSecurePort.setSelected(false);
             } else if (name.equals(Constants.PR_BIND_DN)) {
-                mBindAsText.setText(nvp.getValue());
+                mBindAsText.setText(value);
             } else if (name.equals(Constants.PR_PUBLISHING_ENABLE)) {
-                if (nvp.getValue().equals(Constants.TRUE))
+                if (value.equals(Constants.TRUE))
                     mEnablePublishing.setSelected(true);
                 else
                     mEnablePublishing.setSelected(false);
             } else if (name.equals(Constants.PR_PUBLISHING_QUEUE_ENABLE)) {
-                if (nvp.getValue().equals(Constants.TRUE)) {
+                if (value.equals(Constants.TRUE)) {
                     mEnableQueue.setSelected(true);
                     mPublishingQueue = true;
                 } else {
@@ -308,25 +307,25 @@ public abstract class CMSBaseLDAPPanel extends CMSBaseTab implements ItemListene
                     mPublishingQueue = false;
                 }
             } else if (name.equals(Constants.PR_PUBLISHING_QUEUE_THREADS)) {
-                mMaxNumberOfPublishingThreads = nvp.getValue();
+                mMaxNumberOfPublishingThreads = value;
             } else if (name.equals(Constants.PR_PUBLISHING_QUEUE_PAGE_SIZE)) {
-                mPublishingQueuePageSize = nvp.getValue();
+                mPublishingQueuePageSize = value;
             } else if (name.equals(Constants.PR_PUBLISHING_QUEUE_PRIORITY)) {
-                mPublishingQueuePriorityLevel = nvp.getValue();
+                mPublishingQueuePriorityLevel = value;
             } else if (name.equals(Constants.PR_PUBLISHING_QUEUE_STATUS)) {
-                mPublishingQueueStatus = nvp.getValue();
+                mPublishingQueueStatus = value;
             } else if (name.equals(Constants.PR_ENABLE)) {
-                if (nvp.getValue().equals(Constants.TRUE))
+                if (value.equals(Constants.TRUE))
                     mEnable.setSelected(true);
                 else
                     mEnable.setSelected(false);
             } else if (name.equals(Constants.PR_AUTH_TYPE)) {
-                int index = getIndex(nvp.getValue(), AUTHTYPE);
+                int index = getIndex(value, AUTHTYPE);
                 if (index >= 0)
                     mAuthBox.setSelectedIndex(index);
             } else if (name.equals(Constants.PR_CERT_NAMES)) {
                 mCertBox.removeAllItems();
-                String certNames = nvp.getValue();
+                String certNames = value;
                 StringTokenizer tokenizer = new StringTokenizer(certNames,
                   DELIMITER);
                 for (int index=0; tokenizer.hasMoreTokens(); index++) {
@@ -336,9 +335,9 @@ public abstract class CMSBaseLDAPPanel extends CMSBaseTab implements ItemListene
                     mCertBox.addItem(str);
                 }
             } else if (name.equals(Constants.PR_LDAP_CLIENT_CERT)) {
-                clientCert = nvp.getValue();
+                clientCert = value;
             } else if (name.equals(Constants.PR_LDAP_VERSION)) {
-                version = nvp.getValue();
+                version = value;
             }
         }
 
@@ -512,26 +511,26 @@ public abstract class CMSBaseLDAPPanel extends CMSBaseTab implements ItemListene
 
         if (mPublishing) {
             if (mEnablePublishing.isSelected())
-                nvps.add(Constants.PR_PUBLISHING_ENABLE,Constants.TRUE);
+                nvps.put(Constants.PR_PUBLISHING_ENABLE, Constants.TRUE);
             else
-                nvps.add(Constants.PR_PUBLISHING_ENABLE,Constants.FALSE);
+                nvps.put(Constants.PR_PUBLISHING_ENABLE, Constants.FALSE);
 		}
 
         if (mLDAPPublishing) {
             if (mEnable.isSelected())
-                nvps.add(Constants.PR_ENABLE,Constants.TRUE);
+                nvps.put(Constants.PR_ENABLE, Constants.TRUE);
             else
-                nvps.add(Constants.PR_ENABLE,Constants.FALSE);
+                nvps.put(Constants.PR_ENABLE, Constants.FALSE);
         }
 
         if (mEnableQueue.isSelected())
-            nvps.add(Constants.PR_PUBLISHING_QUEUE_ENABLE, Constants.TRUE);
+            nvps.put(Constants.PR_PUBLISHING_QUEUE_ENABLE, Constants.TRUE);
         else
-            nvps.add(Constants.PR_PUBLISHING_QUEUE_ENABLE, Constants.FALSE);
-        nvps.add(Constants.PR_PUBLISHING_QUEUE_THREADS, mMaxNumberOfPublishingThreads);
-        nvps.add(Constants.PR_PUBLISHING_QUEUE_PAGE_SIZE, mPublishingQueuePageSize);
-        nvps.add(Constants.PR_PUBLISHING_QUEUE_PRIORITY, mPublishingQueuePriorityLevel);
-        nvps.add(Constants.PR_PUBLISHING_QUEUE_STATUS, mPublishingQueueStatus);
+            nvps.put(Constants.PR_PUBLISHING_QUEUE_ENABLE, Constants.FALSE);
+        nvps.put(Constants.PR_PUBLISHING_QUEUE_THREADS, mMaxNumberOfPublishingThreads);
+        nvps.put(Constants.PR_PUBLISHING_QUEUE_PAGE_SIZE, mPublishingQueuePageSize);
+        nvps.put(Constants.PR_PUBLISHING_QUEUE_PRIORITY, mPublishingQueuePriorityLevel);
+        nvps.put(Constants.PR_PUBLISHING_QUEUE_STATUS, mPublishingQueueStatus);
 
         if (mEnable.isSelected()) {
             String host = mHostNameText.getText().trim();
@@ -550,21 +549,21 @@ public abstract class CMSBaseLDAPPanel extends CMSBaseTab implements ItemListene
                 showMessageDialog("NUMBERFORMAT");
                 return false;
             }
-            nvps.add(Constants.PR_HOST_NAME, host);
-            nvps.add(Constants.PR_LDAP_PORT, port);
+            nvps.put(Constants.PR_HOST_NAME, host);
+            nvps.put(Constants.PR_LDAP_PORT, port);
 
             if (mSecurePort.isSelected())
-                nvps.add(Constants.PR_SECURE_PORT_ENABLED, Constants.TRUE);
+                nvps.put(Constants.PR_SECURE_PORT_ENABLED, Constants.TRUE);
             else
-                nvps.add(Constants.PR_SECURE_PORT_ENABLED, Constants.FALSE);
+                nvps.put(Constants.PR_SECURE_PORT_ENABLED, Constants.FALSE);
 
             if (mAuthBox.getSelectedIndex() == 0) {
                 if (mPanelName.equals("CALDAPSETTING")) {
-                    nvps.add(Constants.PR_BINDPWD_PROMPT, "CA LDAP Publishing");
+                    nvps.put(Constants.PR_BINDPWD_PROMPT, "CA LDAP Publishing");
                 } else {
-                    nvps.add(Constants.PR_BINDPWD_PROMPT, "RA LDAP Publishing");
+                    nvps.put(Constants.PR_BINDPWD_PROMPT, "RA LDAP Publishing");
                 }
-                nvps.add(Constants.PR_BIND_DN, bindAs);
+                nvps.put(Constants.PR_BIND_DN, bindAs);
                 passwd = mPasswordText.getText();
 
                 if (passwd.equals("")) {
@@ -572,10 +571,10 @@ public abstract class CMSBaseLDAPPanel extends CMSBaseTab implements ItemListene
                     return false;
                 }
            
-                nvps.add(Constants.PR_DIRECTORY_MANAGER_PWD, passwd);
+                nvps.put(Constants.PR_DIRECTORY_MANAGER_PWD, passwd);
             } else {
-                nvps.add(Constants.PR_LDAP_CLIENT_CERT, 
-                  (String)(mCertBox.getSelectedItem()));
+                nvps.put(Constants.PR_LDAP_CLIENT_CERT,
+                        (String) (mCertBox.getSelectedItem()));
             }
 
             int index = mAuthBox.getSelectedIndex();
@@ -585,11 +584,11 @@ public abstract class CMSBaseLDAPPanel extends CMSBaseTab implements ItemListene
                     return false;
                 }
             }
-            nvps.add(Constants.PR_AUTH_TYPE, AUTHTYPE[index]);
-            nvps.add(Constants.PR_LDAP_VERSION, 
-              (String)mVersionBox.getSelectedItem());
+            nvps.put(Constants.PR_AUTH_TYPE, AUTHTYPE[index]);
+            nvps.put(Constants.PR_LDAP_VERSION,
+                    (String) mVersionBox.getSelectedItem());
 
-			// test the connection before save
+            // test the connection before save
 			/*
 			LDAPConnection conn = null;
 			if (mAuthBox.getSelectedIndex() == 1) {
@@ -642,8 +641,8 @@ public abstract class CMSBaseLDAPPanel extends CMSBaseTab implements ItemListene
 								  Constants.RS_ID_CONFIG, nvps, false);
 			// show test report
 			String report = "";
-			for (int i = 0; i<nvps1.size();i++) {
-				report = report + nvps1.elementAt(i).getValue() + "\n";
+            for (String value : nvps1.values()) {
+				report = report + value + "\n";
 			}
 			if (report.indexOf("Fail") == -1) {
 				JOptionPane.showMessageDialog(
@@ -665,8 +664,8 @@ public abstract class CMSBaseLDAPPanel extends CMSBaseTab implements ItemListene
 								  Constants.RS_ID_CONFIG, nvps, false);
 					clearDirtyFlag();
 				} else {
-					nvps.add(Constants.PR_ENABLE, "false");
-					mAdmin.modify(mServletName, ScopeDef.SC_LDAP,
+					nvps.put(Constants.PR_ENABLE, "false");
+                    mAdmin.modify(mServletName, ScopeDef.SC_LDAP,
 								  Constants.RS_ID_CONFIG, nvps, false);
 				}
 			}
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/CMSCACertSettingPanel.java b/pki/base/console/src/com/netscape/admin/certsrv/config/CMSCACertSettingPanel.java
index a43df0d12..76aa59511 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/CMSCACertSettingPanel.java
+++ b/pki/base/console/src/com/netscape/admin/certsrv/config/CMSCACertSettingPanel.java
@@ -20,8 +20,7 @@ package com.netscape.admin.certsrv.config;
 import com.netscape.admin.certsrv.*;
 import com.netscape.certsrv.common.*;
 import com.netscape.management.client.util.*;
-import javax.swing.*;
-import java.awt.*;
+
 import java.awt.event.*;
 
 /**
@@ -71,8 +70,8 @@ public class CMSCACertSettingPanel extends CMSCertSettingPanel {
     public void refresh() {
         _model.progressStart();
         NameValuePairs nvp = new NameValuePairs();
-        nvp.add(Constants.PR_MAPPER, "");
-        nvp.add(Constants.PR_PUBLISHER, "");
+        nvp.put(Constants.PR_MAPPER, "");
+        nvp.put(Constants.PR_PUBLISHER, "");
 
         try {
             NameValuePairs val = _admin.read(DestDef.DEST_CA_ADMIN,
@@ -159,13 +158,12 @@ public class CMSCACertSettingPanel extends CMSCertSettingPanel {
     */
     
     private void populate(NameValuePairs nvps) {
-        for (int i=0; i<nvps.size(); i++) {
-            NameValuePair nvp = nvps.elementAt(i);
-            String name = nvp.getName();
+        for (String name : nvps.keySet()) {
+            String value = nvps.get(name);
             if (name.equals(Constants.PR_MAPPER)) {
-                _mapper.setText(nvp.getValue());
+                _mapper.setText(value);
             } else if (name.equals(Constants.PR_PUBLISHER)) {
-                _publisher.setText(nvp.getValue());
+                _publisher.setText(value);
             }
         }
     }     
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/CMSCAConnectorPanel.java b/pki/base/console/src/com/netscape/admin/certsrv/config/CMSCAConnectorPanel.java
index 0ddb90dc4..1af02a881 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/CMSCAConnectorPanel.java
+++ b/pki/base/console/src/com/netscape/admin/certsrv/config/CMSCAConnectorPanel.java
@@ -18,15 +18,12 @@
 package com.netscape.admin.certsrv.config;
 
 import com.netscape.admin.certsrv.*;
-import com.netscape.management.client.*;
 import com.netscape.management.client.util.*;
 import com.netscape.certsrv.common.*;
 import com.netscape.admin.certsrv.connection.*;
 import javax.swing.*;
-import javax.swing.border.*;
 import java.awt.*;
 import java.awt.event.*;
-import java.util.*;
 
 /**
  * CA Connector Panel
@@ -150,15 +147,15 @@ public class CMSCAConnectorPanel  extends CMSBaseTab
             JFrame frame = mModel.getFrame();
             String name = (String)mList.getSelectedValue();
             NameValuePairs nvps = new NameValuePairs();
-            nvps.add(Constants.PR_ID, "");
-            nvps.add(Constants.PR_HOST, "");
-            nvps.add(Constants.PR_PORT, "");
+            nvps.put(Constants.PR_ID, "");
+            nvps.put(Constants.PR_HOST, "");
+            nvps.put(Constants.PR_PORT, "");
             // Inserted by beomsuk
-            nvps.add(Constants.PR_TIMEOUT, "");
+            nvps.put(Constants.PR_TIMEOUT, "");
             // Insert end
-            nvps.add(Constants.PR_URI, "");
-            nvps.add(Constants.PR_LOCAL, "");
-            nvps.add(Constants.PR_ENABLE, "");
+            nvps.put(Constants.PR_URI, "");
+            nvps.put(Constants.PR_LOCAL, "");
+            nvps.put(Constants.PR_ENABLE, "");
 
             try {
                 NameValuePairs values = mAdmin.read(DestDef.DEST_CA_ADMIN,
@@ -168,7 +165,7 @@ public class CMSCAConnectorPanel  extends CMSBaseTab
  
                 boolean colocated = false;
                 if (name.equals("Data Recovery Manager Connector")) {
-                    String val = values.getValue("id");
+                    String val = values.get("id");
                     if (val != null && val.equals("kra"))
                         colocated = true;
                 }
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/CMSCAGeneralPanel.java b/pki/base/console/src/com/netscape/admin/certsrv/config/CMSCAGeneralPanel.java
index 3efcd1bbc..6f809316a 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/CMSCAGeneralPanel.java
+++ b/pki/base/console/src/com/netscape/admin/certsrv/config/CMSCAGeneralPanel.java
@@ -249,13 +249,13 @@ public class CMSCAGeneralPanel extends CMSBaseTab implements ItemListener {
     public void refresh() {
         mModel.progressStart();
         NameValuePairs nvps = new NameValuePairs();
-        nvps.add(Constants.PR_EE_ENABLED, "");
+        nvps.put(Constants.PR_EE_ENABLED, "");
         //nvps.add(Constants.PR_RA_ENABLED, "");
-        nvps.add(Constants.PR_DEFAULT_ALGORITHM, "");
-        nvps.add(Constants.PR_ALL_ALGORITHMS, "");
-        nvps.add(Constants.PR_SERIAL, "");
-        nvps.add(Constants.PR_MAXSERIAL, "");
-        nvps.add(Constants.PR_VALIDITY, "");
+        nvps.put(Constants.PR_DEFAULT_ALGORITHM, "");
+        nvps.put(Constants.PR_ALL_ALGORITHMS, "");
+        nvps.put(Constants.PR_SERIAL, "");
+        nvps.put(Constants.PR_MAXSERIAL, "");
+        nvps.put(Constants.PR_VALIDITY, "");
 
         try {
             NameValuePairs val = mAdmin.read(DestDef.DEST_CA_ADMIN,
@@ -272,31 +272,30 @@ public class CMSCAGeneralPanel extends CMSBaseTab implements ItemListener {
 
     protected void populate(NameValuePairs nvps) {
         String defaultAlgorithm = "";
-        for (int i=0; i<nvps.size(); i++) {
-            NameValuePair nvp = nvps.elementAt(i);
-            String name = nvp.getName();
+        for (String name : nvps.keySet()) {
+            String value = nvps.get(name);
             if (name.equals(Constants.PR_EE_ENABLED)) {
-                mEEEnable.setSelected(getBoolean(nvp.getValue()));
+                mEEEnable.setSelected(getBoolean(value));
             } else if (name.equals(Constants.PR_OCSP_ENABLED)) {
-                mOCSPEnable.setSelected(getBoolean(nvp.getValue()));
+                mOCSPEnable.setSelected(getBoolean(value));
 /*
             } else if (name.equals(Constants.PR_RA_ENABLED)) {
                 mRAEnable.setSelected(getBoolean(nvp.getValue()));
 */
             } else if (name.equals(Constants.PR_VALIDITY)) {
-                mValidity.setSelected(getBoolean(nvp.getValue()));
+                mValidity.setSelected(getBoolean(value));
             } else if (name.equals(Constants.PR_DEFAULT_ALGORITHM)) {
-                defaultAlgorithm = nvp.getValue();
+                defaultAlgorithm = value;
             } else if (name.equals(Constants.PR_ALL_ALGORITHMS)) {
-                initAlgorithmBox(nvp.getValue());
+                initAlgorithmBox(value);
             } else if (name.equals(Constants.PR_SERIAL)) {
-				String serial = nvp.getValue();
+				String serial = value;
 				if (!serial.equals(""))
 					mSerialNumber.setText(serial);
 				else
 					mSerialNumber.setText("All serial numbers are used");
             } else if (name.equals(Constants.PR_MAXSERIAL)) {
-				String serial = nvp.getValue();
+				String serial = value;
 				if (!serial.equals(""))
 					mMaxSerialNumber.setText(serial);
             }
@@ -340,14 +339,14 @@ public class CMSCAGeneralPanel extends CMSBaseTab implements ItemListener {
         NameValuePairs nvps = new NameValuePairs();
 
         if (mEEEnable.isSelected())
-            nvps.add(Constants.PR_EE_ENABLED, Constants.TRUE);
+            nvps.put(Constants.PR_EE_ENABLED, Constants.TRUE);
         else
-            nvps.add(Constants.PR_EE_ENABLED, Constants.FALSE);
+            nvps.put(Constants.PR_EE_ENABLED, Constants.FALSE);
 
         if (mOCSPEnable.isSelected())
-            nvps.add(Constants.PR_OCSP_ENABLED, Constants.TRUE);
+            nvps.put(Constants.PR_OCSP_ENABLED, Constants.TRUE);
         else
-            nvps.add(Constants.PR_OCSP_ENABLED, Constants.FALSE);
+            nvps.put(Constants.PR_OCSP_ENABLED, Constants.FALSE);
 
 /*
         if (mRAEnable.isSelected())
@@ -357,12 +356,12 @@ public class CMSCAGeneralPanel extends CMSBaseTab implements ItemListener {
 */
 
         if (mValidity.isSelected())
-            nvps.add(Constants.PR_VALIDITY, Constants.TRUE);
+            nvps.put(Constants.PR_VALIDITY, Constants.TRUE);
         else
-            nvps.add(Constants.PR_VALIDITY, Constants.FALSE);
+            nvps.put(Constants.PR_VALIDITY, Constants.FALSE);
 
-        nvps.add(Constants.PR_DEFAULT_ALGORITHM, 
-          (String)mAlgorithms.getSelectedItem());
+        nvps.put(Constants.PR_DEFAULT_ALGORITHM,
+                (String) mAlgorithms.getSelectedItem());
 
         String serial = (String)mSerialNumber.getText().trim();
         try {
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/CMSCRLCachePanel.java b/pki/base/console/src/com/netscape/admin/certsrv/config/CMSCRLCachePanel.java
index 723668790..51da9c58c 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/CMSCRLCachePanel.java
+++ b/pki/base/console/src/com/netscape/admin/certsrv/config/CMSCRLCachePanel.java
@@ -24,7 +24,6 @@ import com.netscape.admin.certsrv.connection.*;
 import javax.swing.*;
 import java.awt.*;
 import java.awt.event.*;
-import java.util.StringTokenizer;
 
 /**
  * Panel Setting CRL Cache
@@ -205,10 +204,10 @@ public class CMSCRLCachePanel extends CMSBaseTab {
     public void refresh() {
         _model.progressStart();
         NameValuePairs nvps = new NameValuePairs();
-        nvps.add(Constants.PR_ENABLE_CACHE, "");
-        nvps.add(Constants.PR_CACHE_FREQ, "");
-        nvps.add(Constants.PR_CACHE_RECOVERY, "");
-        nvps.add(Constants.PR_CACHE_TESTING, "");
+        nvps.put(Constants.PR_ENABLE_CACHE, "");
+        nvps.put(Constants.PR_CACHE_FREQ, "");
+        nvps.put(Constants.PR_CACHE_RECOVERY, "");
+        nvps.put(Constants.PR_CACHE_TESTING, "");
 
         try {
             NameValuePairs val = null;
@@ -233,10 +232,8 @@ public class CMSCRLCachePanel extends CMSBaseTab {
 
     public void populate(NameValuePairs nvps) {
         String signingAlg = "";
-        for (int i=0; i<nvps.size(); i++) {
-            NameValuePair nvp = nvps.elementAt(i);
-            String name = nvp.getName();            
-            String value = nvp.getValue().trim();
+        for (String name : nvps.keySet()) {
+            String value = nvps.get(name).trim();
             if (name.equals(Constants.PR_ENABLE_CACHE)) {
                 mEnableCache.setSelected(getBoolean(value, true));
             } else if (name.equals(Constants.PR_CACHE_FREQ)) {
@@ -276,9 +273,9 @@ public class CMSCRLCachePanel extends CMSBaseTab {
 
 
         if (mEnableCache.isSelected())
-            nvps.add(Constants.PR_ENABLE_CACHE, Constants.TRUE);
+            nvps.put(Constants.PR_ENABLE_CACHE, Constants.TRUE);
         else
-            nvps.add(Constants.PR_ENABLE_CACHE, Constants.FALSE);
+            nvps.put(Constants.PR_ENABLE_CACHE, Constants.FALSE);
 
         cacheFreq = mCacheFreq.getText().trim();
         if (cacheFreq.equals("")) {
@@ -295,18 +292,18 @@ public class CMSCRLCachePanel extends CMSBaseTab {
             showMessageDialog("NUMBERFORMAT");
             return false;
         }
-        nvps.add(Constants.PR_CACHE_FREQ, cacheFreq);
+        nvps.put(Constants.PR_CACHE_FREQ, cacheFreq);
 
 
         if (mEnableCacheRecovery.isSelected())
-            nvps.add(Constants.PR_CACHE_RECOVERY, Constants.TRUE);
+            nvps.put(Constants.PR_CACHE_RECOVERY, Constants.TRUE);
         else
-            nvps.add(Constants.PR_CACHE_RECOVERY, Constants.FALSE);
+            nvps.put(Constants.PR_CACHE_RECOVERY, Constants.FALSE);
 
         if (mEnableCacheTesting.isSelected())
-            nvps.add(Constants.PR_CACHE_TESTING, Constants.TRUE);
+            nvps.put(Constants.PR_CACHE_TESTING, Constants.TRUE);
         else
-            nvps.add(Constants.PR_CACHE_TESTING, Constants.FALSE);
+            nvps.put(Constants.PR_CACHE_TESTING, Constants.FALSE);
 
         _model.progressStart();
 
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/CMSCRLFormatPanel.java b/pki/base/console/src/com/netscape/admin/certsrv/config/CMSCRLFormatPanel.java
index 6e22af602..3257b90a0 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/CMSCRLFormatPanel.java
+++ b/pki/base/console/src/com/netscape/admin/certsrv/config/CMSCRLFormatPanel.java
@@ -220,14 +220,14 @@ public class CMSCRLFormatPanel extends CMSBaseTab {
     public void refresh() {
         _model.progressStart();
         NameValuePairs nvps = new NameValuePairs();
-        nvps.add(Constants.PR_EXTENSIONS, "");
-        nvps.add(Constants.PR_SIGNING_ALGORITHM, "");
-        nvps.add(Constants.PR_INCLUDE_EXPIREDCERTS, "");
-        nvps.add(Constants.PR_INCLUDE_EXPIREDCERTS_ONEEXTRATIME, "");
-        nvps.add(Constants.PR_CA_CERTS_ONLY, "");
-        nvps.add(Constants.PR_PROFILE_CERTS_ONLY, "");
-        nvps.add(Constants.PR_PROFILE_LIST, "");
-        nvps.add(Constants.PR_ENABLE_CACHE, "");
+        nvps.put(Constants.PR_EXTENSIONS, "");
+        nvps.put(Constants.PR_SIGNING_ALGORITHM, "");
+        nvps.put(Constants.PR_INCLUDE_EXPIREDCERTS, "");
+        nvps.put(Constants.PR_INCLUDE_EXPIREDCERTS_ONEEXTRATIME, "");
+        nvps.put(Constants.PR_CA_CERTS_ONLY, "");
+        nvps.put(Constants.PR_PROFILE_CERTS_ONLY, "");
+        nvps.put(Constants.PR_PROFILE_LIST, "");
+        nvps.put(Constants.PR_ENABLE_CACHE, "");
 
         try {
             NameValuePairs val = null;
@@ -259,10 +259,8 @@ public class CMSCRLFormatPanel extends CMSBaseTab {
 
     public void populate(NameValuePairs nvps) {
         String signingAlg = "";
-        for (int i=0; i<nvps.size(); i++) {
-            NameValuePair nvp = nvps.elementAt(i);
-            String name = nvp.getName();            
-            String value = nvp.getValue().trim();
+        for (String name : nvps.keySet()) {
+            String value = nvps.get(name).trim();
             if (name.equals(Constants.PR_EXTENSIONS)) {
                 mEnableExtensions.setSelected(getBoolean(value));
             } else if (name.equals(Constants.PR_SIGNING_ALGORITHM)) {
@@ -328,29 +326,29 @@ public class CMSCRLFormatPanel extends CMSBaseTab {
         NameValuePairs nvps = new NameValuePairs();
 
         if (mEnableExtensions.isSelected())
-            nvps.add(Constants.PR_EXTENSIONS, Constants.TRUE);
+            nvps.put(Constants.PR_EXTENSIONS, Constants.TRUE);
         else
-            nvps.add(Constants.PR_EXTENSIONS, Constants.FALSE);
+            nvps.put(Constants.PR_EXTENSIONS, Constants.FALSE);
  
         if (mEnableExpired.isSelected())
-            nvps.add(Constants.PR_INCLUDE_EXPIREDCERTS, Constants.TRUE);
+            nvps.put(Constants.PR_INCLUDE_EXPIREDCERTS, Constants.TRUE);
         else
-            nvps.add(Constants.PR_INCLUDE_EXPIREDCERTS, Constants.FALSE);
+            nvps.put(Constants.PR_INCLUDE_EXPIREDCERTS, Constants.FALSE);
 
         if (mEnableOneExtraTime.isSelected())
-            nvps.add(Constants.PR_INCLUDE_EXPIREDCERTS_ONEEXTRATIME, Constants.TRUE);
+            nvps.put(Constants.PR_INCLUDE_EXPIREDCERTS_ONEEXTRATIME, Constants.TRUE);
         else
-            nvps.add(Constants.PR_INCLUDE_EXPIREDCERTS_ONEEXTRATIME, Constants.FALSE);
+            nvps.put(Constants.PR_INCLUDE_EXPIREDCERTS_ONEEXTRATIME, Constants.FALSE);
 
         if (mCACertsOnly.isSelected())
-            nvps.add(Constants.PR_CA_CERTS_ONLY, Constants.TRUE);
+            nvps.put(Constants.PR_CA_CERTS_ONLY, Constants.TRUE);
         else
-            nvps.add(Constants.PR_CA_CERTS_ONLY, Constants.FALSE);
+            nvps.put(Constants.PR_CA_CERTS_ONLY, Constants.FALSE);
         
         if (mProfileCertsOnly.isSelected())
-            nvps.add(Constants.PR_PROFILE_CERTS_ONLY, Constants.TRUE);
+            nvps.put(Constants.PR_PROFILE_CERTS_ONLY, Constants.TRUE);
         else
-            nvps.add(Constants.PR_PROFILE_CERTS_ONLY, Constants.FALSE);
+            nvps.put(Constants.PR_PROFILE_CERTS_ONLY, Constants.FALSE);
 
         String profileList = null;
         if (mProfileCertsOnly.isSelected()) {
@@ -365,15 +363,15 @@ public class CMSCRLFormatPanel extends CMSBaseTab {
             }
         }
         if (profileList != null)
-            nvps.add(Constants.PR_PROFILE_LIST, profileList);
+            nvps.put(Constants.PR_PROFILE_LIST, profileList);
         else
-            nvps.add(Constants.PR_PROFILE_LIST, mProfiles.getText().trim());
+            nvps.put(Constants.PR_PROFILE_LIST, mProfiles.getText().trim());
 
 
         int index = mAlgorithms.getSelectedIndex();
 
-        nvps.add(Constants.PR_SIGNING_ALGORITHM,
-            (String)mAlgorithms.getSelectedItem());
+        nvps.put(Constants.PR_SIGNING_ALGORITHM,
+                (String) mAlgorithms.getSelectedItem());
 
         _model.progressStart();
 
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/CMSCRLIPPanel.java b/pki/base/console/src/com/netscape/admin/certsrv/config/CMSCRLIPPanel.java
index 9bc141f7b..553211eb8 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/CMSCRLIPPanel.java
+++ b/pki/base/console/src/com/netscape/admin/certsrv/config/CMSCRLIPPanel.java
@@ -24,11 +24,9 @@ import com.netscape.management.client.util.*;
 import com.netscape.certsrv.common.*;
 import com.netscape.admin.certsrv.connection.*;
 import javax.swing.*;
-import javax.swing.border.*;
 import java.awt.*;
 import java.awt.event.*;
 import java.util.*;
-import javax.swing.tree.*;
 
 /**
  * CRL IP Panel
@@ -173,10 +171,10 @@ public class CMSCRLIPPanel  extends CMSBaseTab
             String name = ((JLabel)mList.getSelectedValue()).getText();
 						  //(String)mList.getSelectedValue();
             NameValuePairs nvps = new NameValuePairs();
-            nvps.add(Constants.PR_ENABLED, "");
-            nvps.add(Constants.PR_ID, "");
-            nvps.add(Constants.PR_DESCRIPTION, "");
-            nvps.add(Constants.PR_CLASS, "");
+            nvps.put(Constants.PR_ENABLED, "");
+            nvps.put(Constants.PR_ID, "");
+            nvps.put(Constants.PR_DESCRIPTION, "");
+            nvps.put(Constants.PR_CLASS, "");
             try {
                 NameValuePairs values = mAdmin.read(DestDef.DEST_CA_ADMIN,
                                                     ScopeDef.SC_CRLIPS,
@@ -295,15 +293,13 @@ public class CMSCRLIPPanel  extends CMSBaseTab
     //update the UI component using the data retrieved
     private void populate(NameValuePairs nvps) {
 
-        Enumeration names = nvps.getNames();
         mDataModel.removeAllElements();
         mNames.removeAllElements();
-        while (names.hasMoreElements()) {
-            String name = (String)names.nextElement();
+        for (String name : nvps.keySet()) {
             if (name.indexOf('.') == -1) {
                 mNames.addElement(name);
 
-                String enable = nvps.getValue(name+"."+Constants.PR_ENABLED);
+                String enable = nvps.get(name + "." + Constants.PR_ENABLED);
                 if (enable != null && enable.equalsIgnoreCase(Constants.TRUE)) {
                     mDataModel.addElement(new JLabel(name, 
                                           CMSAdminUtil.getImage(CMSAdminResources.IMAGE_RULE),
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/CMSCRLSettingPanel.java b/pki/base/console/src/com/netscape/admin/certsrv/config/CMSCRLSettingPanel.java
index d2b25f207..d420686e3 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/CMSCRLSettingPanel.java
+++ b/pki/base/console/src/com/netscape/admin/certsrv/config/CMSCRLSettingPanel.java
@@ -286,15 +286,15 @@ public class CMSCRLSettingPanel extends CMSBaseTab {
     public void refresh() {
         _model.progressStart();
         NameValuePairs nvps = new NameValuePairs();
-        nvps.add(Constants.PR_ENABLE_CRL, "");
-        nvps.add(Constants.PR_UPDATE_SCHEMA, "");
-        nvps.add(Constants.PR_EXTENDED_NEXT_UPDATE, "");
-        nvps.add(Constants.PR_UPDATE_ALWAYS, "");
-        nvps.add(Constants.PR_ENABLE_DAILY, "");
-        nvps.add(Constants.PR_DAILY_UPDATES, "");
-        nvps.add(Constants.PR_ENABLE_FREQ, "");
-        nvps.add(Constants.PR_UPDATE_FREQ, "");
-        nvps.add(Constants.PR_GRACE_PERIOD, "");
+        nvps.put(Constants.PR_ENABLE_CRL, "");
+        nvps.put(Constants.PR_UPDATE_SCHEMA, "");
+        nvps.put(Constants.PR_EXTENDED_NEXT_UPDATE, "");
+        nvps.put(Constants.PR_UPDATE_ALWAYS, "");
+        nvps.put(Constants.PR_ENABLE_DAILY, "");
+        nvps.put(Constants.PR_DAILY_UPDATES, "");
+        nvps.put(Constants.PR_ENABLE_FREQ, "");
+        nvps.put(Constants.PR_UPDATE_FREQ, "");
+        nvps.put(Constants.PR_GRACE_PERIOD, "");
 
         try {
             NameValuePairs val = null;
@@ -319,11 +319,8 @@ public class CMSCRLSettingPanel extends CMSBaseTab {
     }
 
     public void populate(NameValuePairs nvps) {
-        String signingAlg = "";
-        for (int i=0; i<nvps.size(); i++) {
-            NameValuePair nvp = nvps.elementAt(i);
-            String name = nvp.getName();            
-            String value = nvp.getValue().trim();
+        for (String name : nvps.keySet()) {
+            String value = nvps.get(name).trim();
             if (name.equals(Constants.PR_ENABLE_CRL)) {
                 mEnableCRL.setSelected(getBoolean(value));
             } else if (name.equals(Constants.PR_UPDATE_SCHEMA)) {
@@ -535,41 +532,41 @@ public class CMSCRLSettingPanel extends CMSBaseTab {
         NameValuePairs nvps = new NameValuePairs();
 
         if (mEnableCRL.isSelected())
-            nvps.add(Constants.PR_ENABLE_CRL, Constants.TRUE);
+            nvps.put(Constants.PR_ENABLE_CRL, Constants.TRUE);
         else
-            nvps.add(Constants.PR_ENABLE_CRL, Constants.FALSE);
+            nvps.put(Constants.PR_ENABLE_CRL, Constants.FALSE);
 
-        nvps.add(Constants.PR_UPDATE_SCHEMA, mCRLGen.getText().trim());
+        nvps.put(Constants.PR_UPDATE_SCHEMA, mCRLGen.getText().trim());
 
         if (mExtendNextUpdate.isSelected())
-            nvps.add(Constants.PR_EXTENDED_NEXT_UPDATE, Constants.TRUE);
+            nvps.put(Constants.PR_EXTENDED_NEXT_UPDATE, Constants.TRUE);
         else
-            nvps.add(Constants.PR_EXTENDED_NEXT_UPDATE, Constants.FALSE);
+            nvps.put(Constants.PR_EXTENDED_NEXT_UPDATE, Constants.FALSE);
 
         if (mAlways.isSelected())
-            nvps.add(Constants.PR_UPDATE_ALWAYS, Constants.TRUE);
+            nvps.put(Constants.PR_UPDATE_ALWAYS, Constants.TRUE);
         else
-            nvps.add(Constants.PR_UPDATE_ALWAYS, Constants.FALSE);
+            nvps.put(Constants.PR_UPDATE_ALWAYS, Constants.FALSE);
 
         if (mDaily.isSelected())
-            nvps.add(Constants.PR_ENABLE_DAILY, Constants.TRUE);
+            nvps.put(Constants.PR_ENABLE_DAILY, Constants.TRUE);
         else
-            nvps.add(Constants.PR_ENABLE_DAILY, Constants.FALSE);
+            nvps.put(Constants.PR_ENABLE_DAILY, Constants.FALSE);
 
         if (timeList != null)
-            nvps.add(Constants.PR_DAILY_UPDATES, timeList);
+            nvps.put(Constants.PR_DAILY_UPDATES, timeList);
         else
-            nvps.add(Constants.PR_DAILY_UPDATES, mDailyAt.getText().trim());
+            nvps.put(Constants.PR_DAILY_UPDATES, mDailyAt.getText().trim());
 
 
         if (mEnableFreq.isSelected())
-            nvps.add(Constants.PR_ENABLE_FREQ, Constants.TRUE);
+            nvps.put(Constants.PR_ENABLE_FREQ, Constants.TRUE);
         else
-            nvps.add(Constants.PR_ENABLE_FREQ, Constants.FALSE);
+            nvps.put(Constants.PR_ENABLE_FREQ, Constants.FALSE);
 
-        nvps.add(Constants.PR_UPDATE_FREQ, mFrequency.getText().trim());
+        nvps.put(Constants.PR_UPDATE_FREQ, mFrequency.getText().trim());
 
-        nvps.add(Constants.PR_GRACE_PERIOD, mGracePeriod.getText().trim());
+        nvps.put(Constants.PR_GRACE_PERIOD, mGracePeriod.getText().trim());
 
 
         _model.progressStart();
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/CMSEAGeneralPanel.java b/pki/base/console/src/com/netscape/admin/certsrv/config/CMSEAGeneralPanel.java
index 6130f9316..2d35133df 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/CMSEAGeneralPanel.java
+++ b/pki/base/console/src/com/netscape/admin/certsrv/config/CMSEAGeneralPanel.java
@@ -24,8 +24,6 @@ import com.netscape.admin.certsrv.connection.*;
 import javax.swing.*;
 import java.awt.*;
 import java.awt.event.*;
-import java.util.*;
-import java.math.*;
 
 /**
  * KRA General Setting
@@ -90,7 +88,7 @@ public class CMSEAGeneralPanel extends CMSBaseTab implements ItemListener {
     public void refresh() {
         mModel.progressStart();
         NameValuePairs nvps = new NameValuePairs();
-        nvps.add(Constants.PR_NO_OF_REQUIRED_RECOVERY_AGENTS, "1");
+        nvps.put(Constants.PR_NO_OF_REQUIRED_RECOVERY_AGENTS, "1");
 
         try {
             NameValuePairs val = mAdmin.read(DestDef.DEST_KRA_ADMIN,
@@ -106,12 +104,10 @@ public class CMSEAGeneralPanel extends CMSBaseTab implements ItemListener {
     }
 
     protected void populate(NameValuePairs nvps) {
-        String defaultAlgorithm = "";
-        for (int i=0; i<nvps.size(); i++) {
-            NameValuePair nvp = nvps.elementAt(i);
-            String name = nvp.getName();
+        for (String name : nvps.keySet()) {
+            String value = nvps.get(name);
             if (name.equals(Constants.PR_NO_OF_REQUIRED_RECOVERY_AGENTS)) {
-                mNumberOfAgentsText.setText(nvp.getValue());
+                mNumberOfAgentsText.setText(value);
             }
         }
     }
@@ -144,8 +140,8 @@ public class CMSEAGeneralPanel extends CMSBaseTab implements ItemListener {
         }
 
         NameValuePairs nvps = new NameValuePairs();
-        nvps.add(Constants.PR_NO_OF_REQUIRED_RECOVERY_AGENTS, 
-          numberOfAgents);
+        nvps.put(Constants.PR_NO_OF_REQUIRED_RECOVERY_AGENTS,
+                numberOfAgents);
 
         mModel.progressStart();
         try {
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/CMSEncryptionPanel.java b/pki/base/console/src/com/netscape/admin/certsrv/config/CMSEncryptionPanel.java
index 0891c63fc..913974eaf 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/CMSEncryptionPanel.java
+++ b/pki/base/console/src/com/netscape/admin/certsrv/config/CMSEncryptionPanel.java
@@ -19,20 +19,15 @@ package com.netscape.admin.certsrv.config;
 
 import com.netscape.admin.certsrv.*;
 import com.netscape.management.client.console.*;
-import com.netscape.admin.certsrv.security.*;
 import com.netscape.admin.certsrv.connection.*;
 import com.netscape.certsrv.common.*;
 import java.awt.*;
 import java.util.*;
-import java.io.*;
 import javax.swing.*;
 import java.awt.event.*;
 import javax.swing.border.*;
 import com.netscape.management.client.util.*;
-import com.netscape.management.nmclf.*;
-import javax.swing.plaf.*;
 import com.netscape.admin.certsrv.keycert.*;
-import com.netscape.admin.certsrv.config.install.*;
 import com.netscape.admin.certsrv.managecert.*;
 
 /**
@@ -185,7 +180,7 @@ public class CMSEncryptionPanel extends CMSBaseTab  {
         for (Enumeration e = mCertMapping.keys() ; e.hasMoreElements() ;) {
             CipherEntryData data = 
                 (CipherEntryData)mCertMapping.get(e.nextElement());
-            nvp.add(data.getTagName(),data.getTokenName()+","+data.getCertName());
+            nvp.put(data.getTagName(), data.getTokenName() + "," + data.getCertName());
         }
         
         if (updateCertMap(nvp)) {
@@ -423,20 +418,20 @@ public class CMSEncryptionPanel extends CMSBaseTab  {
     private void setupDataContainer(NameValuePairs response) {
         
         //setup security version flag
-        String version = response.getValue(Constants.PR_CIPHER_VERSION);
+        String version = response.get(Constants.PR_CIPHER_VERSION);
         if ( (version != null) && (version.equals(
             Constants.PR_CIPHER_VERSION_DOMESTIC)) ) {
             mIsDomestic = true;            
         }
         
         //setup fortezza flag
-        String fortezza = response.getValue(Constants.PR_CIPHER_FORTEZZA);
+        String fortezza = response.get(Constants.PR_CIPHER_FORTEZZA);
         if ( (fortezza != null) && (fortezza.equalsIgnoreCase("TRUE")) ){
             mHasFortezza = true;            
         }
         
         //setup cipher preference settings
-        String cipherpref = response.getValue(Constants.PR_CIPHER_PREF);
+        String cipherpref = response.get(Constants.PR_CIPHER_PREF);
         //Debug.println("cipher preference: "+cipherpref);
         if ( (cipherpref != null) && (!cipherpref.trim().equals("")) ) {
             StringTokenizer tokenizer = new StringTokenizer(cipherpref, ",");
@@ -455,7 +450,7 @@ public class CMSEncryptionPanel extends CMSBaseTab  {
         for (Enumeration e = mCertMapping.keys() ; e.hasMoreElements() ;) {
             String name = (String) e.nextElement();
             CipherEntryData data = (CipherEntryData)mCertMapping.get(name);
-            String value = response.getValue(data.getTagName());
+            String value = response.get(data.getTagName());
             if ( (value != null) && (!value.trim().equals("")) ) {
                 StringTokenizer tokenizer = new StringTokenizer(value, ",");
                 try {
@@ -475,7 +470,7 @@ public class CMSEncryptionPanel extends CMSBaseTab  {
         mSelectionIgnore = false;
         
         //setup the token-cert list data table
-        String tokenlist = response.getValue(Constants.PR_TOKEN_LIST);
+        String tokenlist = response.get(Constants.PR_TOKEN_LIST);
         if ( (tokenlist != null) && (!tokenlist.trim().equals("")) ) {
             StringTokenizer tokenizer = new StringTokenizer(tokenlist, ",");
             while (tokenizer.hasMoreTokens()) {
@@ -483,7 +478,7 @@ public class CMSEncryptionPanel extends CMSBaseTab  {
                 Debug.println("Token: "+token);
                 
                 //get the certificate associated with this token
-                String certList = response.getValue(Constants.PR_TOKEN_PREFIX+token);
+                String certList = response.get(Constants.PR_TOKEN_PREFIX + token);
                 Vector certVector = new Vector();
                 if ( (certList != null) && (!certList.trim().equals("")) ) {
                     StringTokenizer tokenizer2 = new StringTokenizer(certList, ",");
@@ -739,15 +734,15 @@ public class CMSEncryptionPanel extends CMSBaseTab  {
     {
         Debug.println("Get Security Information");
         NameValuePairs nvp = new NameValuePairs();
-        nvp.add(Constants.PR_CIPHER_PREF,"");
-        nvp.add(Constants.PR_CIPHER_VERSION,"");
-        nvp.add(Constants.PR_CIPHER_FORTEZZA,"");
-        nvp.add(Constants.PR_TOKEN_LIST,"");
+        nvp.put(Constants.PR_CIPHER_PREF, "");
+        nvp.put(Constants.PR_CIPHER_VERSION, "");
+        nvp.put(Constants.PR_CIPHER_FORTEZZA, "");
+        nvp.put(Constants.PR_TOKEN_LIST, "");
         
         //create installed certificate list data request
         for (Enumeration e = mCertMapping.elements(); e.hasMoreElements() ;) {
             CipherEntryData data = (CipherEntryData)e.nextElement();
-            nvp.add(data.getTagName(),"");
+            nvp.put(data.getTagName(), "");
         }
         
         NameValuePairs response;
@@ -767,7 +762,7 @@ public class CMSEncryptionPanel extends CMSBaseTab  {
         Debug.println("Set Cipher Preference: "+list);
         
         NameValuePairs nvp = new NameValuePairs();
-        nvp.add(Constants.PR_CIPHER_PREF, list);
+        nvp.put(Constants.PR_CIPHER_PREF, list);
         
         //send to server
         try {
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/CMSErrorLogPanel.java b/pki/base/console/src/com/netscape/admin/certsrv/config/CMSErrorLogPanel.java
index 484be33dd..23b4ececa 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/CMSErrorLogPanel.java
+++ b/pki/base/console/src/com/netscape/admin/certsrv/config/CMSErrorLogPanel.java
@@ -18,13 +18,10 @@
 package com.netscape.admin.certsrv.config;
 
 import com.netscape.admin.certsrv.*;
-import com.netscape.admin.certsrv.connection.*;
 import com.netscape.certsrv.common.*;
 import com.netscape.management.client.util.*;
-import java.awt.*;
+
 import java.awt.event.*;
-import java.util.*;
-import javax.swing.*;
 
 /**
  * Error Log Setting Tab to be displayed at the right hand side
@@ -67,14 +64,14 @@ public class CMSErrorLogPanel extends CMSBaseLogPanel {
     public void refresh() {
         mModel.progressStart();
         NameValuePairs nvp = new NameValuePairs();
-        nvp.add(Constants.PR_LOG_ENABLED, "");
-        nvp.add(Constants.PR_LOG_LEVEL, "");
-        nvp.add(Constants.PR_LOG_BUFFERSIZE, "");
+        nvp.put(Constants.PR_LOG_ENABLED, "");
+        nvp.put(Constants.PR_LOG_LEVEL, "");
+        nvp.put(Constants.PR_LOG_BUFFERSIZE, "");
         //nvp.add(Constants.PR_LOG_EXPIRED_TIME, "");
         //nvp.add(Constants.PR_LOG_FILENAME, "");
         //nvp.add(Constants.PR_LOG_FLUSHINTERVAL, "");
-        nvp.add(Constants.PR_LOG_MAXFILESIZE, "");
-        nvp.add(Constants.PR_LOG_ROLLEROVER_INTERVAL, "");
+        nvp.put(Constants.PR_LOG_MAXFILESIZE, "");
+        nvp.put(Constants.PR_LOG_ROLLEROVER_INTERVAL, "");
 
         try {
             NameValuePairs val = mAdmin.read(DestDef.DEST_LOG_ADMIN,
@@ -92,16 +89,16 @@ public class CMSErrorLogPanel extends CMSBaseLogPanel {
     }
 
     private void parseVals(NameValuePairs nvp) {
-        if (nvp.getValue(Constants.PR_LOG_ENABLED).equalsIgnoreCase(
+        if (nvp.get(Constants.PR_LOG_ENABLED).equalsIgnoreCase(
             Constants.TRUE)) 
             activateLog.setSelected(true);
         else
             activateLog.setSelected(false);
-        mLevel = Integer.parseInt(nvp.getValue(Constants.PR_LOG_LEVEL));
-        mlogBufSizTextData = nvp.getValue(Constants.PR_LOG_BUFFERSIZE);
-        mlogMaxSizTextData = nvp.getValue(Constants.PR_LOG_MAXFILESIZE);
+        mLevel = Integer.parseInt(nvp.get(Constants.PR_LOG_LEVEL));
+        mlogBufSizTextData = nvp.get(Constants.PR_LOG_BUFFERSIZE);
+        mlogMaxSizTextData = nvp.get(Constants.PR_LOG_MAXFILESIZE);
         int val = 
-          Integer.parseInt(nvp.getValue(Constants.PR_LOG_ROLLEROVER_INTERVAL));
+          Integer.parseInt(nvp.get(Constants.PR_LOG_ROLLEROVER_INTERVAL));
         mFrequency = getRollOverIndex(val);
     }
 
@@ -135,19 +132,19 @@ public class CMSErrorLogPanel extends CMSBaseLogPanel {
         NameValuePairs nvp = new NameValuePairs();
 
         if (activateLog.isSelected())
-            nvp.add(Constants.PR_LOG_ENABLED, Constants.TRUE);
+            nvp.put(Constants.PR_LOG_ENABLED, Constants.TRUE);
         else
-            nvp.add(Constants.PR_LOG_ENABLED, Constants.FALSE);
+            nvp.put(Constants.PR_LOG_ENABLED, Constants.FALSE);
         String str = "" + mLogLevel.getSelectedIndex();
-        nvp.add(Constants.PR_LOG_LEVEL, str);
-        nvp.add(Constants.PR_LOG_BUFFERSIZE, mlogBufSizText.getText().trim());
+        nvp.put(Constants.PR_LOG_LEVEL, str);
+        nvp.put(Constants.PR_LOG_BUFFERSIZE, mlogBufSizText.getText().trim());
         //nvp.add(Constants.PR_LOG_EXPIRED_TIME, "");
         //nvp.add(Constants.PR_LOG_FILENAME, "");
         //nvp.add(Constants.PR_LOG_FLUSHINTERVAL, "");
-        nvp.add(Constants.PR_LOG_MAXFILESIZE, mlogMaxSizText.getText().trim());
+        nvp.put(Constants.PR_LOG_MAXFILESIZE, mlogMaxSizText.getText().trim());
 
         str = "" + getRollOverTime(mlogFQC.getSelectedIndex());
-        nvp.add(Constants.PR_LOG_ROLLEROVER_INTERVAL, str);
+        nvp.put(Constants.PR_LOG_ROLLEROVER_INTERVAL, str);
 
         mModel.progressStart();
         try {
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/CMSKRAAutoPanel.java b/pki/base/console/src/com/netscape/admin/certsrv/config/CMSKRAAutoPanel.java
index be81b035b..f408e7297 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/CMSKRAAutoPanel.java
+++ b/pki/base/console/src/com/netscape/admin/certsrv/config/CMSKRAAutoPanel.java
@@ -18,13 +18,11 @@
 package com.netscape.admin.certsrv.config;
 
 import com.netscape.admin.certsrv.*;
-import com.netscape.management.client.util.*;
 import com.netscape.certsrv.common.*;
 import com.netscape.admin.certsrv.connection.*;
 import com.netscape.admin.certsrv.ug.*;
 import javax.swing.*;
 import java.awt.*;
-import java.util.*;
 import java.awt.event.*;
 
 /**
@@ -143,7 +141,7 @@ public class CMSKRAAutoPanel extends CMSBaseUGTab {
     public void refresh() {
         mModel.progressStart();
         NameValuePairs nvps = new NameValuePairs();
-        nvps.add(Constants.PR_AUTO_RECOVERY_ON, "");
+        nvps.put(Constants.PR_AUTO_RECOVERY_ON, "");
 
         try {
             NameValuePairs val = mAdmin.read(DestDef.DEST_KRA_ADMIN,
@@ -157,11 +155,10 @@ public class CMSKRAAutoPanel extends CMSBaseUGTab {
     }
 
     protected void populate(NameValuePairs nvps) {
-        for (int i=0; i<nvps.size(); i++) {
-            NameValuePair nvp = nvps.elementAt(i);
-            String name = nvp.getName();
+        for (String name : nvps.keySet()) {
+            String value = nvps.get(name);
             if (name.equals(Constants.PR_AUTO_RECOVERY_ON)) {
-                if (nvp.getValue().equals(Constants.TRUE)) {
+                if (value.equals(Constants.TRUE)) {
                     setStatus(true);
                     //mEnableAuto.setText(mDisableLabel);
                     //mEnableAuto.setToolTipText(mDisableTTip);
@@ -198,7 +195,7 @@ public class CMSKRAAutoPanel extends CMSBaseUGTab {
             } else {
                 mModel.progressStart();
                 NameValuePairs nvps = new NameValuePairs();
-                nvps.add(Constants.PR_AUTO_RECOVERY_ON, Constants.FALSE);
+                nvps.put(Constants.PR_AUTO_RECOVERY_ON, Constants.FALSE);
                 try {
                     mAdmin.modify(DestDef.DEST_KRA_ADMIN,
                       ScopeDef.SC_AUTO_RECOVERY, Constants.RS_ID_CONFIG, nvps);
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/CMSKRAPasswdPanel.java b/pki/base/console/src/com/netscape/admin/certsrv/config/CMSKRAPasswdPanel.java
index 7c52eab87..7c70dca7f 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/CMSKRAPasswdPanel.java
+++ b/pki/base/console/src/com/netscape/admin/certsrv/config/CMSKRAPasswdPanel.java
@@ -18,9 +18,7 @@
 package com.netscape.admin.certsrv.config;
 
 import com.netscape.admin.certsrv.*;
-import com.netscape.admin.certsrv.connection.*;
 import com.netscape.admin.certsrv.connection.AdminConnection;
-import com.netscape.management.client.util.*;
 import com.netscape.certsrv.common.*;
 import com.netscape.admin.certsrv.ug.*;
 import javax.swing.*;
@@ -58,7 +56,7 @@ public class CMSKRAPasswdPanel extends CMSBaseUGTab {
     public void refresh() {
         mModel.progressStart();
         NameValuePairs nvps = new NameValuePairs();
-        nvps.add(Constants.PR_RECOVERY_AGENT, "");
+        nvps.put(Constants.PR_RECOVERY_AGENT, "");
 
         try {
             NameValuePairs val = mAdmin.read(DestDef.DEST_KRA_ADMIN,
@@ -74,18 +72,17 @@ public class CMSKRAPasswdPanel extends CMSBaseUGTab {
     }
 
     protected void populate(NameValuePairs nvps) {
-        for (int i=0; i<nvps.size(); i++) {
-            NameValuePair nvp = nvps.elementAt(i);
-            String name = nvp.getName();
+        for (String name : nvps.keySet()) {
+            String value = nvps.get(name);
             if (name.equals(Constants.PR_RECOVERY_AGENT)) {
                 mAgentModel.removeAllElements();
-                updateModel(nvp);
+                updateModel(value);
             }
         }
     }
 
-    private void updateModel(NameValuePair nvp) {
-        String[] uids = getUIDs(nvp.getValue());
+    private void updateModel(String value) {
+        String[] uids = getUIDs(value);
         for (int i=0; i<uids.length; i++) {
             JLabel label = makeJLabel(mUserIcon, uids[i],
               SwingConstants.LEFT);
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/CMSKRASchemePanel.java b/pki/base/console/src/com/netscape/admin/certsrv/config/CMSKRASchemePanel.java
index 274b7d54e..34950b371 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/CMSKRASchemePanel.java
+++ b/pki/base/console/src/com/netscape/admin/certsrv/config/CMSKRASchemePanel.java
@@ -18,14 +18,12 @@
 package com.netscape.admin.certsrv.config;
 
 import com.netscape.admin.certsrv.*;
-import com.netscape.admin.certsrv.connection.*;
 import com.netscape.admin.certsrv.connection.AdminConnection;
 import com.netscape.management.client.util.*;
 import com.netscape.certsrv.common.*;
 import com.netscape.admin.certsrv.ug.*;
 import javax.swing.*;
 import java.awt.*;
-import java.util.*;
 import java.awt.event.*;
 
 /**
@@ -82,8 +80,8 @@ public class CMSKRASchemePanel extends CMSBaseUGTab {
     public void refresh() {
         mModel.progressStart();
         NameValuePairs nvps = new NameValuePairs();
-        nvps.add(Constants.PR_RECOVERY_N, "");
-        nvps.add(Constants.PR_RECOVERY_M, "");
+        nvps.put(Constants.PR_RECOVERY_N, "");
+        nvps.put(Constants.PR_RECOVERY_M, "");
 
         try {
             NameValuePairs val = mAdmin.read(DestDef.DEST_KRA_ADMIN,
@@ -99,13 +97,12 @@ public class CMSKRASchemePanel extends CMSBaseUGTab {
     }
 
     protected void populate(NameValuePairs nvps) {
-        for (int i=0; i<nvps.size(); i++) {
-            NameValuePair nvp = nvps.elementAt(i);
-            String name = nvp.getName();
+        for (String name : nvps.keySet()) {
+            String value = nvps.get(name);
             if (name.equals(Constants.PR_RECOVERY_N)) {
-                mAvailAgentLbl.setText(nvp.getValue());
+                mAvailAgentLbl.setText(value);
             } else if (name.equals(Constants.PR_RECOVERY_M)) {
-                mReqAgentLbl.setText(nvp.getValue());
+                mReqAgentLbl.setText(value);
             }
         }
     }
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/CMSLDAPSettingPanel.java b/pki/base/console/src/com/netscape/admin/certsrv/config/CMSLDAPSettingPanel.java
index 85596d55e..641a6641e 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/CMSLDAPSettingPanel.java
+++ b/pki/base/console/src/com/netscape/admin/certsrv/config/CMSLDAPSettingPanel.java
@@ -17,7 +17,6 @@
 // --- END COPYRIGHT BLOCK ---
 package com.netscape.admin.certsrv.config;
 
-import com.netscape.management.client.util.*;
 import com.netscape.admin.certsrv.*;
 import com.netscape.certsrv.common.*;
 import com.netscape.admin.certsrv.connection.*;
@@ -177,14 +176,14 @@ public class CMSLDAPSettingPanel extends CMSBaseTab {
     public void refresh() {
         mModel.progressStart();
         NameValuePairs nvps = new NameValuePairs();
-        nvps.add(Constants.PR_HOST_NAME, "");
-        nvps.add(Constants.PR_LDAP_PORT, "");
+        nvps.put(Constants.PR_HOST_NAME, "");
+        nvps.put(Constants.PR_LDAP_PORT, "");
         //nvps.add(Constants.PR_SECURE_PORT_ENABLED, "");
         //nvps.add(Constants.PR_BASE_DN, "");
-        nvps.add(Constants.PR_BIND_DN, "");
-        nvps.add(Constants.PR_LDAP_VERSION, "");
-        nvps.add(Constants.PR_LDAP_MAX_CONNS, "");
-        nvps.add(Constants.PR_LDAP_MIN_CONNS, "");
+        nvps.put(Constants.PR_BIND_DN, "");
+        nvps.put(Constants.PR_LDAP_VERSION, "");
+        nvps.put(Constants.PR_LDAP_MAX_CONNS, "");
+        nvps.put(Constants.PR_LDAP_MIN_CONNS, "");
 
         try {
             NameValuePairs val = mAdmin.read(mServletName,
@@ -210,13 +209,12 @@ public class CMSLDAPSettingPanel extends CMSBaseTab {
 
     protected void populate(NameValuePairs nvps) {
         String version = "";
-        for (int i=0; i<nvps.size(); i++) {
-            NameValuePair nvp = nvps.elementAt(i);
-            String name = nvp.getName();
+        for (String name : nvps.keySet()) {
+            String value = nvps.get(name);
             if (name.equals(Constants.PR_HOST_NAME)) {
-                mHostNameText.setText(nvp.getValue());
+                mHostNameText.setText(value);
             } else if (name.equals(Constants.PR_LDAP_PORT)) {
-                mPortText.setText(nvp.getValue());
+                mPortText.setText(value);
             } else if (name.equals(Constants.PR_SECURE_PORT_ENABLED)) {
 /*
                 if (nvp.getValue().equals(Constants.TRUE))
@@ -227,18 +225,18 @@ public class CMSLDAPSettingPanel extends CMSBaseTab {
             } else if (name.equals(Constants.PR_BASE_DN)) {
                 //mBaseDNText.setText(nvp.getValue());
             } else if (name.equals(Constants.PR_BIND_DN)) {
-                mBindAsText.setText(nvp.getValue());
+                mBindAsText.setText(value);
             } else if (name.equals(Constants.PR_ENABLE)) {
-                if (nvp.getValue().equals(Constants.TRUE))
+                if (value.equals(Constants.TRUE))
                     mEnable.setSelected(true);
                 else
                     mEnable.setSelected(false);
             } else if (name.equals(Constants.PR_LDAP_VERSION)) {
-                version = nvp.getValue();
+                version = value;
             } else if (name.equals(Constants.PR_LDAP_MIN_CONNS)) {
-                mMinConnsText.setText(nvp.getValue());
+                mMinConnsText.setText(value);
             } else if (name.equals(Constants.PR_LDAP_MAX_CONNS)) {
-                mMaxConnsText.setText(nvp.getValue());
+                mMaxConnsText.setText(value);
             }
 
         }
@@ -301,12 +299,12 @@ public class CMSLDAPSettingPanel extends CMSBaseTab {
         }
 
         NameValuePairs nvps = new NameValuePairs();
-        nvps.add(Constants.PR_HOST_NAME, host);
-        nvps.add(Constants.PR_LDAP_PORT, port);
+        nvps.put(Constants.PR_HOST_NAME, host);
+        nvps.put(Constants.PR_LDAP_PORT, port);
         //nvps.add(Constants.PR_BASE_DN, baseDN);
-        nvps.add(Constants.PR_BIND_DN, bindAs);
-        nvps.add(Constants.PR_LDAP_MAX_CONNS, maxConns);
-        nvps.add(Constants.PR_LDAP_MIN_CONNS, minConns);
+        nvps.put(Constants.PR_BIND_DN, bindAs);
+        nvps.put(Constants.PR_LDAP_MAX_CONNS, maxConns);
+        nvps.put(Constants.PR_LDAP_MIN_CONNS, minConns);
 /*
         nvps.add(Constants.PR_LDAP_VERSION, 
           (String)mVersionBox.getSelectedItem());
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/CMSNetworkPanel.java b/pki/base/console/src/com/netscape/admin/certsrv/config/CMSNetworkPanel.java
index ef85e4986..03458d2b1 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/CMSNetworkPanel.java
+++ b/pki/base/console/src/com/netscape/admin/certsrv/config/CMSNetworkPanel.java
@@ -23,7 +23,6 @@ import com.netscape.certsrv.common.*;
 import com.netscape.management.client.util.*;
 import com.netscape.management.client.console.ConsoleInfo;
 import java.awt.*;
-import java.util.*;
 import java.awt.event.*;
 import javax.swing.*;
 import javax.swing.text.*;
@@ -251,25 +250,25 @@ public class CMSNetworkPanel extends CMSBaseTab {
         } else {
             mModel.progressStart();
             NameValuePairs nvps = new NameValuePairs();
-            nvps.add(Constants.PR_ADMIN_S_PORT, adminSSLPortStr);
-            nvps.add(Constants.PR_GATEWAY_PORT, gatewayPortStr);
-            nvps.add(Constants.PR_AGENT_S_PORT, agentSSLPortStr);
+            nvps.put(Constants.PR_ADMIN_S_PORT, adminSSLPortStr);
+            nvps.put(Constants.PR_GATEWAY_PORT, gatewayPortStr);
+            nvps.put(Constants.PR_AGENT_S_PORT, agentSSLPortStr);
 
             if (mGatewaySSLPortText.isEnabled()) {
-                nvps.add(Constants.PR_GATEWAY_S_PORT, gatewaySSLPortStr);
+                nvps.put(Constants.PR_GATEWAY_S_PORT, gatewaySSLPortStr);
             }
 
             if (mGatewaySSLBacklogText.isEnabled()) {
-                nvps.add(Constants.PR_GATEWAY_S_BACKLOG, gatewaySSLBacklogStr);
+                nvps.put(Constants.PR_GATEWAY_S_BACKLOG, gatewaySSLBacklogStr);
             }
 
             if (mEnable.isSelected()) {
-                nvps.add(Constants.PR_GATEWAY_PORT_ENABLED, Constants.TRUE);
-                nvps.add(Constants.PR_ADMIN_S_BACKLOG, adminSSLBacklogStr);
-                nvps.add(Constants.PR_GATEWAY_BACKLOG, gatewayBacklogStr);
-                nvps.add(Constants.PR_AGENT_S_BACKLOG, agentSSLBacklogStr);
+                nvps.put(Constants.PR_GATEWAY_PORT_ENABLED, Constants.TRUE);
+                nvps.put(Constants.PR_ADMIN_S_BACKLOG, adminSSLBacklogStr);
+                nvps.put(Constants.PR_GATEWAY_BACKLOG, gatewayBacklogStr);
+                nvps.put(Constants.PR_AGENT_S_BACKLOG, agentSSLBacklogStr);
             } else
-                nvps.add(Constants.PR_GATEWAY_PORT_ENABLED, Constants.FALSE);
+                nvps.put(Constants.PR_GATEWAY_PORT_ENABLED, Constants.FALSE);
 
             try {
                 mAdmin.modify(DestDef.DEST_SERVER_ADMIN, ScopeDef.SC_NETWORK,
@@ -312,11 +311,11 @@ public class CMSNetworkPanel extends CMSBaseTab {
     public void refresh() {
         mModel.progressStart();
         NameValuePairs nvps = new NameValuePairs();
-        nvps.add(Constants.PR_ADMIN_S_PORT, "");
-        nvps.add(Constants.PR_AGENT_S_PORT, "");
-        nvps.add(Constants.PR_GATEWAY_S_PORT, "");
-        nvps.add(Constants.PR_GATEWAY_PORT, "");
-        nvps.add(Constants.PR_GATEWAY_PORT_ENABLED, "");
+        nvps.put(Constants.PR_ADMIN_S_PORT, "");
+        nvps.put(Constants.PR_AGENT_S_PORT, "");
+        nvps.put(Constants.PR_GATEWAY_S_PORT, "");
+        nvps.put(Constants.PR_GATEWAY_PORT, "");
+        nvps.put(Constants.PR_GATEWAY_PORT_ENABLED, "");
 
         try {
             NameValuePairs val = mAdmin.read(DestDef.DEST_SERVER_ADMIN,
@@ -344,11 +343,9 @@ public class CMSNetworkPanel extends CMSBaseTab {
     }
 
     private void populate(NameValuePairs nvps) {
-        for (int i=0; i<nvps.size(); i++) {
-            NameValuePair nvp = nvps.elementAt(i);
-            String name = nvp.getName();
-            String str = nvp.getValue();
-            
+        for (String name : nvps.keySet()) {
+            String str = nvps.get(name);
+
             if (name.equals(Constants.PR_GATEWAY_PORT_ENABLED)) {
                 mEnable.setSelected(getBoolean(str));
             } else {
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/CMSOCSPGeneralPanel.java b/pki/base/console/src/com/netscape/admin/certsrv/config/CMSOCSPGeneralPanel.java
index 9c3bdf3d3..37dfbef44 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/CMSOCSPGeneralPanel.java
+++ b/pki/base/console/src/com/netscape/admin/certsrv/config/CMSOCSPGeneralPanel.java
@@ -126,8 +126,8 @@ public class CMSOCSPGeneralPanel extends CMSBaseTab implements ItemListener {
     public void refresh() {
         mModel.progressStart();
         NameValuePairs nvps = new NameValuePairs();
-        nvps.add(Constants.PR_DEFAULT_ALGORITHM, "");
-        nvps.add(Constants.PR_ALL_ALGORITHMS, "");
+        nvps.put(Constants.PR_DEFAULT_ALGORITHM, "");
+        nvps.put(Constants.PR_ALL_ALGORITHMS, "");
 
         try {
             NameValuePairs val = mAdmin.read(DestDef.DEST_OCSP_ADMIN,
@@ -144,13 +144,12 @@ public class CMSOCSPGeneralPanel extends CMSBaseTab implements ItemListener {
 
     protected void populate(NameValuePairs nvps) {
         String defaultAlgorithm = "";
-        for (int i=0; i<nvps.size(); i++) {
-            NameValuePair nvp = nvps.elementAt(i);
-            String name = nvp.getName();
+        for (String name : nvps.keySet()) {
+            String value = nvps.get(name);
             if (name.equals(Constants.PR_DEFAULT_ALGORITHM)) {
-                defaultAlgorithm = nvp.getValue();
+                defaultAlgorithm = value;
             } else if (name.equals(Constants.PR_ALL_ALGORITHMS)) {
-                initAlgorithmBox(nvp.getValue());
+                initAlgorithmBox(value);
             }
         }
 
@@ -191,8 +190,8 @@ public class CMSOCSPGeneralPanel extends CMSBaseTab implements ItemListener {
     public boolean applyCallback() {
         NameValuePairs nvps = new NameValuePairs();
 
-        nvps.add(Constants.PR_DEFAULT_ALGORITHM, 
-          (String)mAlgorithms.getSelectedItem());
+        nvps.put(Constants.PR_DEFAULT_ALGORITHM,
+                (String) mAlgorithms.getSelectedItem());
 
         mModel.progressStart();
         try {
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/CMSPasswordDialog.java b/pki/base/console/src/com/netscape/admin/certsrv/config/CMSPasswordDialog.java
index 03fc449f7..47cb6c865 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/CMSPasswordDialog.java
+++ b/pki/base/console/src/com/netscape/admin/certsrv/config/CMSPasswordDialog.java
@@ -22,7 +22,7 @@ import java.util.*;
 import java.awt.event.*;
 import javax.swing.*;
 import javax.swing.event.*;
-import javax.swing.border.*;
+
 import com.netscape.admin.certsrv.*;
 import com.netscape.management.client.util.*;
 import com.netscape.certsrv.common.*;
@@ -229,8 +229,8 @@ public class CMSPasswordDialog extends JDialog
             
                
             NameValuePairs nvps = new NameValuePairs();
-            nvps.add(Constants.PR_OLD_AGENT_PWD, oldpassword);
-            nvps.add(Constants.PR_AGENT_PWD, newpassword);
+            nvps.put(Constants.PR_OLD_AGENT_PWD, oldpassword);
+            nvps.put(Constants.PR_AGENT_PWD, newpassword);
 
             try {
                 mAdmin.modify(DestDef.DEST_KRA_ADMIN,
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/CMSPluginInstanceTab.java b/pki/base/console/src/com/netscape/admin/certsrv/config/CMSPluginInstanceTab.java
index 3e50148f3..d4fb62340 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/CMSPluginInstanceTab.java
+++ b/pki/base/console/src/com/netscape/admin/certsrv/config/CMSPluginInstanceTab.java
@@ -21,11 +21,10 @@ import com.netscape.admin.certsrv.*;
 import com.netscape.admin.certsrv.connection.*;
 import com.netscape.admin.certsrv.ug.*;
 import javax.swing.*;
-import javax.swing.event.*;
 import java.awt.event.*;
 import java.awt.*;
 import java.util.*;
-import com.netscape.management.client.*;
+
 import com.netscape.management.client.util.*;
 import com.netscape.certsrv.common.*;
 
@@ -148,7 +147,7 @@ public abstract class CMSPluginInstanceTab extends CMSBaseUGTab {
 				
 			dialog.setModel(mModel);
 			dialog.setInstanceScope(mScope);
-            dialog.showDialog(response, data.getValue(RULE_NAME));
+            dialog.showDialog(response, data.get(RULE_NAME));
             
             if(!dialog.isOK()) return;
 
@@ -329,7 +328,7 @@ public abstract class CMSPluginInstanceTab extends CMSBaseUGTab {
         NameValuePairs response;
         NameValuePairs request = new NameValuePairs();
         if (mId != null && mId.length() > 0) {
-            request.add(Constants.PR_ID, mId);
+            request.put(Constants.PR_ID, mId);
         }
 
         try {
@@ -349,22 +348,20 @@ public abstract class CMSPluginInstanceTab extends CMSBaseUGTab {
 
         Debug.println(response.toString());
 
-        Enumeration e = response.getNames();
-        
-        
 		/* 	format of each data element:
 			plugin;visibility;enabled
 				where plugin is the name of the plugin impl
 				visibility is one of {visible,invisible}
 				enabled is one of {enabled,disabled}
 		*/
-        while (e.hasMoreElements()) {
+
+        for (String entry : response.keySet()) {
 			String plugin="";
 			String visibility=null;
 			String enabled=null;
 
-        	String entry = ((String)e.nextElement()).trim();
-            String value = response.getValue(entry);
+            entry = entry.trim();
+            String value = response.get(entry);
 
 			StringTokenizer st = new StringTokenizer(value,";");
 
@@ -382,10 +379,10 @@ Debug.println("xxxxxxx plugin " + plugin);
 			if (visibility != null && visibility.equals("visible")) {
 
                	NameValuePairs data = new NameValuePairs();
-               	data.add(RULE_NAME,entry);
-               	data.add(RULE_IMPL,plugin);
+		data.put(RULE_NAME, entry);
+		data.put(RULE_IMPL, plugin);
 				if (enabled != null) {
-               		data.add(RULE_STAT,enabled);
+			data.put(RULE_STAT, enabled);
 				}
                	mDataModel.processData(data);
 			}
@@ -411,7 +408,7 @@ Debug.println("xxxxxxx plugin " + plugin);
         try {
             mConnection.delete(mDestination,
                                mScope,
-                               data.getValue(RULE_NAME));
+                               data.get(RULE_NAME));
         } catch (EAdminException e) {
             //display error dialog
             showErrorDialog(e.getMessage());
@@ -431,12 +428,12 @@ Debug.println("xxxxxxx plugin " + plugin);
             mDataModel.getObjectValueAt(mTable.getSelectedRow());
         NameValuePairs request = new NameValuePairs();
         if (mId != null && mId.length() > 0) {
-            request.add(mId, "");
+            request.put(mId, "");
         }
             
         NameValuePairs response = mConnection.read(mDestination,
                                                    mScope,
-                                                   data.getValue(RULE_NAME),
+                                                   data.get(RULE_NAME),
                                                    request);
         return response;
     }
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/CMSRACLMPanel.java b/pki/base/console/src/com/netscape/admin/certsrv/config/CMSRACLMPanel.java
index 3b2ee1ce4..734425b41 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/CMSRACLMPanel.java
+++ b/pki/base/console/src/com/netscape/admin/certsrv/config/CMSRACLMPanel.java
@@ -138,12 +138,12 @@ public class CMSRACLMPanel extends CMSBaseTab {
     public void refresh() {
         mModel.progressStart();
         NameValuePairs nvps = new NameValuePairs();
-        nvps.add(Constants.PR_RENEWAL_ENABLED, "");
-        nvps.add(Constants.PR_RENEWAL_VALIDITY, "");
-        nvps.add(Constants.PR_RENEWAL_EMAIL, "");
-        nvps.add(Constants.PR_RENEWAL_EXPIREDNOTIFIEDENABLED, "");
-        nvps.add(Constants.PR_RENEWAL_NUMNOTIFICATION, "");
-        nvps.add(Constants.PR_RENEWAL_INTERVAL, "");
+        nvps.put(Constants.PR_RENEWAL_ENABLED, "");
+        nvps.put(Constants.PR_RENEWAL_VALIDITY, "");
+        nvps.put(Constants.PR_RENEWAL_EMAIL, "");
+        nvps.put(Constants.PR_RENEWAL_EXPIREDNOTIFIEDENABLED, "");
+        nvps.put(Constants.PR_RENEWAL_NUMNOTIFICATION, "");
+        nvps.put(Constants.PR_RENEWAL_INTERVAL, "");
 
         try {
             NameValuePairs val = mAdmin.read(DestDef.DEST_RA_ADMIN,
@@ -162,23 +162,22 @@ public class CMSRACLMPanel extends CMSBaseTab {
     protected void populate(NameValuePairs nvps) {
         boolean renewalEnabled = false;
         boolean notificationEnabled = false;
-        for (int i=0; i<nvps.size(); i++) {
-            NameValuePair nvp = nvps.elementAt(i);
-            String name = nvp.getName();
+        for (String name : nvps.keySet()) {
+            String value = nvps.get(name);
             if (name.equals(Constants.PR_RENEWAL_ENABLED)) {
-                renewalEnabled = getBoolean(nvp.getValue());
+                renewalEnabled = getBoolean(value);
                 mRenewEnable.setSelected(renewalEnabled);
             } else if (name.equals(Constants.PR_RENEWAL_EXPIREDNOTIFIEDENABLED)) {
-                notificationEnabled = getBoolean(nvp.getValue());
+                notificationEnabled = getBoolean(value);
                 mNotifyEnable.setSelected(notificationEnabled);
             } else if (name.equals(Constants.PR_RENEWAL_VALIDITY)) {
-                mValidText.setText(nvp.getValue());                
+                mValidText.setText(value);
             } else if (name.equals(Constants.PR_RENEWAL_EMAIL)) {   
-                mEmailText.setText(nvp.getValue());
+                mEmailText.setText(value);
             } else if (name.equals(Constants.PR_RENEWAL_NUMNOTIFICATION)) {
-                mNotifiedText.setText(nvp.getValue());
+                mNotifiedText.setText(value);
             } else if (name.equals(Constants.PR_RENEWAL_INTERVAL)) {
-                mIntervalText.setText(nvp.getValue());
+                mIntervalText.setText(value);
             }
         }
 
@@ -254,7 +253,7 @@ public class CMSRACLMPanel extends CMSBaseTab {
     public boolean applyCallback() {
         NameValuePairs nvps = new NameValuePairs();
         if (mRenewEnable.isSelected()) {
-            nvps.add(Constants.PR_RENEWAL_ENABLED, Constants.TRUE);
+            nvps.put(Constants.PR_RENEWAL_ENABLED, Constants.TRUE);
             String validStr = mValidText.getText();
             try {
                 int num = Integer.parseInt(validStr);
@@ -262,12 +261,12 @@ public class CMSRACLMPanel extends CMSBaseTab {
                 showMessageDialog("NUMBERFORMAT");
                 return false;
             }
-            nvps.add(Constants.PR_RENEWAL_VALIDITY, validStr);
+            nvps.put(Constants.PR_RENEWAL_VALIDITY, validStr);
         
             if (mNotifyEnable.isSelected()) {
-                nvps.add(Constants.PR_RENEWAL_EXPIREDNOTIFIEDENABLED, 
-                  Constants.TRUE);
-                nvps.add(Constants.PR_RENEWAL_EMAIL, mEmailText.getText());
+                nvps.put(Constants.PR_RENEWAL_EXPIREDNOTIFIEDENABLED,
+                        Constants.TRUE);
+                nvps.put(Constants.PR_RENEWAL_EMAIL, mEmailText.getText());
                 String numStr = mNotifiedText.getText();
                 String intervalStr = mIntervalText.getText();
 
@@ -279,14 +278,14 @@ public class CMSRACLMPanel extends CMSBaseTab {
                     return false;
                 }
 
-                nvps.add(Constants.PR_RENEWAL_NUMNOTIFICATION, numStr);
-                nvps.add(Constants.PR_RENEWAL_INTERVAL, intervalStr);
+                nvps.put(Constants.PR_RENEWAL_NUMNOTIFICATION, numStr);
+                nvps.put(Constants.PR_RENEWAL_INTERVAL, intervalStr);
             } else {
-                nvps.add(Constants.PR_RENEWAL_EXPIREDNOTIFIEDENABLED, 
-                  Constants.FALSE);
+                nvps.put(Constants.PR_RENEWAL_EXPIREDNOTIFIEDENABLED,
+                        Constants.FALSE);
             }
         } else {
-            nvps.add(Constants.PR_RENEWAL_ENABLED, Constants.FALSE);
+            nvps.put(Constants.PR_RENEWAL_ENABLED, Constants.FALSE);
         }
 
         mModel.progressStart();
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/CMSRAConnectorPanel.java b/pki/base/console/src/com/netscape/admin/certsrv/config/CMSRAConnectorPanel.java
index 34b351ea4..7733a43d7 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/CMSRAConnectorPanel.java
+++ b/pki/base/console/src/com/netscape/admin/certsrv/config/CMSRAConnectorPanel.java
@@ -18,15 +18,12 @@
 package com.netscape.admin.certsrv.config;
 
 import com.netscape.admin.certsrv.*;
-import com.netscape.management.client.*;
 import com.netscape.management.client.util.*;
 import com.netscape.certsrv.common.*;
 import com.netscape.admin.certsrv.connection.*;
 import javax.swing.*;
-import javax.swing.border.*;
 import java.awt.*;
 import java.awt.event.*;
-import java.util.*;
 
 /**
  * RA Connector Panel
@@ -164,15 +161,15 @@ public class CMSRAConnectorPanel  extends CMSBaseTab
             JFrame frame = mModel.getFrame();
             String name = (String)mList.getSelectedValue();
             NameValuePairs nvps = new NameValuePairs();
-            nvps.add(Constants.PR_ID, "");
-            nvps.add(Constants.PR_HOST, "");
-            nvps.add(Constants.PR_PORT, "");
+            nvps.put(Constants.PR_ID, "");
+            nvps.put(Constants.PR_HOST, "");
+            nvps.put(Constants.PR_PORT, "");
             // Inserted by beomsuk
-            nvps.add(Constants.PR_TIMEOUT, "");
+            nvps.put(Constants.PR_TIMEOUT, "");
             // Insert end
-            nvps.add(Constants.PR_URI, "");
-            nvps.add(Constants.PR_LOCAL, "");
-            nvps.add(Constants.PR_ENABLE, "");
+            nvps.put(Constants.PR_URI, "");
+            nvps.put(Constants.PR_LOCAL, "");
+            nvps.put(Constants.PR_ENABLE, "");
 
             try {
                 NameValuePairs values = mAdmin.read(DestDef.DEST_RA_ADMIN,
@@ -183,7 +180,7 @@ public class CMSRAConnectorPanel  extends CMSBaseTab
  
                 boolean colocated = false;
                 if (name.equals("Data Recovery Manager Connector")) {
-                    String val = values.getValue("id");
+                    String val = values.get("id");
                     if (val != null && val.equals("kra"))
                         colocated = true;
                 }
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/CMSRAGeneralPanel.java b/pki/base/console/src/com/netscape/admin/certsrv/config/CMSRAGeneralPanel.java
index f7ed785b5..6605385b0 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/CMSRAGeneralPanel.java
+++ b/pki/base/console/src/com/netscape/admin/certsrv/config/CMSRAGeneralPanel.java
@@ -100,7 +100,7 @@ public class CMSRAGeneralPanel extends CMSBaseTab {
     public void refresh() {
         mModel.progressStart();
         NameValuePairs nvps = new NameValuePairs();
-        nvps.add(Constants.PR_EE_ENABLED, "");
+        nvps.put(Constants.PR_EE_ENABLED, "");
         //nvps.add(Constants.PR_RA_ENABLED, "");
 
         try {
@@ -118,14 +118,13 @@ public class CMSRAGeneralPanel extends CMSBaseTab {
 
     protected void populate(NameValuePairs nvps) {
         Debug.println("RA General Received: "+nvps.toString());
-        for (int i=0; i<nvps.size(); i++) {
-            NameValuePair nvp = nvps.elementAt(i);
-            String name = nvp.getName();
+        for (String name : nvps.keySet()) {
+            String value = nvps.get(name);
             if (name.equals(Constants.PR_EE_ENABLED)) {
-                mEEEnable.setSelected(getBoolean(nvp.getValue()));
+                mEEEnable.setSelected(getBoolean(value));
 /*
             } else if (name.equals(Constants.PR_RA_ENABLED)) {
-                mRAEnable.setSelected(getBoolean(nvp.getValue()));
+                mRAEnable.setSelected(getBoolean(value));
 */
             }
         }
@@ -149,9 +148,9 @@ public class CMSRAGeneralPanel extends CMSBaseTab {
         NameValuePairs nvps = new NameValuePairs();
 
         if (mEEEnable.isSelected())
-            nvps.add(Constants.PR_EE_ENABLED, Constants.TRUE);
+            nvps.put(Constants.PR_EE_ENABLED, Constants.TRUE);
         else
-            nvps.add(Constants.PR_EE_ENABLED, Constants.FALSE);
+            nvps.put(Constants.PR_EE_ENABLED, Constants.FALSE);
 
 /*
         if (mRAEnable.isSelected())
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/CMSSMTPPanel.java b/pki/base/console/src/com/netscape/admin/certsrv/config/CMSSMTPPanel.java
index 2f5aeb593..0275e3cb0 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/CMSSMTPPanel.java
+++ b/pki/base/console/src/com/netscape/admin/certsrv/config/CMSSMTPPanel.java
@@ -87,8 +87,8 @@ public class CMSSMTPPanel extends CMSBaseTab {
     public void refresh() {
         mModel.progressStart();
         NameValuePairs nvps = new NameValuePairs();
-        nvps.add(Constants.PR_SERVER_NAME, "");
-        nvps.add(Constants.PR_PORT, "");
+        nvps.put(Constants.PR_SERVER_NAME, "");
+        nvps.put(Constants.PR_PORT, "");
         try {
             NameValuePairs val = mAdmin.read(DestDef.DEST_SERVER_ADMIN,
               ScopeDef.SC_SMTP, Constants.RS_ID_CONFIG, nvps);
@@ -104,13 +104,12 @@ public class CMSSMTPPanel extends CMSBaseTab {
     }
 
     private void populate(NameValuePairs nvps) {
-        for (int i=0; i<nvps.size(); i++) {
-            NameValuePair nvp = nvps.elementAt(i);
-            String name = nvp.getName();
+        for (String name : nvps.keySet()) {
+            String value = nvps.get(name);
             if (name.equals(Constants.PR_SERVER_NAME)) {
-                mServerText.setText(nvp.getValue());
+                mServerText.setText(value);
             } else if (name.equals(Constants.PR_PORT)) {
-                mPortText.setText(nvp.getValue());
+                mPortText.setText(value);
             }
         }
     }
@@ -143,8 +142,8 @@ public class CMSSMTPPanel extends CMSBaseTab {
         }
 
         NameValuePairs nvps = new NameValuePairs();
-        nvps.add(Constants.PR_SERVER_NAME, mServerText.getText().trim());
-        nvps.add(Constants.PR_PORT, port);
+        nvps.put(Constants.PR_SERVER_NAME, mServerText.getText().trim());
+        nvps.put(Constants.PR_PORT, port);
         mModel.progressStart();
         try {
             mAdmin.modify(DestDef.DEST_SERVER_ADMIN,
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/CMSSNMPPanel.java b/pki/base/console/src/com/netscape/admin/certsrv/config/CMSSNMPPanel.java
index 8ef18cc79..b5b589eb0 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/CMSSNMPPanel.java
+++ b/pki/base/console/src/com/netscape/admin/certsrv/config/CMSSNMPPanel.java
@@ -147,13 +147,13 @@ public class CMSSNMPPanel extends CMSBaseTab {
     public void refresh() {
         mModel.progressStart();
         NameValuePairs nvps = new NameValuePairs();
-        nvps.add(Constants.PR_SNMP_ENABLED, "");
-        nvps.add(Constants.PR_SNMP_MASTER_HOST, "");
-        nvps.add(Constants.PR_SNMP_MASTER_PORT, "");
-        nvps.add(Constants.PR_SNMP_DESC, "");
-        nvps.add(Constants.PR_SNMP_ORGN, "");
-        nvps.add(Constants.PR_SNMP_LOC, "");
-        nvps.add(Constants.PR_SNMP_CONTACT, "");
+        nvps.put(Constants.PR_SNMP_ENABLED, "");
+        nvps.put(Constants.PR_SNMP_MASTER_HOST, "");
+        nvps.put(Constants.PR_SNMP_MASTER_PORT, "");
+        nvps.put(Constants.PR_SNMP_DESC, "");
+        nvps.put(Constants.PR_SNMP_ORGN, "");
+        nvps.put(Constants.PR_SNMP_LOC, "");
+        nvps.put(Constants.PR_SNMP_CONTACT, "");
 
         try {
             NameValuePairs val = mAdmin.read(DestDef.DEST_SERVER_ADMIN,
@@ -170,23 +170,22 @@ public class CMSSNMPPanel extends CMSBaseTab {
     }
 
     private void populate(NameValuePairs nvps) {
-        for (int i=0; i<nvps.size(); i++) {
-            NameValuePair nvp = nvps.elementAt(i);
-            String name = nvp.getName();
+        for (String name : nvps.keySet()) {
+            String value = nvps.get(name);
             if (name.equals(Constants.PR_SNMP_ENABLED)) {
-                mEnable.setSelected(getBoolean(nvp));                
+                mEnable.setSelected(getBoolean(value));
             } else if (name.equals(Constants.PR_SNMP_MASTER_HOST)) {
-                mHostNameText.setText(nvp.getValue());
+                mHostNameText.setText(value);
             } else if (name.equals(Constants.PR_SNMP_MASTER_PORT)) {
-                mPortText.setText(nvp.getValue());
+                mPortText.setText(value);
             } else if (name.equals(Constants.PR_SNMP_DESC)) {
-                mDescText.setText(nvp.getValue());
+                mDescText.setText(value);
             } else if (name.equals(Constants.PR_SNMP_ORGN)) {
-                mOrgnText.setText(nvp.getValue());
+                mOrgnText.setText(value);
             } else if (name.equals(Constants.PR_SNMP_LOC)) {
-                mLocText.setText(nvp.getValue());
+                mLocText.setText(value);
             } else if (name.equals(Constants.PR_SNMP_CONTACT)) {
-                mContactText.setText(nvp.getValue());
+                mContactText.setText(value);
             }
         }
 
@@ -196,8 +195,8 @@ public class CMSSNMPPanel extends CMSBaseTab {
             enableTextField(false, getBackground());
     }
 
-    public boolean getBoolean(NameValuePair nvp) {
-        if (nvp.getValue().equals(Constants.TRUE))
+    public boolean getBoolean(String value) {
+        if (value.equals(Constants.TRUE))
             return true;
         return false;
     }
@@ -261,16 +260,16 @@ public class CMSSNMPPanel extends CMSBaseTab {
 
         NameValuePairs nvps = new NameValuePairs();
         if (mEnable.isSelected())
-            nvps.add(Constants.PR_SNMP_ENABLED, Constants.TRUE);
+            nvps.put(Constants.PR_SNMP_ENABLED, Constants.TRUE);
         else
-            nvps.add(Constants.PR_SNMP_ENABLED, Constants.FALSE);
+            nvps.put(Constants.PR_SNMP_ENABLED, Constants.FALSE);
 
-        nvps.add(Constants.PR_SNMP_MASTER_HOST, mHostNameText.getText().trim());
-        nvps.add(Constants.PR_SNMP_MASTER_PORT, port);
-        nvps.add(Constants.PR_SNMP_DESC, mDescText.getText().trim()); 
-        nvps.add(Constants.PR_SNMP_ORGN, mOrgnText.getText().trim());
-        nvps.add(Constants.PR_SNMP_LOC, mLocText.getText().trim());
-        nvps.add(Constants.PR_SNMP_CONTACT, mContactText.getText().trim());
+        nvps.put(Constants.PR_SNMP_MASTER_HOST, mHostNameText.getText().trim());
+        nvps.put(Constants.PR_SNMP_MASTER_PORT, port);
+        nvps.put(Constants.PR_SNMP_DESC, mDescText.getText().trim());
+        nvps.put(Constants.PR_SNMP_ORGN, mOrgnText.getText().trim());
+        nvps.put(Constants.PR_SNMP_LOC, mLocText.getText().trim());
+        nvps.put(Constants.PR_SNMP_CONTACT, mContactText.getText().trim());
 
         mModel.progressStart();
         try {
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/CMSSelfTestsPanel.java b/pki/base/console/src/com/netscape/admin/certsrv/config/CMSSelfTestsPanel.java
index 712beb32b..ab957a69c 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/CMSSelfTestsPanel.java
+++ b/pki/base/console/src/com/netscape/admin/certsrv/config/CMSSelfTestsPanel.java
@@ -23,7 +23,6 @@ import com.netscape.certsrv.common.*;
 import com.netscape.management.client.util.*;
 import java.awt.*;
 import java.awt.event.*;
-import java.util.*;
 import javax.swing.*;
 import javax.swing.border.*;
 
@@ -147,7 +146,7 @@ public class CMSSelfTestsPanel extends CMSBaseTab
         NameValuePairs nvps = new NameValuePairs();
         NameValuePairs nvps1;
   
-        nvps.add( Constants.PR_RUN_SELFTESTS_ON_DEMAND, Constants.TRUE );
+        nvps.put(Constants.PR_RUN_SELFTESTS_ON_DEMAND, Constants.TRUE);
   
         if( evt.getSource().equals( mOnDemand ) ) {
             Debug.println( "Run self tests on-demand . . ." );
@@ -161,13 +160,14 @@ public class CMSSelfTestsPanel extends CMSBaseTab
                 // show server response
                 String responseClass = "";
                 String response = "";
-                for( int i = 0; i < nvps1.size(); i++ ) {
-                    if( i == 0 ) {
-                        responseClass = nvps1.elementAt( i ).getValue();
+                boolean first = true;
+                for (String name : nvps1.keySet()) {
+                    String value = nvps1.get(name);
+                    if (first) {
+                        first = false;
+                        responseClass = value;
                     } else {
-                        response = response
-                                 + nvps1.elementAt( i ).getValue()
-                                 + "\n";
+                        response = response + value + "\n";
                     }
                 }
 
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/CMSUserCertSettingPanel.java b/pki/base/console/src/com/netscape/admin/certsrv/config/CMSUserCertSettingPanel.java
index a4b7740f5..ca424c3a0 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/CMSUserCertSettingPanel.java
+++ b/pki/base/console/src/com/netscape/admin/certsrv/config/CMSUserCertSettingPanel.java
@@ -20,8 +20,7 @@ package com.netscape.admin.certsrv.config;
 import com.netscape.admin.certsrv.*;
 import com.netscape.certsrv.common.*;
 import com.netscape.management.client.util.*;
-import javax.swing.*;
-import java.awt.*;
+
 import java.awt.event.*;
 
 /**
@@ -77,8 +76,8 @@ public class CMSUserCertSettingPanel extends CMSCertSettingPanel {
     public void refresh() {
         _model.progressStart();
         NameValuePairs nvp = new NameValuePairs();
-        nvp.add(Constants.PR_MAPPER, "");
-        nvp.add(Constants.PR_PUBLISHER, "");
+        nvp.put(Constants.PR_MAPPER, "");
+        nvp.put(Constants.PR_PUBLISHER, "");
 
         try {
             NameValuePairs val = _admin.read(_servletName,
@@ -142,13 +141,12 @@ public class CMSUserCertSettingPanel extends CMSCertSettingPanel {
     }
 
     private void populate(NameValuePairs nvps) {
-        for (int i=0; i<nvps.size(); i++) {
-            NameValuePair nvp = nvps.elementAt(i);
-            String name = nvp.getName();
+        for (String name : nvps.keySet()) {
+            String value = nvps.get(name);
             if (name.equals(Constants.PR_MAPPER)) {
-                _mapper.setText(nvp.getValue());
+                _mapper.setText(value);
             } else if (name.equals(Constants.PR_PUBLISHER)) {
-                _publisher.setText(nvp.getValue());
+                _publisher.setText(value);
             }
         }
     }
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/CRLExtensionsRuleDataModel.java b/pki/base/console/src/com/netscape/admin/certsrv/config/CRLExtensionsRuleDataModel.java
index 15f2ca3d3..e5ae9352a 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/CRLExtensionsRuleDataModel.java
+++ b/pki/base/console/src/com/netscape/admin/certsrv/config/CRLExtensionsRuleDataModel.java
@@ -20,7 +20,6 @@ package com.netscape.admin.certsrv.config;
 import java.util.*;
 import javax.swing.*;
 import com.netscape.admin.certsrv.*;
-import com.netscape.admin.certsrv.connection.*;
 import com.netscape.certsrv.common.*;
 import com.netscape.management.client.util.Debug;
 
@@ -52,19 +51,19 @@ public class CRLExtensionsRuleDataModel extends CMSRuleDataModel
         Vector v = new Vector();
         NameValuePairs obj = (NameValuePairs) data;
 
-        if (obj.getValue(RULE_STAT).equalsIgnoreCase("enabled")) {
-            v.addElement(new JLabel(obj.getValue(RULE_NAME),
+        if (obj.get(RULE_STAT).equalsIgnoreCase("enabled")) {
+            v.addElement(new JLabel(obj.get(RULE_NAME),
                     CMSAdminUtil.getImage(CMSAdminResources.IMAGE_RULE),
                     JLabel.LEFT));
             v.addElement(mResource.getString("CRLEXTSRULE_LABEL_ENABLED_LABEL"));       
         } else {
-            v.addElement(new JLabel(obj.getValue(RULE_NAME),
+            v.addElement(new JLabel(obj.get(RULE_NAME),
                     CMSAdminUtil.getImage(CMSAdminResources.IMAGE_RULE_DISABLE),
                     JLabel.LEFT));
             v.addElement(mResource.getString("CRLEXTSRULE_LABEL_DISABLED_LABEL"));
         }
         addRow(v, data);
-        mRules.addElement(obj.getValue(RULE_NAME));
+        mRules.addElement(obj.get(RULE_NAME));
     }
 
 }
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/CRLIPEditor.java b/pki/base/console/src/com/netscape/admin/certsrv/config/CRLIPEditor.java
index ea7d78c4f..040b21b83 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/CRLIPEditor.java
+++ b/pki/base/console/src/com/netscape/admin/certsrv/config/CRLIPEditor.java
@@ -18,16 +18,12 @@
 package com.netscape.admin.certsrv.config;
 
 import com.netscape.admin.certsrv.*;
-import com.netscape.admin.certsrv.config.*;
 import com.netscape.admin.certsrv.connection.*;
 import javax.swing.*;
-import javax.swing.event.*;
-import javax.swing.table.*;
-import javax.swing.text.*;
 import java.awt.event.*;
 import java.awt.*;
 import java.util.*;
-import com.netscape.management.client.*;
+
 import com.netscape.management.client.util.*;
 import com.netscape.certsrv.common.*;
 
@@ -106,10 +102,8 @@ public class CRLIPEditor extends JDialog implements ActionListener {
 
     public void showDialog(NameValuePairs values) {
 
-        for (int i=0; i<values.size(); i++) {
-            NameValuePair nvp = values.elementAt(i);
-            String name = nvp.getName();
-            String val = nvp.getValue();
+        for (String name : values.keySet()) {
+            String val = values.get(name);
             if ((mName == null || mName.length() == 0) &&
                 name.equals(Constants.PR_ID)) {
                 mNameText.setText(val);
@@ -284,17 +278,17 @@ public class CRLIPEditor extends JDialog implements ActionListener {
             NameValuePairs nvps = new NameValuePairs();
 
             if (mName != null && mName.length() > 0) {
-                nvps.add(Constants.PR_ID, mName);
+                nvps.put(Constants.PR_ID, mName);
             } else {
-                nvps.add(Constants.PR_ID, mNameText.getText().trim());
+                nvps.put(Constants.PR_ID, mNameText.getText().trim());
             }
 
-            nvps.add(Constants.PR_DESCRIPTION, mDescText.getText().trim());
+            nvps.put(Constants.PR_DESCRIPTION, mDescText.getText().trim());
 
             if (mEnable) {
-                nvps.add(Constants.PR_ENABLED, Constants.TRUE);
+                nvps.put(Constants.PR_ENABLED, Constants.TRUE);
             } else {
-                nvps.add(Constants.PR_ENABLED, Constants.FALSE);
+                nvps.put(Constants.PR_ENABLED, Constants.FALSE);
             }
 
             try {
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/ConnectorEditor.java b/pki/base/console/src/com/netscape/admin/certsrv/config/ConnectorEditor.java
index b6b831d05..6f711eca9 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/ConnectorEditor.java
+++ b/pki/base/console/src/com/netscape/admin/certsrv/config/ConnectorEditor.java
@@ -19,16 +19,13 @@ package com.netscape.admin.certsrv.config;
 
 import com.netscape.admin.certsrv.*;
 import com.netscape.admin.certsrv.ug.*;
-import com.netscape.admin.certsrv.config.*;
 import com.netscape.admin.certsrv.connection.*;
 import javax.swing.*;
-import javax.swing.event.*;
 import javax.swing.table.*;
-import javax.swing.text.*;
 import java.awt.event.*;
 import java.awt.*;
 import java.util.*;
-import com.netscape.management.client.*;
+
 import com.netscape.management.client.util.*;
 import com.netscape.certsrv.common.*;
 
@@ -111,18 +108,17 @@ public class ConnectorEditor extends JDialog implements ActionListener, MouseLis
         if (response != null) {
             String[] vals = new String[response.size()];
             int i=0;
-            for (Enumeration e = response.getNames(); e.hasMoreElements() ;) {
-                String entry = ((String)e.nextElement()).trim();
-                vals[i++] = entry;
+            for (String entry : response.keySet()) {
+                vals[i++] = entry.trim();
             }
 
             int sindex = 0;
             String snickname = "";
-            CMSAdminUtil.quickSort(vals, 0, response.size()-1);
+            CMSAdminUtil.quickSort(vals, 0, response.size() - 1);
             for (i=0; i<vals.length; i++) {
                 Vector v = new Vector();
                 String entry = vals[i];
-                String value = response.getValue(entry);
+                String value = response.get(entry);
 
                 // look for the comma separator
                 int lastindex = entry.lastIndexOf(",");
@@ -179,17 +175,16 @@ public class ConnectorEditor extends JDialog implements ActionListener, MouseLis
 
         try {
             NameValuePairs nvps = new NameValuePairs();
-            nvps.add(Constants.PR_NICK_NAME, nickname);
-            nvps.add(Constants.PR_SERIAL_NUMBER, serialno);
-            nvps.add(Constants.PR_ISSUER_NAME, issuername);
+            nvps.put(Constants.PR_NICK_NAME, nickname);
+            nvps.put(Constants.PR_SERIAL_NUMBER, serialno);
+            nvps.put(Constants.PR_ISSUER_NAME, issuername);
             NameValuePairs results = mAdmin.process(
               DestDef.DEST_SERVER_ADMIN, ScopeDef.SC_CERT_PRETTY_PRINT,
               Constants.RS_ID_CONFIG, nvps);
             if (nvps.size() <= 0)
                 return;
-            NameValuePair nvp = results.elementAt(0);
-            String name = nvp.getName();
-            String print = nvp.getValue();
+            String name = results.keySet().iterator().next(); // first element
+            String print = results.get(name);
             CertViewDialog certdialog = new CertViewDialog(mParentFrame);
             certdialog.showDialog(nickname, print);
         } catch (EAdminException ex) {
@@ -225,10 +220,8 @@ public class ConnectorEditor extends JDialog implements ActionListener, MouseLis
 
     public void showDialog(NameValuePairs values) {
 
-        for (int i=0; i<values.size(); i++) {
-            NameValuePair nvp = values.elementAt(i);
-            String name = nvp.getName();
-            String val = nvp.getValue();
+        for (String name : values.keySet()) {
+            String val = values.get(name);
             if (name.equals(Constants.PR_HOST)) {
                 mHostText.setText(val);
             } else if (name.equals(Constants.PR_PORT)) {
@@ -568,8 +561,8 @@ public class ConnectorEditor extends JDialog implements ActionListener, MouseLis
             NameValuePairs nvps = new NameValuePairs();
             
             if (mEnable) {
-                nvps.add(Constants.PR_LOCAL, Constants.FALSE);
-                nvps.add(Constants.PR_HOST, mHostText.getText());
+                nvps.put(Constants.PR_LOCAL, Constants.FALSE);
+                nvps.put(Constants.PR_HOST, mHostText.getText());
                 String portStr = mPortText.getText().trim();
                 try {
                     int port = Integer.parseInt(portStr);
@@ -583,7 +576,7 @@ public class ConnectorEditor extends JDialog implements ActionListener, MouseLis
                       "NONINTEGER", CMSAdminUtil.ERROR_MESSAGE);
                     return;
                 }
-                nvps.add(Constants.PR_PORT, portStr);
+                nvps.put(Constants.PR_PORT, portStr);
 
                 String timeoutStr = mTimeoutText.getText().trim();
                 try {
@@ -598,19 +591,19 @@ public class ConnectorEditor extends JDialog implements ActionListener, MouseLis
                       "TIMEOUTNONINTEGER", CMSAdminUtil.ERROR_MESSAGE);
                     return;
                 }
-                nvps.add(Constants.PR_TIMEOUT, timeoutStr);
+                nvps.put(Constants.PR_TIMEOUT, timeoutStr);
                    
                 if (mName.equals("Data Recovery Manager Connector")) {
-                    nvps.add(Constants.PR_URI, "/kra/agent/kra/connector");
+                    nvps.put(Constants.PR_URI, "/kra/agent/kra/connector");
                 } else if (mName.equals("Registration Manager Connector")) {
-                    nvps.add(Constants.PR_URI, "/ra/connector");
+                    nvps.put(Constants.PR_URI, "/ra/connector");
                 } else if (mName.equals("Certificate Manager Connector")) {
-                    nvps.add(Constants.PR_URI, "/ca/connector");
+                    nvps.put(Constants.PR_URI, "/ca/connector");
                 }
-                nvps.add(Constants.PR_NICK_NAME, mNicknameText.getText().trim());
-                nvps.add(Constants.PR_ENABLED, Constants.TRUE);
+                nvps.put(Constants.PR_NICK_NAME, mNicknameText.getText().trim());
+                nvps.put(Constants.PR_ENABLED, Constants.TRUE);
             } else {
-                nvps.add(Constants.PR_ENABLED, Constants.FALSE);
+                nvps.put(Constants.PR_ENABLED, Constants.FALSE);
             }
 
             try {
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/GeneralLogPanel.java b/pki/base/console/src/com/netscape/admin/certsrv/config/GeneralLogPanel.java
index 8765f08eb..66e9b4397 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/GeneralLogPanel.java
+++ b/pki/base/console/src/com/netscape/admin/certsrv/config/GeneralLogPanel.java
@@ -17,9 +17,7 @@
 // --- END COPYRIGHT BLOCK ---
 package com.netscape.admin.certsrv.config;
 
-import com.netscape.management.client.util.*;
 import com.netscape.admin.certsrv.*;
-import com.netscape.admin.certsrv.ug.*;
 import com.netscape.certsrv.common.*;
 import com.netscape.admin.certsrv.connection.*;
 import javax.swing.*;
@@ -119,8 +117,8 @@ public class GeneralLogPanel extends CMSBaseTab {
     public void refresh() {
         mModel.progressStart();
         NameValuePairs nvps = new NameValuePairs();
-        nvps.add(Constants.PR_DEBUG_LOG_ENABLE, "true");
-        nvps.add(Constants.PR_DEBUG_LOG_LEVEL, "0");
+        nvps.put(Constants.PR_DEBUG_LOG_ENABLE, "true");
+        nvps.put(Constants.PR_DEBUG_LOG_LEVEL, "0");
         /*nvps.add(Constants.PR_DEBUG_LOG_SHOWCALLER, ""); */
 
         try {
@@ -150,21 +148,19 @@ public class GeneralLogPanel extends CMSBaseTab {
     }
 
     protected void populate(NameValuePairs nvps) {
-        String version = "";
-        for (int i=0; i<nvps.size(); i++) {
-            NameValuePair nvp = nvps.elementAt(i);
-            String name = nvp.getName();
+        for (String name : nvps.keySet()) {
+            String value = nvps.get(name);
             if (name.equals(Constants.PR_DEBUG_LOG_ENABLE)) {
-                if (nvp.getValue().equals(Constants.TRUE))
+                if (value.equals(Constants.TRUE))
                     mEnable.setSelected(true);
                 else
                     mEnable.setSelected(false);
             } else if (name.equals(Constants.PR_DEBUG_LOG_LEVEL)) {
-                mLevelText.setText(nvp.getValue());
+                mLevelText.setText(value);
             } 
 
             /* else if (name.equals(Constants.PR_DEBUG_LOG_SHOWCALLER)) {
-                if (nvp.getValue().equals(Constants.TRUE))
+                if (value.equals(Constants.TRUE))
                     mShowCaller.setSelected(true);
                 else
                     mShowCaller.setSelected(false);
@@ -213,7 +209,7 @@ public class GeneralLogPanel extends CMSBaseTab {
         }
 
         NameValuePairs nvps = new NameValuePairs();
-        nvps.add(Constants.PR_DEBUG_LOG_LEVEL, level);
+        nvps.put(Constants.PR_DEBUG_LOG_LEVEL, level);
 
         /*
         if (mShowCaller.isSelected())
@@ -223,9 +219,9 @@ public class GeneralLogPanel extends CMSBaseTab {
         */
 
         if (mEnable.isSelected())
-            nvps.add(Constants.PR_DEBUG_LOG_ENABLE, Constants.TRUE);
+            nvps.put(Constants.PR_DEBUG_LOG_ENABLE, Constants.TRUE);
         else
-            nvps.add(Constants.PR_DEBUG_LOG_ENABLE, Constants.FALSE);
+            nvps.put(Constants.PR_DEBUG_LOG_ENABLE, Constants.FALSE);
 
         mModel.progressStart();
         try {
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/JobsImplDataModel.java b/pki/base/console/src/com/netscape/admin/certsrv/config/JobsImplDataModel.java
index 76f7a73ec..d3a605433 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/JobsImplDataModel.java
+++ b/pki/base/console/src/com/netscape/admin/certsrv/config/JobsImplDataModel.java
@@ -20,7 +20,6 @@ package com.netscape.admin.certsrv.config;
 import java.util.*;
 import javax.swing.*;
 import com.netscape.admin.certsrv.*;
-import com.netscape.admin.certsrv.connection.*;
 import com.netscape.certsrv.common.*;
 
 /**
@@ -58,10 +57,10 @@ public class JobsImplDataModel extends CMSContentTableModel
     public void processData(Object data) {
         Vector v = new Vector();
         NameValuePairs obj = (NameValuePairs) data;
-        v.addElement(new JLabel(obj.getValue(IMPL_NAME),
+        v.addElement(new JLabel(obj.get(IMPL_NAME),
             CMSAdminUtil.getImage(CMSAdminResources.IMAGE_RULE_PLUGIN),
             JLabel.LEFT));
-        v.addElement(obj.getValue(IMPL_CLASS));
+        v.addElement(obj.get(IMPL_CLASS));
         //v.addElement(obj.getValue(IMPL_DESC));
         addRow(v, data);
     }
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/JobsImplTab.java b/pki/base/console/src/com/netscape/admin/certsrv/config/JobsImplTab.java
index 58628b133..57848c649 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/JobsImplTab.java
+++ b/pki/base/console/src/com/netscape/admin/certsrv/config/JobsImplTab.java
@@ -21,11 +21,10 @@ import com.netscape.admin.certsrv.*;
 import com.netscape.admin.certsrv.connection.*;
 import com.netscape.admin.certsrv.ug.*;
 import javax.swing.*;
-import javax.swing.event.*;
 import java.awt.event.*;
 import java.awt.*;
 import java.util.*;
-import com.netscape.management.client.*;
+
 import com.netscape.management.client.util.*;
 import com.netscape.certsrv.common.*;
 
@@ -110,9 +109,9 @@ public class JobsImplTab extends CMSBaseUGTab {
                     mDataModel.getObjectValueAt(mTable.getSelectedRow());    
             if (mViewer==null)
                 mViewer = new ViewDialog(mModel.getFrame());
-            mViewer.showDialog(obj.getValue(IMPL_NAME),
-                               obj.getValue(IMPL_CLASS),
-                               obj.getValue(IMPL_DESC));
+            mViewer.showDialog(obj.get(IMPL_NAME),
+                               obj.get(IMPL_CLASS),
+                               obj.get(IMPL_DESC));
         }        
         if (e.getSource().equals(mHelp)) {
             helpCallback();
@@ -264,23 +263,23 @@ public class JobsImplTab extends CMSBaseUGTab {
         //parse the data
         int i=0;
         String[] vals = new String[response.size()];
-        Hashtable data = new Hashtable();
-        for (Enumeration e = response.getNames(); e.hasMoreElements() ;) {
-            String entry = ((String)e.nextElement()).trim();
-            String value = response.getValue(entry);
+        Hashtable<String, NameValuePairs> data = new Hashtable<String, NameValuePairs>();
+        for (String entry : response.keySet()) {
+            entry = entry.trim();
+            String value = response.get(entry);
 			Debug.println("entry= "+entry);
-			Debug.println("value= "+value);
+			Debug.println("value= " + value);
             int x = value.indexOf(",");
-			Debug.println("x = "+x);
+			Debug.println("x = " + x);
             NameValuePairs obj = new NameValuePairs();
-            obj.add(IMPL_NAME,entry);
+            obj.put(IMPL_NAME, entry);
             vals[i++]= entry ;
 			if (x != -1) {
-            	obj.add(IMPL_CLASS, value.substring(0,x));
-            	obj.add(IMPL_DESC, value.substring(x+1));
+		obj.put(IMPL_CLASS, value.substring(0, x));
+		obj.put(IMPL_DESC, value.substring(x + 1));
 			}
 			else {
-				obj.add(IMPL_CLASS, value);
+				obj.put(IMPL_CLASS, value);
 			}
             data.put(entry,obj);
         }
@@ -309,7 +308,7 @@ public class JobsImplTab extends CMSBaseUGTab {
         try {
             mConnection.delete(mDestination,
                                ScopeDef.SC_JOBS_IMPLS,
-                               obj.getValue(IMPL_NAME));
+                               obj.get(IMPL_NAME));
         } catch (EAdminException e) {
             //display error dialog
             showErrorDialog(e.getMessage());
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/JobsRuleDataModel.java b/pki/base/console/src/com/netscape/admin/certsrv/config/JobsRuleDataModel.java
index e12114eb1..76fbd9a38 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/JobsRuleDataModel.java
+++ b/pki/base/console/src/com/netscape/admin/certsrv/config/JobsRuleDataModel.java
@@ -20,7 +20,6 @@ package com.netscape.admin.certsrv.config;
 import java.util.*;
 import javax.swing.*;
 import com.netscape.admin.certsrv.*;
-import com.netscape.admin.certsrv.connection.*;
 import com.netscape.certsrv.common.*;
 import com.netscape.management.client.util.Debug;
 
@@ -53,19 +52,19 @@ public class JobsRuleDataModel extends CMSRuleDataModel
         NameValuePairs obj = (NameValuePairs) data;
 
         //XXX NEED TO ADD STUFF
-        if (obj.getValue(RULE_STAT).equalsIgnoreCase("enabled")) {
-            v.addElement(new JLabel(obj.getValue(RULE_NAME),
+        if (obj.get(RULE_STAT).equalsIgnoreCase("enabled")) {
+            v.addElement(new JLabel(obj.get(RULE_NAME),
                     CMSAdminUtil.getImage(CMSAdminResources.IMAGE_RULE),
                     JLabel.LEFT));
             v.addElement(mResource.getString("JOBSRULE_LABEL_ENABLED_LABEL"));       
         } else {
-            v.addElement(new JLabel(obj.getValue(RULE_NAME),
+            v.addElement(new JLabel(obj.get(RULE_NAME),
                     CMSAdminUtil.getImage(CMSAdminResources.IMAGE_RULE_DISABLE),
                     JLabel.LEFT));
             v.addElement(mResource.getString("JOBSRULE_LABEL_DISABLED_LABEL"));
         }
         addRow(v, data);
-        mRules.addElement(obj.getValue(RULE_NAME));
+        mRules.addElement(obj.get(RULE_NAME));
     }
 
 
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/JobsSettingPanel.java b/pki/base/console/src/com/netscape/admin/certsrv/config/JobsSettingPanel.java
index b33613014..b6a93d191 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/JobsSettingPanel.java
+++ b/pki/base/console/src/com/netscape/admin/certsrv/config/JobsSettingPanel.java
@@ -19,12 +19,10 @@ package com.netscape.admin.certsrv.config;
 
 import com.netscape.admin.certsrv.*;
 import com.netscape.certsrv.common.*;
-import com.netscape.management.client.util.*;
 import com.netscape.admin.certsrv.connection.*;
-import com.netscape.admin.certsrv.config.*;
+
 import javax.swing.*;
 import java.awt.*;
-import java.util.*;
 import java.awt.event.*;
 
 /**
@@ -110,8 +108,8 @@ public class JobsSettingPanel extends CMSBaseTab implements ItemListener {
     public void refresh() {
         mModel.progressStart();
         NameValuePairs nvps = new NameValuePairs();
-		nvps.add(Constants.PR_ENABLE,"");
-        nvps.add(Constants.PR_JOBS_FREQUENCY, "");
+		nvps.put(Constants.PR_ENABLE, "");
+        nvps.put(Constants.PR_JOBS_FREQUENCY, "");
 
         try {
             NameValuePairs val = mAdmin.read(mServletName,
@@ -131,13 +129,12 @@ public class JobsSettingPanel extends CMSBaseTab implements ItemListener {
         String clientCert = "";
 
         String version = "";
-        for (int i=0; i<nvps.size(); i++) {
-            NameValuePair nvp = nvps.elementAt(i);
-            String name = nvp.getName();
+        for (String name : nvps.keySet()) {
+            String value = nvps.get(name);
             if (name.equals(Constants.PR_JOBS_FREQUENCY)) {
-                mFrequencyText.setText(nvp.getValue());
+                mFrequencyText.setText(value);
             } else if (name.equals(Constants.PR_ENABLE)) {
-                if (nvp.getValue().equals(Constants.TRUE))
+                if (value.equals(Constants.TRUE))
                     mEnable.setSelected(true);
                 else
                     mEnable.setSelected(false);
@@ -208,12 +205,12 @@ public class JobsSettingPanel extends CMSBaseTab implements ItemListener {
 
         NameValuePairs nvps = new NameValuePairs();
 		if (mEnable.isSelected())
-			nvps.add(Constants.PR_ENABLE,Constants.TRUE);
+			nvps.put(Constants.PR_ENABLE, Constants.TRUE);
 		else
-			nvps.add(Constants.PR_ENABLE,Constants.FALSE);
+			nvps.put(Constants.PR_ENABLE, Constants.FALSE);
 
         if (mEnable.isSelected()){
-            nvps.add(Constants.PR_JOBS_FREQUENCY, freq);
+            nvps.put(Constants.PR_JOBS_FREQUENCY, freq);
 		}
 
         mModel.progressStart();
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/KeyCreateDialog.java b/pki/base/console/src/com/netscape/admin/certsrv/config/KeyCreateDialog.java
index 9e6d1cf9b..5821127d4 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/KeyCreateDialog.java
+++ b/pki/base/console/src/com/netscape/admin/certsrv/config/KeyCreateDialog.java
@@ -25,9 +25,8 @@ import javax.swing.event.*;
 import java.awt.event.*;
 import java.awt.*;
 import java.util.*;
-import com.netscape.management.client.*;
+
 import com.netscape.management.client.util.*;
-import javax.swing.table.*;
 import com.netscape.certsrv.common.*;
 
 /**
@@ -285,8 +284,8 @@ public class KeyCreateDialog extends JDialog
 
             //construct NVP
             NameValuePairs config = new NameValuePairs();
-            config.add(Constants.PR_KEY_LIST, mNameField.getText());
-            config.add(Constants.PR_TOKEN_LIST, selectedToken);
+            config.put(Constants.PR_KEY_LIST, mNameField.getText());
+            config.put(Constants.PR_TOKEN_LIST, selectedToken);
 
 
 
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/LogImplDataModel.java b/pki/base/console/src/com/netscape/admin/certsrv/config/LogImplDataModel.java
index df246f2c5..a5af0b1dc 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/LogImplDataModel.java
+++ b/pki/base/console/src/com/netscape/admin/certsrv/config/LogImplDataModel.java
@@ -20,7 +20,6 @@ package com.netscape.admin.certsrv.config;
 import java.util.*;
 import javax.swing.*;
 import com.netscape.admin.certsrv.*;
-import com.netscape.admin.certsrv.connection.*;
 import com.netscape.certsrv.common.*;
 
 /**
@@ -58,10 +57,10 @@ public class LogImplDataModel extends CMSContentTableModel
     public void processData(Object data) {
         Vector v = new Vector();
         NameValuePairs obj = (NameValuePairs) data;
-        v.addElement(new JLabel(obj.getValue(IMPL_NAME),
+        v.addElement(new JLabel(obj.get(IMPL_NAME),
             CMSAdminUtil.getImage(CMSAdminResources.IMAGE_RULE_PLUGIN),
             JLabel.LEFT));
-        v.addElement(obj.getValue(IMPL_CLASS));
+        v.addElement(obj.get(IMPL_CLASS));
         //v.addElement(obj.getValue(IMPL_DESC));
         addRow(v, data);
     }
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/LogImplTab.java b/pki/base/console/src/com/netscape/admin/certsrv/config/LogImplTab.java
index 984e2cb21..1b654fead 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/LogImplTab.java
+++ b/pki/base/console/src/com/netscape/admin/certsrv/config/LogImplTab.java
@@ -21,11 +21,10 @@ import com.netscape.admin.certsrv.*;
 import com.netscape.admin.certsrv.connection.*;
 import com.netscape.admin.certsrv.ug.*;
 import javax.swing.*;
-import javax.swing.event.*;
 import java.awt.event.*;
 import java.awt.*;
 import java.util.*;
-import com.netscape.management.client.*;
+
 import com.netscape.management.client.util.*;
 import com.netscape.certsrv.common.*;
 
@@ -110,9 +109,9 @@ public class LogImplTab extends CMSBaseUGTab {
                     mDataModel.getObjectValueAt(mTable.getSelectedRow());    
             if (mViewer==null)
                 mViewer = new ViewDialog(mModel.getFrame());
-            mViewer.showDialog(obj.getValue(IMPL_NAME),
-                               obj.getValue(IMPL_CLASS),
-                               obj.getValue(IMPL_DESC));
+            mViewer.showDialog(obj.get(IMPL_NAME),
+                               obj.get(IMPL_CLASS),
+                               obj.get(IMPL_DESC));
         }        
         if (e.getSource().equals(mHelp)) {
             helpCallback();
@@ -264,16 +263,16 @@ public class LogImplTab extends CMSBaseUGTab {
         //parse the data
         int i=0;
         String[] vals = new String[response.size()];
-        Hashtable data = new Hashtable();
-        for (Enumeration e = response.getNames(); e.hasMoreElements() ;) {
-            String entry = ((String)e.nextElement()).trim();
-            String value = response.getValue(entry);
+        Hashtable<String, NameValuePairs> data = new Hashtable<String, NameValuePairs>();
+        for (String entry : response.keySet()) {
+            entry = entry.trim();
+            String value = response.get(entry);
             int x = value.indexOf(",");
             NameValuePairs obj = new NameValuePairs();
-            obj.add(IMPL_NAME,entry);
+            obj.put(IMPL_NAME, entry);
             vals[i++]= entry ;
-            obj.add(IMPL_CLASS, value.substring(0,x));
-            obj.add(IMPL_DESC, value.substring(x+1));
+            obj.put(IMPL_CLASS, value.substring(0, x));
+            obj.put(IMPL_DESC, value.substring(x + 1));
             data.put(entry,obj);
         }
         
@@ -301,7 +300,7 @@ public class LogImplTab extends CMSBaseUGTab {
         try {
             mConnection.delete(mDestination,
                                ScopeDef.SC_LOG_IMPLS,
-                               obj.getValue(IMPL_NAME));
+                               obj.get(IMPL_NAME));
         } catch (EAdminException e) {
             //display error dialog
             showErrorDialog(e.getMessage());
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/LogRuleDataModel.java b/pki/base/console/src/com/netscape/admin/certsrv/config/LogRuleDataModel.java
index 57b7b0471..1a64226f0 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/LogRuleDataModel.java
+++ b/pki/base/console/src/com/netscape/admin/certsrv/config/LogRuleDataModel.java
@@ -20,7 +20,6 @@ package com.netscape.admin.certsrv.config;
 import java.util.*;
 import javax.swing.*;
 import com.netscape.admin.certsrv.*;
-import com.netscape.admin.certsrv.connection.*;
 import com.netscape.certsrv.common.*;
 import com.netscape.management.client.util.Debug;
 
@@ -52,10 +51,10 @@ public class LogRuleDataModel extends CMSRuleDataModel
         Vector v = new Vector();
         NameValuePairs obj = (NameValuePairs) data;
 
-        v.addElement(new JLabel(obj.getValue(RULE_NAME),
+        v.addElement(new JLabel(obj.get(RULE_NAME),
                   CMSAdminUtil.getImage(CMSAdminResources.IMAGE_RULE),
                   JLabel.LEFT));
-        v.addElement(obj.getValue(RULE_IMPL));
+        v.addElement(obj.get(RULE_IMPL));
         addRow(v, data);
     }
 
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/MNSchemeWizardInfo.java b/pki/base/console/src/com/netscape/admin/certsrv/config/MNSchemeWizardInfo.java
index fd2fe0843..8d90914b3 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/MNSchemeWizardInfo.java
+++ b/pki/base/console/src/com/netscape/admin/certsrv/config/MNSchemeWizardInfo.java
@@ -17,12 +17,9 @@
 // --- END COPYRIGHT BLOCK ---
 package com.netscape.admin.certsrv.config;
 
-import java.awt.*;
-import javax.swing.*;
 import com.netscape.admin.certsrv.*;
 import com.netscape.admin.certsrv.connection.*;
 import com.netscape.admin.certsrv.wizard.*;
-import com.netscape.management.client.util.*;
 import com.netscape.certsrv.common.*;
 
 /**
@@ -95,16 +92,16 @@ public class MNSchemeWizardInfo extends WizardInfo {
     public void changeScheme() throws EAdminException {
 
         NameValuePairs param = new NameValuePairs();
-        param.add(Constants.PR_RECOVERY_M, (String)get(Constants.PR_RECOVERY_M));
-        param.add(Constants.PR_RECOVERY_N, (String)get(Constants.PR_RECOVERY_N));
-        param.add(Constants.PR_RECOVERY_AGENT, (String)get(Constants.PR_RECOVERY_AGENT));
-        param.add(Constants.PR_OLD_RECOVERY_AGENT, (String)get(Constants.PR_OLD_RECOVERY_AGENT));
+        param.put(Constants.PR_RECOVERY_M, (String) get(Constants.PR_RECOVERY_M));
+        param.put(Constants.PR_RECOVERY_N, (String) get(Constants.PR_RECOVERY_N));
+        param.put(Constants.PR_RECOVERY_AGENT, (String) get(Constants.PR_RECOVERY_AGENT));
+        param.put(Constants.PR_OLD_RECOVERY_AGENT, (String) get(Constants.PR_OLD_RECOVERY_AGENT));
 
         mConnection.modify(DestDef.DEST_KRA_ADMIN,
                                ScopeDef.SC_MNSCHEME,
                                Constants.RS_ID_CONFIG,
                                param);
 
-        //param.removeAllPairs();
+        //param.clear();
     }
 }
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/MapperImplDataModel.java b/pki/base/console/src/com/netscape/admin/certsrv/config/MapperImplDataModel.java
index 50728b13d..23d6ee0b4 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/MapperImplDataModel.java
+++ b/pki/base/console/src/com/netscape/admin/certsrv/config/MapperImplDataModel.java
@@ -20,7 +20,6 @@ package com.netscape.admin.certsrv.config;
 import java.util.*;
 import javax.swing.*;
 import com.netscape.admin.certsrv.*;
-import com.netscape.admin.certsrv.connection.*;
 import com.netscape.certsrv.common.*;
 
 /**
@@ -58,10 +57,10 @@ public class MapperImplDataModel extends CMSContentTableModel
     public void processData(Object data) {
         Vector v = new Vector();
         NameValuePairs obj = (NameValuePairs) data;
-        v.addElement(new JLabel(obj.getValue(IMPL_NAME),
+        v.addElement(new JLabel(obj.get(IMPL_NAME),
             CMSAdminUtil.getImage(CMSAdminResources.IMAGE_RULE_PLUGIN),
             JLabel.LEFT));
-        v.addElement(obj.getValue(IMPL_CLASS));
+        v.addElement(obj.get(IMPL_CLASS));
         //v.addElement(obj.getValue(IMPL_DESC));
         addRow(v, data);
     }
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/MapperImplTab.java b/pki/base/console/src/com/netscape/admin/certsrv/config/MapperImplTab.java
index 66d4ba4ce..2ad54da60 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/MapperImplTab.java
+++ b/pki/base/console/src/com/netscape/admin/certsrv/config/MapperImplTab.java
@@ -21,11 +21,10 @@ import com.netscape.admin.certsrv.*;
 import com.netscape.admin.certsrv.connection.*;
 import com.netscape.admin.certsrv.ug.*;
 import javax.swing.*;
-import javax.swing.event.*;
 import java.awt.event.*;
 import java.awt.*;
 import java.util.*;
-import com.netscape.management.client.*;
+
 import com.netscape.management.client.util.*;
 import com.netscape.certsrv.common.*;
 
@@ -115,9 +114,9 @@ public class MapperImplTab extends CMSBaseUGTab {
                     mDataModel.getObjectValueAt(mTable.getSelectedRow());    
             if (mViewer==null)
                 mViewer = new ViewDialog(mModel.getFrame());
-            mViewer.showDialog(obj.getValue(IMPL_NAME),
-                               obj.getValue(IMPL_CLASS),
-                               obj.getValue(IMPL_DESC));
+            mViewer.showDialog(obj.get(IMPL_NAME),
+                               obj.get(IMPL_CLASS),
+                               obj.get(IMPL_DESC));
         }        
         if (e.getSource().equals(mHelp)) {
             helpCallback();
@@ -269,16 +268,16 @@ public class MapperImplTab extends CMSBaseUGTab {
         //parse the data
         int i=0;
         String[] vals = new String[response.size()];
-        Hashtable data = new Hashtable();
-        for (Enumeration e = response.getNames(); e.hasMoreElements() ;) {
-            String entry = ((String)e.nextElement()).trim();
-            String value = response.getValue(entry);
+        Hashtable<String, NameValuePairs> data = new Hashtable<String, NameValuePairs>();
+        for (String entry : response.keySet()) {
+            entry = entry.trim();
+            String value = response.get(entry);
             int x = value.indexOf(",");
             NameValuePairs obj = new NameValuePairs();
-            obj.add(IMPL_NAME,entry);
+            obj.put(IMPL_NAME, entry);
             vals[i++]= entry ;
-            obj.add(IMPL_CLASS, value.substring(0,x));
-            obj.add(IMPL_DESC, value.substring(x+1));
+            obj.put(IMPL_CLASS, value.substring(0, x));
+            obj.put(IMPL_DESC, value.substring(x + 1));
             data.put(entry,obj);
         }
         
@@ -306,7 +305,7 @@ public class MapperImplTab extends CMSBaseUGTab {
         try {
             mConnection.delete(mDestination,
                                ScopeDef.SC_MAPPER_IMPLS,
-                               obj.getValue(IMPL_NAME));
+                               obj.get(IMPL_NAME));
         } catch (EAdminException e) {
             //display error dialog
             showErrorDialog(e.getMessage());
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/MapperRuleDataModel.java b/pki/base/console/src/com/netscape/admin/certsrv/config/MapperRuleDataModel.java
index 1235fcc14..a72b59f7c 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/MapperRuleDataModel.java
+++ b/pki/base/console/src/com/netscape/admin/certsrv/config/MapperRuleDataModel.java
@@ -20,7 +20,6 @@ package com.netscape.admin.certsrv.config;
 import java.util.*;
 import javax.swing.*;
 import com.netscape.admin.certsrv.*;
-import com.netscape.admin.certsrv.connection.*;
 import com.netscape.certsrv.common.*;
 import com.netscape.management.client.util.Debug;
 
@@ -52,10 +51,10 @@ public class MapperRuleDataModel extends CMSRuleDataModel
         Vector v = new Vector();
         NameValuePairs obj = (NameValuePairs) data;
 
-        v.addElement(new JLabel(obj.getValue(RULE_NAME),
+        v.addElement(new JLabel(obj.get(RULE_NAME),
                   CMSAdminUtil.getImage(CMSAdminResources.IMAGE_RULE),
                   JLabel.LEFT));
-        v.addElement(obj.getValue(RULE_IMPL));
+        v.addElement(obj.get(RULE_IMPL));
         addRow(v, data);
     }
 
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/OCSPStoresInstanceTab.java b/pki/base/console/src/com/netscape/admin/certsrv/config/OCSPStoresInstanceTab.java
index f48339b25..ff234c7fd 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/OCSPStoresInstanceTab.java
+++ b/pki/base/console/src/com/netscape/admin/certsrv/config/OCSPStoresInstanceTab.java
@@ -19,13 +19,10 @@ package com.netscape.admin.certsrv.config;
 
 import com.netscape.admin.certsrv.*;
 import com.netscape.admin.certsrv.connection.*;
-import com.netscape.admin.certsrv.ug.*;
+
 import javax.swing.*;
-import javax.swing.event.*;
 import java.awt.event.*;
-import java.awt.*;
-import java.util.*;
-import com.netscape.management.client.*;
+
 import com.netscape.management.client.util.*;
 import com.netscape.certsrv.common.*;
 
@@ -118,7 +115,7 @@ public class OCSPStoresInstanceTab extends CMSPluginInstanceTab {
         try {
             mConnection.modify(DestDef.DEST_OCSP_ADMIN,
                                ScopeDef.SC_OCSPSTORE_DEFAULT,
-                               data.getValue(RULE_NAME), nvps);
+                               data.get(RULE_NAME), nvps);
         } catch (EAdminException e) {
             //display error dialog
             showErrorDialog(e.getMessage());
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/OCSPStoresRuleDataModel.java b/pki/base/console/src/com/netscape/admin/certsrv/config/OCSPStoresRuleDataModel.java
index 30211b689..5cd67e276 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/OCSPStoresRuleDataModel.java
+++ b/pki/base/console/src/com/netscape/admin/certsrv/config/OCSPStoresRuleDataModel.java
@@ -20,7 +20,6 @@ package com.netscape.admin.certsrv.config;
 import java.util.*;
 import javax.swing.*;
 import com.netscape.admin.certsrv.*;
-import com.netscape.admin.certsrv.connection.*;
 import com.netscape.certsrv.common.*;
 import com.netscape.management.client.util.Debug;
 
@@ -52,19 +51,19 @@ public class OCSPStoresRuleDataModel extends CMSRuleDataModel
         Vector v = new Vector();
         NameValuePairs obj = (NameValuePairs) data;
 
-        if (obj.getValue(RULE_STAT).equalsIgnoreCase("enabled")) {
-            v.addElement(new JLabel(obj.getValue(RULE_NAME),
+        if (obj.get(RULE_STAT).equalsIgnoreCase("enabled")) {
+            v.addElement(new JLabel(obj.get(RULE_NAME),
                     CMSAdminUtil.getImage(CMSAdminResources.IMAGE_RULE),
                     JLabel.LEFT));
             v.addElement(mResource.getString("OCSPSTORESRULE_LABEL_ENABLED_LABEL"));       
         } else {
-            v.addElement(new JLabel(obj.getValue(RULE_NAME),
+            v.addElement(new JLabel(obj.get(RULE_NAME),
                     CMSAdminUtil.getImage(CMSAdminResources.IMAGE_RULE_DISABLE),
                     JLabel.LEFT));
             v.addElement(mResource.getString("OCSPSTORESRULE_LABEL_DISABLED_LABEL"));
         }
         addRow(v, data);
-        mRules.addElement(obj.getValue(RULE_NAME));
+        mRules.addElement(obj.get(RULE_NAME));
     }
 
 }
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/PanelMapperConfigDialog.java b/pki/base/console/src/com/netscape/admin/certsrv/config/PanelMapperConfigDialog.java
index f3db6374a..5de06c7f9 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/PanelMapperConfigDialog.java
+++ b/pki/base/console/src/com/netscape/admin/certsrv/config/PanelMapperConfigDialog.java
@@ -20,13 +20,12 @@ package com.netscape.admin.certsrv.config;
 import com.netscape.admin.certsrv.*;
 import com.netscape.admin.certsrv.connection.*;
 import javax.swing.*;
-import javax.swing.event.*;
 import javax.swing.table.*;
 import javax.swing.text.*;
 import java.awt.event.*;
 import java.awt.*;
 import java.util.*;
-import com.netscape.management.client.*;
+
 import com.netscape.management.client.util.*;
 import com.netscape.certsrv.common.*;
 
@@ -207,8 +206,8 @@ public class PanelMapperConfigDialog extends JDialog
         Debug.println("MapperList: "+response.toString());
         mSelection.removeAllItems();
         
-        for (Enumeration e = response.getNames(); e.hasMoreElements() ;) {
-            mSelection.addItem(((String)e.nextElement()).trim());
+        for (String name : response.keySet()) {
+            mSelection.addItem(name.trim());
         }
         
         mSelection.setSelectedItem(mapperName);
@@ -230,11 +229,11 @@ public class PanelMapperConfigDialog extends JDialog
 
         mDataModel.removeAllRows();
         
-        for (Enumeration e = mData.getNames(); e.hasMoreElements() ;) {
-            String entry = ((String)e.nextElement()).trim();
+        for (String entry : mData.keySet()) {
+            entry = entry.trim();
             if (!entry.equals(Constants.PR_MAPPER)) {
-                String value = mData.getValue(entry);
-                Vector v = new Vector();
+                String value = mData.get(entry);
+                Vector<String> v = new Vector<String>();
                 v.addElement(entry);
                 v.addElement(value);
                 mDataModel.addRow(v);
@@ -369,15 +368,15 @@ public class PanelMapperConfigDialog extends JDialog
     //save the configuration settings for the mapper
     private void saveConfiguration() throws EAdminException {
         NameValuePairs nvp = getData();
-        nvp.add(Constants.PR_MAPPER, (String)mSelection.getSelectedItem());
+        nvp.put(Constants.PR_MAPPER, (String) mSelection.getSelectedItem());
         mConn.modify(mDest, mScope, Constants.RS_ID_CONFIG, nvp);
     }
 
     private NameValuePairs getData() {
         NameValuePairs response = new NameValuePairs();
         for (int i=0; i< mDataModel.getRowCount(); i++) {
-            response.add((String)mDataModel.getValueAt(i,0),
-                         (String)mDataModel.getValueAt(i,1));
+            response.put((String) mDataModel.getValueAt(i, 0),
+                    (String) mDataModel.getValueAt(i, 1));
         }
         return response;
     }
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/PluginSelectionDialog.java b/pki/base/console/src/com/netscape/admin/certsrv/config/PluginSelectionDialog.java
index c88251f0b..437881186 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/PluginSelectionDialog.java
+++ b/pki/base/console/src/com/netscape/admin/certsrv/config/PluginSelectionDialog.java
@@ -20,11 +20,10 @@ package com.netscape.admin.certsrv.config;
 import com.netscape.admin.certsrv.*;
 import com.netscape.admin.certsrv.connection.*;
 import javax.swing.*;
-import javax.swing.event.*;
 import java.awt.event.*;
 import java.awt.*;
 import java.util.*;
-import com.netscape.management.client.*;
+
 import com.netscape.management.client.util.*;
 import com.netscape.certsrv.common.*;
 
@@ -163,7 +162,7 @@ public class PluginSelectionDialog extends JDialog
             }
             Debug.println(response.toString());
             String id = ((JLabel)mDataModel.elementAt(mList.getSelectedIndex())).getText();
-            response.add(Constants.PR_POLICY_IMPL_NAME,id);
+            response.put(Constants.PR_POLICY_IMPL_NAME, id);
 
             CMSBaseConfigDialog dialog = null;
             if (mExtraDestination == null) {
@@ -338,9 +337,9 @@ public class PluginSelectionDialog extends JDialog
         //parse the data
         String[] vals = new String[response.size()];
         int i=0;
-        for (Enumeration e = response.getNames(); e.hasMoreElements() ;) {
-            vals[i++] = ((String)e.nextElement()).trim();
-			Debug.println("PluginSelectionDialog::update() - adding '"+vals[i-1]+"'");
+        for (String name : response.keySet()) {
+            vals[i++] = name.trim();
+			Debug.println("PluginSelectionDialog::update() - adding '" + vals[i - 1] + "'");
         }
         
         CMSAdminUtil.bubbleSort(vals);
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/PolicyImplDataModel.java b/pki/base/console/src/com/netscape/admin/certsrv/config/PolicyImplDataModel.java
index 8ac219345..59ea36ec8 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/PolicyImplDataModel.java
+++ b/pki/base/console/src/com/netscape/admin/certsrv/config/PolicyImplDataModel.java
@@ -20,7 +20,6 @@ package com.netscape.admin.certsrv.config;
 import java.util.*;
 import javax.swing.*;
 import com.netscape.admin.certsrv.*;
-import com.netscape.admin.certsrv.connection.*;
 import com.netscape.certsrv.common.*;
 
 /**
@@ -58,10 +57,10 @@ public class PolicyImplDataModel extends CMSContentTableModel
     public void processData(Object data) {
         Vector v = new Vector();
         NameValuePairs obj = (NameValuePairs) data;
-        v.addElement(new JLabel(obj.getValue(IMPL_NAME),
+        v.addElement(new JLabel(obj.get(IMPL_NAME),
             CMSAdminUtil.getImage(CMSAdminResources.IMAGE_RULE_PLUGIN),
             JLabel.LEFT));
-        v.addElement(obj.getValue(IMPL_CLASS));
+        v.addElement(obj.get(IMPL_CLASS));
         //v.addElement(obj.getValue(IMPL_DESC));
         addRow(v, data);
     }
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/PolicyImplTab.java b/pki/base/console/src/com/netscape/admin/certsrv/config/PolicyImplTab.java
index 8e89dcf45..f4fab7260 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/PolicyImplTab.java
+++ b/pki/base/console/src/com/netscape/admin/certsrv/config/PolicyImplTab.java
@@ -21,11 +21,10 @@ import com.netscape.admin.certsrv.*;
 import com.netscape.admin.certsrv.connection.*;
 import com.netscape.admin.certsrv.ug.*;
 import javax.swing.*;
-import javax.swing.event.*;
 import java.awt.event.*;
 import java.awt.*;
 import java.util.*;
-import com.netscape.management.client.*;
+
 import com.netscape.management.client.util.*;
 import com.netscape.certsrv.common.*;
 
@@ -117,9 +116,9 @@ public class PolicyImplTab extends CMSBaseUGTab {
                     mDataModel.getObjectValueAt(mTable.getSelectedRow());    
             if (mViewer==null)
                 mViewer = new ViewDialog(mModel.getFrame());
-            mViewer.showDialog(obj.getValue(IMPL_NAME),
-                               obj.getValue(IMPL_CLASS),
-                               obj.getValue(IMPL_DESC));
+            mViewer.showDialog(obj.get(IMPL_NAME),
+                               obj.get(IMPL_CLASS),
+                               obj.get(IMPL_DESC));
         }        
         if (e.getSource().equals(mHelp)) {
             helpCallback();
@@ -271,16 +270,16 @@ public class PolicyImplTab extends CMSBaseUGTab {
         //parse the data
         int i=0;
         String[] vals = new String[response.size()];
-        Hashtable data = new Hashtable();
-        for (Enumeration e = response.getNames(); e.hasMoreElements() ;) {
-            String entry = ((String)e.nextElement()).trim();
-            String value = response.getValue(entry);
+        Hashtable<String, NameValuePairs> data = new Hashtable<String, NameValuePairs>();
+        for (String entry : response.keySet()) {
+            entry = entry.trim();
+            String value = response.get(entry);
             int x = value.indexOf(",");
             NameValuePairs obj = new NameValuePairs();
-            obj.add(IMPL_NAME,entry);
+            obj.put(IMPL_NAME, entry);
             vals[i++]= entry ;
-            obj.add(IMPL_CLASS, value.substring(0,x));
-            obj.add(IMPL_DESC, value.substring(x+1));
+            obj.put(IMPL_CLASS, value.substring(0, x));
+            obj.put(IMPL_DESC, value.substring(x + 1));
             data.put(entry,obj);
         }
         
@@ -308,7 +307,7 @@ public class PolicyImplTab extends CMSBaseUGTab {
         try {
             mConnection.delete(mDestination,
                                ScopeDef.SC_POLICY_IMPLS,
-                               obj.getValue(IMPL_NAME));
+                               obj.get(IMPL_NAME));
         } catch (EAdminException e) {
             //display error dialog
             showErrorDialog(e.getMessage());
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/PolicyRuleDataModel.java b/pki/base/console/src/com/netscape/admin/certsrv/config/PolicyRuleDataModel.java
index e379b53e9..9bbeda334 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/PolicyRuleDataModel.java
+++ b/pki/base/console/src/com/netscape/admin/certsrv/config/PolicyRuleDataModel.java
@@ -20,7 +20,6 @@ package com.netscape.admin.certsrv.config;
 import java.util.*;
 import javax.swing.*;
 import com.netscape.admin.certsrv.*;
-import com.netscape.admin.certsrv.connection.*;
 import com.netscape.certsrv.common.*;
 import com.netscape.management.client.util.Debug;
 
@@ -53,19 +52,19 @@ public class PolicyRuleDataModel extends CMSRuleDataModel
         NameValuePairs obj = (NameValuePairs) data;
 
         //XXX NEED TO ADD STUFF
-        if (obj.getValue(RULE_STAT).equalsIgnoreCase("enabled")) {
-            v.addElement(new JLabel(obj.getValue(RULE_NAME),
+        if (obj.get(RULE_STAT).equalsIgnoreCase("enabled")) {
+            v.addElement(new JLabel(obj.get(RULE_NAME),
                     CMSAdminUtil.getImage(CMSAdminResources.IMAGE_RULE),
                     JLabel.LEFT));
             v.addElement(mResource.getString("POLICYRULE_LABEL_ENABLED_LABEL"));       
         } else {
-            v.addElement(new JLabel(obj.getValue(RULE_NAME),
+            v.addElement(new JLabel(obj.get(RULE_NAME),
                     CMSAdminUtil.getImage(CMSAdminResources.IMAGE_RULE_DISABLE),
                     JLabel.LEFT));
             v.addElement(mResource.getString("POLICYRULE_LABEL_DISABLED_LABEL"));
         }
         addRow(v, data);
-        mRules.addElement(obj.getValue(RULE_NAME));
+        mRules.addElement(obj.get(RULE_NAME));
     }
 
 
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/PolicyRuleOrderDialog.java b/pki/base/console/src/com/netscape/admin/certsrv/config/PolicyRuleOrderDialog.java
index ec7394d4e..1c99d999f 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/PolicyRuleOrderDialog.java
+++ b/pki/base/console/src/com/netscape/admin/certsrv/config/PolicyRuleOrderDialog.java
@@ -20,11 +20,10 @@ package com.netscape.admin.certsrv.config;
 import com.netscape.admin.certsrv.*;
 import com.netscape.admin.certsrv.connection.*;
 import javax.swing.*;
-import javax.swing.event.*;
 import java.awt.event.*;
 import java.awt.*;
 import java.util.*;
-import com.netscape.management.client.*;
+
 import com.netscape.management.client.util.*;
 import com.netscape.certsrv.common.*;
 
@@ -285,7 +284,7 @@ public class PolicyRuleOrderDialog extends JDialog
         }
         
         NameValuePairs nvp = new NameValuePairs();
-        nvp.add(Constants.PR_POLICY_ORDER, buf.toString());
+        nvp.put(Constants.PR_POLICY_ORDER, buf.toString());
         
         Debug.println("ORDER: "+buf.toString());
         
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/ProfileConfigDialog.java b/pki/base/console/src/com/netscape/admin/certsrv/config/ProfileConfigDialog.java
index f83a7457c..a8d312d2a 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/ProfileConfigDialog.java
+++ b/pki/base/console/src/com/netscape/admin/certsrv/config/ProfileConfigDialog.java
@@ -20,13 +20,10 @@ package com.netscape.admin.certsrv.config;
 import com.netscape.admin.certsrv.*;
 import com.netscape.admin.certsrv.connection.*;
 import javax.swing.*;
-import javax.swing.event.*;
-import javax.swing.table.*;
-import javax.swing.text.*;
 import java.awt.event.*;
 import java.awt.*;
 import java.util.*;
-import com.netscape.management.client.*;
+
 import com.netscape.management.client.util.*;
 import com.netscape.certsrv.common.*;
 
@@ -367,11 +364,11 @@ public class ProfileConfigDialog extends CMSBaseConfigDialog
                 if (mModel != null) { mModel.progressStart(); }
 
                 String instanceName = mPluginName.getText();
-                nvp.add("impl", mImplName.getText());
-                nvp.add("name", mNameField.getText());
-                nvp.add("visible", (String)(mVisibleField.getSelectedItem()));
-                nvp.add("auth", mAuthField.getText());
-                nvp.add("desc", mDescField.getText());
+                nvp.put("impl", mImplName.getText());
+                nvp.put("name", mNameField.getText());
+                nvp.put("visible", (String) (mVisibleField.getSelectedItem()));
+                nvp.put("auth", mAuthField.getText());
+                nvp.put("desc", mDescField.getText());
            //     nvp.add("config", mConfigField.getText());
                // mAdminConnection.add(DestDef.DEST_CA_PROFILE_ADMIN, 
                 mAdminConnection.add(mDest,
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/ProfileEditDialog.java b/pki/base/console/src/com/netscape/admin/certsrv/config/ProfileEditDialog.java
index 0a3ceebe2..d10e19215 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/ProfileEditDialog.java
+++ b/pki/base/console/src/com/netscape/admin/certsrv/config/ProfileEditDialog.java
@@ -21,12 +21,10 @@ import com.netscape.admin.certsrv.*;
 import com.netscape.admin.certsrv.connection.*;
 import javax.swing.*;
 import javax.swing.event.*;
-import javax.swing.table.*;
-import javax.swing.text.*;
 import java.awt.event.*;
 import java.awt.*;
 import java.util.*;
-import com.netscape.management.client.*;
+
 import com.netscape.management.client.util.*;
 import com.netscape.certsrv.common.*;
 
@@ -684,11 +682,11 @@ public class ProfileEditDialog extends CMSBaseConfigDialog
                     mModel.progressStart();
 
                 String instanceName = mPluginName.getText();
-                nvp.add("impl", mImplName.getText());
-                nvp.add("name", mNameField.getText());
-                nvp.add("desc", mDescField.getText());
-                nvp.add("visible", (String)(mVisibleField.getSelectedItem()));
-                nvp.add("auth", mAuthField.getText());
+                nvp.put("impl", mImplName.getText());
+                nvp.put("name", mNameField.getText());
+                nvp.put("desc", mDescField.getText());
+                nvp.put("visible", (String) (mVisibleField.getSelectedItem()));
+                nvp.put("auth", mAuthField.getText());
         //      nvp.add("config", mConfigField.getText());
 
 /*
@@ -719,7 +717,7 @@ public class ProfileEditDialog extends CMSBaseConfigDialog
     private void deletePolicy(String profileId, String policyId) 
       throws EAdminException{
         NameValuePairs nvps = new NameValuePairs();
-        nvps.add("POLICYID", policyId);
+        nvps.put("POLICYID", policyId);
         //mAdminConnection.delete(DestDef.DEST_CA_PROFILE_ADMIN,
         mAdminConnection.delete(mDest,
           ScopeDef.SC_PROFILE_POLICIES, profileId, nvps);
@@ -728,7 +726,7 @@ public class ProfileEditDialog extends CMSBaseConfigDialog
     private void deleteInput(String profileId, String inputId)
       throws EAdminException{
         NameValuePairs nvps = new NameValuePairs();
-        nvps.add("INPUTID", inputId);
+        nvps.put("INPUTID", inputId);
         //mAdminConnection.delete(DestDef.DEST_CA_PROFILE_ADMIN,
         mAdminConnection.delete(mDest,
           ScopeDef.SC_PROFILE_INPUT, profileId, nvps);
@@ -737,7 +735,7 @@ public class ProfileEditDialog extends CMSBaseConfigDialog
     private void deleteOutput(String profileId, String outputId)
       throws EAdminException{
         NameValuePairs nvps = new NameValuePairs();
-        nvps.add("OUTPUTID", outputId);
+        nvps.put("OUTPUTID", outputId);
         //mAdminConnection.delete(DestDef.DEST_CA_PROFILE_ADMIN,
         mAdminConnection.delete(mDest,
           ScopeDef.SC_PROFILE_OUTPUT, profileId, nvps);
@@ -769,17 +767,17 @@ public class ProfileEditDialog extends CMSBaseConfigDialog
         } 
         mModel.progressStop();
 
-            String enable = response.getValue("enable");
+            String enable = response.get("enable");
 
 	    if (response != null) {
         	mPluginName.setEnabled(false); 
                 mPluginName.setBackground(getBackground());
         	mPluginName.setText(name);
-        	mNameField.setText(response.getValue("name"));
-      		mDescField.setText(response.getValue("desc"));
-      		mAuthField.setText(response.getValue("auth"));
-      		mVisibleField.setSelectedItem(response.getValue("visible"));
-      		mImplName.setText(response.getValue("plugin"));
+		mNameField.setText(response.get("name"));
+		mDescField.setText(response.get("desc"));
+		mAuthField.setText(response.get("auth"));
+		mVisibleField.setSelectedItem(response.get("visible"));
+		mImplName.setText(response.get("plugin"));
  //     		mConfigField.setText(response.getValue("config"));
 	    }
             if (enable != null && enable.equals("true")) {
@@ -870,29 +868,27 @@ public class ProfileEditDialog extends CMSBaseConfigDialog
     }
 
     private void populatePolicies(NameValuePairs response, JTable table) {
-        Vector colNames = new Vector();
+        Vector<String> colNames = new Vector<String>();
         colNames.addElement("Set Id");
         colNames.addElement("Id");
         colNames.addElement("Defaults");
         colNames.addElement("Constraints");
-        Vector d = new Vector();
+        Vector<Vector<String>> d = new Vector<Vector<String>>();
 
-        Enumeration e = response.getNames();
-        if (e != null) {
-          for (; e.hasMoreElements() ;) {
-            String entry = ((String)e.nextElement()).trim();
-            String value = response.getValue(entry);
+        for (String entry : response.keySet()) {
+            entry = entry.trim();
+            String value = response.get(entry);
             Debug.println("populatePolicies entry= "+entry);
             Debug.println("populatePolicies value= "+value);
 
             StringTokenizer st = new StringTokenizer(value, ";");
-            String def = (String)st.nextToken();
-            String con = (String)st.nextToken();
-            Vector row = new Vector();
+            String def = st.nextToken();
+            String con = st.nextToken();
+            Vector<String> row = new Vector<String>();
            
             StringTokenizer st1 = new StringTokenizer(entry, ":");
-            String setId = (String)st1.nextToken();
-            String id = (String)st1.nextToken();
+            String setId = st1.nextToken();
+            String id = st1.nextToken();
            
             if (mDefSetId == null) {
               mDefSetId = setId;
@@ -902,7 +898,6 @@ public class ProfileEditDialog extends CMSBaseConfigDialog
             row.addElement(def);
             row.addElement(con);
             d.addElement(row);
-          }
         }
         ProfileEditDataModel model = new ProfileEditDataModel();
         model.setInfo(d, colNames);
@@ -910,21 +905,21 @@ public class ProfileEditDialog extends CMSBaseConfigDialog
     }
 
     private void populateNonPolicy(NameValuePairs response, JTable table) {
-        Vector colNames = new Vector();
+        Vector<String> colNames = new Vector<String>();
         colNames.addElement("Id");
         if (table == mInputTable)
             colNames.addElement("Inputs");
         else if (table == mOutputTable)
             colNames.addElement("Outputs");
-        Vector d = new Vector();
+        Vector<Vector<String>> d = new Vector<Vector<String>>();
 
-        for (Enumeration e = response.getNames(); e.hasMoreElements() ;) {
-            String entry = ((String)e.nextElement()).trim();
-            String value = response.getValue(entry);
-            Debug.println("populateNonPolicy entry= "+entry);
-            Debug.println("populateNonPolicy value= "+value);
+        for (String entry : response.keySet()) {
+            entry = entry.trim();
+            String value = response.get(entry);
+            Debug.println("populateNonPolicy entry= " + entry);
+            Debug.println("populateNonPolicy value= " + value);
 
-            Vector row = new Vector();
+            Vector<String> row = new Vector<String>();
             row.addElement(entry);
             row.addElement(value);
             d.addElement(row);
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/ProfileImplDataModel.java b/pki/base/console/src/com/netscape/admin/certsrv/config/ProfileImplDataModel.java
index 98c188380..eee2531cf 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/ProfileImplDataModel.java
+++ b/pki/base/console/src/com/netscape/admin/certsrv/config/ProfileImplDataModel.java
@@ -20,7 +20,6 @@ package com.netscape.admin.certsrv.config;
 import java.util.*;
 import javax.swing.*;
 import com.netscape.admin.certsrv.*;
-import com.netscape.admin.certsrv.connection.*;
 import com.netscape.certsrv.common.*;
 
 /**
@@ -59,11 +58,11 @@ public class ProfileImplDataModel extends CMSContentTableModel
     public void processData(Object data) {
         Vector v = new Vector();
         NameValuePairs obj = (NameValuePairs) data;
-        v.addElement(new JLabel(obj.getValue(IMPL_NAME),
+        v.addElement(new JLabel(obj.get(IMPL_NAME),
             CMSAdminUtil.getImage(CMSAdminResources.IMAGE_RULE_PLUGIN),
             JLabel.LEFT));
-        v.addElement(obj.getValue(IMPL_TYPE));
-        v.addElement(obj.getValue(IMPL_CLASS));
+        v.addElement(obj.get(IMPL_TYPE));
+        v.addElement(obj.get(IMPL_CLASS));
         //v.addElement(obj.getValue(IMPL_DESC));
         addRow(v, data);
     }
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/ProfileImplTab.java b/pki/base/console/src/com/netscape/admin/certsrv/config/ProfileImplTab.java
index e9047701c..c7d28dd07 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/ProfileImplTab.java
+++ b/pki/base/console/src/com/netscape/admin/certsrv/config/ProfileImplTab.java
@@ -21,11 +21,10 @@ import com.netscape.admin.certsrv.*;
 import com.netscape.admin.certsrv.connection.*;
 import com.netscape.admin.certsrv.ug.*;
 import javax.swing.*;
-import javax.swing.event.*;
 import java.awt.event.*;
 import java.awt.*;
 import java.util.*;
-import com.netscape.management.client.*;
+
 import com.netscape.management.client.util.*;
 import com.netscape.certsrv.common.*;
 
@@ -111,9 +110,9 @@ public class ProfileImplTab extends CMSBaseUGTab {
                     mDataModel.getObjectValueAt(mTable.getSelectedRow());    
             if (mViewer==null)
                 mViewer = new ViewDialog(mModel.getFrame());
-            mViewer.showDialog(obj.getValue(IMPL_NAME),
-                               obj.getValue(IMPL_CLASS),
-                               obj.getValue(IMPL_DESC));
+            mViewer.showDialog(obj.get(IMPL_NAME),
+                               obj.get(IMPL_CLASS),
+                               obj.get(IMPL_DESC));
         }        
         if (e.getSource().equals(mHelp)) {
             helpCallback();
@@ -264,9 +263,9 @@ public class ProfileImplTab extends CMSBaseUGTab {
             mModel.progressStop();
             return;
         }
-        for (Enumeration e = response1.getNames(); e.hasMoreElements() ;) {
-            String entry = ((String)e.nextElement()).trim();
-            response.add(entry+";profile", response1.getValue(entry));
+        for (String entry : response1.keySet()) {
+            entry = entry.trim();
+            response.put(entry + ";profile", response1.get(entry));
         }
         try {
             response2 = mConnection.search(mDestination,
@@ -278,9 +277,9 @@ public class ProfileImplTab extends CMSBaseUGTab {
             mModel.progressStop();
             return;
         }
-        for (Enumeration e = response2.getNames(); e.hasMoreElements() ;) {
-            String entry = ((String)e.nextElement()).trim();
-            response.add(entry+";profileInput", response2.getValue(entry));
+        for (String entry : response2.keySet()) {
+            entry = entry.trim();
+            response.put(entry + ";profileInput", response2.get(entry));
         }
         try {
             response3 = mConnection.search(mDestination,
@@ -292,9 +291,9 @@ public class ProfileImplTab extends CMSBaseUGTab {
             mModel.progressStop();
             return;
         }
-        for (Enumeration e = response3.getNames(); e.hasMoreElements() ;) {
-            String entry = ((String)e.nextElement()).trim();
-            response.add(entry+";profileOutput", response3.getValue(entry));
+        for (String entry : response3.keySet()) {
+            entry = entry.trim();
+            response.put(entry + ";profileOutput", response3.get(entry));
         }
         try {
             response4 = mConnection.search(mDestination,
@@ -306,9 +305,9 @@ public class ProfileImplTab extends CMSBaseUGTab {
             mModel.progressStop();
             return;
         }
-        for (Enumeration e = response4.getNames(); e.hasMoreElements() ;) {
-            String entry = ((String)e.nextElement()).trim();
-            response.add(entry+";defaultPolicy", response4.getValue(entry));
+        for (String entry : response4.keySet()) {
+            entry = entry.trim();
+            response.put(entry + ";defaultPolicy", response4.get(entry));
         }
         try {
             response5 = mConnection.search(mDestination,
@@ -320,27 +319,27 @@ public class ProfileImplTab extends CMSBaseUGTab {
             mModel.progressStop();
             return;
         }
-        for (Enumeration e = response5.getNames(); e.hasMoreElements() ;) {
-            String entry = ((String)e.nextElement()).trim();
-            response.add(entry+";constraintPolicy", response5.getValue(entry));
+        for (String entry : response5.keySet()) {
+            entry = entry.trim();
+            response.put(entry + ";constraintPolicy", response5.get(entry));
         }
 
         //parse the data
         int i=0;
         String[] vals = new String[response.size()];
         Hashtable data = new Hashtable();
-        for (Enumeration e = response.getNames(); e.hasMoreElements() ;) {
-            String entry = ((String)e.nextElement()).trim();
-            String value = response.getValue(entry);
+        for (String entry : response.keySet()) {
+            entry = entry.trim();
+            String value = response.get(entry);
             int x = value.indexOf(",");
             int x_end = value.lastIndexOf(",");
             int y = entry.indexOf(";");
             NameValuePairs obj = new NameValuePairs();
-            obj.add(IMPL_NAME,entry.substring(0,y));
-            obj.add(IMPL_TYPE,entry.substring(y+1));
+            obj.put(IMPL_NAME, entry.substring(0, y));
+            obj.put(IMPL_TYPE, entry.substring(y + 1));
             vals[i++]= entry ;
-            obj.add(IMPL_CLASS, value.substring(0,x));
-            obj.add(IMPL_DESC, value.substring(x+1,x_end));
+            obj.put(IMPL_CLASS, value.substring(0, x));
+            obj.put(IMPL_DESC, value.substring(x + 1, x_end));
             data.put(entry,obj);
         }
         
@@ -367,8 +366,8 @@ public class ProfileImplTab extends CMSBaseUGTab {
         //send comment to server for the removal of user
         try {
             mConnection.delete(mDestination,
-                               obj.getValue(IMPL_TYPE),
-                               obj.getValue(IMPL_NAME));
+                               obj.get(IMPL_TYPE),
+                               obj.get(IMPL_NAME));
         } catch (EAdminException e) {
             //display error dialog
             showErrorDialog(e.getMessage());
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/ProfileNonPolicyNewDialog.java b/pki/base/console/src/com/netscape/admin/certsrv/config/ProfileNonPolicyNewDialog.java
index 05836bc87..e597b242b 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/ProfileNonPolicyNewDialog.java
+++ b/pki/base/console/src/com/netscape/admin/certsrv/config/ProfileNonPolicyNewDialog.java
@@ -20,13 +20,10 @@ package com.netscape.admin.certsrv.config;
 import com.netscape.admin.certsrv.*;
 import com.netscape.admin.certsrv.connection.*;
 import javax.swing.*;
-import javax.swing.event.*;
-import javax.swing.table.*;
-import javax.swing.text.*;
 import java.awt.event.*;
 import java.awt.*;
 import java.util.*;
-import com.netscape.management.client.*;
+
 import com.netscape.management.client.util.*;
 import com.netscape.certsrv.common.*;
 
@@ -309,8 +306,8 @@ setLabelCellEditor(mTable, 1);
                 }
 
                 for (int i = 0; i < mTable.getRowCount(); i++) {
-                    nvp.add((String)mTable.getValueAt(i,0),
-                      (String)mTable.getValueAt(i,1));
+                    nvp.put((String) mTable.getValueAt(i, 0),
+                            (String) mTable.getValueAt(i, 1));
 	            }
 
                 if (mIsNew) {
@@ -384,11 +381,11 @@ setLabelCellEditor(mTable, 1);
         defcolNames.addElement("Value"); 
         Vector defdata = new Vector(); 
 
-        for (Enumeration e = response.getNames(); e.hasMoreElements() ;) {
-           String entry = ((String)e.nextElement()).trim();
-           String value = response.getValue(entry);
-                  Debug.println("entry= "+entry);
-                  Debug.println("value= "+value); 
+        for (String entry : response.keySet()) {
+           entry = entry.trim();
+           String value = response.get(entry);
+                  Debug.println("entry= " + entry);
+                  Debug.println("value= " + value);
 
   int start_pos = value.indexOf(';');
   int end_pos = value.lastIndexOf(';');
@@ -413,9 +410,9 @@ setLabelCellEditor(mTable, 1);
              mPluginName.setText(profileId);
              mPluginName.setBackground(getBackground());
              mPluginName.setEnabled(false);
-             mNameField.setText(response.getValue("name"));
+             mNameField.setText(response.get("name"));
              if (mIsNew)
-                 mDescField.setText(response.getValue("desc"));
+                 mDescField.setText(response.get("desc"));
 	    }
 
         this.show();
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/ProfileNonPolicySelDialog.java b/pki/base/console/src/com/netscape/admin/certsrv/config/ProfileNonPolicySelDialog.java
index 4487754f2..8d97ffd13 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/ProfileNonPolicySelDialog.java
+++ b/pki/base/console/src/com/netscape/admin/certsrv/config/ProfileNonPolicySelDialog.java
@@ -20,11 +20,10 @@ package com.netscape.admin.certsrv.config;
 import com.netscape.admin.certsrv.*;
 import com.netscape.admin.certsrv.connection.*;
 import javax.swing.*;
-import javax.swing.event.*;
 import java.awt.event.*;
 import java.awt.*;
 import java.util.*;
-import com.netscape.management.client.*;
+
 import com.netscape.management.client.util.*;
 import com.netscape.certsrv.common.*;
 
@@ -348,9 +347,9 @@ public class ProfileNonPolicySelDialog extends JDialog
         //parse the data
         String[] vals = new String[response.size()];
         int i=0;
-        for (Enumeration e = response.getNames(); e.hasMoreElements() ;) {
-            String name = ((String)e.nextElement()).trim();
-            String val = response.getValue(name);
+        for (String name : response.keySet()) {
+            name = name.trim();
+            String val = response.get(name);
             StringTokenizer st = new StringTokenizer(val, ",");
             String className = st.nextToken();
             String desc = st.nextToken();
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/ProfilePluginSelectionDialog.java b/pki/base/console/src/com/netscape/admin/certsrv/config/ProfilePluginSelectionDialog.java
index c3b033221..ec3bb4c7c 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/ProfilePluginSelectionDialog.java
+++ b/pki/base/console/src/com/netscape/admin/certsrv/config/ProfilePluginSelectionDialog.java
@@ -20,11 +20,8 @@ package com.netscape.admin.certsrv.config;
 import com.netscape.admin.certsrv.*;
 import com.netscape.admin.certsrv.connection.*;
 import javax.swing.*;
-import javax.swing.event.*;
 import java.awt.event.*;
-import java.awt.*;
-import java.util.*;
-import com.netscape.management.client.*;
+
 import com.netscape.management.client.util.*;
 import com.netscape.certsrv.common.*;
 
@@ -89,7 +86,7 @@ public class ProfilePluginSelectionDialog extends PluginSelectionDialog
             }
             Debug.println(response.toString());
             String id =(String)(((ProfileListDataModel)mDataModel).getObjectValueAt(mList.getSelectedIndex()));
-            response.add(Constants.PR_POLICY_IMPL_NAME,id);
+            response.put(Constants.PR_POLICY_IMPL_NAME, id);
 
             CMSBaseConfigDialog dialog = null;
             if (mExtraDestination == null) {
@@ -160,9 +157,8 @@ public class ProfilePluginSelectionDialog extends PluginSelectionDialog
         String[] classnames = new String[response.size()];
         String[] ids = new String[response.size()];
         int i=0;
-        for (Enumeration e = response.getNames(); e.hasMoreElements() ;) {
-            String id = (String)e.nextElement();
-            String value = response.getValue(id);
+        for (String id : response.keySet()) {
+            String value = response.get(id);
             int pos = value.lastIndexOf(",");
             String className = value.substring(pos+1);
 
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/ProfilePolicyEditDialog.java b/pki/base/console/src/com/netscape/admin/certsrv/config/ProfilePolicyEditDialog.java
index 12781c6b5..34b95c0f1 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/ProfilePolicyEditDialog.java
+++ b/pki/base/console/src/com/netscape/admin/certsrv/config/ProfilePolicyEditDialog.java
@@ -20,13 +20,11 @@ package com.netscape.admin.certsrv.config;
 import com.netscape.admin.certsrv.*;
 import com.netscape.admin.certsrv.connection.*;
 import javax.swing.*;
-import javax.swing.event.*;
 import javax.swing.table.*;
-import javax.swing.text.*;
 import java.awt.event.*;
 import java.awt.*;
 import java.util.*;
-import com.netscape.management.client.*;
+
 import com.netscape.management.client.util.*;
 import com.netscape.certsrv.common.*;
 
@@ -462,7 +460,7 @@ public class ProfilePolicyEditDialog extends CMSBaseConfigDialog
                 val = (String)(((JComboBox)comp).getSelectedItem());
             }
             String name1 = ((JLabel)(mDefaultTable.getValueAt(i,0))).getText();
-			nvp.add(name1, val);
+			nvp.put(name1, val);
 	        }
 
 
@@ -485,7 +483,7 @@ public class ProfilePolicyEditDialog extends CMSBaseConfigDialog
             }
 
             String name1 = ((JLabel)(mConstraintTable.getValueAt(i,0))).getText();
-            nvp.add(name1, val);
+            nvp.put(name1, val);
 	        }
                 instanceName = mPluginName.getText();
 //DestDef.DEST_CA_PROFILE_ADMIN, 
@@ -582,9 +580,9 @@ public class ProfilePolicyEditDialog extends CMSBaseConfigDialog
         defcolNames.addElement("Value"); 
         Vector defdata = new Vector(); 
 
-        for (Enumeration e = response.getNames(); e.hasMoreElements() ;) {
-           String entry = ((String)e.nextElement()).trim();
-           String value = response.getValue(entry);
+        for (String entry : response.keySet()) {
+           entry = entry.trim();
+           String value = response.get(entry);
                   Debug.println("ProfilePolicyEditDialog entry= "+entry);
                   Debug.println("ProfilePolicyEditDialog value= "+value); 
 
@@ -605,7 +603,7 @@ public class ProfilePolicyEditDialog extends CMSBaseConfigDialog
         	mPluginName.setText(profileId);
 	        mPluginName.setBackground(getBackground());
         	mPluginName.setEnabled(false);
-        	mNameField.setText(response.getValue("name"));
+		mNameField.setText(response.get("name"));
       		mDescField.setText(setid);
 	        mDescField.setBackground(getBackground());
         	mDescField.setEnabled(false);
@@ -633,9 +631,9 @@ public class ProfilePolicyEditDialog extends CMSBaseConfigDialog
         colNames.addElement("Value"); 
         Vector d = new Vector(); 
 
-        for (Enumeration e = response.getNames(); e.hasMoreElements() ;) {
-           String entry = ((String)e.nextElement()).trim();
-           String value = response.getValue(entry);
+        for (String entry : response.keySet()) {
+           entry = entry.trim();
+           String value = response.get(entry);
                   Debug.println("entry= "+entry);
                   Debug.println("value= "+value); 
 
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/ProfilePolicyNewDialog.java b/pki/base/console/src/com/netscape/admin/certsrv/config/ProfilePolicyNewDialog.java
index 44e1aa512..941917808 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/ProfilePolicyNewDialog.java
+++ b/pki/base/console/src/com/netscape/admin/certsrv/config/ProfilePolicyNewDialog.java
@@ -20,13 +20,11 @@ package com.netscape.admin.certsrv.config;
 import com.netscape.admin.certsrv.*;
 import com.netscape.admin.certsrv.connection.*;
 import javax.swing.*;
-import javax.swing.event.*;
 import javax.swing.table.*;
-import javax.swing.text.*;
 import java.awt.event.*;
 import java.awt.*;
 import java.util.*;
-import com.netscape.management.client.*;
+
 import com.netscape.management.client.util.*;
 import com.netscape.certsrv.common.*;
 
@@ -483,7 +481,7 @@ public class ProfilePolicyNewDialog extends CMSBaseConfigDialog
                 val = (String)(((JComboBox)comp).getSelectedItem());
             }
             String name1 = ((JLabel)(mDefaultTable.getValueAt(i,0))).getText();
-            nvp.add(name1, val);
+            nvp.put(name1, val);
 	        }
 
 
@@ -505,7 +503,7 @@ public class ProfilePolicyNewDialog extends CMSBaseConfigDialog
             }
 
             String name1 = ((JLabel)(mConstraintTable.getValueAt(i,0))).getText();
-            nvp.add(name1, val);
+            nvp.put(name1, val);
 	        }
                 instanceName = mPluginName.getText();
                 //mAdminConnection.add(DestDef.DEST_CA_PROFILE_ADMIN, 
@@ -559,9 +557,9 @@ public class ProfilePolicyNewDialog extends CMSBaseConfigDialog
         defcolNames.addElement("Value"); 
         Vector defdata = new Vector(); 
 
-        for (Enumeration e = response.getNames(); e.hasMoreElements() ;) {
-           String entry = ((String)e.nextElement()).trim();
-           String value = response.getValue(entry);
+        for (String entry : response.keySet()) {
+           entry = entry.trim();
+           String value = response.get(entry);
                   Debug.println("entry= "+entry);
                   Debug.println("value= "+value); 
 
@@ -581,8 +579,8 @@ public class ProfilePolicyNewDialog extends CMSBaseConfigDialog
         	mPluginName.setText(profileId);
 	        mPluginName.setBackground(getBackground());
         	mPluginName.setEnabled(false);
-        	mNameField.setText(response.getValue("name"));
-      		mDescField.setText(response.getValue("desc"));
+		mNameField.setText(response.get("name"));
+		mDescField.setText(response.get("desc"));
 	}
 
         // retrieve policy information
@@ -604,9 +602,9 @@ public class ProfilePolicyNewDialog extends CMSBaseConfigDialog
         colNames.addElement("Value"); 
         Vector d = new Vector(); 
 
-        for (Enumeration e = response.getNames(); e.hasMoreElements() ;) {
-           String entry = ((String)e.nextElement()).trim();
-           String value = response.getValue(entry);
+        for (String entry : response.keySet()) {
+           entry = entry.trim();
+           String value = response.get(entry);
                   Debug.println("entry= "+entry);
                   Debug.println("value= "+value); 
 
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/ProfilePolicySelectionDialog.java b/pki/base/console/src/com/netscape/admin/certsrv/config/ProfilePolicySelectionDialog.java
index 69d502355..44fe9886b 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/ProfilePolicySelectionDialog.java
+++ b/pki/base/console/src/com/netscape/admin/certsrv/config/ProfilePolicySelectionDialog.java
@@ -24,7 +24,7 @@ import javax.swing.event.*;
 import java.awt.event.*;
 import java.awt.*;
 import java.util.*;
-import com.netscape.management.client.*;
+
 import com.netscape.management.client.util.*;
 import com.netscape.certsrv.common.*;
 
@@ -460,9 +460,9 @@ public class ProfilePolicySelectionDialog extends JDialog
         //parse the data
         String[] vals = new String[response.size()];
         int i=0;
-        for (Enumeration e = response.getNames(); e.hasMoreElements() ;) {
-            String name = ((String)e.nextElement()).trim();
-            String val = response.getValue(name);
+        for (String name : response.keySet()) {
+            name = name.trim();
+            String val = response.get(name);
             StringTokenizer st = new StringTokenizer(val, ",");
             String className = st.nextToken();
             String desc = st.nextToken();
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/ProfileRegisterDialog.java b/pki/base/console/src/com/netscape/admin/certsrv/config/ProfileRegisterDialog.java
index fb9ed20e7..c576adbe6 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/ProfileRegisterDialog.java
+++ b/pki/base/console/src/com/netscape/admin/certsrv/config/ProfileRegisterDialog.java
@@ -20,14 +20,12 @@ package com.netscape.admin.certsrv.config;
 import com.netscape.admin.certsrv.*;
 import com.netscape.admin.certsrv.connection.*;
 import javax.swing.*;
-import javax.swing.*;
 import javax.swing.event.*;
 import java.awt.event.*;
 import java.awt.*;
 import java.util.*;
-import com.netscape.management.client.*;
+
 import com.netscape.management.client.util.*;
-import javax.swing.table.*;
 import com.netscape.certsrv.common.*;
 
 
@@ -287,8 +285,8 @@ public class ProfileRegisterDialog extends JDialog
 
             //construct NVP
             NameValuePairs config = new NameValuePairs();
-            config.add(Constants.PR_POLICY_CLASS, mClassField.getText());
-            config.add(Constants.PR_POLICY_DESC, mDescField.getText());
+            config.put(Constants.PR_POLICY_CLASS, mClassField.getText());
+            config.put(Constants.PR_POLICY_DESC, mDescField.getText());
 
             if (mType) {
               mScope=mTypeField.getText();
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/ProfileRuleDataModel.java b/pki/base/console/src/com/netscape/admin/certsrv/config/ProfileRuleDataModel.java
index 73bf5ca91..7a3ba2827 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/ProfileRuleDataModel.java
+++ b/pki/base/console/src/com/netscape/admin/certsrv/config/ProfileRuleDataModel.java
@@ -20,9 +20,7 @@ package com.netscape.admin.certsrv.config;
 import java.util.*;
 import javax.swing.*;
 import com.netscape.admin.certsrv.*;
-import com.netscape.admin.certsrv.connection.*;
 import com.netscape.certsrv.common.*;
-import com.netscape.management.client.util.Debug;
 
 
 /**
@@ -52,19 +50,19 @@ public class ProfileRuleDataModel extends CMSRuleDataModel
         NameValuePairs obj = (NameValuePairs) data;
 
         //XXX NEED TO ADD STUFF
-        if (obj.getValue(RULE_STAT).equalsIgnoreCase("enabled")) {
-            v.addElement(new JLabel(obj.getValue(RULE_NAME),
+        if (obj.get(RULE_STAT).equalsIgnoreCase("enabled")) {
+            v.addElement(new JLabel(obj.get(RULE_NAME),
                     CMSAdminUtil.getImage(CMSAdminResources.IMAGE_RULE),
                     JLabel.LEFT));
             v.addElement(mResource.getString("POLICYRULE_LABEL_ENABLED_LABEL"));       
         } else {
-            v.addElement(new JLabel(obj.getValue(RULE_NAME),
+            v.addElement(new JLabel(obj.get(RULE_NAME),
                     CMSAdminUtil.getImage(CMSAdminResources.IMAGE_RULE_DISABLE),
                     JLabel.LEFT));
             v.addElement(mResource.getString("POLICYRULE_LABEL_DISABLED_LABEL"));
         }
         addRow(v, data);
-        mRules.addElement(obj.getValue(RULE_NAME));
+        mRules.addElement(obj.get(RULE_NAME));
     }
 
 
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/PublisherImplDataModel.java b/pki/base/console/src/com/netscape/admin/certsrv/config/PublisherImplDataModel.java
index 18ad05ba2..aefa4b1cc 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/PublisherImplDataModel.java
+++ b/pki/base/console/src/com/netscape/admin/certsrv/config/PublisherImplDataModel.java
@@ -20,7 +20,6 @@ package com.netscape.admin.certsrv.config;
 import java.util.*;
 import javax.swing.*;
 import com.netscape.admin.certsrv.*;
-import com.netscape.admin.certsrv.connection.*;
 import com.netscape.certsrv.common.*;
 
 /**
@@ -58,10 +57,10 @@ public class PublisherImplDataModel extends CMSContentTableModel
     public void processData(Object data) {
         Vector v = new Vector();
         NameValuePairs obj = (NameValuePairs) data;
-        v.addElement(new JLabel(obj.getValue(IMPL_NAME),
+        v.addElement(new JLabel(obj.get(IMPL_NAME),
             CMSAdminUtil.getImage(CMSAdminResources.IMAGE_RULE_PLUGIN),
             JLabel.LEFT));
-        v.addElement(obj.getValue(IMPL_CLASS));
+        v.addElement(obj.get(IMPL_CLASS));
         //v.addElement(obj.getValue(IMPL_DESC));
         addRow(v, data);
     }
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/PublisherImplTab.java b/pki/base/console/src/com/netscape/admin/certsrv/config/PublisherImplTab.java
index ebe4db5db..79fedfe5e 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/PublisherImplTab.java
+++ b/pki/base/console/src/com/netscape/admin/certsrv/config/PublisherImplTab.java
@@ -21,11 +21,10 @@ import com.netscape.admin.certsrv.*;
 import com.netscape.admin.certsrv.connection.*;
 import com.netscape.admin.certsrv.ug.*;
 import javax.swing.*;
-import javax.swing.event.*;
 import java.awt.event.*;
 import java.awt.*;
 import java.util.*;
-import com.netscape.management.client.*;
+
 import com.netscape.management.client.util.*;
 import com.netscape.certsrv.common.*;
 
@@ -115,9 +114,9 @@ public class PublisherImplTab extends CMSBaseUGTab {
                     mDataModel.getObjectValueAt(mTable.getSelectedRow());    
             if (mViewer==null)
                 mViewer = new ViewDialog(mModel.getFrame());
-            mViewer.showDialog(obj.getValue(IMPL_NAME),
-                               obj.getValue(IMPL_CLASS),
-                               obj.getValue(IMPL_DESC));
+            mViewer.showDialog(obj.get(IMPL_NAME),
+                               obj.get(IMPL_CLASS),
+                               obj.get(IMPL_DESC));
         }        
         if (e.getSource().equals(mHelp)) {
             helpCallback();
@@ -271,15 +270,15 @@ public class PublisherImplTab extends CMSBaseUGTab {
         int i=0;
         String[] vals = new String[response.size()];
         Hashtable data = new Hashtable();
-        for (Enumeration e = response.getNames(); e.hasMoreElements() ;) {
-            String entry = ((String)e.nextElement()).trim();
-            String value = response.getValue(entry);
+        for (String entry : response.keySet()) {
+            entry = entry.trim();
+            String value = response.get(entry);
             int x = value.indexOf(",");
             NameValuePairs obj = new NameValuePairs();
-            obj.add(IMPL_NAME,entry);
+            obj.put(IMPL_NAME, entry);
             vals[i++]= entry ;
-            obj.add(IMPL_CLASS, value.substring(0,x));
-            obj.add(IMPL_DESC, value.substring(x+1));
+            obj.put(IMPL_CLASS, value.substring(0, x));
+            obj.put(IMPL_DESC, value.substring(x + 1));
             data.put(entry,obj);
         }
         
@@ -307,7 +306,7 @@ public class PublisherImplTab extends CMSBaseUGTab {
         try {
             mConnection.delete(mDestination,
                                ScopeDef.SC_PUBLISHER_IMPLS,
-                               obj.getValue(IMPL_NAME));
+                               obj.get(IMPL_NAME));
         } catch (EAdminException e) {
             //display error dialog
             showErrorDialog(e.getMessage());
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/PublisherRuleDataModel.java b/pki/base/console/src/com/netscape/admin/certsrv/config/PublisherRuleDataModel.java
index e8ff44e44..03faeac21 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/PublisherRuleDataModel.java
+++ b/pki/base/console/src/com/netscape/admin/certsrv/config/PublisherRuleDataModel.java
@@ -20,7 +20,6 @@ package com.netscape.admin.certsrv.config;
 import java.util.*;
 import javax.swing.*;
 import com.netscape.admin.certsrv.*;
-import com.netscape.admin.certsrv.connection.*;
 import com.netscape.certsrv.common.*;
 import com.netscape.management.client.util.Debug;
 
@@ -52,10 +51,10 @@ public class PublisherRuleDataModel extends CMSRuleDataModel
         Vector v = new Vector();
         NameValuePairs obj = (NameValuePairs) data;
 
-        v.addElement(new JLabel(obj.getValue(RULE_NAME),
+        v.addElement(new JLabel(obj.get(RULE_NAME),
                   CMSAdminUtil.getImage(CMSAdminResources.IMAGE_RULE),
                   JLabel.LEFT));
-        v.addElement(obj.getValue(RULE_IMPL));
+        v.addElement(obj.get(RULE_IMPL));
         addRow(v, data);
     }
 
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/RegisterDialog.java b/pki/base/console/src/com/netscape/admin/certsrv/config/RegisterDialog.java
index e1ef3631a..fe48419c7 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/RegisterDialog.java
+++ b/pki/base/console/src/com/netscape/admin/certsrv/config/RegisterDialog.java
@@ -24,9 +24,8 @@ import javax.swing.event.*;
 import java.awt.event.*;
 import java.awt.*;
 import java.util.*;
-import com.netscape.management.client.*;
+
 import com.netscape.management.client.util.*;
-import javax.swing.table.*;
 import com.netscape.certsrv.common.*;
 
 /**
@@ -270,7 +269,7 @@ public class RegisterDialog extends JDialog
 
             //construct NVP
             NameValuePairs config = new NameValuePairs();
-            config.add(Constants.PR_POLICY_CLASS, mClassField.getText());
+            config.put(Constants.PR_POLICY_CLASS, mClassField.getText());
 
             if (mType) {
               mScope=mTypeField.getText();
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/RuleImplDataModel.java b/pki/base/console/src/com/netscape/admin/certsrv/config/RuleImplDataModel.java
index 26e065c04..86a4fa6d4 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/RuleImplDataModel.java
+++ b/pki/base/console/src/com/netscape/admin/certsrv/config/RuleImplDataModel.java
@@ -20,7 +20,6 @@ package com.netscape.admin.certsrv.config;
 import java.util.*;
 import javax.swing.*;
 import com.netscape.admin.certsrv.*;
-import com.netscape.admin.certsrv.connection.*;
 import com.netscape.certsrv.common.*;
 
 /**
@@ -58,10 +57,10 @@ public class RuleImplDataModel extends CMSContentTableModel
     public void processData(Object data) {
         Vector v = new Vector();
         NameValuePairs obj = (NameValuePairs) data;
-        v.addElement(new JLabel(obj.getValue(IMPL_NAME),
+        v.addElement(new JLabel(obj.get(IMPL_NAME),
             CMSAdminUtil.getImage(CMSAdminResources.IMAGE_RULE_PLUGIN),
             JLabel.LEFT));
-        v.addElement(obj.getValue(IMPL_CLASS));
+        v.addElement(obj.get(IMPL_CLASS));
         //v.addElement(obj.getValue(IMPL_DESC));
         addRow(v, data);
     }
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/RuleImplTab.java b/pki/base/console/src/com/netscape/admin/certsrv/config/RuleImplTab.java
index b0c262dea..098cbcbd1 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/RuleImplTab.java
+++ b/pki/base/console/src/com/netscape/admin/certsrv/config/RuleImplTab.java
@@ -21,11 +21,10 @@ import com.netscape.admin.certsrv.*;
 import com.netscape.admin.certsrv.connection.*;
 import com.netscape.admin.certsrv.ug.*;
 import javax.swing.*;
-import javax.swing.event.*;
 import java.awt.event.*;
 import java.awt.*;
 import java.util.*;
-import com.netscape.management.client.*;
+
 import com.netscape.management.client.util.*;
 import com.netscape.certsrv.common.*;
 
@@ -115,9 +114,9 @@ public class RuleImplTab extends CMSBaseUGTab {
                     mDataModel.getObjectValueAt(mTable.getSelectedRow());    
             if (mViewer==null)
                 mViewer = new ViewDialog(mModel.getFrame());
-            mViewer.showDialog(obj.getValue(IMPL_NAME),
-                               obj.getValue(IMPL_CLASS),
-                               obj.getValue(IMPL_DESC));
+            mViewer.showDialog(obj.get(IMPL_NAME),
+                               obj.get(IMPL_CLASS),
+                               obj.get(IMPL_DESC));
         }        
         if (e.getSource().equals(mHelp)) {
             helpCallback();
@@ -270,15 +269,15 @@ public class RuleImplTab extends CMSBaseUGTab {
         int i=0;
         String[] vals = new String[response.size()];
         Hashtable data = new Hashtable();
-        for (Enumeration e = response.getNames(); e.hasMoreElements() ;) {
-            String entry = ((String)e.nextElement()).trim();
-            String value = response.getValue(entry);
+        for (String entry : response.keySet()) {
+            entry = entry.trim();
+            String value = response.get(entry);
             int x = value.indexOf(",");
             NameValuePairs obj = new NameValuePairs();
-            obj.add(IMPL_NAME,entry);
+            obj.put(IMPL_NAME, entry);
             vals[i++]= entry ;
-            obj.add(IMPL_CLASS, value.substring(0,x));
-            obj.add(IMPL_DESC, value.substring(x+1));
+            obj.put(IMPL_CLASS, value.substring(0, x));
+            obj.put(IMPL_DESC, value.substring(x + 1));
             data.put(entry,obj);
         }
         
@@ -306,7 +305,7 @@ public class RuleImplTab extends CMSBaseUGTab {
         try {
             mConnection.delete(mDestination,
                                ScopeDef.SC_RULE_IMPLS,
-                               obj.getValue(IMPL_NAME));
+                               obj.get(IMPL_NAME));
         } catch (EAdminException e) {
             //display error dialog
             showErrorDialog(e.getMessage());
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/RuleRuleDataModel.java b/pki/base/console/src/com/netscape/admin/certsrv/config/RuleRuleDataModel.java
index 0eb22433d..cee7727a1 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/RuleRuleDataModel.java
+++ b/pki/base/console/src/com/netscape/admin/certsrv/config/RuleRuleDataModel.java
@@ -20,7 +20,6 @@ package com.netscape.admin.certsrv.config;
 import java.util.*;
 import javax.swing.*;
 import com.netscape.admin.certsrv.*;
-import com.netscape.admin.certsrv.connection.*;
 import com.netscape.certsrv.common.*;
 import com.netscape.management.client.util.Debug;
 
@@ -52,19 +51,19 @@ public class RuleRuleDataModel extends CMSRuleDataModel
         Vector v = new Vector();
         NameValuePairs obj = (NameValuePairs) data;
 
-        if (obj.getValue(RULE_STAT).equalsIgnoreCase("enabled")) {
-            v.addElement(new JLabel(obj.getValue(RULE_NAME),
+        if (obj.get(RULE_STAT).equalsIgnoreCase("enabled")) {
+            v.addElement(new JLabel(obj.get(RULE_NAME),
                     CMSAdminUtil.getImage(CMSAdminResources.IMAGE_RULE),
                     JLabel.LEFT));
             v.addElement(mResource.getString("RULERULE_LABEL_ENABLED_LABEL"));       
         } else {
-            v.addElement(new JLabel(obj.getValue(RULE_NAME),
+            v.addElement(new JLabel(obj.get(RULE_NAME),
                     CMSAdminUtil.getImage(CMSAdminResources.IMAGE_RULE_DISABLE),
                     JLabel.LEFT));
             v.addElement(mResource.getString("RULERULE_LABEL_DISABLED_LABEL"));
         }
         addRow(v, data);
-        mRules.addElement(obj.getValue(RULE_NAME));
+        mRules.addElement(obj.get(RULE_NAME));
     }
 
 
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/TKSKeysTab.java b/pki/base/console/src/com/netscape/admin/certsrv/config/TKSKeysTab.java
index 458885e2a..ac8b5e610 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/TKSKeysTab.java
+++ b/pki/base/console/src/com/netscape/admin/certsrv/config/TKSKeysTab.java
@@ -17,22 +17,17 @@
 // --- END COPYRIGHT BLOCK ---
 package com.netscape.admin.certsrv.config;
 
-import com.netscape.admin.certsrv.keycert.*;
 import com.netscape.admin.certsrv.*;
 import com.netscape.admin.certsrv.connection.*;
 import com.netscape.admin.certsrv.ug.*;
 import javax.swing.*;
-import javax.swing.event.*;
 import java.awt.event.*;
 import java.awt.*;
 import java.util.*;
-import com.netscape.management.client.*;
+
 import com.netscape.management.client.console.*;
 import com.netscape.management.client.util.*;
 import com.netscape.certsrv.common.*;
-import org.mozilla.jss.*;
-import org.mozilla.jss.pkcs10.*;
-import org.mozilla.jss.crypto.*;
 import org.mozilla.jss.CryptoManager;
 /**
  * User Certs Tab
@@ -239,9 +234,8 @@ public class TKSKeysTab extends CMSBaseUGTab {
 			mToken.removeAllItems();
 			String[] vals = new String[response.size()];
 			int i=0;
-			for (Enumeration e = response.getNames(); e.hasMoreElements() ;) {
-				String entry = ((String)e.nextElement()).trim();
-				vals[i++] = entry;
+            for (String entry : response.keySet()) {
+				vals[i++] = entry.trim();
 			}
         
 			int sindex = 0;
@@ -249,7 +243,7 @@ public class TKSKeysTab extends CMSBaseUGTab {
 			for (i=0; i<vals.length; i++) {
 				Vector v = new Vector();
 				String entry = vals[i];
-				String value = response.getValue(entry);
+				String value = response.get(entry);
 				// look for the comma separator
 				
 				StringTokenizer st = new StringTokenizer(value, ",");
@@ -293,7 +287,7 @@ public class TKSKeysTab extends CMSBaseUGTab {
         NameValuePairs response;
         NameValuePairs request;
         request = new NameValuePairs();
-        request.add(Constants.PR_TOKEN_LIST, (String)mToken.getSelectedItem());
+        request.put(Constants.PR_TOKEN_LIST, (String) mToken.getSelectedItem());
         try {
             response = mConnection.search(mDestination,
               ScopeDef.SC_TKSKEYSLIST, request); 
@@ -311,9 +305,8 @@ public class TKSKeysTab extends CMSBaseUGTab {
         if (response != null) {
             String[] vals = new String[response.size()];
             int i=0;
-            for (Enumeration e = response.getNames(); e.hasMoreElements() ;) {
-                String entry = ((String)e.nextElement()).trim();
-                vals[i++] = entry;
+            for (String entry : response.keySet()) {
+                vals[i++] = entry.trim();
             }
             
             int sindex = 0;
@@ -321,7 +314,7 @@ public class TKSKeysTab extends CMSBaseUGTab {
             for (i=0; i<vals.length; i++) {
                 String entry = vals[i];
                 if (entry.equals(Constants.PR_TOKEN_LIST)) {
-                    String value = response.getValue(entry);
+                    String value = response.get(entry);
                     // look for the comma separator
                     StringTokenizer st = new StringTokenizer(value, ",");
                     int numberOfKeys = 0;
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/UserCertsTab.java b/pki/base/console/src/com/netscape/admin/certsrv/config/UserCertsTab.java
index e5fc28135..de0a075a1 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/UserCertsTab.java
+++ b/pki/base/console/src/com/netscape/admin/certsrv/config/UserCertsTab.java
@@ -22,11 +22,10 @@ import com.netscape.admin.certsrv.*;
 import com.netscape.admin.certsrv.connection.*;
 import com.netscape.admin.certsrv.ug.*;
 import javax.swing.*;
-import javax.swing.event.*;
 import java.awt.event.*;
 import java.awt.*;
 import java.util.*;
-import com.netscape.management.client.*;
+
 import com.netscape.management.client.console.*;
 import com.netscape.management.client.util.*;
 import com.netscape.certsrv.common.*;
@@ -123,17 +122,16 @@ public class UserCertsTab extends CMSBaseUGTab {
             
             try {
                 NameValuePairs nvps = new NameValuePairs();
-                nvps.add(Constants.PR_NICK_NAME, nickname);
-                nvps.add(Constants.PR_SERIAL_NUMBER, serialno);
-                nvps.add(Constants.PR_ISSUER_NAME, issuername);
+                nvps.put(Constants.PR_NICK_NAME, nickname);
+                nvps.put(Constants.PR_SERIAL_NUMBER, serialno);
+                nvps.put(Constants.PR_ISSUER_NAME, issuername);
                 NameValuePairs results = mConnection.read(
                   DestDef.DEST_SERVER_ADMIN, ScopeDef.SC_CERT_PRETTY_PRINT,
                   Constants.RS_ID_CONFIG, nvps);
                 if (nvps.size() <= 0)
                     return;
-                NameValuePair nvp = results.elementAt(0);
-                String name = nvp.getName();
-                String print = nvp.getValue();
+                String name = results.keySet().iterator().next(); // first element
+                String print = results.get(name);
                 CertViewDialog certdialog = new CertViewDialog(mModel.getFrame());
                 certdialog.showDialog(nickname, print);
             } catch (EAdminException ex) {
@@ -289,9 +287,8 @@ public class UserCertsTab extends CMSBaseUGTab {
         if (response != null) {
             String[] vals = new String[response.size()];
             int i=0;
-            for (Enumeration e = response.getNames(); e.hasMoreElements() ;) {
-                String entry = ((String)e.nextElement()).trim();
-                vals[i++] = entry;
+            for (String entry : response.keySet()) {
+                vals[i++] = entry.trim();
             }
             
             int sindex = 0;
@@ -300,7 +297,7 @@ public class UserCertsTab extends CMSBaseUGTab {
             for (i=0; i<vals.length; i++) {
                 Vector v = new Vector();
                 String entry = vals[i];
-                String value = response.getValue(entry);
+                String value = response.get(entry);
 
                 // look for the comma separator
                 int lastindex = entry.lastIndexOf(",");
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WICertExtensionPage.java b/pki/base/console/src/com/netscape/admin/certsrv/config/install/WICertExtensionPage.java
index 7ba0636fd..8c989685a 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WICertExtensionPage.java
+++ b/pki/base/console/src/com/netscape/admin/certsrv/config/install/WICertExtensionPage.java
@@ -17,18 +17,10 @@
 // --- END COPYRIGHT BLOCK ---
 package com.netscape.admin.certsrv.config.install;
 
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.border.*;
-import javax.swing.*;
 import com.netscape.admin.certsrv.*;
-import com.netscape.admin.certsrv.connection.*;
 import com.netscape.admin.certsrv.wizard.*;
 import com.netscape.certsrv.common.*;
 import com.netscape.admin.certsrv.config.*;
-import com.netscape.management.client.console.*;
-import com.netscape.admin.certsrv.task.*;
-import java.util.*;
 
 /**
  * Certificate Extension for installation wizard.
@@ -87,12 +79,12 @@ class WICertExtensionPage extends WBaseCertExtensionPage implements
         if (ready) {
             NameValuePairs nvps = new NameValuePairs();
 
-            nvps.add(Constants.PR_CERTIFICATE_TYPE, wizardInfo.getCertType());
-            nvps.add(Constants.PR_SUBJECT_NAME, wizardInfo.getSubjectName());
-            nvps.add(Constants.PR_TOKEN_NAME, wizardInfo.getTokenName());
-            nvps.add(Constants.PR_KEY_LENGTH, wizardInfo.getKeyLength());
-            nvps.add(Constants.PR_KEY_TYPE, wizardInfo.getKeyType());
-            nvps.add(Constants.PR_KEY_CURVENAME, wizardInfo.getKeyCurveName());
+            nvps.put(Constants.PR_CERTIFICATE_TYPE, wizardInfo.getCertType());
+            nvps.put(Constants.PR_SUBJECT_NAME, wizardInfo.getSubjectName());
+            nvps.put(Constants.PR_TOKEN_NAME, wizardInfo.getTokenName());
+            nvps.put(Constants.PR_KEY_LENGTH, wizardInfo.getKeyLength());
+            nvps.put(Constants.PR_KEY_TYPE, wizardInfo.getKeyType());
+            nvps.put(Constants.PR_KEY_CURVENAME, wizardInfo.getKeyCurveName());
             addValidityPeriod(wizardInfo, nvps);
 
             if (mBasicCheckBox.isSelected())
@@ -102,16 +94,16 @@ class WICertExtensionPage extends WBaseCertExtensionPage implements
                 addExtendedKey(nvps);
 
             if (mAKICheckBox.isSelected())
-                nvps.add(Constants.PR_AKI, Constants.TRUE);
+                nvps.put(Constants.PR_AKI, Constants.TRUE);
 
             if (mSKICheckBox.isSelected())
-                nvps.add(Constants.PR_SKI, Constants.TRUE);
+                nvps.put(Constants.PR_SKI, Constants.TRUE);
 
             if (mKeyUsageBox.isSelected())
-                nvps.add(Constants.PR_KEY_USAGE, Constants.TRUE);
+                nvps.put(Constants.PR_KEY_USAGE, Constants.TRUE);
 
             if (mMIMECheckBox.isSelected())
-                nvps.add(Constants.PR_DER_EXTENSION, mMIMEText.getText().trim());
+                nvps.put(Constants.PR_DER_EXTENSION, mMIMEText.getText().trim());
 
             wizardInfo.put(wizardInfo.ALL_CERT_INFO, nvps); 
         }
@@ -122,45 +114,45 @@ class WICertExtensionPage extends WBaseCertExtensionPage implements
 
     private void addValidityPeriod(InstallWizardInfo wizardInfo, 
       NameValuePairs nvps) {
-        nvps.add(Constants.PR_BEGIN_YEAR, wizardInfo.getBeginYear());
-        nvps.add(Constants.PR_BEGIN_MONTH, wizardInfo.getBeginMonth());
-        nvps.add(Constants.PR_BEGIN_DATE, wizardInfo.getBeginDate());
-        nvps.add(Constants.PR_BEGIN_HOUR, wizardInfo.getBeginHour());
-        nvps.add(Constants.PR_BEGIN_MIN, wizardInfo.getBeginMin());
-        nvps.add(Constants.PR_BEGIN_SEC, wizardInfo.getBeginSec());
-        nvps.add(Constants.PR_AFTER_YEAR, wizardInfo.getAfterYear());
-        nvps.add(Constants.PR_AFTER_MONTH, wizardInfo.getAfterMonth());
-        nvps.add(Constants.PR_AFTER_DATE, wizardInfo.getAfterDate());
-        nvps.add(Constants.PR_AFTER_HOUR, wizardInfo.getAfterHour());
-        nvps.add(Constants.PR_AFTER_MIN, wizardInfo.getAfterMin());
-        nvps.add(Constants.PR_AFTER_SEC, wizardInfo.getAfterSec());
+        nvps.put(Constants.PR_BEGIN_YEAR, wizardInfo.getBeginYear());
+        nvps.put(Constants.PR_BEGIN_MONTH, wizardInfo.getBeginMonth());
+        nvps.put(Constants.PR_BEGIN_DATE, wizardInfo.getBeginDate());
+        nvps.put(Constants.PR_BEGIN_HOUR, wizardInfo.getBeginHour());
+        nvps.put(Constants.PR_BEGIN_MIN, wizardInfo.getBeginMin());
+        nvps.put(Constants.PR_BEGIN_SEC, wizardInfo.getBeginSec());
+        nvps.put(Constants.PR_AFTER_YEAR, wizardInfo.getAfterYear());
+        nvps.put(Constants.PR_AFTER_MONTH, wizardInfo.getAfterMonth());
+        nvps.put(Constants.PR_AFTER_DATE, wizardInfo.getAfterDate());
+        nvps.put(Constants.PR_AFTER_HOUR, wizardInfo.getAfterHour());
+        nvps.put(Constants.PR_AFTER_MIN, wizardInfo.getAfterMin());
+        nvps.put(Constants.PR_AFTER_SEC, wizardInfo.getAfterSec());
     }
 
     private void addBasicConstraints(NameValuePairs nvps) {
         if (mCACheckBox.isSelected())
-            nvps.add(Constants.PR_IS_CA, Constants.TRUE);
+            nvps.put(Constants.PR_IS_CA, Constants.TRUE);
 
 	if (mCertPathBox.isSelected()) {
             String certLen = mCertPathText.getText().trim();
             if (!certLen.equals(""))
-               nvps.add(Constants.PR_CERT_LEN, certLen);
+               nvps.put(Constants.PR_CERT_LEN, certLen);
 	} else {
 	    // negative number means infinity
-            nvps.add(Constants.PR_CERT_LEN, "-1");
+            nvps.put(Constants.PR_CERT_LEN, "-1");
 	}
     }
 
     private void addExtendedKey(NameValuePairs nvps) {
         if (mSSLClient.isSelected()) 
-            nvps.add(Constants.PR_SSL_CLIENT_BIT, Constants.TRUE);
+            nvps.put(Constants.PR_SSL_CLIENT_BIT, Constants.TRUE);
         if (mSSLServer.isSelected())
-            nvps.add(Constants.PR_SSL_SERVER_BIT, Constants.TRUE);
+            nvps.put(Constants.PR_SSL_SERVER_BIT, Constants.TRUE);
         if (mSSLMail.isSelected())
-            nvps.add(Constants.PR_SSL_MAIL_BIT, Constants.TRUE);
+            nvps.put(Constants.PR_SSL_MAIL_BIT, Constants.TRUE);
         if (mObjectSigning.isSelected())
-            nvps.add(Constants.PR_OBJECT_SIGNING_BIT, Constants.TRUE);
+            nvps.put(Constants.PR_OBJECT_SIGNING_BIT, Constants.TRUE);
         if (mTimeStamping.isSelected())
-            nvps.add(Constants.PR_TIMESTAMPING_BIT, Constants.TRUE);
+            nvps.put(Constants.PR_TIMESTAMPING_BIT, Constants.TRUE);
     }
 
     public void callHelp() {
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WIGenKeyCertPage.java b/pki/base/console/src/com/netscape/admin/certsrv/config/install/WIGenKeyCertPage.java
index 9a5c0b617..8272d44df 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WIGenKeyCertPage.java
+++ b/pki/base/console/src/com/netscape/admin/certsrv/config/install/WIGenKeyCertPage.java
@@ -18,14 +18,10 @@
 package com.netscape.admin.certsrv.config.install;
 
 import java.awt.*;
-import java.util.*;
 import javax.swing.*;
 import com.netscape.admin.certsrv.*;
-import com.netscape.admin.certsrv.connection.*;
 import com.netscape.admin.certsrv.wizard.*;
 import com.netscape.certsrv.common.*;
-import com.netscape.admin.certsrv.task.*;
-import com.netscape.management.client.console.*;
 
 /**
  * Generate the certificate
@@ -85,10 +81,10 @@ class WIGenKeyCertPage extends WizardBasePanel implements IWizardPanel {
             rawData = rawData+"&"+ConfigConstants.PR_DB_PWD+"="+wizardInfo.getInternalDBPasswd();
 
 	if (nvps != null) {
-        	for (int i=0; i<nvps.size(); i++) {
-        	    NameValuePair nvp = (NameValuePair)nvps.elementAt(i);
-                    rawData = rawData+"&"+nvp.getName()+"="+nvp.getValue();
-        	}
+        for (String name : nvps.keySet()) {
+            String value = nvps.get(name);
+            rawData = rawData+"&"+name+"="+value;
+        }
 	}
         
         startProgressStatus();
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WIGenKeyCertReqPage.java b/pki/base/console/src/com/netscape/admin/certsrv/config/install/WIGenKeyCertReqPage.java
index 7d83c8b65..b5c0378c3 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/install/WIGenKeyCertReqPage.java
+++ b/pki/base/console/src/com/netscape/admin/certsrv/config/install/WIGenKeyCertReqPage.java
@@ -18,15 +18,10 @@
 package com.netscape.admin.certsrv.config.install;
 
 import java.awt.*;
-import java.util.*;
 import javax.swing.*;
 import com.netscape.admin.certsrv.*;
-import com.netscape.admin.certsrv.connection.*;
 import com.netscape.admin.certsrv.wizard.*;
 import com.netscape.certsrv.common.*;
-import com.netscape.admin.certsrv.task.*;
-import com.netscape.management.client.console.*;
-import com.netscape.management.client.util.*;
 
 /**
  * Generate the certificate request
@@ -70,7 +65,7 @@ class WIGenKeyCertReqPage extends WizardBasePanel implements IWizardPanel {
 		NameValuePairs nvps =
 			(NameValuePairs)wizardInfo.get(wizardInfo.ALL_CERT_INFO);
 		if (nvps != null) {
-			str = (String)nvps.getValue(Constants.PR_SKI);
+			str = (String)nvps.get(Constants.PR_SKI);
 			if (str != null && str.equals(ConfigConstants.TRUE)) {
 				mCMC.setEnabled(true);
 				mCMC.setVisible(true);
@@ -171,11 +166,10 @@ class WIGenKeyCertReqPage extends WizardBasePanel implements IWizardPanel {
 
         NameValuePairs nvps = wizardInfo.getAllCertInfo();//extensions
         if (nvps != null)  {
-            for (int i=0; i<nvps.size(); i++) {
-                NameValuePair nvp = (NameValuePair)nvps.elementAt(i);
-
-			    if (nvp.getName()!= null && nvp.getValue()!= null)
-                    rawData = rawData+"&"+nvp.getName()+"="+nvp.getValue();
+            for (String name : nvps.keySet()) {
+                String value = nvps.get(name);
+			    if (name != null && value != null)
+                    rawData = rawData+"&"+name+"="+value;
             }
         }