summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--pki/.classpath11
-rwxr-xr-xpki/base/silent/scripts/pkisilent2
-rw-r--r--pki/base/silent/src/CMakeLists.txt89
-rw-r--r--pki/base/silent/src/com/netscape/pkisilent/ConfigureCA.java (renamed from pki/base/silent/src/ca/ConfigureCA.java)8
-rw-r--r--pki/base/silent/src/com/netscape/pkisilent/ConfigureDRM.java (renamed from pki/base/silent/src/drm/ConfigureDRM.java)8
-rw-r--r--pki/base/silent/src/com/netscape/pkisilent/ConfigureOCSP.java (renamed from pki/base/silent/src/ocsp/ConfigureOCSP.java)7
-rw-r--r--pki/base/silent/src/com/netscape/pkisilent/ConfigureRA.java (renamed from pki/base/silent/src/ra/ConfigureRA.java)7
-rw-r--r--pki/base/silent/src/com/netscape/pkisilent/ConfigureSubCA.java (renamed from pki/base/silent/src/subca/ConfigureSubCA.java)7
-rw-r--r--pki/base/silent/src/com/netscape/pkisilent/ConfigureTKS.java (renamed from pki/base/silent/src/tks/ConfigureTKS.java)7
-rw-r--r--pki/base/silent/src/com/netscape/pkisilent/ConfigureTPS.java (renamed from pki/base/silent/src/tps/ConfigureTPS.java)7
-rw-r--r--pki/base/silent/src/com/netscape/pkisilent/CreateInstance.java (renamed from pki/base/silent/src/common/createinstance.java)9
-rw-r--r--pki/base/silent/src/com/netscape/pkisilent/PKISilent.java60
-rw-r--r--pki/base/silent/src/com/netscape/pkisilent/argparser/ArgParseException.java (renamed from pki/base/silent/src/argparser/ArgParseException.java)1
-rwxr-xr-xpki/base/silent/src/com/netscape/pkisilent/argparser/ArgParser.java (renamed from pki/base/silent/src/argparser/ArgParser.java)1
-rw-r--r--pki/base/silent/src/com/netscape/pkisilent/argparser/ArgParserTest.java (renamed from pki/base/silent/src/argparser/ArgParserTest.java)1
-rw-r--r--pki/base/silent/src/com/netscape/pkisilent/argparser/BooleanHolder.java (renamed from pki/base/silent/src/argparser/BooleanHolder.java)1
-rw-r--r--pki/base/silent/src/com/netscape/pkisilent/argparser/CharHolder.java (renamed from pki/base/silent/src/argparser/CharHolder.java)1
-rw-r--r--pki/base/silent/src/com/netscape/pkisilent/argparser/DoubleHolder.java (renamed from pki/base/silent/src/argparser/DoubleHolder.java)1
-rw-r--r--pki/base/silent/src/com/netscape/pkisilent/argparser/FloatHolder.java (renamed from pki/base/silent/src/argparser/FloatHolder.java)1
-rw-r--r--pki/base/silent/src/com/netscape/pkisilent/argparser/IntHolder.java (renamed from pki/base/silent/src/argparser/IntHolder.java)1
-rw-r--r--pki/base/silent/src/com/netscape/pkisilent/argparser/LongHolder.java (renamed from pki/base/silent/src/argparser/LongHolder.java)1
-rw-r--r--pki/base/silent/src/com/netscape/pkisilent/argparser/ObjectHolder.java (renamed from pki/base/silent/src/argparser/ObjectHolder.java)1
-rw-r--r--pki/base/silent/src/com/netscape/pkisilent/argparser/SimpleExample.java (renamed from pki/base/silent/src/argparser/SimpleExample.java)1
-rw-r--r--pki/base/silent/src/com/netscape/pkisilent/argparser/StringHolder.java (renamed from pki/base/silent/src/argparser/StringHolder.java)1
-rw-r--r--pki/base/silent/src/com/netscape/pkisilent/argparser/StringScanException.java (renamed from pki/base/silent/src/argparser/StringScanException.java)1
-rw-r--r--pki/base/silent/src/com/netscape/pkisilent/argparser/StringScanner.java (renamed from pki/base/silent/src/argparser/StringScanner.java)1
-rw-r--r--pki/base/silent/src/com/netscape/pkisilent/common/AutoInstaller.java (renamed from pki/base/silent/src/common/AutoInstaller.java)2
-rw-r--r--pki/base/silent/src/com/netscape/pkisilent/common/BaseState.java (renamed from pki/base/silent/src/common/BaseState.java)1
-rw-r--r--pki/base/silent/src/com/netscape/pkisilent/common/CMSConfig.java (renamed from pki/base/silent/src/common/CMSConfig.java)1
-rw-r--r--pki/base/silent/src/com/netscape/pkisilent/common/CMSInstance.java (renamed from pki/base/silent/src/common/CMSInstance.java)1
-rw-r--r--pki/base/silent/src/com/netscape/pkisilent/common/CMSLDAP.java (renamed from pki/base/silent/src/common/CMSLDAP.java)1
-rw-r--r--pki/base/silent/src/com/netscape/pkisilent/common/CMSProperties.java (renamed from pki/base/silent/src/common/CMSProperties.java)1
-rw-r--r--pki/base/silent/src/com/netscape/pkisilent/common/CMSTask.java (renamed from pki/base/silent/src/common/CMSTask.java)4
-rw-r--r--pki/base/silent/src/com/netscape/pkisilent/common/CertificateRecord.java (renamed from pki/base/silent/src/common/Certificate_Record.java)5
-rw-r--r--pki/base/silent/src/com/netscape/pkisilent/common/ComCrypto.java (renamed from pki/base/silent/src/common/ComCrypto.java)3
-rw-r--r--pki/base/silent/src/com/netscape/pkisilent/common/Con2Agent.java (renamed from pki/base/silent/src/common/Con2Agent.java)1
-rw-r--r--pki/base/silent/src/com/netscape/pkisilent/common/DirEnroll.java (renamed from pki/base/silent/src/ca/DirEnroll.java)3
-rw-r--r--pki/base/silent/src/com/netscape/pkisilent/common/ParseXML.java (renamed from pki/base/silent/src/common/ParseXML.java)1
-rw-r--r--pki/base/silent/src/com/netscape/pkisilent/common/PostQuery.java (renamed from pki/base/silent/src/common/PostQuery.java)1
-rw-r--r--pki/base/silent/src/com/netscape/pkisilent/common/Request.java (renamed from pki/base/silent/src/ca/Request.java)3
-rw-r--r--pki/base/silent/src/com/netscape/pkisilent/common/ServerInfo.java (renamed from pki/base/silent/src/common/ServerInfo.java)1
-rw-r--r--pki/base/silent/src/com/netscape/pkisilent/common/TestClient.java (renamed from pki/base/silent/src/common/TestClient.java)4
-rw-r--r--pki/base/silent/src/com/netscape/pkisilent/common/UserEnroll.java (renamed from pki/base/silent/src/ca/UserEnroll.java)3
-rw-r--r--pki/base/silent/src/com/netscape/pkisilent/common/Utilities.java (renamed from pki/base/silent/src/common/Utilities.java)5
-rw-r--r--pki/base/silent/src/com/netscape/pkisilent/common/checkRequest.java (renamed from pki/base/silent/src/ca/checkRequest.java)3
-rw-r--r--pki/base/silent/src/com/netscape/pkisilent/http/CertSelection.java (renamed from pki/base/silent/src/http/CertSelection.java)1
-rw-r--r--pki/base/silent/src/com/netscape/pkisilent/http/HTMLDocument.java (renamed from pki/base/silent/src/http/HTMLDocument.java)1
-rw-r--r--pki/base/silent/src/com/netscape/pkisilent/http/HTTPClient.java (renamed from pki/base/silent/src/http/HTTPClient.java)4
-rw-r--r--pki/base/silent/src/com/netscape/pkisilent/http/HTTPResponse.java (renamed from pki/base/silent/src/http/HTTPResponse.java)3
49 files changed, 224 insertions, 65 deletions
diff --git a/pki/.classpath b/pki/.classpath
index 7b50d29c9..3bad20517 100644
--- a/pki/.classpath
+++ b/pki/.classpath
@@ -7,19 +7,10 @@
<classpathentry excluding="**/CMakeLists.txt" kind="src" path="base/kra/src"/>
<classpathentry kind="src" path="base/migrate/80"/>
<classpathentry excluding="**/CMakeLists.txt" kind="src" path="base/ocsp/src"/>
- <classpathentry kind="src" path="base/silent/src/argparser"/>
- <classpathentry kind="src" path="base/silent/src/ca"/>
- <classpathentry kind="src" path="base/silent/src/common"/>
- <classpathentry kind="src" path="base/silent/src/drm"/>
- <classpathentry kind="src" path="base/silent/src/http"/>
- <classpathentry kind="src" path="base/silent/src/ocsp"/>
- <classpathentry kind="src" path="base/silent/src/ra"/>
- <classpathentry kind="src" path="base/silent/src/subca"/>
- <classpathentry kind="src" path="base/silent/src/tks"/>
- <classpathentry kind="src" path="base/silent/src/tps"/>
<classpathentry excluding="**/CMakeLists.txt" kind="src" path="base/symkey/src"/>
<classpathentry excluding="**/CMakeLists.txt" kind="src" path="base/tks/src"/>
<classpathentry excluding="**/CMakeLists.txt" kind="src" path="base/util/src"/>
+ <classpathentry kind="src" path="base/silent/src"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="lib" path="/usr/share/java/idm-console-mcc.jar"/>
<classpathentry kind="lib" path="/usr/share/java/idm-console-base.jar"/>
diff --git a/pki/base/silent/scripts/pkisilent b/pki/base/silent/scripts/pkisilent
index 6b4bd221d..778c40036 100755
--- a/pki/base/silent/scripts/pkisilent
+++ b/pki/base/silent/scripts/pkisilent
@@ -104,7 +104,7 @@ if( $ARCHITECTURE eq "x86_64" ) {
## based upon the preset LD_LIBRARY_PATH and CP environment variables. ##
###############################################################################
-my $output = `java -cp $ENV{CLASSPATH} @ARGV`;
+my $output = `java -cp $ENV{CLASSPATH} com.netscape.pkisilent.PKISilent @ARGV`;
my $status = $?;
print "#######################################################################\n";
diff --git a/pki/base/silent/src/CMakeLists.txt b/pki/base/silent/src/CMakeLists.txt
index 4a3ab4a77..b610df96d 100644
--- a/pki/base/silent/src/CMakeLists.txt
+++ b/pki/base/silent/src/CMakeLists.txt
@@ -25,51 +25,50 @@ find_file(XERCES_JAR
)
set(pki-silent_java_SRCS
- common/AutoInstaller.java
- common/CMSConfig.java
- common/ParseXML.java
- common/ServerInfo.java
- common/CMSTask.java
- common/TestClient.java
- common/Certificate_Record.java
- common/ComCrypto.java
- common/CMSLDAP.java
- common/createinstance.java
- common/Utilities.java
- common/BaseState.java
- common/PostQuery.java
- common/Con2Agent.java
- common/CMSProperties.java
- common/CMSInstance.java
- argparser/IntHolder.java
- argparser/StringScanException.java
- argparser/StringHolder.java
- argparser/CharHolder.java
- argparser/ArgParser.java
- argparser/FloatHolder.java
- argparser/BooleanHolder.java
- argparser/StringScanner.java
- argparser/ObjectHolder.java
- argparser/SimpleExample.java
- argparser/ArgParserTest.java
- argparser/DoubleHolder.java
- argparser/ArgParseException.java
- argparser/LongHolder.java
- tps/ConfigureTPS.java
- ra/ConfigureRA.java
- subca/ConfigureSubCA.java
- http/HTTPResponse.java
- http/HTTPClient.java
- http/HTMLDocument.java
- http/CertSelection.java
- tks/ConfigureTKS.java
- ca/DirEnroll.java
- ca/UserEnroll.java
- ca/Request.java
- ca/checkRequest.java
- ca/ConfigureCA.java
- drm/ConfigureDRM.java
- ocsp/ConfigureOCSP.java
+ com/netscape/pkisilent/ConfigureTKS.java
+ com/netscape/pkisilent/ConfigureCA.java
+ com/netscape/pkisilent/argparser/CharHolder.java
+ com/netscape/pkisilent/argparser/ArgParseException.java
+ com/netscape/pkisilent/argparser/StringHolder.java
+ com/netscape/pkisilent/argparser/SimpleExample.java
+ com/netscape/pkisilent/argparser/ArgParser.java
+ com/netscape/pkisilent/argparser/DoubleHolder.java
+ com/netscape/pkisilent/argparser/ObjectHolder.java
+ com/netscape/pkisilent/argparser/FloatHolder.java
+ com/netscape/pkisilent/argparser/BooleanHolder.java
+ com/netscape/pkisilent/argparser/StringScanException.java
+ com/netscape/pkisilent/argparser/StringScanner.java
+ com/netscape/pkisilent/argparser/LongHolder.java
+ com/netscape/pkisilent/argparser/IntHolder.java
+ com/netscape/pkisilent/ConfigureTPS.java
+ com/netscape/pkisilent/http/HTTPClient.java
+ com/netscape/pkisilent/http/HTMLDocument.java
+ com/netscape/pkisilent/http/HTTPResponse.java
+ com/netscape/pkisilent/http/CertSelection.java
+ com/netscape/pkisilent/common/Request.java
+ com/netscape/pkisilent/common/CertificateRecord.java
+ com/netscape/pkisilent/common/CMSInstance.java
+ com/netscape/pkisilent/common/Utilities.java
+ com/netscape/pkisilent/common/ComCrypto.java
+ com/netscape/pkisilent/common/BaseState.java
+ com/netscape/pkisilent/common/CMSLDAP.java
+ com/netscape/pkisilent/common/CMSConfig.java
+ com/netscape/pkisilent/common/PostQuery.java
+ com/netscape/pkisilent/common/ServerInfo.java
+ com/netscape/pkisilent/common/AutoInstaller.java
+ com/netscape/pkisilent/common/UserEnroll.java
+ com/netscape/pkisilent/common/ParseXML.java
+ com/netscape/pkisilent/common/CMSProperties.java
+ com/netscape/pkisilent/common/DirEnroll.java
+ com/netscape/pkisilent/common/Con2Agent.java
+ com/netscape/pkisilent/common/TestClient.java
+ com/netscape/pkisilent/common/CMSTask.java
+ com/netscape/pkisilent/ConfigureOCSP.java
+ com/netscape/pkisilent/CreateInstance.java
+ com/netscape/pkisilent/ConfigureRA.java
+ com/netscape/pkisilent/ConfigureSubCA.java
+ com/netscape/pkisilent/ConfigureDRM.java
+ com/netscape/pkisilent/PKISilent.java
)
set(CMAKE_JAVA_INCLUDE_PATH
diff --git a/pki/base/silent/src/ca/ConfigureCA.java b/pki/base/silent/src/com/netscape/pkisilent/ConfigureCA.java
index 0b01e56ee..b31f47d40 100644
--- a/pki/base/silent/src/ca/ConfigureCA.java
+++ b/pki/base/silent/src/com/netscape/pkisilent/ConfigureCA.java
@@ -1,3 +1,4 @@
+package com.netscape.pkisilent;
// --- BEGIN COPYRIGHT BLOCK ---
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
@@ -16,6 +17,7 @@
// All rights reserved.
// --- END COPYRIGHT BLOCK ---
+
import java.io.BufferedInputStream;
import java.io.BufferedReader;
import java.io.ByteArrayInputStream;
@@ -33,6 +35,12 @@ import org.mozilla.jss.pkcs12.AuthenticatedSafes;
import org.mozilla.jss.pkcs12.PFX;
import com.netscape.osutil.OSUtil;
+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;
public class ConfigureCA {
diff --git a/pki/base/silent/src/drm/ConfigureDRM.java b/pki/base/silent/src/com/netscape/pkisilent/ConfigureDRM.java
index 72448f242..17a0042c0 100644
--- a/pki/base/silent/src/drm/ConfigureDRM.java
+++ b/pki/base/silent/src/com/netscape/pkisilent/ConfigureDRM.java
@@ -1,3 +1,4 @@
+package com.netscape.pkisilent;
// --- BEGIN COPYRIGHT BLOCK ---
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
@@ -16,6 +17,7 @@
// All rights reserved.
// --- END COPYRIGHT BLOCK ---
+
import java.io.BufferedInputStream;
import java.io.BufferedReader;
import java.io.ByteArrayInputStream;
@@ -31,6 +33,12 @@ import org.mozilla.jss.pkcs12.AuthenticatedSafes;
import org.mozilla.jss.pkcs12.PFX;
import com.netscape.osutil.OSUtil;
+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;
public class ConfigureDRM
{
diff --git a/pki/base/silent/src/ocsp/ConfigureOCSP.java b/pki/base/silent/src/com/netscape/pkisilent/ConfigureOCSP.java
index e25822d88..1c775d814 100644
--- a/pki/base/silent/src/ocsp/ConfigureOCSP.java
+++ b/pki/base/silent/src/com/netscape/pkisilent/ConfigureOCSP.java
@@ -1,3 +1,4 @@
+package com.netscape.pkisilent;
// --- BEGIN COPYRIGHT BLOCK ---
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
@@ -31,6 +32,12 @@ import org.mozilla.jss.pkcs12.AuthenticatedSafes;
import org.mozilla.jss.pkcs12.PFX;
import com.netscape.osutil.OSUtil;
+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;
public class ConfigureOCSP
{
diff --git a/pki/base/silent/src/ra/ConfigureRA.java b/pki/base/silent/src/com/netscape/pkisilent/ConfigureRA.java
index fef97ed19..d8a8b0248 100644
--- a/pki/base/silent/src/ra/ConfigureRA.java
+++ b/pki/base/silent/src/com/netscape/pkisilent/ConfigureRA.java
@@ -1,3 +1,4 @@
+package com.netscape.pkisilent;
// --- BEGIN COPYRIGHT BLOCK ---
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
@@ -22,6 +23,12 @@ import java.util.ArrayList;
import java.util.Hashtable;
import com.netscape.osutil.OSUtil;
+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;
public class ConfigureRA
{
diff --git a/pki/base/silent/src/subca/ConfigureSubCA.java b/pki/base/silent/src/com/netscape/pkisilent/ConfigureSubCA.java
index 3fe48dce2..715cc2306 100644
--- a/pki/base/silent/src/subca/ConfigureSubCA.java
+++ b/pki/base/silent/src/com/netscape/pkisilent/ConfigureSubCA.java
@@ -1,3 +1,4 @@
+package com.netscape.pkisilent;
// --- BEGIN COPYRIGHT BLOCK ---
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
@@ -22,6 +23,12 @@ import java.util.ArrayList;
import java.util.Hashtable;
import com.netscape.osutil.OSUtil;
+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;
public class ConfigureSubCA
{
diff --git a/pki/base/silent/src/tks/ConfigureTKS.java b/pki/base/silent/src/com/netscape/pkisilent/ConfigureTKS.java
index 0e593c9cc..7d75fe56a 100644
--- a/pki/base/silent/src/tks/ConfigureTKS.java
+++ b/pki/base/silent/src/com/netscape/pkisilent/ConfigureTKS.java
@@ -1,3 +1,4 @@
+package com.netscape.pkisilent;
// --- BEGIN COPYRIGHT BLOCK ---
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
@@ -31,6 +32,12 @@ import org.mozilla.jss.pkcs12.AuthenticatedSafes;
import org.mozilla.jss.pkcs12.PFX;
import com.netscape.osutil.OSUtil;
+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;
public class ConfigureTKS
{
diff --git a/pki/base/silent/src/tps/ConfigureTPS.java b/pki/base/silent/src/com/netscape/pkisilent/ConfigureTPS.java
index 0b5aa41e1..71ae942f6 100644
--- a/pki/base/silent/src/tps/ConfigureTPS.java
+++ b/pki/base/silent/src/com/netscape/pkisilent/ConfigureTPS.java
@@ -1,3 +1,4 @@
+package com.netscape.pkisilent;
// --- BEGIN COPYRIGHT BLOCK ---
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
@@ -22,6 +23,12 @@ import java.util.ArrayList;
import java.util.Hashtable;
import com.netscape.osutil.OSUtil;
+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;
public class ConfigureTPS
{
diff --git a/pki/base/silent/src/common/createinstance.java b/pki/base/silent/src/com/netscape/pkisilent/CreateInstance.java
index 5b2020085..c1a9a7be6 100644
--- a/pki/base/silent/src/common/createinstance.java
+++ b/pki/base/silent/src/com/netscape/pkisilent/CreateInstance.java
@@ -1,3 +1,4 @@
+package com.netscape.pkisilent;
// --- BEGIN COPYRIGHT BLOCK ---
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
@@ -18,8 +19,10 @@
import java.net.URLEncoder;
+import com.netscape.pkisilent.common.PostQuery;
-public class createinstance {
+
+public class CreateInstance {
private static String host;
private static String port;
@@ -31,7 +34,7 @@ public class createinstance {
private static String adminDomain;
private static String first_arg;
- public createinstance() {// do nothing :)
+ public CreateInstance() {// do nothing :)
}
public void usage() {
@@ -73,7 +76,7 @@ public class createinstance {
}
public static void main(String args[]) {
- createinstance newinstance = new createinstance();
+ CreateInstance newinstance = new CreateInstance();
// set variables
diff --git a/pki/base/silent/src/com/netscape/pkisilent/PKISilent.java b/pki/base/silent/src/com/netscape/pkisilent/PKISilent.java
new file mode 100644
index 000000000..97d097c51
--- /dev/null
+++ b/pki/base/silent/src/com/netscape/pkisilent/PKISilent.java
@@ -0,0 +1,60 @@
+package com.netscape.pkisilent;
+
+import java.lang.reflect.Method;
+import java.util.Arrays;
+import java.util.HashMap;
+
+
+public class PKISilent {
+ private static void usage() {
+ System.out.print("usage: java " + PKISilent.class.getCanonicalName());
+ boolean first = true;
+ for (Class c : classes) {
+ if (first) {
+ System.out.println(" [ ");
+ } else {
+ System.out.println(" | ");
+ }
+ first = false;
+ System.out.print(" " + c.getSimpleName());
+ }
+ System.out.println(" ] ");
+ }
+
+ static Class[] classes = { ConfigureCA.class, ConfigureDRM.class,
+ ConfigureOCSP.class, ConfigureRA.class, ConfigureSubCA.class,
+ ConfigureTKS.class, ConfigureTPS.class, CreateInstance.class, };
+
+ public static final void main(String[] args) {
+ HashMap<String, Method> classMap = new HashMap<String, Method>();
+ for (Class c : classes) {
+ try {
+ classMap.put(c.getSimpleName(),
+ c.getMethod("main", String[].class));
+ } catch (Exception e) {
+ // The set of classes listed above is guaranteed to have a
+ // method 'main'
+ e.printStackTrace();
+ }
+ }
+ if (args.length == 0) {
+ usage();
+ System.exit(-1);
+ }
+ Method mainMethod = classMap.get(args[0]);
+ if (mainMethod == null) {
+ usage();
+ System.exit(-1);
+ }
+ String[] innerArgs = {};
+ if (args.length > 1) {
+ innerArgs = Arrays.copyOfRange(args, 1, args.length);
+ }
+
+ try {
+ mainMethod.invoke(null, (Object) innerArgs);
+ } catch (Exception e) {
+ // exception is guaranteed to have the static main method
+ }
+ }
+}
diff --git a/pki/base/silent/src/argparser/ArgParseException.java b/pki/base/silent/src/com/netscape/pkisilent/argparser/ArgParseException.java
index 9253ca24f..37defbe59 100644
--- a/pki/base/silent/src/argparser/ArgParseException.java
+++ b/pki/base/silent/src/com/netscape/pkisilent/argparser/ArgParseException.java
@@ -1,3 +1,4 @@
+package com.netscape.pkisilent.argparser;
// --- BEGIN COPYRIGHT BLOCK ---
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/pki/base/silent/src/argparser/ArgParser.java b/pki/base/silent/src/com/netscape/pkisilent/argparser/ArgParser.java
index e7bd7e741..f4e07f2e5 100755
--- a/pki/base/silent/src/argparser/ArgParser.java
+++ b/pki/base/silent/src/com/netscape/pkisilent/argparser/ArgParser.java
@@ -1,3 +1,4 @@
+package com.netscape.pkisilent.argparser;
// --- BEGIN COPYRIGHT BLOCK ---
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/pki/base/silent/src/argparser/ArgParserTest.java b/pki/base/silent/src/com/netscape/pkisilent/argparser/ArgParserTest.java
index a2a29bc68..652b7b849 100644
--- a/pki/base/silent/src/argparser/ArgParserTest.java
+++ b/pki/base/silent/src/com/netscape/pkisilent/argparser/ArgParserTest.java
@@ -1,3 +1,4 @@
+package com.netscape.pkisilent.argparser;
// --- BEGIN COPYRIGHT BLOCK ---
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/pki/base/silent/src/argparser/BooleanHolder.java b/pki/base/silent/src/com/netscape/pkisilent/argparser/BooleanHolder.java
index 18a35c058..470b0fca3 100644
--- a/pki/base/silent/src/argparser/BooleanHolder.java
+++ b/pki/base/silent/src/com/netscape/pkisilent/argparser/BooleanHolder.java
@@ -1,3 +1,4 @@
+package com.netscape.pkisilent.argparser;
// --- BEGIN COPYRIGHT BLOCK ---
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/pki/base/silent/src/argparser/CharHolder.java b/pki/base/silent/src/com/netscape/pkisilent/argparser/CharHolder.java
index b096df9ca..02e3aa429 100644
--- a/pki/base/silent/src/argparser/CharHolder.java
+++ b/pki/base/silent/src/com/netscape/pkisilent/argparser/CharHolder.java
@@ -1,3 +1,4 @@
+package com.netscape.pkisilent.argparser;
// --- BEGIN COPYRIGHT BLOCK ---
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/pki/base/silent/src/argparser/DoubleHolder.java b/pki/base/silent/src/com/netscape/pkisilent/argparser/DoubleHolder.java
index 3728ebf2e..08d7dedf5 100644
--- a/pki/base/silent/src/argparser/DoubleHolder.java
+++ b/pki/base/silent/src/com/netscape/pkisilent/argparser/DoubleHolder.java
@@ -1,3 +1,4 @@
+package com.netscape.pkisilent.argparser;
// --- BEGIN COPYRIGHT BLOCK ---
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/pki/base/silent/src/argparser/FloatHolder.java b/pki/base/silent/src/com/netscape/pkisilent/argparser/FloatHolder.java
index 4cded9aa4..ad4ac8601 100644
--- a/pki/base/silent/src/argparser/FloatHolder.java
+++ b/pki/base/silent/src/com/netscape/pkisilent/argparser/FloatHolder.java
@@ -1,3 +1,4 @@
+package com.netscape.pkisilent.argparser;
// --- BEGIN COPYRIGHT BLOCK ---
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/pki/base/silent/src/argparser/IntHolder.java b/pki/base/silent/src/com/netscape/pkisilent/argparser/IntHolder.java
index fd8403bd1..7310082df 100644
--- a/pki/base/silent/src/argparser/IntHolder.java
+++ b/pki/base/silent/src/com/netscape/pkisilent/argparser/IntHolder.java
@@ -1,3 +1,4 @@
+package com.netscape.pkisilent.argparser;
// --- BEGIN COPYRIGHT BLOCK ---
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/pki/base/silent/src/argparser/LongHolder.java b/pki/base/silent/src/com/netscape/pkisilent/argparser/LongHolder.java
index 13a84008b..14501ea25 100644
--- a/pki/base/silent/src/argparser/LongHolder.java
+++ b/pki/base/silent/src/com/netscape/pkisilent/argparser/LongHolder.java
@@ -1,3 +1,4 @@
+package com.netscape.pkisilent.argparser;
// --- BEGIN COPYRIGHT BLOCK ---
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/pki/base/silent/src/argparser/ObjectHolder.java b/pki/base/silent/src/com/netscape/pkisilent/argparser/ObjectHolder.java
index 8e3493e1d..eba424d6c 100644
--- a/pki/base/silent/src/argparser/ObjectHolder.java
+++ b/pki/base/silent/src/com/netscape/pkisilent/argparser/ObjectHolder.java
@@ -1,3 +1,4 @@
+package com.netscape.pkisilent.argparser;
// --- BEGIN COPYRIGHT BLOCK ---
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/pki/base/silent/src/argparser/SimpleExample.java b/pki/base/silent/src/com/netscape/pkisilent/argparser/SimpleExample.java
index 58e4d4656..8086131b8 100644
--- a/pki/base/silent/src/argparser/SimpleExample.java
+++ b/pki/base/silent/src/com/netscape/pkisilent/argparser/SimpleExample.java
@@ -1,3 +1,4 @@
+package com.netscape.pkisilent.argparser;
// --- BEGIN COPYRIGHT BLOCK ---
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/pki/base/silent/src/argparser/StringHolder.java b/pki/base/silent/src/com/netscape/pkisilent/argparser/StringHolder.java
index 7737fa4cd..6a86e605a 100644
--- a/pki/base/silent/src/argparser/StringHolder.java
+++ b/pki/base/silent/src/com/netscape/pkisilent/argparser/StringHolder.java
@@ -1,3 +1,4 @@
+package com.netscape.pkisilent.argparser;
// --- BEGIN COPYRIGHT BLOCK ---
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/pki/base/silent/src/argparser/StringScanException.java b/pki/base/silent/src/com/netscape/pkisilent/argparser/StringScanException.java
index b7b4c7d2d..af102d38f 100644
--- a/pki/base/silent/src/argparser/StringScanException.java
+++ b/pki/base/silent/src/com/netscape/pkisilent/argparser/StringScanException.java
@@ -1,3 +1,4 @@
+package com.netscape.pkisilent.argparser;
// --- BEGIN COPYRIGHT BLOCK ---
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/pki/base/silent/src/argparser/StringScanner.java b/pki/base/silent/src/com/netscape/pkisilent/argparser/StringScanner.java
index 425ad3ac1..fae67c791 100644
--- a/pki/base/silent/src/argparser/StringScanner.java
+++ b/pki/base/silent/src/com/netscape/pkisilent/argparser/StringScanner.java
@@ -1,3 +1,4 @@
+package com.netscape.pkisilent.argparser;
// --- BEGIN COPYRIGHT BLOCK ---
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/pki/base/silent/src/common/AutoInstaller.java b/pki/base/silent/src/com/netscape/pkisilent/common/AutoInstaller.java
index c343a6918..a16a6cc53 100644
--- a/pki/base/silent/src/common/AutoInstaller.java
+++ b/pki/base/silent/src/com/netscape/pkisilent/common/AutoInstaller.java
@@ -1,3 +1,4 @@
+package com.netscape.pkisilent.common;
// --- BEGIN COPYRIGHT BLOCK ---
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
@@ -26,6 +27,7 @@ import java.util.GregorianCalendar;
import java.util.Properties;
+
/**
* CMS Test Framework.
* Use this class to Configure a CA, RA,DRM,OCSP and SubCA subsystem.
diff --git a/pki/base/silent/src/common/BaseState.java b/pki/base/silent/src/com/netscape/pkisilent/common/BaseState.java
index e5ff7ccd9..a3ceec31a 100644
--- a/pki/base/silent/src/common/BaseState.java
+++ b/pki/base/silent/src/com/netscape/pkisilent/common/BaseState.java
@@ -1,3 +1,4 @@
+package com.netscape.pkisilent.common;
// --- BEGIN COPYRIGHT BLOCK ---
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/pki/base/silent/src/common/CMSConfig.java b/pki/base/silent/src/com/netscape/pkisilent/common/CMSConfig.java
index 4d29cb8b0..6913a1440 100644
--- a/pki/base/silent/src/common/CMSConfig.java
+++ b/pki/base/silent/src/com/netscape/pkisilent/common/CMSConfig.java
@@ -1,3 +1,4 @@
+package com.netscape.pkisilent.common;
// --- BEGIN COPYRIGHT BLOCK ---
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/pki/base/silent/src/common/CMSInstance.java b/pki/base/silent/src/com/netscape/pkisilent/common/CMSInstance.java
index 542636edd..0687bc2aa 100644
--- a/pki/base/silent/src/common/CMSInstance.java
+++ b/pki/base/silent/src/com/netscape/pkisilent/common/CMSInstance.java
@@ -1,3 +1,4 @@
+package com.netscape.pkisilent.common;
// --- BEGIN COPYRIGHT BLOCK ---
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/pki/base/silent/src/common/CMSLDAP.java b/pki/base/silent/src/com/netscape/pkisilent/common/CMSLDAP.java
index b7f678064..51dbd2127 100644
--- a/pki/base/silent/src/common/CMSLDAP.java
+++ b/pki/base/silent/src/com/netscape/pkisilent/common/CMSLDAP.java
@@ -1,3 +1,4 @@
+package com.netscape.pkisilent.common;
// --- BEGIN COPYRIGHT BLOCK ---
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/pki/base/silent/src/common/CMSProperties.java b/pki/base/silent/src/com/netscape/pkisilent/common/CMSProperties.java
index 0c64ac9e8..e4ea36019 100644
--- a/pki/base/silent/src/common/CMSProperties.java
+++ b/pki/base/silent/src/com/netscape/pkisilent/common/CMSProperties.java
@@ -1,3 +1,4 @@
+package com.netscape.pkisilent.common;
// --- BEGIN COPYRIGHT BLOCK ---
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/pki/base/silent/src/common/CMSTask.java b/pki/base/silent/src/com/netscape/pkisilent/common/CMSTask.java
index c9b1aeab8..479e13e6e 100644
--- a/pki/base/silent/src/common/CMSTask.java
+++ b/pki/base/silent/src/com/netscape/pkisilent/common/CMSTask.java
@@ -1,3 +1,4 @@
+package com.netscape.pkisilent.common;
// --- BEGIN COPYRIGHT BLOCK ---
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
@@ -20,6 +21,9 @@ import java.io.BufferedReader;
import java.io.IOException;
import java.io.InputStreamReader;
+import com.netscape.pkisilent.argparser.ArgParser;
+import com.netscape.pkisilent.argparser.StringHolder;
+
/**
* CS Test framework .
diff --git a/pki/base/silent/src/common/Certificate_Record.java b/pki/base/silent/src/com/netscape/pkisilent/common/CertificateRecord.java
index 91b7dab11..c636b0a19 100644
--- a/pki/base/silent/src/common/Certificate_Record.java
+++ b/pki/base/silent/src/com/netscape/pkisilent/common/CertificateRecord.java
@@ -1,3 +1,4 @@
+package com.netscape.pkisilent.common;
// --- BEGIN COPYRIGHT BLOCK ---
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
@@ -18,7 +19,7 @@
-public class Certificate_Record {
+public class CertificateRecord {
public String revokedOn = null;
public String revokedBy = null;
@@ -38,7 +39,7 @@ public class Certificate_Record {
public String pkcs7ChainBase64 = null;
public String certPrettyPrint = null;
- public Certificate_Record() {// Do nothing
+ public CertificateRecord() {// Do nothing
}
}
diff --git a/pki/base/silent/src/common/ComCrypto.java b/pki/base/silent/src/com/netscape/pkisilent/common/ComCrypto.java
index 3e5d927ff..46bd96640 100644
--- a/pki/base/silent/src/common/ComCrypto.java
+++ b/pki/base/silent/src/com/netscape/pkisilent/common/ComCrypto.java
@@ -1,3 +1,4 @@
+package com.netscape.pkisilent.common;
// --- BEGIN COPYRIGHT BLOCK ---
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
@@ -321,7 +322,7 @@ public class ComCrypto {
*/
- String normalizeForLDAP(String s) {
+ public String normalizeForLDAP(String s) {
String val = "";
diff --git a/pki/base/silent/src/common/Con2Agent.java b/pki/base/silent/src/com/netscape/pkisilent/common/Con2Agent.java
index 5c05b40c1..584d68ce1 100644
--- a/pki/base/silent/src/common/Con2Agent.java
+++ b/pki/base/silent/src/com/netscape/pkisilent/common/Con2Agent.java
@@ -1,3 +1,4 @@
+package com.netscape.pkisilent.common;
// --- BEGIN COPYRIGHT BLOCK ---
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/pki/base/silent/src/ca/DirEnroll.java b/pki/base/silent/src/com/netscape/pkisilent/common/DirEnroll.java
index 5ca3fccfd..59820fe7a 100644
--- a/pki/base/silent/src/ca/DirEnroll.java
+++ b/pki/base/silent/src/com/netscape/pkisilent/common/DirEnroll.java
@@ -1,3 +1,4 @@
+package com.netscape.pkisilent.common;
// --- BEGIN COPYRIGHT BLOCK ---
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
@@ -16,6 +17,7 @@
// All rights reserved.
// --- END COPYRIGHT BLOCK ---
+
import java.io.BufferedOutputStream;
import java.io.BufferedReader;
import java.io.InputStreamReader;
@@ -28,6 +30,7 @@ import java.util.GregorianCalendar;
import org.mozilla.jss.ssl.SSLSocket;
+
/**
* CMS Test framework - Legacyenrollment forms for Directory based enrollmnet and Portal based enrollment .
* Certificate issuance through Legacy Directory based enrollment and Portal based enrollment form.
diff --git a/pki/base/silent/src/common/ParseXML.java b/pki/base/silent/src/com/netscape/pkisilent/common/ParseXML.java
index 474136213..e430bb6ae 100644
--- a/pki/base/silent/src/common/ParseXML.java
+++ b/pki/base/silent/src/com/netscape/pkisilent/common/ParseXML.java
@@ -1,3 +1,4 @@
+package com.netscape.pkisilent.common;
// --- BEGIN COPYRIGHT BLOCK ---
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/pki/base/silent/src/common/PostQuery.java b/pki/base/silent/src/com/netscape/pkisilent/common/PostQuery.java
index 10599ce2e..87fcf5002 100644
--- a/pki/base/silent/src/common/PostQuery.java
+++ b/pki/base/silent/src/com/netscape/pkisilent/common/PostQuery.java
@@ -1,3 +1,4 @@
+package com.netscape.pkisilent.common;
// --- BEGIN COPYRIGHT BLOCK ---
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/pki/base/silent/src/ca/Request.java b/pki/base/silent/src/com/netscape/pkisilent/common/Request.java
index 600d21e31..c10cafa29 100644
--- a/pki/base/silent/src/ca/Request.java
+++ b/pki/base/silent/src/com/netscape/pkisilent/common/Request.java
@@ -1,3 +1,4 @@
+package com.netscape.pkisilent.common;
// --- BEGIN COPYRIGHT BLOCK ---
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
@@ -16,6 +17,7 @@
// All rights reserved.
// --- END COPYRIGHT BLOCK ---
+
import java.net.URLEncoder;
import java.util.Calendar;
import java.util.Date;
@@ -23,6 +25,7 @@ import java.util.GregorianCalendar;
import java.util.Vector;
+
/**
* CMS Test framework .
* Submits List,Approve,Reject,cancel requests to agent port
diff --git a/pki/base/silent/src/common/ServerInfo.java b/pki/base/silent/src/com/netscape/pkisilent/common/ServerInfo.java
index e9d96cd4c..89fa768ca 100644
--- a/pki/base/silent/src/common/ServerInfo.java
+++ b/pki/base/silent/src/com/netscape/pkisilent/common/ServerInfo.java
@@ -1,3 +1,4 @@
+package com.netscape.pkisilent.common;
// --- BEGIN COPYRIGHT BLOCK ---
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/pki/base/silent/src/common/TestClient.java b/pki/base/silent/src/com/netscape/pkisilent/common/TestClient.java
index 266a125d2..fc2668565 100644
--- a/pki/base/silent/src/common/TestClient.java
+++ b/pki/base/silent/src/com/netscape/pkisilent/common/TestClient.java
@@ -1,3 +1,4 @@
+package com.netscape.pkisilent.common;
// --- BEGIN COPYRIGHT BLOCK ---
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
@@ -28,6 +29,7 @@ import org.mozilla.jss.crypto.X509Certificate;
import org.mozilla.jss.ssl.SSLCertificateApprovalCallback;
+
/**
* CMS Test framework .
* Before createing an instance of this class make sure you havae set an environment variable TEST_CONFIG_FILE.
@@ -73,7 +75,7 @@ public class TestClient implements SSLCertificateApprovalCallback {
// Cert Sub vart
public String UID, OU, O, DN, E, CN, C, GN, SN, L, MAIL;
// Enroll
- String PWD;
+ protected String PWD;
// CRypto
public ComCrypto cCrypt = new ComCrypto();
public String pkcs10request = null;
diff --git a/pki/base/silent/src/ca/UserEnroll.java b/pki/base/silent/src/com/netscape/pkisilent/common/UserEnroll.java
index fee2532e8..fa402cf61 100644
--- a/pki/base/silent/src/ca/UserEnroll.java
+++ b/pki/base/silent/src/com/netscape/pkisilent/common/UserEnroll.java
@@ -1,3 +1,4 @@
+package com.netscape.pkisilent.common;
// --- BEGIN COPYRIGHT BLOCK ---
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
@@ -16,6 +17,7 @@
// All rights reserved.
// --- END COPYRIGHT BLOCK ---
+
import java.io.BufferedOutputStream;
import java.io.BufferedReader;
import java.io.InputStreamReader;
@@ -28,6 +30,7 @@ import java.util.GregorianCalendar;
import org.mozilla.jss.ssl.SSLSocket;
+
/**
* CMS Test framework .
* Submits Legacy Manual User Enrollment request from EESSL port. Parses the response from server and return RequestID.
diff --git a/pki/base/silent/src/common/Utilities.java b/pki/base/silent/src/com/netscape/pkisilent/common/Utilities.java
index 7deb154ca..fa5c7c4a8 100644
--- a/pki/base/silent/src/common/Utilities.java
+++ b/pki/base/silent/src/com/netscape/pkisilent/common/Utilities.java
@@ -1,3 +1,4 @@
+package com.netscape.pkisilent.common;
// --- BEGIN COPYRIGHT BLOCK ---
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
@@ -285,12 +286,12 @@ public class Utilities {
/*
* function to decode base64 encoded certificate
*/
- public Certificate_Record decode_cert(String cert) {
+ public CertificateRecord decode_cert(String cert) {
String head = "-----BEGIN CERTIFICATE-----";
String tail = "-----END CERTIFICATE-----";
- Certificate_Record cr = new Certificate_Record();
+ CertificateRecord cr = new CertificateRecord();
int head_pos = cert.indexOf(head);
int tail_pos = cert.indexOf(tail);
diff --git a/pki/base/silent/src/ca/checkRequest.java b/pki/base/silent/src/com/netscape/pkisilent/common/checkRequest.java
index 41cd2d70c..f2a71085e 100644
--- a/pki/base/silent/src/ca/checkRequest.java
+++ b/pki/base/silent/src/com/netscape/pkisilent/common/checkRequest.java
@@ -1,3 +1,4 @@
+package com.netscape.pkisilent.common;
// --- BEGIN COPYRIGHT BLOCK ---
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
@@ -16,6 +17,7 @@
// All rights reserved.
// --- END COPYRIGHT BLOCK ---
+
import java.io.BufferedOutputStream;
import java.io.BufferedReader;
import java.io.FileOutputStream;
@@ -28,6 +30,7 @@ import java.util.GregorianCalendar;
import org.mozilla.jss.ssl.SSLSocket;
+
/**
* CMS Test framework .
* Submits a checkRequestStatus request to the server. parses the response from server and can import cert to the specified client database.
diff --git a/pki/base/silent/src/http/CertSelection.java b/pki/base/silent/src/com/netscape/pkisilent/http/CertSelection.java
index 433a52aa9..a759cca2c 100644
--- a/pki/base/silent/src/http/CertSelection.java
+++ b/pki/base/silent/src/com/netscape/pkisilent/http/CertSelection.java
@@ -1,3 +1,4 @@
+package com.netscape.pkisilent.http;
// --- BEGIN COPYRIGHT BLOCK ---
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/pki/base/silent/src/http/HTMLDocument.java b/pki/base/silent/src/com/netscape/pkisilent/http/HTMLDocument.java
index 944d45a02..8d6048dea 100644
--- a/pki/base/silent/src/http/HTMLDocument.java
+++ b/pki/base/silent/src/com/netscape/pkisilent/http/HTMLDocument.java
@@ -1,3 +1,4 @@
+package com.netscape.pkisilent.http;
// --- BEGIN COPYRIGHT BLOCK ---
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/pki/base/silent/src/http/HTTPClient.java b/pki/base/silent/src/com/netscape/pkisilent/http/HTTPClient.java
index b6067519e..4431be8ef 100644
--- a/pki/base/silent/src/http/HTTPClient.java
+++ b/pki/base/silent/src/com/netscape/pkisilent/http/HTTPClient.java
@@ -1,3 +1,4 @@
+package com.netscape.pkisilent.http;
// --- BEGIN COPYRIGHT BLOCK ---
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
@@ -37,6 +38,9 @@ import org.mozilla.jss.ssl.TestCertApprovalCallback;
import org.mozilla.jss.ssl.TestClientCertificateSelectionCallback;
import com.netscape.osutil.OSUtil;
+import com.netscape.pkisilent.argparser.ArgParser;
+import com.netscape.pkisilent.argparser.StringHolder;
+import com.netscape.pkisilent.common.ComCrypto;
public class HTTPClient implements SSLCertificateApprovalCallback
diff --git a/pki/base/silent/src/http/HTTPResponse.java b/pki/base/silent/src/com/netscape/pkisilent/http/HTTPResponse.java
index 8e0c6680a..5b88ac277 100644
--- a/pki/base/silent/src/http/HTTPResponse.java
+++ b/pki/base/silent/src/com/netscape/pkisilent/http/HTTPResponse.java
@@ -1,3 +1,4 @@
+package com.netscape.pkisilent.http;
// --- BEGIN COPYRIGHT BLOCK ---
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
@@ -20,6 +21,8 @@
import java.util.ArrayList;
import java.util.StringTokenizer;
+import com.netscape.pkisilent.common.Utilities;
+
public class HTTPResponse
{