Added generics (part 3).

This patch brings down the warnings from 3992 to 3500.

Ticket #2

20 files changed, 186 insertions, 185 deletions

diff --git a/pki/base/common/src/com/netscape/cms/servlet/admin/PublisherAdminServlet.java b/pki/base/common/src/com/netscape/cms/servlet/admin/PublisherAdminServlet.java
index 58cf327bb..799e1bb37 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/admin/PublisherAdminServlet.java
+++ b/pki/base/common/src/com/netscape/cms/servlet/admin/PublisherAdminServlet.java
@@ -327,13 +327,13 @@ public class PublisherAdminServlet extends AdminServlet {
 
     private IExtendedPluginInfo getExtendedPluginInfo(IPublisherProcessor
             p) {
-        Enumeration mappers = p.getMapperInsts().keys();
-        Enumeration publishers = p.getPublisherInsts().keys();
+        Enumeration<String> mappers = p.getMapperInsts().keys();
+        Enumeration<String> publishers = p.getPublisherInsts().keys();
 
         StringBuffer map = new StringBuffer();
 
         for (; mappers.hasMoreElements();) {
-            String name = (String) mappers.nextElement();
+            String name = mappers.nextElement();
 
             if (map.length() == 0) {
                 map.append(name);
@@ -372,7 +372,7 @@ public class PublisherAdminServlet extends AdminServlet {
 
         if (implType.equals(Constants.PR_EXT_PLUGIN_IMPLTYPE_PUBLISHRULE)) {
             IPublisherProcessor p_processor = mProcessor;
-            Plugin plugin = (Plugin) p_processor.getRulePlugins().get(implName);
+            RulePlugin plugin = p_processor.getRulePlugins().get(implName);
 
             // Should get the registered rules from processor
             // instead of plugin
@@ -439,10 +439,11 @@ public class PublisherAdminServlet extends AdminServlet {
         IConfigStore ldapcfg = publishcfg.getSubStore(IPublisherProcessor.PROP_LDAP_PUBLISH_SUBSTORE);
         IConfigStore ldap = ldapcfg.getSubStore(IPublisherProcessor.PROP_LDAP);
 
-        Enumeration e = req.getParameterNames();
+        @SuppressWarnings("unchecked")
+        Enumeration<String> e = req.getParameterNames();
 
         while (e.hasMoreElements()) {
-            String name = (String) e.nextElement();
+            String name = e.nextElement();
 
             if (name.equals(Constants.OP_TYPE))
                 continue;
@@ -502,7 +503,6 @@ public class PublisherAdminServlet extends AdminServlet {
 
     private void setLDAPDest(HttpServletRequest req, HttpServletResponse resp)
             throws ServletException, IOException, EBaseException {
-        NameValuePairs params = new NameValuePairs();
 
         //Save New Settings to the config file
         IConfigStore config = mAuth.getConfigStore();
@@ -521,11 +521,12 @@ public class PublisherAdminServlet extends AdminServlet {
         }
 
         //set reset of the parameters
-        Enumeration e = req.getParameterNames();
+        @SuppressWarnings("unchecked")
+        Enumeration<String> e = req.getParameterNames();
         String pwd = null;
 
         while (e.hasMoreElements()) {
-            String name = (String) e.nextElement();
+            String name = e.nextElement();
 
             if (name.equals(Constants.OP_TYPE))
                 continue;
@@ -641,11 +642,12 @@ public class PublisherAdminServlet extends AdminServlet {
         }
 
         //set reset of the parameters
-        Enumeration e = req.getParameterNames();
+        @SuppressWarnings("unchecked")
+        Enumeration<String> e = req.getParameterNames();
         String pwd = null;
 
         while (e.hasMoreElements()) {
-            String name = (String) e.nextElement();
+            String name = e.nextElement();
 
             if (name.equals(Constants.OP_TYPE))
                 continue;
@@ -1038,7 +1040,7 @@ public class PublisherAdminServlet extends AdminServlet {
         IConfigStore instancesConfig = destStore.getSubStore("impl");
 
         // Does the class exist?
-        Class newImpl = null;
+        Class<?> newImpl = null;
 
         try {
             newImpl = Class.forName(classPath);
@@ -1147,7 +1149,7 @@ public class PublisherAdminServlet extends AdminServlet {
             return;
         }
 
-        Vector configParams = mProcessor.getMapperDefaultParams(implname);
+        Vector<String> configParams = mProcessor.getMapperDefaultParams(implname);
 
         IConfigStore destStore = mConfig.getSubStore(mAuth.getId() + ".publish.mapper");
         IConfigStore instancesConfig = destStore.getSubStore("instance");
@@ -1243,10 +1245,10 @@ public class PublisherAdminServlet extends AdminServlet {
             HttpServletResponse resp) throws ServletException,
             IOException, EBaseException {
         NameValuePairs params = new NameValuePairs();
-        Enumeration e = mProcessor.getMapperPlugins().keys();
+        Enumeration<String> e = mProcessor.getMapperPlugins().keys();
 
         while (e.hasMoreElements()) {
-            String name = (String) e.nextElement();
+            String name = e.nextElement();
             MapperPlugin value = (MapperPlugin)
                     mProcessor.getMapperPlugins().get(name);
             // get Description
@@ -1284,10 +1286,10 @@ public class PublisherAdminServlet extends AdminServlet {
             IOException, EBaseException {
 
         NameValuePairs params = new NameValuePairs();
-        Enumeration e = mProcessor.getMapperInsts().keys();
+        Enumeration<String> e = mProcessor.getMapperInsts().keys();
 
         for (; e.hasMoreElements();) {
-            String name = (String) e.nextElement();
+            String name = e.nextElement();
             ILdapMapper value = mProcessor.getMapperInstance(name);
 
             params.add(name, getMapperPluginName(value) + ";visible");
@@ -1373,7 +1375,7 @@ public class PublisherAdminServlet extends AdminServlet {
 
         // first check if any instances from this mapper
         // DON'T remove mapper if any instance
-        for (Enumeration e = mProcessor.getMapperInsts().keys(); e.hasMoreElements();) {
+        for (Enumeration<String> e = mProcessor.getMapperInsts().keys(); e.hasMoreElements();) {
             String name = (String) e.nextElement();
             ILdapMapper mapper = mProcessor.getMapperInstance(name);
 
@@ -1421,14 +1423,14 @@ public class PublisherAdminServlet extends AdminServlet {
             return;
         }
 
-        Vector configParams = mProcessor.getMapperDefaultParams(implname);
+        Vector<String> configParams = mProcessor.getMapperDefaultParams(implname);
         NameValuePairs params = new NameValuePairs();
 
         // implName is always required so always send it.
         params.add(Constants.PR_MAPPER_IMPL_NAME, "");
         if (configParams != null) {
             for (int i = 0; i < configParams.size(); i++) {
-                String kv = (String) configParams.elementAt(i);
+                String kv = configParams.elementAt(i);
                 int index = kv.indexOf('=');
 
                 params.add(kv.substring(0, index),
@@ -1463,7 +1465,7 @@ public class PublisherAdminServlet extends AdminServlet {
 
         ILdapMapper mapperInst = (ILdapMapper)
                 mProcessor.getMapperInstance(id);
-        Vector configParams = mapperInst.getInstanceParams();
+        Vector<String> configParams = mapperInst.getInstanceParams();
         NameValuePairs params = new NameValuePairs();
 
         params.add(Constants.PR_MAPPER_IMPL_NAME,
@@ -1471,7 +1473,7 @@ public class PublisherAdminServlet extends AdminServlet {
         // implName is always required so always send it.
         if (configParams != null) {
             for (int i = 0; i < configParams.size(); i++) {
-                String kv = (String) configParams.elementAt(i);
+                String kv = configParams.elementAt(i);
                 int index = kv.indexOf('=');
 
                 params.add(kv.substring(0, index),
@@ -1528,14 +1530,14 @@ public class PublisherAdminServlet extends AdminServlet {
 
         ILdapMapper oldinst =
                 (ILdapMapper) mProcessor.getMapperInstance(id);
-        Vector oldConfigParms = oldinst.getInstanceParams();
+        Vector<String> oldConfigParms = oldinst.getInstanceParams();
         NameValuePairs saveParams = new NameValuePairs();
 
         // implName is always required so always include it it.
         saveParams.add("pluginName", implname);
         if (oldConfigParms != null) {
             for (int i = 0; i < oldConfigParms.size(); i++) {
-                String kv = (String) oldConfigParms.elementAt(i);
+                String kv = oldConfigParms.elementAt(i);
                 int index = kv.indexOf('=');
 
                 saveParams.add(kv.substring(0, index),
@@ -1554,7 +1556,7 @@ public class PublisherAdminServlet extends AdminServlet {
 
         // create new substore.
 
-        Vector configParams = mProcessor.getMapperInstanceParams(id);
+        Vector<String> configParams = mProcessor.getMapperInstanceParams(id);
 
         instancesConfig.removeSubStore(id);
 
@@ -1563,7 +1565,7 @@ public class PublisherAdminServlet extends AdminServlet {
         substore.put("pluginName", implname);
         if (configParams != null) {
             for (int i = 0; i < configParams.size(); i++) {
-                String kv = (String) configParams.elementAt(i);
+                String kv = configParams.elementAt(i);
                 int index = kv.indexOf('=');
                 String key = kv.substring(0, index);
                 String val = req.getParameter(key);
@@ -1683,7 +1685,7 @@ public class PublisherAdminServlet extends AdminServlet {
         IConfigStore instancesConfig = destStore.getSubStore("impl");
 
         // Does the class exist?
-        Class newImpl = null;
+        Class<?> newImpl = null;
 
         try {
             newImpl = Class.forName(classPath);
@@ -1781,7 +1783,7 @@ public class PublisherAdminServlet extends AdminServlet {
             return;
         }
 
-        Vector configParams = mProcessor.getRuleDefaultParams(implname);
+        Vector<String> configParams = mProcessor.getRuleDefaultParams(implname);
 
         IConfigStore destStore =
                 mConfig.getSubStore(mAuth.getId()
@@ -1792,7 +1794,7 @@ public class PublisherAdminServlet extends AdminServlet {
 
         if (configParams != null) {
             for (int i = 0; i < configParams.size(); i++) {
-                String kv = (String) configParams.elementAt(i);
+                String kv = configParams.elementAt(i);
                 int index = kv.indexOf('=');
                 String val = req.getParameter(kv.substring(0, index));
 
@@ -1882,10 +1884,10 @@ public class PublisherAdminServlet extends AdminServlet {
             HttpServletResponse resp) throws ServletException,
             IOException, EBaseException {
         NameValuePairs params = new NameValuePairs();
-        Enumeration e = mProcessor.getRulePlugins().keys();
+        Enumeration<String> e = mProcessor.getRulePlugins().keys();
 
         while (e.hasMoreElements()) {
-            String name = (String) e.nextElement();
+            String name = e.nextElement();
             RulePlugin value = (RulePlugin)
                     mProcessor.getRulePlugins().get(name);
             // get Description
@@ -1909,11 +1911,10 @@ public class PublisherAdminServlet extends AdminServlet {
             HttpServletResponse resp) throws ServletException,
             IOException, EBaseException {
         NameValuePairs params = new NameValuePairs();
-        String insts = null;
-        Enumeration e = mProcessor.getRuleInsts().keys();
+        Enumeration<String> e = mProcessor.getRuleInsts().keys();
 
         for (; e.hasMoreElements();) {
-            String name = (String) e.nextElement();
+            String name = e.nextElement();
             ILdapRule value = (ILdapRule)
                     mProcessor.getRuleInsts().get((Object) name);
             String enabled = value.enabled() ? "enabled" : "disabled";
@@ -1959,9 +1960,8 @@ public class PublisherAdminServlet extends AdminServlet {
 
         // first check if any instances from this rule
         // DON'T remove rule if any instance
-        for (Enumeration e = mProcessor.getRuleInsts().elements(); e.hasMoreElements();) {
-            ILdapRule rule = (ILdapRule)
-                    e.nextElement();
+        for (Enumeration<ILdapRule> e = mProcessor.getRuleInsts().elements(); e.hasMoreElements();) {
+            ILdapRule rule = e.nextElement();
 
             if (id.equals(getRulePluginName(rule))) {
                 sendResponse(ERROR, CMS.getUserMessage(getLocale(req), "CMS_LDAP_SRVLT_IN_USE"), null, resp);
@@ -2058,7 +2058,7 @@ public class PublisherAdminServlet extends AdminServlet {
             return;
         }
 
-        Vector configParams = mProcessor.getRuleDefaultParams(implname);
+        Vector<String> configParams = mProcessor.getRuleDefaultParams(implname);
         NameValuePairs params = new NameValuePairs();
 
         // implName is always required so always send it.
@@ -2099,7 +2099,7 @@ public class PublisherAdminServlet extends AdminServlet {
 
         ILdapRule ruleInst = (ILdapRule)
                 mProcessor.getRuleInsts().get(id);
-        Vector configParams = ruleInst.getInstanceParams();
+        Vector<String> configParams = ruleInst.getInstanceParams();
         NameValuePairs params = new NameValuePairs();
 
         params.add(Constants.PR_RULE_IMPL_NAME,
@@ -2163,14 +2163,14 @@ public class PublisherAdminServlet extends AdminServlet {
 
         ILdapRule oldinst =
                 (ILdapRule) mProcessor.getRuleInsts().get((Object) id);
-        Vector oldConfigParms = oldinst.getInstanceParams();
+        Vector<String> oldConfigParms = oldinst.getInstanceParams();
         NameValuePairs saveParams = new NameValuePairs();
 
         // implName is always required so always include it it.
         saveParams.add("pluginName", implname);
         if (oldConfigParms != null) {
             for (int i = 0; i < oldConfigParms.size(); i++) {
-                String kv = (String) oldConfigParms.elementAt(i);
+                String kv = oldConfigParms.elementAt(i);
                 int index = kv.indexOf('=');
 
                 saveParams.add(kv.substring(0, index),
@@ -2189,7 +2189,7 @@ public class PublisherAdminServlet extends AdminServlet {
 
         // create new substore.
 
-        Vector configParams = mProcessor.getRuleDefaultParams(implname);
+        Vector<String> configParams = mProcessor.getRuleDefaultParams(implname);
 
         instancesConfig.removeSubStore(id);
 
@@ -2198,7 +2198,7 @@ public class PublisherAdminServlet extends AdminServlet {
         substore.put("pluginName", implname);
         if (configParams != null) {
             for (int i = 0; i < configParams.size(); i++) {
-                String kv = (String) configParams.elementAt(i);
+                String kv = configParams.elementAt(i);
                 int index = kv.indexOf('=');
                 String key = kv.substring(0, index);
                 String val = req.getParameter(key);
@@ -2322,7 +2322,7 @@ public class PublisherAdminServlet extends AdminServlet {
         IConfigStore instancesConfig = destStore.getSubStore("impl");
 
         // Does the class exist?
-        Class newImpl = null;
+        Class<?> newImpl = null;
 
         try {
             newImpl = Class.forName(classPath);
@@ -2422,7 +2422,7 @@ public class PublisherAdminServlet extends AdminServlet {
             return;
         }
 
-        Vector configParams = mProcessor.getPublisherDefaultParams(implname);
+        Vector<String> configParams = mProcessor.getPublisherDefaultParams(implname);
 
         IConfigStore destStore =
                 mConfig.getSubStore(mAuth.getId() + ".publish.publisher");
@@ -2431,7 +2431,7 @@ public class PublisherAdminServlet extends AdminServlet {
 
         if (configParams != null) {
             for (int i = 0; i < configParams.size(); i++) {
-                String kv = (String) configParams.elementAt(i);
+                String kv = configParams.elementAt(i);
                 int index = kv.indexOf('=');
                 String val = null;
 
@@ -2533,10 +2533,10 @@ public class PublisherAdminServlet extends AdminServlet {
             IOException, EBaseException {
 
         NameValuePairs params = new NameValuePairs();
-        Enumeration e = mProcessor.getPublisherPlugins().keys();
+        Enumeration<String> e = mProcessor.getPublisherPlugins().keys();
 
         while (e.hasMoreElements()) {
-            String name = (String) e.nextElement();
+            String name = e.nextElement();
             PublisherPlugin value = (PublisherPlugin)
                     mProcessor.getPublisherPlugins().get(name);
             // get Description
@@ -2571,11 +2571,10 @@ public class PublisherAdminServlet extends AdminServlet {
             IOException, EBaseException {
 
         NameValuePairs params = new NameValuePairs();
-        String insts = null;
-        Enumeration e = mProcessor.getPublisherInsts().keys();
+        Enumeration<String> e = mProcessor.getPublisherInsts().keys();
 
         for (; e.hasMoreElements();) {
-            String name = (String) e.nextElement();
+            String name = e.nextElement();
             ILdapPublisher value = mProcessor.getPublisherInstance(name);
 
             if (value == null)
@@ -2613,8 +2612,8 @@ public class PublisherAdminServlet extends AdminServlet {
 
         // first check if any instances from this publisher
         // DON'T remove publisher if any instance
-        for (Enumeration e = mProcessor.getPublisherInsts().keys(); e.hasMoreElements();) {
-            String name = (String) e.nextElement();
+        for (Enumeration<String> e = mProcessor.getPublisherInsts().keys(); e.hasMoreElements();) {
+            String name = e.nextElement();
             ILdapPublisher publisher =
                     mProcessor.getPublisherInstance(name);
 
@@ -2722,7 +2721,7 @@ public class PublisherAdminServlet extends AdminServlet {
             return;
         }
 
-        Vector configParams = mProcessor.getPublisherDefaultParams(implname);
+        Vector<String> configParams = mProcessor.getPublisherDefaultParams(implname);
         NameValuePairs params = new NameValuePairs();
 
         // implName is always required so always send it.
@@ -2769,7 +2768,7 @@ public class PublisherAdminServlet extends AdminServlet {
 
         ILdapPublisher publisherInst = (ILdapPublisher)
                 mProcessor.getPublisherInstance(id);
-        Vector configParams = publisherInst.getInstanceParams();
+        Vector<String> configParams = publisherInst.getInstanceParams();
         NameValuePairs params = new NameValuePairs();
 
         params.add(Constants.PR_PUBLISHER_IMPL_NAME,
@@ -2844,7 +2843,7 @@ public class PublisherAdminServlet extends AdminServlet {
         // save old instance substore params in case new one fails. 
 
         ILdapPublisher oldinst = mProcessor.getPublisherInstance(id);
-        Vector oldConfigParms = oldinst.getInstanceParams();
+        Vector<String> oldConfigParms = oldinst.getInstanceParams();
         NameValuePairs saveParams = new NameValuePairs();
         String pubType = "";
 
@@ -2886,7 +2885,7 @@ public class PublisherAdminServlet extends AdminServlet {
 
         // create new substore.
 
-        Vector configParams = mProcessor.getPublisherInstanceParams(id);
+        Vector<String> configParams = mProcessor.getPublisherInstanceParams(id);
 
         instancesConfig.removeSubStore(id);
 
@@ -3107,10 +3106,10 @@ public class PublisherAdminServlet extends AdminServlet {
         store.removeSubStore(id);
         IConfigStore rstore = store.makeSubStore(id);
 
-        Enumeration keys = saveParams.getNames();
+        Enumeration<String> keys = saveParams.getNames();
 
         while (keys.hasMoreElements()) {
-            String key = (String) keys.nextElement();
+            String key = keys.nextElement();
             String value = saveParams.getValue(key);
 
             if (value != null)
diff --git a/pki/base/common/src/com/netscape/cms/servlet/admin/RAAdminServlet.java b/pki/base/common/src/com/netscape/cms/servlet/admin/RAAdminServlet.java
index cbabe1fd0..1adde0891 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/admin/RAAdminServlet.java
+++ b/pki/base/common/src/com/netscape/cms/servlet/admin/RAAdminServlet.java
@@ -185,10 +185,11 @@ public class RAAdminServlet extends AdminServlet {
             HttpServletResponse resp, IConfigStore rc) throws ServletException,
             IOException, EBaseException {
         NameValuePairs params = new NameValuePairs();
-        Enumeration e = req.getParameterNames();
+        @SuppressWarnings("unchecked")
+        Enumeration<String> e = req.getParameterNames();
 
         while (e.hasMoreElements()) {
-            String name = (String) e.nextElement();
+            String name = e.nextElement();
 
             if (name.equals(Constants.OP_TYPE))
                 continue;
@@ -250,10 +251,11 @@ public class RAAdminServlet extends AdminServlet {
 
         IConfigStore riq = nc.getSubStore(IRegistrationAuthority.PROP_REQ_IN_Q_SUBSTORE);
 
-        Enumeration e = req.getParameterNames();
+        @SuppressWarnings("unchecked")
+        Enumeration<String> e = req.getParameterNames();
 
         while (e.hasMoreElements()) {
-            String name = (String) e.nextElement();
+            String name = e.nextElement();
 
             if (name.equals(Constants.OP_TYPE))
                 continue;
@@ -285,10 +287,11 @@ public class RAAdminServlet extends AdminServlet {
         IConfigStore riq = nc.getSubStore(IRegistrationAuthority.PROP_REQ_IN_Q_SUBSTORE);
 
         //set rest of the parameters
-        Enumeration e = req.getParameterNames();
+        @SuppressWarnings("unchecked")
+        Enumeration<String> e = req.getParameterNames();
 
         while (e.hasMoreElements()) {
-            String name = (String) e.nextElement();
+            String name = e.nextElement();
 
             if (name.equals(Constants.OP_TYPE))
                 continue;
@@ -322,10 +325,11 @@ public class RAAdminServlet extends AdminServlet {
             HttpServletResponse resp, IConfigStore rc, IRequestListener thisListener) throws ServletException,
             IOException, EBaseException {
         //set rest of the parameters
-        Enumeration e = req.getParameterNames();
+        @SuppressWarnings("unchecked")
+        Enumeration<String> e = req.getParameterNames();
 
         while (e.hasMoreElements()) {
-            String name = (String) e.nextElement();
+            String name = e.nextElement();
 
             if (name.equals(Constants.OP_TYPE))
                 continue;
@@ -404,12 +408,13 @@ public class RAAdminServlet extends AdminServlet {
          }
          */
 
-        Enumeration enum1 = req.getParameterNames();
+        @SuppressWarnings("unchecked")
+        Enumeration<String> enum1 = req.getParameterNames();
         NameValuePairs params = new NameValuePairs();
 
         if (caConnectorConfig != null) {
             while (enum1.hasMoreElements()) {
-                String name = (String) enum1.nextElement();
+                String name = enum1.nextElement();
 
                 if (name.equals(Constants.RS_ID))
                     continue;
@@ -441,11 +446,12 @@ public class RAAdminServlet extends AdminServlet {
             caConnectorConfig = connectorConfig.getSubStore("KRA");
         }
 
-        Enumeration enum1 = req.getParameterNames();
+        @SuppressWarnings("unchecked")
+        Enumeration<String> enum1 = req.getParameterNames();
 
         if (caConnectorConfig != null) {
             while (enum1.hasMoreElements()) {
-                String name = (String) enum1.nextElement();
+                String name = enum1.nextElement();
 
                 if (name.equals(Constants.OP_TYPE))
                     continue;
@@ -469,10 +475,11 @@ public class RAAdminServlet extends AdminServlet {
 
     private boolean isCAConnector(HttpServletRequest req) {
 
-        Enumeration enum1 = req.getParameterNames();
+        @SuppressWarnings("unchecked")
+        Enumeration<String> enum1 = req.getParameterNames();
 
         while (enum1.hasMoreElements()) {
-            String key = (String) enum1.nextElement();
+            String key = enum1.nextElement();
 
             if (key.equals("RS_ID")) {
                 String val = req.getParameter(key);
@@ -488,10 +495,11 @@ public class RAAdminServlet extends AdminServlet {
 
     private boolean isRAConnector(HttpServletRequest req) {
 
-        Enumeration enum1 = req.getParameterNames();
+        @SuppressWarnings("unchecked")
+        Enumeration<String> enum1 = req.getParameterNames();
 
         while (enum1.hasMoreElements()) {
-            String key = (String) enum1.nextElement();
+            String key = enum1.nextElement();
 
             if (key.equals("RS_ID")) {
                 String val = req.getParameter(key);
@@ -507,10 +515,11 @@ public class RAAdminServlet extends AdminServlet {
 
     private boolean isKRAConnector(HttpServletRequest req) {
 
-        Enumeration enum1 = req.getParameterNames();
+        @SuppressWarnings("unchecked")
+        Enumeration<String> enum1 = req.getParameterNames();
 
         while (enum1.hasMoreElements()) {
-            String key = (String) enum1.nextElement();
+            String key = enum1.nextElement();
 
             if (key.equals("RS_ID")) {
                 String val = req.getParameter(key);
diff --git a/pki/base/common/src/com/netscape/cms/servlet/admin/UsrGrpAdminServlet.java b/pki/base/common/src/com/netscape/cms/servlet/admin/UsrGrpAdminServlet.java
index 8481fffe1..6eaf004f9 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/admin/UsrGrpAdminServlet.java
+++ b/pki/base/common/src/com/netscape/cms/servlet/admin/UsrGrpAdminServlet.java
@@ -90,8 +90,6 @@ public class UsrGrpAdminServlet extends AdminServlet {
 
     private IUGSubsystem mMgr = null;
 
-    private IAuthzSubsystem mAuthz = null;
-
     private static String[] mMultiRoleGroupEnforceList = null;
     private final static String MULTI_ROLE_ENABLE = "multiroles.enable";
     private final static String MULTI_ROLE_ENFORCE_GROUP_LIST = "multiroles.false.groupEnforceList";
@@ -345,7 +343,7 @@ public class UsrGrpAdminServlet extends AdminServlet {
 
         NameValuePairs params = new NameValuePairs();
 
-        Enumeration e = null;
+        Enumeration<IUser> e = null;
 
         try {
             e = mMgr.listUsers("*");
@@ -359,7 +357,7 @@ public class UsrGrpAdminServlet extends AdminServlet {
         int i = 0;
 
         while (e.hasMoreElements()) {
-            IUser user = (IUser) e.nextElement();
+            IUser user = e.nextElement();
 
             if (i > 0) {
                 sb.append(";");
@@ -424,7 +422,7 @@ public class UsrGrpAdminServlet extends AdminServlet {
 
             // get list of groups, and get a list of those that this
             //			uid belongs to
-            Enumeration e = null;
+            Enumeration<IGroup> e = null;
 
             try {
                 e = mMgr.findGroups("*");
@@ -438,7 +436,7 @@ public class UsrGrpAdminServlet extends AdminServlet {
             StringBuffer grpString = new StringBuffer();
 
             while (e.hasMoreElements()) {
-                IGroup group = (IGroup) e.nextElement();
+                IGroup group = e.nextElement();
 
                 if (group.isMember(id) == true) {
                     if (grpString.length() != 0) {
@@ -553,7 +551,7 @@ public class UsrGrpAdminServlet extends AdminServlet {
             IOException, EBaseException {
         NameValuePairs params = new NameValuePairs();
 
-        Enumeration e = null;
+        Enumeration<IGroup> e = null;
 
         try {
             e = mMgr.listGroups("*");
@@ -564,7 +562,7 @@ public class UsrGrpAdminServlet extends AdminServlet {
         }
 
         while (e.hasMoreElements()) {
-            IGroup group = (IGroup) e.nextElement();
+            IGroup group = e.nextElement();
             String desc = group.getDescription();
 
             if (desc != null) {
@@ -600,7 +598,7 @@ public class UsrGrpAdminServlet extends AdminServlet {
             return;
         }
 
-        Enumeration e = null;
+        Enumeration<IGroup> e = null;
 
         try {
             e = mMgr.findGroups(id);
@@ -611,13 +609,13 @@ public class UsrGrpAdminServlet extends AdminServlet {
         }
 
         if (e.hasMoreElements()) {
-            IGroup group = (IGroup) e.nextElement();
+            IGroup group = e.nextElement();
 
             params.add(Constants.PR_GROUP_GROUP, group.getGroupID());
             params.add(Constants.PR_GROUP_DESC,
                     group.getDescription());
 
-            Enumeration members = group.getMemberNames();
+            Enumeration<String> members = group.getMemberNames();
             StringBuffer membersString = new StringBuffer();
 
             if (members != null) {
@@ -626,7 +624,7 @@ public class UsrGrpAdminServlet extends AdminServlet {
                         membersString.append(", ");
                     }
 
-                    String mn = (String) members.nextElement();
+                    String mn = members.nextElement();
 
                     membersString.append(mn);
                 }
@@ -814,7 +812,7 @@ public class UsrGrpAdminServlet extends AdminServlet {
                         Constants.PR_USER_GROUP);
 
                 if (groupName != null) {
-                    Enumeration e = null;
+                    Enumeration<IGroup> e = null;
 
                     try {
                         e = mMgr.findGroups(groupName);
@@ -836,7 +834,7 @@ public class UsrGrpAdminServlet extends AdminServlet {
                     }
 
                     if (e.hasMoreElements()) {
-                        IGroup group = (IGroup) e.nextElement();
+                        IGroup group = e.nextElement();
 
                         group.addMemberName(id);
                         try {
@@ -902,8 +900,6 @@ public class UsrGrpAdminServlet extends AdminServlet {
                 }
                 return;
             } catch (LDAPException e) {
-                String errMsg = "addUser()" + e.toString();
-
                 log(ILogger.LL_FAILURE, CMS.getLogMessage("ADMIN_SRVLT_ADD_USER_FAIL", e.toString()));
 
                 // store a message in the signed audit log file
@@ -1530,7 +1526,7 @@ public class UsrGrpAdminServlet extends AdminServlet {
                 return;
             }
             // get list of groups, and see if uid belongs to any
-            Enumeration e = null;
+            Enumeration<IGroup> e = null;
 
             try {
                 e = mMgr.findGroups("*");
@@ -2090,7 +2086,7 @@ public class UsrGrpAdminServlet extends AdminServlet {
     }
 
     private boolean isDuplicate(String groupName, String memberName) {
-        Enumeration groups = null;
+        Enumeration<IGroup> groups = null;
 
         // Let's not mess with users that are already a member of this group
         boolean isMember = false;
@@ -2105,15 +2101,15 @@ public class UsrGrpAdminServlet extends AdminServlet {
         try {
             groups = mMgr.listGroups("*");
             while (groups.hasMoreElements()) {
-                IGroup group = (IGroup) groups.nextElement();
+                IGroup group = groups.nextElement();
                 String name = group.getName();
-                Enumeration g = mMgr.findGroups(name);
-                IGroup g1 = (IGroup) g.nextElement();
+                Enumeration<IGroup> g = mMgr.findGroups(name);
+                IGroup g1 = g.nextElement();
                 if (!name.equals(groupName)) {
                     if (isGroupInMultiRoleEnforceList(name)) {
-                        Enumeration members = g1.getMemberNames();
+                        Enumeration<String> members = g1.getMemberNames();
                         while (members.hasMoreElements()) {
-                            String m1 = (String) members.nextElement();
+                            String m1 = members.nextElement();
                             if (m1.equals(memberName))
                                 return true;
                         }
diff --git a/pki/base/common/src/com/netscape/cms/servlet/base/CMSServlet.java b/pki/base/common/src/com/netscape/cms/servlet/base/CMSServlet.java
index e292e501a..a48b8146c 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/base/CMSServlet.java
+++ b/pki/base/common/src/com/netscape/cms/servlet/base/CMSServlet.java
@@ -55,7 +55,6 @@ import netscape.security.x509.RevocationReason;
 import netscape.security.x509.RevokedCertImpl;
 import netscape.security.x509.X509CertImpl;
 
-import org.mozilla.jss.ssl.SSLSocket;
 import org.w3c.dom.Node;
 
 import com.netscape.certsrv.apps.CMS;
@@ -446,7 +445,6 @@ public abstract class CMSServlet extends HttpServlet {
             outputHttpParameters(httpReq);
         }
         CMS.debug("CMSServlet: " + mId + " start to service.");
-        String className = this.getClass().getName();
 
         // get a cms request 
         CMSRequest cmsRequest = newCMSRequest();
@@ -770,7 +768,6 @@ public abstract class CMSServlet extends HttpServlet {
      * Invalidates a SSL Session. So client auth will happen again.
      */
     protected static void invalidateSSLSession(HttpServletRequest httpReq) {
-        SSLSocket s = null;
 
         /*
          try {
@@ -1812,9 +1809,6 @@ public abstract class CMSServlet extends HttpServlet {
         String auditACLResource = resource;
         String auditOperation = "enroll";
 
-        SessionContext auditContext = SessionContext.getExistingContext();
-        String authManagerId = null;
-
         try {
             authzToken = mAuthz.authorize(authzMgrName, authToken, exp);
             if (authzToken != null) {
diff --git a/pki/base/common/src/com/netscape/cms/servlet/cert/DisplayCRL.java b/pki/base/common/src/com/netscape/cms/servlet/cert/DisplayCRL.java
index bdaa0df29..c34cd2227 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/cert/DisplayCRL.java
+++ b/pki/base/common/src/com/netscape/cms/servlet/cert/DisplayCRL.java
@@ -183,7 +183,7 @@ public class DisplayCRL extends CMSServlet {
         boolean isCRLCacheEnabled = false;
         String masterHost = null;
         String masterPort = null;
-        Vector ipNames = null;
+        Vector<String> ipNames = null;
         String ipId = crlIssuingPointId;
         ICRLRepository crlRepository = mCA.getCRLRepository();
 
@@ -203,7 +203,7 @@ public class DisplayCRL extends CMSServlet {
                 if (ipNames != null && ipNames.size() > 0) {
                     int i;
                     for (i = 0; i < ipNames.size(); i++) {
-                        String ipName = (String) ipNames.elementAt(i);
+                        String ipName = ipNames.elementAt(i);
                         if (crlIssuingPointId.equals(ipName)) {
                             break;
                         }
diff --git a/pki/base/common/src/com/netscape/cms/servlet/cert/GetInfo.java b/pki/base/common/src/com/netscape/cms/servlet/cert/GetInfo.java
index ce3b7ee69..9db5cb892 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/cert/GetInfo.java
+++ b/pki/base/common/src/com/netscape/cms/servlet/cert/GetInfo.java
@@ -213,9 +213,9 @@ public class GetInfo extends CMSServlet {
 
                 ICRLRepository crlRepository = mCA.getCRLRepository();
 
-                Vector ipNames = crlRepository.getIssuingPointsNames();
+                Vector<String> ipNames = crlRepository.getIssuingPointsNames();
                 for (int i = 0; i < ipNames.size(); i++) {
-                    String ipName = (String) ipNames.elementAt(i);
+                    String ipName = ipNames.elementAt(i);
                     ICRLIssuingPointRecord crlRecord = null;
                     try {
                         crlRecord = crlRepository.readCRLIssuingPointRecord(ipName);
diff --git a/pki/base/common/src/com/netscape/cms/servlet/cert/ReasonToRevoke.java b/pki/base/common/src/com/netscape/cms/servlet/cert/ReasonToRevoke.java
index 878820597..b8e56b3e7 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/cert/ReasonToRevoke.java
+++ b/pki/base/common/src/com/netscape/cms/servlet/cert/ReasonToRevoke.java
@@ -249,7 +249,6 @@ public class ReasonToRevoke extends CMSServlet {
                     totalRecordCount, mTimeLimits);
 
             int count = 0;
-            String errorMsg = null;
 
             while (e != null && e.hasMoreElements()) {
                 ICertRecord rec = (ICertRecord) e.nextElement();
diff --git a/pki/base/common/src/com/netscape/cms/servlet/cert/RemoteAuthConfig.java b/pki/base/common/src/com/netscape/cms/servlet/cert/RemoteAuthConfig.java
index 5a0a12662..55d8bb04c 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/cert/RemoteAuthConfig.java
+++ b/pki/base/common/src/com/netscape/cms/servlet/cert/RemoteAuthConfig.java
@@ -75,7 +75,7 @@ public class RemoteAuthConfig extends CMSServlet {
     private IAuthSubsystem mAuthSubsystem = null;
     private IConfigStore mAuthConfig = null;
     private IConfigStore mFileConfig = null;
-    private Vector mRemotelySetInstances = new Vector();
+    private Vector<String> mRemotelySetInstances = new Vector<String>();
     private boolean mEnableRemoteConfiguration = false;
 
     /**
@@ -302,10 +302,11 @@ public class RemoteAuthConfig extends CMSServlet {
                 LDAPAttribute attr = entry.getAttribute(MEMBER_OF);
 
                 if (attr != null) {
-                    Enumeration eVals = attr.getStringValues();
+                    @SuppressWarnings("unchecked")
+                    Enumeration<String> eVals = attr.getStringValues();
 
                     while (eVals.hasMoreElements()) {
-                        String nextValue = (String) eVals.nextElement();
+                        String nextValue = eVals.nextElement();
 
                         if (nextValue.indexOf("Administrator") > -1) {
                             LDAPEntry groupEntry = c.read(nextValue);
@@ -314,10 +315,11 @@ public class RemoteAuthConfig extends CMSServlet {
                                 LDAPAttribute gAttr = groupEntry.getAttribute(UNIQUE_MEMBER);
 
                                 if (gAttr != null) {
-                                    Enumeration eValues = gAttr.getStringValues();
+                                    @SuppressWarnings("unchecked")
+                                    Enumeration<String> eValues = gAttr.getStringValues();
 
                                     while (eValues.hasMoreElements()) {
-                                        String value = (String) eValues.nextElement();
+                                        String value = eValues.nextElement();
 
                                         if (value.equals(entry.getDN())) {
                                             c.disconnect();
@@ -409,10 +411,11 @@ public class RemoteAuthConfig extends CMSServlet {
 
                     if (attr != null) {
                         memberOf = true;
-                        Enumeration eVals = attr.getStringValues();
+                        @SuppressWarnings("unchecked")
+                        Enumeration<String> eVals = attr.getStringValues();
 
                         while (eVals.hasMoreElements()) {
-                            String nextValue = (String) eVals.nextElement();
+                            String nextValue = eVals.nextElement();
 
                             if (nextValue.indexOf("Administrator") > -1) {
                                 LDAPEntry groupEntry = c.read(nextValue);
@@ -421,10 +424,11 @@ public class RemoteAuthConfig extends CMSServlet {
                                     LDAPAttribute gAttr = groupEntry.getAttribute(UNIQUE_MEMBER);
 
                                     if (gAttr != null) {
-                                        Enumeration eValues = gAttr.getStringValues();
+                                        @SuppressWarnings("unchecked")
+                                        Enumeration<String> eValues = gAttr.getStringValues();
 
                                         while (eValues.hasMoreElements()) {
-                                            String value = (String) eValues.nextElement();
+                                            String value = eValues.nextElement();
 
                                             if (value.equals(entry.getDN())) {
                                                 c.disconnect();
@@ -516,7 +520,7 @@ public class RemoteAuthConfig extends CMSServlet {
         for (int i = 0; i < mRemotelySetInstances.size(); i++) {
             if (i > 0)
                 list.append(",");
-            list.append((String) mRemotelySetInstances.elementAt(i));
+            list.append(mRemotelySetInstances.elementAt(i));
         }
 
         mAuthConfig.putString(REMOTELY_SET_INSTANCES, list.toString());
@@ -543,7 +547,7 @@ public class RemoteAuthConfig extends CMSServlet {
             for (int i = 0; i < mRemotelySetInstances.size(); i++) {
                 if (i > 0)
                     list.append(",");
-                list.append((String) mRemotelySetInstances.elementAt(i));
+                list.append(mRemotelySetInstances.elementAt(i));
             }
 
             mAuthConfig.putString(REMOTELY_SET_INSTANCES, list.toString());
@@ -563,10 +567,10 @@ public class RemoteAuthConfig extends CMSServlet {
         boolean isListed = false;
 
         if (pluginName != null && pluginName.length() > 0) {
-            Enumeration e = mAuthSubsystem.getAuthManagerPlugins();
+            Enumeration<AuthMgrPlugin> e = mAuthSubsystem.getAuthManagerPlugins();
 
             while (e.hasMoreElements()) {
-                AuthMgrPlugin plugin = (AuthMgrPlugin) e.nextElement();
+                AuthMgrPlugin plugin = e.nextElement();
 
                 if (pluginName.equals(plugin.getId())) {
                     isListed = true;
@@ -582,10 +586,10 @@ public class RemoteAuthConfig extends CMSServlet {
         boolean isListed = false;
 
         if (instanceName != null && instanceName.length() > 0) {
-            Enumeration e = mAuthSubsystem.getAuthManagers();
+            Enumeration<IAuthManager> e = mAuthSubsystem.getAuthManagers();
 
             while (e.hasMoreElements()) {
-                IAuthManager authManager = (IAuthManager) e.nextElement();
+                IAuthManager authManager = e.nextElement();
 
                 if (instanceName.equals(authManager.getName())) {
                     isListed = true;
diff --git a/pki/base/common/src/com/netscape/cms/servlet/cert/RenewalServlet.java b/pki/base/common/src/com/netscape/cms/servlet/cert/RenewalServlet.java
index 2bc1d3051..fd2454210 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/cert/RenewalServlet.java
+++ b/pki/base/common/src/com/netscape/cms/servlet/cert/RenewalServlet.java
@@ -278,10 +278,10 @@ public class RenewalServlet extends CMSServlet {
             cmsReq.setIRequestStatus();
             // audit log the status
             if (status == RequestStatus.REJECTED) {
-                Vector messages = req.getExtDataInStringVector(IRequest.ERRORS);
+                Vector<String> messages = req.getExtDataInStringVector(IRequest.ERRORS);
 
                 if (messages != null) {
-                    Enumeration msgs = messages.elements();
+                    Enumeration<String> msgs = messages.elements();
                     StringBuffer wholeMsg = new StringBuffer();
 
                     while (msgs.hasMoreElements()) {
diff --git a/pki/base/common/src/com/netscape/cms/servlet/cert/RevocationServlet.java b/pki/base/common/src/com/netscape/cms/servlet/cert/RevocationServlet.java
index 875f2ab67..a4d434bd4 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/cert/RevocationServlet.java
+++ b/pki/base/common/src/com/netscape/cms/servlet/cert/RevocationServlet.java
@@ -239,10 +239,10 @@ public class RevocationServlet extends CMSServlet {
 
             if (status == RequestStatus.COMPLETE) {
                 header.addStringValue("request", req.getRequestId().toString());
-                Enumeration enum1 = req.getExtDataKeys();
+                Enumeration<String> enum1 = req.getExtDataKeys();
 
                 while (enum1.hasMoreElements()) {
-                    String name = (String) enum1.nextElement();
+                    String name = enum1.nextElement();
 
                     if (name.equals(IRequest.OLD_CERTS)) {
                         X509CertImpl[] certs = req.getExtDataInCertArray(IRequest.OLD_CERTS);
diff --git a/pki/base/common/src/com/netscape/cms/servlet/cert/UpdateDir.java b/pki/base/common/src/com/netscape/cms/servlet/cert/UpdateDir.java
index dc084bd94..0491ccef5 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/cert/UpdateDir.java
+++ b/pki/base/common/src/com/netscape/cms/servlet/cert/UpdateDir.java
@@ -342,10 +342,10 @@ public class UpdateDir extends CMSServlet {
                 updateValue[UPDATE_CRL].equalsIgnoreCase("yes"))) {
             // check if received issuing point ID is known to the server
             if (crlIssuingPointId != null) {
-                Enumeration ips = mCA.getCRLIssuingPoints();
+                Enumeration<ICRLIssuingPoint> ips = mCA.getCRLIssuingPoints();
 
                 while (ips.hasMoreElements()) {
-                    ICRLIssuingPoint ip = (ICRLIssuingPoint) ips.nextElement();
+                    ICRLIssuingPoint ip = ips.nextElement();
 
                     if (crlIssuingPointId.equals(ip.getId())) {
                         break;
@@ -357,19 +357,19 @@ public class UpdateDir extends CMSServlet {
             if (crlIssuingPointId == null) {
                 // publish all issuing points
                 if (mClonedCA && mCRLRepository != null) {
-                    Vector ipNames = mCRLRepository.getIssuingPointsNames();
+                    Vector<String> ipNames = mCRLRepository.getIssuingPointsNames();
                     if (ipNames != null && ipNames.size() > 0) {
                         for (int i = 0; i < ipNames.size(); i++) {
-                            String ipName = (String) ipNames.elementAt(i);
+                            String ipName = ipNames.elementAt(i);
 
                             updateCRLIssuingPoint(header, ipName, null, locale);
                         }
                     }
                 } else {
-                    Enumeration oips = mCA.getCRLIssuingPoints();
+                    Enumeration<ICRLIssuingPoint> oips = mCA.getCRLIssuingPoints();
 
                     while (oips.hasMoreElements()) {
-                        ICRLIssuingPoint oip = (ICRLIssuingPoint) oips.nextElement();
+                        ICRLIssuingPoint oip = oips.nextElement();
 
                         updateCRLIssuingPoint(header, oip.getId(), oip, locale);
                     }
diff --git a/pki/base/common/src/com/netscape/cms/servlet/common/CMSGateway.java b/pki/base/common/src/com/netscape/cms/servlet/common/CMSGateway.java
index d04e2fb22..20743022a 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/common/CMSGateway.java
+++ b/pki/base/common/src/com/netscape/cms/servlet/common/CMSGateway.java
@@ -77,8 +77,9 @@ public class CMSGateway {
     public CMSGateway() {
     }
 
-    public static Hashtable toHashtable(HttpServletRequest req) {
-        Hashtable httpReqHash = new Hashtable();
+    public static Hashtable<String, String> toHashtable(HttpServletRequest req) {
+        Hashtable<String, String> httpReqHash = new Hashtable<String, String>();
+        @SuppressWarnings("unchecked")
         Enumeration<String> names = req.getParameterNames();
 
         while (names.hasMoreElements()) {
diff --git a/pki/base/common/src/com/netscape/cms/servlet/common/CMSRequest.java b/pki/base/common/src/com/netscape/cms/servlet/common/CMSRequest.java
index b1be4f7a5..ecc5f45be 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/common/CMSRequest.java
+++ b/pki/base/common/src/com/netscape/cms/servlet/common/CMSRequest.java
@@ -82,7 +82,7 @@ public class CMSRequest {
 
     // any request resulting data;
     Object mResult = null;
-    Hashtable mResults = new Hashtable();
+    Hashtable<String, Object> mResults = new Hashtable<String, Object>();
 
     /**
      * Constructor
diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/RegisterUser.java b/pki/base/common/src/com/netscape/cms/servlet/csadmin/RegisterUser.java
index 8ca70bd4a..d1c2b6bfb 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/RegisterUser.java
+++ b/pki/base/common/src/com/netscape/cms/servlet/csadmin/RegisterUser.java
@@ -252,13 +252,13 @@ public class RegisterUser extends CMSServlet {
         auditParams = "Scope;;groups+Operation;;OP_MODIFY+source;;RegisterUser" +
                       "+Resource;;" + mGroupName;
         try {
-            Enumeration groups = ugsys.findGroups(mGroupName);
-            IGroup group = (IGroup) groups.nextElement();
+            Enumeration<IGroup> groups = ugsys.findGroups(mGroupName);
+            IGroup group = groups.nextElement();
 
             auditParams += "+user;;";
-            Enumeration members = group.getMemberNames();
+            Enumeration<String> members = group.getMemberNames();
             while (members.hasMoreElements()) {
-                auditParams += (String) members.nextElement();
+                auditParams += members.nextElement();
                 if (members.hasMoreElements()) {
                     auditParams += ",";
                 }
diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/SessionTimer.java b/pki/base/common/src/com/netscape/cms/servlet/csadmin/SessionTimer.java
index 49cadb9c2..2d8a188af 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/SessionTimer.java
+++ b/pki/base/common/src/com/netscape/cms/servlet/csadmin/SessionTimer.java
@@ -37,9 +37,9 @@ public class SessionTimer extends TimerTask {
     }
 
     public void run() {
-        Enumeration keys = m_sessiontable.getSessionIds();
+        Enumeration<String> keys = m_sessiontable.getSessionIds();
         while (keys.hasMoreElements()) {
-            String sessionId = (String) keys.nextElement();
+            String sessionId = keys.nextElement();
             long beginTime = m_sessiontable.getBeginTime(sessionId);
             Date nowDate = new Date();
             long nowTime = nowDate.getTime();
diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/SizePanel.java b/pki/base/common/src/com/netscape/cms/servlet/csadmin/SizePanel.java
index fcb88c917..c915d9e85 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/SizePanel.java
+++ b/pki/base/common/src/com/netscape/cms/servlet/csadmin/SizePanel.java
@@ -46,7 +46,7 @@ import com.netscape.cms.servlet.wizard.WizardServlet;
 import com.netscape.cmsutil.crypto.CryptoUtil;
 
 public class SizePanel extends WizardPanelBase {
-    private Vector mCerts = null;
+    private Vector<Cert> mCerts = null;
     private WizardServlet mServlet = null;
 
     private String default_ecc_curve_name;
@@ -128,7 +128,7 @@ public class SizePanel extends WizardPanelBase {
 
         context.put("firsttime", "false");
         String errorString = "";
-        mCerts = new Vector();
+        mCerts = new Vector<Cert>();
 
         IConfigStore config = CMS.getConfigStore();
         try {
@@ -251,10 +251,10 @@ public class SizePanel extends WizardPanelBase {
         String token = "";
         try {
             token = config.getString(PRE_CONF_CA_TOKEN, "");
-            Enumeration c = mCerts.elements();
+            Enumeration<Cert> c = mCerts.elements();
 
             while (c.hasMoreElements()) {
-                Cert cert = (Cert) c.nextElement();
+                Cert cert = c.nextElement();
                 String ct = cert.getCertTag();
                 boolean enable = config.getBoolean(PCERT_PREFIX + ct + ".enable", true);
                 if (!enable)
@@ -411,10 +411,10 @@ public class SizePanel extends WizardPanelBase {
         }
 
         // generate key pair 
-        Enumeration c = mCerts.elements();
+        Enumeration<Cert> c = mCerts.elements();
 
         while (c.hasMoreElements()) {
-            Cert cert = (Cert) c.nextElement();
+            Cert cert = c.nextElement();
             String ct = cert.getCertTag();
             String friendlyName = ct;
             boolean enable = true;
diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/UpdateConnector.java b/pki/base/common/src/com/netscape/cms/servlet/csadmin/UpdateConnector.java
index bba1f3782..f3df51bd1 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/UpdateConnector.java
+++ b/pki/base/common/src/com/netscape/cms/servlet/csadmin/UpdateConnector.java
@@ -122,9 +122,10 @@ public class UpdateConnector extends CMSServlet {
 
         IConfigStore cs = CMS.getConfigStore();
 
-        Enumeration list = httpReq.getParameterNames();
+        @SuppressWarnings("unchecked")
+        Enumeration<String> list = httpReq.getParameterNames();
         while (list.hasMoreElements()) {
-            String name = (String) list.nextElement();
+            String name = list.nextElement();
             String val = httpReq.getParameter(name);
             if (name != null && name.startsWith("ca.connector")) {
                 CMS.debug("Adding connector update name=" + name + " val=" + val);
diff --git a/pki/base/common/src/com/netscape/cms/servlet/ocsp/ListCAServlet.java b/pki/base/common/src/com/netscape/cms/servlet/ocsp/ListCAServlet.java
index 83eaca45f..2d9daff95 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/ocsp/ListCAServlet.java
+++ b/pki/base/common/src/com/netscape/cms/servlet/ocsp/ListCAServlet.java
@@ -135,8 +135,7 @@ public class ListCAServlet extends CMSServlet {
                 Integer.toString(defStore.getStateCount()));
 
         while (recs.hasMoreElements()) {
-            ICRLIssuingPointRecord rec =
-                    (ICRLIssuingPointRecord) recs.nextElement();
+            ICRLIssuingPointRecord rec = (ICRLIssuingPointRecord) recs.nextElement();
             IArgBlock rarg = CMS.createArgBlock();
             String thisId = rec.getId();
 
diff --git a/pki/base/common/src/com/netscape/cms/servlet/request/QueryReq.java b/pki/base/common/src/com/netscape/cms/servlet/request/QueryReq.java
index 8ec82d0a4..e580cc9a4 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/request/QueryReq.java
+++ b/pki/base/common/src/com/netscape/cms/servlet/request/QueryReq.java
@@ -437,19 +437,19 @@ public class QueryReq extends CMSServlet {
 
             int numEntries = list.getSize() - list.getCurrentIndex();
 
-            Vector v = fetchRecords(list, maxCount);
+            Vector<IRequest> v = fetchRecords(list, maxCount);
             v = normalizeOrder(v);
             trim(v, id);
 
             int currentCount = 0;
             BigInteger curNum = BigInteger.ZERO;
             BigInteger firstNum = BigInteger.ONE.negate();
-            Enumeration requests = v.elements();
+            Enumeration<IRequest> requests = v.elements();
 
             while (requests.hasMoreElements()) {
                 IRequest request = null;
                 try {
-                    request = (IRequest) requests.nextElement();
+                    request = requests.nextElement();
                 } catch (Exception e) {
                     CMS.debug("Error displaying request:" + e.getMessage());
                     // handled below
@@ -493,9 +493,9 @@ public class QueryReq extends CMSServlet {
      * @param v The vector to trim
      * @param marker the marker to look for.
      */
-    private void trim(Vector v, RequestId marker) {
+    private void trim(Vector<IRequest> v, RequestId marker) {
         int i = v.size() - 1;
-        if (((IRequest) v.elementAt(i)).getRequestId().toString().equals(
+        if (v.elementAt(i).getRequestId().toString().equals(
                 marker.toString())) {
             v.remove(i);
         }
@@ -508,9 +508,9 @@ public class QueryReq extends CMSServlet {
      * @param list
      * @return
      */
-    private Vector fetchRecords(IRequestVirtualList list, int maxCount) {
+    private Vector<IRequest> fetchRecords(IRequestVirtualList list, int maxCount) {
 
-        Vector v = new Vector();
+        Vector<IRequest> v = new Vector<IRequest>();
         int count = list.getSize();
         int c = 0;
         for (int i = 0; i < count; i++) {
@@ -533,20 +533,20 @@ public class QueryReq extends CMSServlet {
      * @param list
      * @return
      */
-    private Vector normalizeOrder(Vector list) {
+    private Vector<IRequest> normalizeOrder(Vector<IRequest> list) {
 
-        BigInteger firstrequestnum = new BigInteger(((IRequest) list.elementAt(0))
+        BigInteger firstrequestnum = new BigInteger(list.elementAt(0)
                 .getRequestId().toString());
-        BigInteger lastrequestnum = new BigInteger(((IRequest) list.elementAt(list
-                .size() - 1)).getRequestId().toString());
+        BigInteger lastrequestnum = new BigInteger(list.elementAt(list
+                .size() - 1).getRequestId().toString());
         boolean reverse = false;
         if (firstrequestnum.compareTo(lastrequestnum) > 0) {
             reverse = true; // if the order is backwards, place items at the beginning
         }
-        Vector v = new Vector();
+        Vector<IRequest> v = new Vector<IRequest>();
         int count = list.size();
         for (int i = 0; i < count; i++) {
-            Object request = list.elementAt(i);
+            IRequest request = list.elementAt(i);
             if (request != null) {
                 if (reverse)
                     v.add(0, request);
diff --git a/pki/base/common/src/com/netscape/cms/servlet/wizard/WizardServlet.java b/pki/base/common/src/com/netscape/cms/servlet/wizard/WizardServlet.java
index bc4ab990b..a71f26dcf 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/wizard/WizardServlet.java
+++ b/pki/base/common/src/com/netscape/cms/servlet/wizard/WizardServlet.java
@@ -52,7 +52,7 @@ public class WizardServlet extends VelocityServlet {
      */
     private static final long serialVersionUID = -4513510177445656799L;
     private String name = null;
-    private Vector mPanels = new Vector();
+    private Vector<IWizardPanel> mPanels = new Vector<IWizardPanel>();
 
     public void init(ServletConfig config) throws ServletException {
         super.init(config);
@@ -84,8 +84,8 @@ public class WizardServlet extends VelocityServlet {
     public void exposePanels(HttpServletRequest request,
                             HttpServletResponse response,
                             Context context) {
-        Enumeration e = mPanels.elements();
-        Vector panels = new Vector();
+        Enumeration<IWizardPanel> e = mPanels.elements();
+        Vector<IWizardPanel> panels = new Vector<IWizardPanel>();
         while (e.hasMoreElements()) {
             IWizardPanel p = (IWizardPanel) e.nextElement();
             panels.addElement(p);
@@ -106,7 +106,7 @@ public class WizardServlet extends VelocityServlet {
     }
 
     public IWizardPanel getPanelByNo(int p) {
-        IWizardPanel panel = (IWizardPanel) mPanels.elementAt(p);
+        IWizardPanel panel = mPanels.elementAt(p);
         if (panel.shouldSkip()) {
             panel = getPanelByNo(p + 1);
         }
@@ -153,8 +153,8 @@ public class WizardServlet extends VelocityServlet {
             ret += ((Integer) v).toString();
         } else if (v instanceof Vector) {
             ret += "<Vector>";
-            Vector v1 = (Vector) v;
-            Enumeration e = v1.elements();
+            Vector<?> v1 = (Vector<?>) v;
+            Enumeration<?> e = v1.elements();
             StringBuffer sb = new StringBuffer();
             while (e.hasMoreElements()) {
                 sb.append(xml_value_flatten(e.nextElement()));
@@ -227,7 +227,7 @@ public class WizardServlet extends VelocityServlet {
         if (request.getParameter("panelname") != null) {
             String name = request.getParameter("panelname");
             for (int i = 0; i < mPanels.size(); i++) {
-                IWizardPanel panel = (IWizardPanel) mPanels.elementAt(i);
+                IWizardPanel panel = mPanels.elementAt(i);
                 if (panel.getId().equals(name)) {
                     return i;
                 }
@@ -239,19 +239,18 @@ public class WizardServlet extends VelocityServlet {
     }
 
     public String getNameFromPanelNo(int p) {
-        IWizardPanel wp = (IWizardPanel) mPanels.elementAt(p);
+        IWizardPanel wp = mPanels.elementAt(p);
         return wp.getId();
     }
 
     public IWizardPanel getPreviousPanel(int p) {
         CMS.debug("getPreviousPanel input p=" + p);
-        IWizardPanel backpanel = (IWizardPanel) mPanels.elementAt(p - 1);
+        IWizardPanel backpanel = mPanels.elementAt(p - 1);
         if (backpanel.isSubPanel()) {
-            backpanel = (IWizardPanel) mPanels.elementAt(p - 1 - 1);
+            backpanel = mPanels.elementAt(p - 1 - 1);
         }
         while (backpanel.shouldSkip()) {
-            backpanel = (IWizardPanel)
-                         mPanels.elementAt(backpanel.getPanelNo() - 1);
+            backpanel = mPanels.elementAt(backpanel.getPanelNo() - 1);
         }
         CMS.debug("getPreviousPanel output p=" + backpanel.getPanelNo());
         return backpanel;
@@ -259,9 +258,9 @@ public class WizardServlet extends VelocityServlet {
 
     public IWizardPanel getNextPanel(int p) {
         CMS.debug("getNextPanel input p=" + p);
-        IWizardPanel panel = (IWizardPanel) mPanels.elementAt(p);
+        IWizardPanel panel = mPanels.elementAt(p);
         if (p == (mPanels.size() - 1)) {
-            p = p;
+            // p = p;
         } else if (panel.isSubPanel()) {
             if (panel.isLoopbackPanel()) {
                 p = p - 1; // Login Panel is a loop back panel
@@ -303,7 +302,7 @@ public class WizardServlet extends VelocityServlet {
         else
             CMS.debug("WizardServlet: in next " + p);
 
-        IWizardPanel panel = (IWizardPanel) mPanels.elementAt(p);
+        IWizardPanel panel = mPanels.elementAt(p);
         try {
             panel.validate(request, response, context);
             try {
@@ -419,9 +418,9 @@ public class WizardServlet extends VelocityServlet {
 
     public void outputHttpParameters(HttpServletRequest httpReq) {
         CMS.debug("WizardServlet:service() uri = " + httpReq.getRequestURI());
-        Enumeration paramNames = httpReq.getParameterNames();
+        Enumeration<String> paramNames = httpReq.getParameterNames();
         while (paramNames.hasMoreElements()) {
-            String pn = (String) paramNames.nextElement();
+            String pn = paramNames.nextElement();
             // added this facility so that password can be hidden,
             // all sensitive parameters should be prefixed with 
             // __ (double underscores); however, in the event that