diff options
Diffstat (limited to 'pki/base/common/src/com/netscape/cms/servlet/csadmin')
25 files changed, 40 insertions, 102 deletions
diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/AdminAuthenticatePanel.java b/pki/base/common/src/com/netscape/cms/servlet/csadmin/AdminAuthenticatePanel.java index 8c84f4a21..7912486f5 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/AdminAuthenticatePanel.java +++ b/pki/base/common/src/com/netscape/cms/servlet/csadmin/AdminAuthenticatePanel.java @@ -87,7 +87,8 @@ public class AdminAuthenticatePanel extends WizardPanelBase { IConfigStore cs = CMS.getConfigStore(); /* clean up if necessary */ try { - boolean done = cs.getBoolean("preop.AdminAuthenticate.done"); + @SuppressWarnings("unused") + boolean done = cs.getBoolean("preop.AdminAuthenticate.done"); // check for errors cs.putBoolean("preop.AdminAuthenticate.done", false); cs.commit(false); } catch (Exception e) { diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/AdminPanel.java b/pki/base/common/src/com/netscape/cms/servlet/csadmin/AdminPanel.java index 223801d8f..4e73b8369 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/AdminPanel.java +++ b/pki/base/common/src/com/netscape/cms/servlet/csadmin/AdminPanel.java @@ -353,12 +353,9 @@ public class AdminPanel extends WizardPanelBase { private void createAdmin(HttpServletRequest request) throws IOException { IUGSubsystem system = (IUGSubsystem) (CMS.getSubsystem(IUGSubsystem.ID)); IConfigStore config = CMS.getConfigStore(); - String adminName = null; String groupName = null; try { - adminName = config.getString(PRE_CONF_ADMIN_NAME, - "Certificate System Administrator"); groupName = config.getString(PRE_CONF_AGENT_GROUP, "Certificate Manager Agents"); } catch (Exception e) { diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/AgentAuthenticatePanel.java b/pki/base/common/src/com/netscape/cms/servlet/csadmin/AgentAuthenticatePanel.java index 6bda87491..c1e6bffd1 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/AgentAuthenticatePanel.java +++ b/pki/base/common/src/com/netscape/cms/servlet/csadmin/AgentAuthenticatePanel.java @@ -177,8 +177,11 @@ public class AgentAuthenticatePanel extends WizardPanelBase { String pwd = HttpInput.getPassword(request, "__password"); config.putString("preop.ca.agent.uid", uid); config.putString("preop.ca.agent.pwd", pwd); + + /* String host = ""; int httpsport = -1; + try { host = config.getString("preop.ca.hostname"); } catch (Exception e) { @@ -195,7 +198,6 @@ public class AgentAuthenticatePanel extends WizardPanelBase { throw new IOException("Missing port"); } - /* // Bugzilla Bug #583825 - CC: Obsolete servlets to be removed from // web.xml as part of CC interface review boolean authenticated = authenticate(host, httpsport, true, diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/BackupKeyCertPanel.java b/pki/base/common/src/com/netscape/cms/servlet/csadmin/BackupKeyCertPanel.java index c1529f256..d216a9212 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/BackupKeyCertPanel.java +++ b/pki/base/common/src/com/netscape/cms/servlet/csadmin/BackupKeyCertPanel.java @@ -93,7 +93,8 @@ public class BackupKeyCertPanel extends WizardPanelBase { IConfigStore cs = CMS.getConfigStore(); /* clean up if necessary */ try { - boolean done = cs.getBoolean("preop.backupkeycert.done"); + @SuppressWarnings("unused") + boolean done = cs.getBoolean("preop.backupkeycert.done"); // check for errors cs.putBoolean("preop.backupkeycert.done", false); cs.commit(false); } catch (Exception e) { @@ -307,7 +308,7 @@ public class BackupKeyCertPanel extends WizardPanelBase { //String nickname = cacerts[i].getSubjectDN().toString(); String nickname = null; try { - byte[] localKeyId = addCertBag(cacerts[i], nickname, safeContents); + addCertBag(cacerts[i], nickname, safeContents); } catch (IOException e) { throw e; } catch (Exception e) { diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/CAInfoPanel.java b/pki/base/common/src/com/netscape/cms/servlet/csadmin/CAInfoPanel.java index ccaa78e0b..5da169915 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/CAInfoPanel.java +++ b/pki/base/common/src/com/netscape/cms/servlet/csadmin/CAInfoPanel.java @@ -190,7 +190,6 @@ public class CAInfoPanel extends WizardPanelBase { public void validate(HttpServletRequest request, HttpServletResponse response, Context context) throws IOException { - IConfigStore config = CMS.getConfigStore(); } /** diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/CertRequestPanel.java b/pki/base/common/src/com/netscape/cms/servlet/csadmin/CertRequestPanel.java index 43c707fbe..04ab4dac8 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/CertRequestPanel.java +++ b/pki/base/common/src/com/netscape/cms/servlet/csadmin/CertRequestPanel.java @@ -122,7 +122,8 @@ public class CertRequestPanel extends WizardPanelBase { if (cert == null) return false; try { - boolean done = cs.getBoolean("preop.CertRequestPanel.done"); + @SuppressWarnings("unused") + boolean done = cs.getBoolean("preop.CertRequestPanel.done"); // check for errors return true; } catch (Exception ee) { if (hardware) { @@ -219,7 +220,8 @@ public class CertRequestPanel extends WizardPanelBase { } try { - boolean done = cs.getBoolean("preop.CertRequestPanel.done"); + @SuppressWarnings("unused") + boolean done = cs.getBoolean("preop.CertRequestPanel.done"); // check for errors cs.putBoolean("preop.CertRequestPanel.done", false); cs.commit(false); } catch (Exception e) { @@ -487,12 +489,6 @@ public class CertRequestPanel extends WizardPanelBase { boolean hasErr = false; IConfigStore config = CMS.getConfigStore(); - String catype = ""; - try { - catype = config.getString("preop.ca.type", ""); - } catch (Exception e) { - } - if (isPanelDone()) { context.put("updateStatus", "success"); return; diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/CertUtil.java b/pki/base/common/src/com/netscape/cms/servlet/csadmin/CertUtil.java index 2934b3ebe..e956edebe 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/CertUtil.java +++ b/pki/base/common/src/com/netscape/cms/servlet/csadmin/CertUtil.java @@ -256,7 +256,7 @@ public class CertUtil { req.setExtData("cert_request_type", reqType); if (subjectName != null) { req.setExtData("subject", subjectName); - X500Name x5Name = new X500Name(subjectName); + new X500Name(subjectName); // check for errors } } queue.updateRequest(req); @@ -596,7 +596,6 @@ public class CertUtil { StringBuffer result = new StringBuffer(); result.append("Fingerprints:\n"); - int index = 0; while (content.length() >= LINE_COUNT) { result.append(content.substring(0, LINE_COUNT)); @@ -623,9 +622,7 @@ public class CertUtil { String fullnickname = nickname; - boolean hardware = false; if (!tokenname.equals("internal") && !tokenname.equals("Internal Key Storage Token")) { - hardware = true; fullnickname = tokenname + ":" + nickname; } diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/DatabasePanel.java b/pki/base/common/src/com/netscape/cms/servlet/csadmin/DatabasePanel.java index 6cafe9736..ec3c8657d 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/DatabasePanel.java +++ b/pki/base/common/src/com/netscape/cms/servlet/csadmin/DatabasePanel.java @@ -170,7 +170,8 @@ public class DatabasePanel extends WizardPanelBase { String secure = "false"; String cloneStartTLS = "false"; try { - String s = cs.getString("preop.database.removeData"); + @SuppressWarnings("unused") + String s = cs.getString("preop.database.removeData"); // check whether it's first time } catch (Exception e) { context.put("firsttime", "true"); } @@ -276,7 +277,8 @@ public class DatabasePanel extends WizardPanelBase { IConfigStore cs = CMS.getConfigStore(); context.put("firsttime", "false"); try { - String s = cs.getString("preop.database.removeData"); + @SuppressWarnings("unused") + String s = cs.getString("preop.database.removeData"); // check whether it's first time } catch (Exception e) { context.put("firsttime", "true"); } @@ -348,10 +350,8 @@ public class DatabasePanel extends WizardPanelBase { } if (portStr != null && portStr.length() > 0) { - int port = -1; - try { - port = Integer.parseInt(portStr); + Integer.parseInt(portStr); // check for errors } catch (Exception e) { cs.putString("preop.database.errorString", "Port is invalid"); context.put("updateStatus", "validate-failure"); @@ -872,25 +872,21 @@ public class DatabasePanel extends WizardPanelBase { IConfigStore cs = CMS.getConfigStore(); boolean hasErr = false; - boolean firsttime = false; context.put("firsttime", "false"); try { - String v = cs.getString("preop.database.removeData"); + String s = cs.getString("preop.database.removeData"); // check whether it's first time } catch (Exception e) { context.put("firsttime", "true"); - firsttime = true; } String hostname1 = ""; String portStr1 = ""; String database1 = ""; - String basedn1 = ""; try { hostname1 = cs.getString("internaldb.ldapconn.host", ""); portStr1 = cs.getString("internaldb.ldapconn.port", ""); database1 = cs.getString("internaldb.database", ""); - basedn1 = cs.getString("internaldb.basedn", ""); } catch (Exception e) { } @@ -1258,7 +1254,7 @@ public class DatabasePanel extends WizardPanelBase { attrs.add(new LDAPAttribute("objectclass", "extensibleObject")); attrs.add(new LDAPAttribute("cn", "changelog5")); attrs.add(new LDAPAttribute("nsslapd-changelogdir", dir)); - entry = new LDAPEntry("cn=changelog5,cn=config", attrs); + entry = new LDAPEntry(dn, attrs); conn.add(entry); } catch (LDAPException e) { if (e.getLDAPResultCode() == LDAPException.ENTRY_ALREADY_EXISTS) { @@ -1452,7 +1448,6 @@ public class DatabasePanel extends WizardPanelBase { String dn = "cn=" + name + "," + replicadn; String filter = "(objectclass=*)"; String[] attrs = { "nsds5replicalastinitstatus" }; - String status = null; CMS.debug("DatabasePanel replicationStatus: dn: " + dn); try { diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/DonePanel.java b/pki/base/common/src/com/netscape/cms/servlet/csadmin/DonePanel.java index ffadf5884..174af72c9 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/DonePanel.java +++ b/pki/base/common/src/com/netscape/cms/servlet/csadmin/DonePanel.java @@ -368,6 +368,7 @@ public class DonePanel extends WizardPanelBase { try { // Fetch the "new" security domain and display it CMS.debug("Dump contents of new Security Domain . . ."); + @SuppressWarnings("unused") String c = getDomainXML(sd_host, sd_admin_port_int, true); } catch (Exception e) { } @@ -422,6 +423,7 @@ public class DonePanel extends WizardPanelBase { // Fetch the "updated" security domain and display it CMS.debug("Dump contents of updated Security Domain . . ."); + @SuppressWarnings("unused") String c = getDomainXML(sd_host, sd_admin_port_int, true); } catch (Exception e) { context.put("errorString", "Failed to update the security domain on the domain master."); @@ -471,12 +473,8 @@ public class DonePanel extends WizardPanelBase { if (!select.equals("clone")) { if (type.equals("CA") || type.equals("KRA")) { - String beginRequestNumStr = ""; String endRequestNumStr = ""; - String beginSerialNumStr = ""; String endSerialNumStr = ""; - String requestIncStr = ""; - String serialIncStr = ""; try { endRequestNumStr = cs.getString("dbs.endRequestNumber", ""); diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/GetCertChain.java b/pki/base/common/src/com/netscape/cms/servlet/csadmin/GetCertChain.java index 6c286e818..02fbd7643 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/GetCertChain.java +++ b/pki/base/common/src/com/netscape/cms/servlet/csadmin/GetCertChain.java @@ -71,11 +71,8 @@ public class GetCertChain extends CMSServlet { * @param cmsReq the object holding the request and response information */ protected void process(CMSRequest cmsReq) throws EBaseException { - HttpServletRequest httpReq = cmsReq.getHttpReq(); HttpServletResponse httpResp = cmsReq.getHttpResp(); - String outputString = null; - CertificateChain certChain = ((ICertAuthority) mAuthority).getCACertChain(); if (certChain == null) { diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/GetConfigEntries.java b/pki/base/common/src/com/netscape/cms/servlet/csadmin/GetConfigEntries.java index c9a900a0b..f1a35bac5 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/GetConfigEntries.java +++ b/pki/base/common/src/com/netscape/cms/servlet/csadmin/GetConfigEntries.java @@ -77,7 +77,6 @@ public class GetConfigEntries extends CMSServlet { * @param cmsReq the object holding the request and response information */ protected void process(CMSRequest cmsReq) throws EBaseException { - HttpServletRequest httpReq = cmsReq.getHttpReq(); HttpServletResponse httpResp = cmsReq.getHttpResp(); IAuthToken authToken = null; diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/GetCookie.java b/pki/base/common/src/com/netscape/cms/servlet/csadmin/GetCookie.java index 2c9cc41f0..8575658ea 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/GetCookie.java +++ b/pki/base/common/src/com/netscape/cms/servlet/csadmin/GetCookie.java @@ -233,7 +233,6 @@ public class GetCookie extends CMSServlet { } try { - String sd_url = "https://" + CMS.getEESSLHost() + ":" + CMS.getEESSLPort(); if (!url.startsWith("$")) { try { form = getTemplate(mFormPath, httpReq, locale); @@ -250,7 +249,6 @@ public class GetCookie extends CMSServlet { header.addStringValue("url", url); header.addStringValue("session_id", cookie); - EBaseException error = null; try { ServletOutputStream out = httpResp.getOutputStream(); @@ -278,7 +276,6 @@ public class GetCookie extends CMSServlet { } private String getGroupName(String uid, String subsystemname) { - String groupname = ""; IUGSubsystem subsystem = (IUGSubsystem) (CMS.getSubsystem(IUGSubsystem.ID)); if (subsystem.isMemberOf(uid, "Enterprise CA Administrators") && diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/GetDomainXML.java b/pki/base/common/src/com/netscape/cms/servlet/csadmin/GetDomainXML.java index 45c5192aa..999f13815 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/GetDomainXML.java +++ b/pki/base/common/src/com/netscape/cms/servlet/csadmin/GetDomainXML.java @@ -23,7 +23,6 @@ import java.util.Enumeration; import java.util.Locale; import javax.servlet.ServletConfig; -import javax.servlet.ServletContext; import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -83,9 +82,7 @@ public class GetDomainXML extends CMSServlet { protected void process(CMSRequest cmsReq) throws EBaseException { CMS.debug("GetDomainXML: processing..."); - HttpServletRequest httpReq = cmsReq.getHttpReq(); HttpServletResponse httpResp = cmsReq.getHttpResp(); - ServletContext context = cmsReq.getServletContext(); String status = SUCCESS; String basedn = null; @@ -108,7 +105,6 @@ public class GetDomainXML extends CMSServlet { LDAPConnection conn = null; try { // get data from ldap - String[] entries = {}; String filter = "objectclass=pkiSecurityGroup"; LDAPSearchConstraints cons = null; String[] attrs = null; diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/GetStatus.java b/pki/base/common/src/com/netscape/cms/servlet/csadmin/GetStatus.java index 28279f04a..4dc6f0ff6 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/GetStatus.java +++ b/pki/base/common/src/com/netscape/cms/servlet/csadmin/GetStatus.java @@ -63,12 +63,9 @@ public class GetStatus extends CMSServlet { * @param cmsReq the object holding the request and response information */ protected void process(CMSRequest cmsReq) throws EBaseException { - HttpServletRequest httpReq = cmsReq.getHttpReq(); HttpServletResponse httpResp = cmsReq.getHttpResp(); IConfigStore config = CMS.getConfigStore(); - String outputString = null; - String state = config.getString("cs.state", ""); String type = config.getString("cs.type", ""); diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/GetSubsystemCert.java b/pki/base/common/src/com/netscape/cms/servlet/csadmin/GetSubsystemCert.java index 7beda6620..288cfad60 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/GetSubsystemCert.java +++ b/pki/base/common/src/com/netscape/cms/servlet/csadmin/GetSubsystemCert.java @@ -64,11 +64,8 @@ public class GetSubsystemCert extends CMSServlet { * Process the HTTP request. */ protected void process(CMSRequest cmsReq) throws EBaseException { - HttpServletRequest httpReq = cmsReq.getHttpReq(); HttpServletResponse httpResp = cmsReq.getHttpResp(); - String outputString = null; - IConfigStore cs = CMS.getConfigStore(); String nickname = ""; try { diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/GetTransportCert.java b/pki/base/common/src/com/netscape/cms/servlet/csadmin/GetTransportCert.java index ae55d2fb8..87a1788d6 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/GetTransportCert.java +++ b/pki/base/common/src/com/netscape/cms/servlet/csadmin/GetTransportCert.java @@ -33,7 +33,6 @@ import com.netscape.certsrv.authentication.IAuthToken; import com.netscape.certsrv.authorization.AuthzToken; import com.netscape.certsrv.authorization.EAuthzAccessDenied; import com.netscape.certsrv.base.EBaseException; -import com.netscape.certsrv.base.IConfigStore; import com.netscape.certsrv.kra.IKeyRecoveryAuthority; import com.netscape.certsrv.logging.ILogger; import com.netscape.certsrv.security.ITransportKeyUnit; @@ -77,7 +76,6 @@ public class GetTransportCert extends CMSServlet { protected void process(CMSRequest cmsReq) throws EBaseException { CMS.debug("UpdateUpdater: processing..."); - HttpServletRequest httpReq = cmsReq.getHttpReq(); HttpServletResponse httpResp = cmsReq.getHttpResp(); IAuthToken authToken = null; @@ -122,8 +120,6 @@ public class GetTransportCert extends CMSServlet { return; } - IConfigStore cs = CMS.getConfigStore(); - IKeyRecoveryAuthority kra = (IKeyRecoveryAuthority) mAuthority; ITransportKeyUnit tu = kra.getTransportKeyUnit(); diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/ImportCAChainPanel.java b/pki/base/common/src/com/netscape/cms/servlet/csadmin/ImportCAChainPanel.java index a26b2dc2c..d0ccb58e9 100755 --- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/ImportCAChainPanel.java +++ b/pki/base/common/src/com/netscape/cms/servlet/csadmin/ImportCAChainPanel.java @@ -117,7 +117,6 @@ public class ImportCAChainPanel extends WizardPanelBase { public void update(HttpServletRequest request, HttpServletResponse response, Context context) throws IOException { - IConfigStore cs = CMS.getConfigStore(); context.put("errorString", ""); context.put("title", "Import CA's Certificate Chain"); diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/MainPageServlet.java b/pki/base/common/src/com/netscape/cms/servlet/csadmin/MainPageServlet.java index 760faed4e..1d833ca9b 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/MainPageServlet.java +++ b/pki/base/common/src/com/netscape/cms/servlet/csadmin/MainPageServlet.java @@ -84,7 +84,6 @@ public class MainPageServlet extends CMSServlet { process(argSet, header, ctx, request, response); - EBaseException error = null; try { ServletOutputStream out = response.getOutputStream(); diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/NamePanel.java b/pki/base/common/src/com/netscape/cms/servlet/csadmin/NamePanel.java index da721b29c..f0447170e 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/NamePanel.java +++ b/pki/base/common/src/com/netscape/cms/servlet/csadmin/NamePanel.java @@ -17,7 +17,6 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.cms.servlet.csadmin; -import java.io.File; import java.io.FileOutputStream; import java.io.IOException; import java.io.PrintStream; @@ -109,7 +108,8 @@ public class NamePanel extends WizardPanelBase { public void cleanUp() throws IOException { IConfigStore cs = CMS.getConfigStore(); try { - boolean done = cs.getBoolean("preop.NamePanel.done"); + @SuppressWarnings("unused") + boolean done = cs.getBoolean("preop.NamePanel.done"); // check for errors cs.putBoolean("preop.NamePanel.done", false); cs.commit(false); } catch (Exception e) { @@ -253,7 +253,8 @@ public class NamePanel extends WizardPanelBase { } try { - boolean done = config.getBoolean("preop.NamePanel.done"); + @SuppressWarnings("unused") + boolean done = config.getBoolean("preop.NamePanel.done"); // check for errors c.setDN(dn); } catch (Exception e) { String instanceId = config.getString("service.instanceID", ""); @@ -417,7 +418,6 @@ public class NamePanel extends WizardPanelBase { if (!token.equals("Internal Key Storage Token")) { serverCertNickname = token + ":" + nickname; } - File file = new File(path + "/conf/serverCertNick.conf"); PrintStream ps = new PrintStream(new FileOutputStream(path + "/conf/serverCertNick.conf")); ps.println(serverCertNickname); ps.close(); @@ -914,10 +914,8 @@ public class NamePanel extends WizardPanelBase { httpsPortStr, "CA"); - int httpsport = -1; - try { - httpsport = Integer.parseInt(httpsPortStr); + Integer.parseInt(httpsPortStr); // check for errors } catch (Exception e) { CMS.debug( "NamePanel update: Https port is not valid. Exception: " 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 d1c2b6bfb..1a621d53d 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 @@ -36,7 +36,6 @@ import com.netscape.certsrv.authentication.IAuthToken; import com.netscape.certsrv.authorization.AuthzToken; import com.netscape.certsrv.authorization.EAuthzAccessDenied; import com.netscape.certsrv.base.EBaseException; -import com.netscape.certsrv.base.IConfigStore; import com.netscape.certsrv.logging.ILogger; import com.netscape.certsrv.usrgrp.ICertUserLocator; import com.netscape.certsrv.usrgrp.IGroup; @@ -137,8 +136,6 @@ public class RegisterUser extends CMSServlet { return; } - IConfigStore cs = CMS.getConfigStore(); - // create user and add certificate String uid = httpReq.getParameter("uid"); String name = httpReq.getParameter("name"); diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/RestoreKeyCertPanel.java b/pki/base/common/src/com/netscape/cms/servlet/csadmin/RestoreKeyCertPanel.java index 0ae550707..80a887fd2 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/RestoreKeyCertPanel.java +++ b/pki/base/common/src/com/netscape/cms/servlet/csadmin/RestoreKeyCertPanel.java @@ -122,7 +122,8 @@ public class RestoreKeyCertPanel extends WizardPanelBase { IConfigStore cs = CMS.getConfigStore(); /* clean up if necessary */ try { - boolean done = cs.getBoolean("preop.restorekeycert.done"); + @SuppressWarnings("unused") + boolean done = cs.getBoolean("preop.restorekeycert.done"); // check for errors cs.putBoolean("preop.restorekeycert.done", false); cs.commit(false); } catch (Exception e) { diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/SecurityDomainPanel.java b/pki/base/common/src/com/netscape/cms/servlet/csadmin/SecurityDomainPanel.java index 7e45f019c..f3a4169e8 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/SecurityDomainPanel.java +++ b/pki/base/common/src/com/netscape/cms/servlet/csadmin/SecurityDomainPanel.java @@ -96,13 +96,11 @@ public class SecurityDomainPanel extends WizardPanelBase { String errorString = ""; String default_admin_url = ""; String name = ""; - String cstype = ""; String systemdService = ""; try { default_admin_url = config.getString("preop.securitydomain.admin_url", ""); name = config.getString("preop.securitydomain.name", ""); - cstype = config.getString("cs.type", ""); systemdService = config.getString("pkicreate.systemd.servicename", ""); } catch (Exception e) { CMS.debug(e.toString()); @@ -364,12 +362,6 @@ public class SecurityDomainPanel extends WizardPanelBase { } catch (EBaseException e) { } - String instanceRoot = ""; - try { - instanceRoot = config.getString("instanceRoot", ""); - } catch (Exception e) { - } - } else if (select.equals("existingdomain")) { config.putString("preop.securitydomain.select", "existing"); config.putString("securitydomain.select", "existing"); 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 c915d9e85..03f0e186d 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 @@ -92,7 +92,8 @@ public class SizePanel extends WizardPanelBase { IConfigStore cs = CMS.getConfigStore(); /* clean up if necessary*/ try { - boolean done = cs.getBoolean("preop.SizePanel.done"); + @SuppressWarnings("unused") + boolean done = cs.getBoolean("preop.SizePanel.done"); // check for errors cs.putBoolean("preop.SizePanel.done", false); cs.commit(false); } catch (Exception e) { @@ -132,7 +133,8 @@ public class SizePanel extends WizardPanelBase { IConfigStore config = CMS.getConfigStore(); try { - boolean done = config.getBoolean("preop.SizePanel.done"); + @SuppressWarnings("unused") + boolean done = config.getBoolean("preop.SizePanel.done"); // check whether it's first time } catch (Exception e) { context.put("firsttime", "true"); } @@ -233,9 +235,9 @@ public class SizePanel extends WizardPanelBase { } context.put("firsttime", "false"); - boolean done = false; try { - done = config.getBoolean("preop.SizePanel.done"); + @SuppressWarnings("unused") + boolean done = config.getBoolean("preop.SizePanel.done"); // check whether it's first time } catch (Exception e) { context.put("firsttime", "true"); if (select1.equals("clone")) { @@ -429,7 +431,6 @@ public class SizePanel extends WizardPanelBase { try { String keytype = config.getString(PCERT_PREFIX + ct + ".keytype"); - String keyalgorithm = config.getString(PCERT_PREFIX + ct + ".keyalgorithm"); if (keytype.equals("rsa")) { int keysize = config.getInteger( diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/UpdateDomainXML.java b/pki/base/common/src/com/netscape/cms/servlet/csadmin/UpdateDomainXML.java index 0476e26d7..a2b6ebc72 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/UpdateDomainXML.java +++ b/pki/base/common/src/com/netscape/cms/servlet/csadmin/UpdateDomainXML.java @@ -314,8 +314,6 @@ public class UpdateDomainXML extends CMSServlet { // update in ldap LDAPEntry entry = null; - ILdapConnFactory connFactory = null; - LDAPConnection conn = null; String listName = type + "List"; String cn = host + ":"; @@ -432,13 +430,13 @@ public class UpdateDomainXML extends CMSServlet { for (int i = 0; i < len; i++) { Node nn = (Node) nodeList.item(i); - Vector v_name = parser.getValuesFromContainer(nn, "SubsystemName"); - Vector v_host = parser.getValuesFromContainer(nn, "Host"); - Vector v_adminport = parser.getValuesFromContainer(nn, "SecureAdminPort"); + Vector<String> v_name = parser.getValuesFromContainer(nn, "SubsystemName"); + Vector<String> v_host = parser.getValuesFromContainer(nn, "Host"); + Vector<String> v_adminport = parser.getValuesFromContainer(nn, "SecureAdminPort"); if ((v_name.elementAt(0).equals(name)) && (v_host.elementAt(0).equals(host)) && (v_adminport.elementAt(0).equals(adminsport))) { Node parent = nn.getParentNode(); - Node remNode = parent.removeChild(nn); + parent.removeChild(nn); count--; break; } @@ -480,7 +478,7 @@ public class UpdateDomainXML extends CMSServlet { } catch (Exception ee) { } - Node nn2 = n.removeChild(countnode); + n.removeChild(countnode); parser.addItemToContainer(n, "SubsystemCount", "" + count); // recreate domain.xml diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/WizardPanelBase.java b/pki/base/common/src/com/netscape/cms/servlet/csadmin/WizardPanelBase.java index a56230c2f..40190c9a7 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/WizardPanelBase.java +++ b/pki/base/common/src/com/netscape/cms/servlet/csadmin/WizardPanelBase.java @@ -1088,18 +1088,6 @@ public class WizardPanelBase implements IWizardPanel { CMS.debug("Getting domain.xml from CA..."); String c = getDomainXML(hostname, httpsadminport, true); - String list = ""; - - CMS.debug("Subsystem Type " + type); - if (type.equals("CA")) { - list = "CAList"; - } else if (type.equals("KRA")) { - list = "KRAList"; - } else if (type.equals("OCSP")) { - list = "OCSPList"; - } else if (type.equals("TKS")) { - list = "TKSList"; - } CMS.debug("Getting " + portType + " from Security Domain ..."); if (!portType.equals("UnSecurePort") && |