revert mistakenly checked in changes in rev 1920

git-svn-id: svn+ssh://svn.fedorahosted.org/svn/pki/trunk@1921 c9f7a03b-bd48-0410-a16d-cbbf54688b0b

2 files changed, 2 insertions, 21 deletions

diff --git a/pki/base/silent/src/ca/ConfigureCA.java b/pki/base/silent/src/ca/ConfigureCA.java
index 828c77c46..66fca89b9 100644
--- a/pki/base/silent/src/ca/ConfigureCA.java
+++ b/pki/base/silent/src/ca/ConfigureCA.java
@@ -187,9 +187,6 @@ public class ConfigureCA {
     public static String clone_p12_passwd = null;
     public static String clone_p12_file = null;
 
-    // sleep time
-    public static int sleep_msecs = 5;
-
     //for correct selection of CA to be cloned
     public static String urls;
 
@@ -200,7 +197,7 @@ public class ConfigureCA {
     public void sleep_time() {
         try {
             System.out.println("Sleeping for 5 secs..");
-            Thread.sleep(sleep_msecs * 1000);
+            Thread.sleep(5000);
         } catch (Exception e) {
             System.out.println("ERROR: sleep problem");
         }
@@ -1538,7 +1535,6 @@ public class ConfigureCA {
         StringHolder x_sd_admin_name = new StringHolder();
         StringHolder x_sd_admin_password = new StringHolder();
 
-        StringHolder x_sleep_msecs = new StringHolder();
 
         // parse the args
         ArgParser parser = new ArgParser("ConfigureCA");
@@ -1657,8 +1653,6 @@ public class ConfigureCA {
         parser.addOption ("-sd_admin_password %s #Security Domain admin password (optional, required if -clone=true)",
             x_sd_admin_password);
 
-        parser.addOption ("-sleep_msecs %s #Sleep time between panels (optional, default 5)", x_sleep_msecs);
-
 
         // and then match the arguments
         String[] unmatched = null;
@@ -1764,13 +1758,6 @@ public class ConfigureCA {
         sd_admin_name = x_sd_admin_name.value;
         sd_admin_password = x_sd_admin_password.value;
 
-        if (x_sleep_msecs != null) {
-            try {
-                sleep_msecs = Integer.parseInt(x_sleep_msecs.value);
-            } catch (Exception e) {
-            }
-        }
-
         boolean st = ca.ConfigureCAInstance();
 	
         if (!st) {
diff --git a/pki/base/tps/lib/perl/PKI/TPS/NamePanel.pm b/pki/base/tps/lib/perl/PKI/TPS/NamePanel.pm
index a474d80b9..3513327a7 100755
--- a/pki/base/tps/lib/perl/PKI/TPS/NamePanel.pm
+++ b/pki/base/tps/lib/perl/PKI/TPS/NamePanel.pm
@@ -401,7 +401,7 @@ $debug_req = "/usr/bin/sslget -e \"$params\" -d \"$instanceDir/alias\" -p \"(sen
         }
     }
 
-    # set selftest and audit logging variables (always use the "latest" subsystem nickname)
+    # set selftest variables (always use the "latest" subsystem nickname)
     my $selftestNickname = $::config->get( "preop.cert.subsystem.nickname" );
     my $selftestNickname_sslserver = $::config->get( "preop.cert.sslserver.nickname" );
     my $selftestNickname_audit_signing = $::config->get( "preop.cert.audit_signing.nickname" );
@@ -417,9 +417,6 @@ $debug_req = "/usr/bin/sslget -e \"$params\" -d \"$instanceDir/alias\" -p \"(sen
                         "$tk$selftestNickname" );
         $::config->put( "tps.cert.audit_signing.nickname",
                         "$tk$selftestNickname_audit_signing" );
-
-        $::config->put( "logging.audit.signedAuditCertNickname",
-                        "$tk$selftestNickname_audit_signing" );
     } else {
         $::config->put( "selftests.plugin.TPSPresence.nickname",
                         "$selftestNickname" );
@@ -432,9 +429,6 @@ $debug_req = "/usr/bin/sslget -e \"$params\" -d \"$instanceDir/alias\" -p \"(sen
                         "$selftestNickname" );
         $::config->put( "tps.cert.audit_signing.nickname",
                         "$selftestNickname_audit_signing" );
-
-        $::config->put( "logging.audit.signedAuditCertNickname",
-                        "$selftestNickname_audit_signing" );
     }
     $::config->commit();