1 files changed, 18 insertions, 19 deletions

diff --git a/base/silent/src/com/netscape/pkisilent/ConfigureTKS.java b/base/silent/src/com/netscape/pkisilent/ConfigureTKS.java
index 77f8ae0bc..aa8dccee8 100644
--- a/base/silent/src/com/netscape/pkisilent/ConfigureTKS.java
+++ b/base/silent/src/com/netscape/pkisilent/ConfigureTKS.java
@@ -24,7 +24,6 @@ import java.io.ByteArrayInputStream;
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
 import java.io.InputStreamReader;
-import java.io.UnsupportedEncodingException;
 import java.net.URLEncoder;
 import java.util.ArrayList;
 
@@ -32,13 +31,13 @@ import org.mozilla.jss.asn1.SEQUENCE;
 import org.mozilla.jss.pkcs12.AuthenticatedSafes;
 import org.mozilla.jss.pkcs12.PFX;
 
+import com.netscape.cmsutil.util.Utils;
 import com.netscape.pkisilent.argparser.ArgParser;
 import com.netscape.pkisilent.argparser.StringHolder;
 import com.netscape.pkisilent.common.ComCrypto;
 import com.netscape.pkisilent.common.ParseXML;
 import com.netscape.pkisilent.http.HTTPClient;
 import com.netscape.pkisilent.http.HTTPResponse;
-import com.netscape.cmsutil.util.Utils;
 
 public class ConfigureTKS {
 
@@ -155,7 +154,7 @@ public class ConfigureTKS {
         }
     }
 
-    public boolean LoginPanel() {
+    public boolean LoginPanel() throws Exception {
         boolean st = false;
         HTTPResponse hr = null;
         ByteArrayInputStream bais = null;
@@ -191,7 +190,7 @@ public class ConfigureTKS {
         return st;
     }
 
-    public boolean TokenChoicePanel() throws UnsupportedEncodingException {
+    public boolean TokenChoicePanel() throws Exception {
         HTTPResponse hr = null;
         ByteArrayInputStream bais = null;
         ParseXML px = new ParseXML();
@@ -240,7 +239,7 @@ public class ConfigureTKS {
         return true;
     }
 
-    public boolean DomainPanel() throws UnsupportedEncodingException {
+    public boolean DomainPanel() throws Exception {
         HTTPResponse hr = null;
         ByteArrayInputStream bais = null;
         ParseXML px = new ParseXML();
@@ -265,7 +264,7 @@ public class ConfigureTKS {
 
     }
 
-    public boolean DisplayChainPanel() {
+    public boolean DisplayChainPanel() throws Exception {
         String query_string = "p=4" + "&op=next" + "&xml=true";
         hc.sslConnect(cs_hostname, cs_port, wizard_uri, query_string);
         // parse xml
@@ -277,7 +276,7 @@ public class ConfigureTKS {
 
     }
 
-    public boolean SecurityDomainLoginPanel() throws UnsupportedEncodingException {
+    public boolean SecurityDomainLoginPanel() throws Exception {
         String tks_url = "https://" + cs_hostname + ":" + cs_port +
                             "/tks/admin/console/config/wizard" +
                             "?p=5&subsystem=TKS";
@@ -320,7 +319,7 @@ public class ConfigureTKS {
 
     }
 
-    public boolean SubsystemPanel() throws UnsupportedEncodingException {
+    public boolean SubsystemPanel() throws Exception {
         HTTPResponse hr = null;
         ByteArrayInputStream bais = null;
         ParseXML px = new ParseXML();
@@ -339,7 +338,7 @@ public class ConfigureTKS {
         return true;
     }
 
-    public boolean LdapConnectionPanel() throws UnsupportedEncodingException {
+    public boolean LdapConnectionPanel() throws Exception {
         HTTPResponse hr = null;
         ByteArrayInputStream bais = null;
         ParseXML px = new ParseXML();
@@ -365,7 +364,7 @@ public class ConfigureTKS {
         return true;
     }
 
-    public boolean KeyPanel() {
+    public boolean KeyPanel() throws Exception {
         HTTPResponse hr = null;
         ByteArrayInputStream bais = null;
         ParseXML px = new ParseXML();
@@ -419,7 +418,7 @@ public class ConfigureTKS {
         return true;
     }
 
-    public boolean CertSubjectPanel() throws UnsupportedEncodingException {
+    public boolean CertSubjectPanel() throws Exception {
         HTTPResponse hr = null;
         ByteArrayInputStream bais = null;
         ParseXML px = new ParseXML();
@@ -471,7 +470,7 @@ public class ConfigureTKS {
         return true;
     }
 
-    public boolean CertificatePanel() throws UnsupportedEncodingException {
+    public boolean CertificatePanel() throws Exception {
         HTTPResponse hr = null;
         ByteArrayInputStream bais = null;
         ParseXML px = new ParseXML();
@@ -499,7 +498,7 @@ public class ConfigureTKS {
         return true;
     }
 
-    public boolean BackupPanel() throws UnsupportedEncodingException {
+    public boolean BackupPanel() throws Exception {
         HTTPResponse hr = null;
         ByteArrayInputStream bais = null;
         ParseXML px = new ParseXML();
@@ -519,7 +518,7 @@ public class ConfigureTKS {
         return true;
     }
 
-    public boolean SavePKCS12Panel() {
+    public boolean SavePKCS12Panel() throws Exception {
         String query_string = "";
 
         HTTPResponse hr = hc.sslConnect(cs_hostname, cs_port, pkcs12_uri, query_string);
@@ -565,7 +564,7 @@ public class ConfigureTKS {
         return true;
     }
 
-    public boolean AdminCertReqPanel() throws UnsupportedEncodingException {
+    public boolean AdminCertReqPanel() throws Exception {
         HTTPResponse hr = null;
         ByteArrayInputStream bais = null;
         ParseXML px = new ParseXML();
@@ -622,7 +621,7 @@ public class ConfigureTKS {
         return true;
     }
 
-    public boolean AdminCertImportPanel() {
+    public boolean AdminCertImportPanel() throws Exception {
         boolean st = false;
 
         String query_string = "serialNumber=" + admin_serial_number +
@@ -660,7 +659,7 @@ public class ConfigureTKS {
         return true;
     }
 
-    public boolean UpdateDomainPanel() throws UnsupportedEncodingException {
+    public boolean UpdateDomainPanel() throws Exception {
         HTTPResponse hr = null;
         ByteArrayInputStream bais = null;
         ParseXML px = new ParseXML();
@@ -680,7 +679,7 @@ public class ConfigureTKS {
         return true;
     }
 
-    public boolean ConfigureTKSInstance() throws UnsupportedEncodingException {
+    public boolean ConfigureTKSInstance() throws Exception {
         // 0. login to cert db
         ComCrypto cCrypt = new ComCrypto(client_certdb_dir,
                                         client_certdb_pwd,
@@ -827,7 +826,7 @@ public class ConfigureTKS {
         }
     }
 
-    public static void main(String args[]) throws UnsupportedEncodingException {
+    public static void main(String args[]) throws Exception {
         ConfigureTKS ca = new ConfigureTKS();
 
         // set variables