Cleanup imports

Automated changes done by Eclipse
Minor tweak to one file where Eclipse was tring to find an import for Any
Due to finding it in an annotated comment.

https://bugzilla.redhat.com/show_bug.cgi?id=728303

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

7 files changed, 54 insertions, 60 deletions

diff --git a/pki/base/common/src/com/netscape/certsrv/security/ICryptoSubsystem.java b/pki/base/common/src/com/netscape/certsrv/security/ICryptoSubsystem.java
index 2e4c0a9ee..ab910b376 100644
--- a/pki/base/common/src/com/netscape/certsrv/security/ICryptoSubsystem.java
+++ b/pki/base/common/src/com/netscape/certsrv/security/ICryptoSubsystem.java
@@ -18,17 +18,24 @@
 package com.netscape.certsrv.security;
 
 
-import org.mozilla.jss.crypto.*;
-import org.mozilla.jss.*;
-import org.mozilla.jss.CryptoManager.*;
-import java.io.*;
-import java.security.*;
-import java.util.*;
-import java.security.*;
-import java.security.cert.*;
-import netscape.security.x509.*;
-import com.netscape.certsrv.base.*;
-import com.netscape.certsrv.common.*;
+import java.io.IOException;
+import java.security.KeyPair;
+import java.security.cert.CertificateException;
+import java.util.Locale;
+
+import netscape.security.x509.AlgorithmId;
+import netscape.security.x509.CertificateExtensions;
+import netscape.security.x509.X509CertImpl;
+
+import org.mozilla.jss.CryptoManager.NotInitializedException;
+import org.mozilla.jss.crypto.ObjectNotFoundException;
+import org.mozilla.jss.crypto.PQGParams;
+import org.mozilla.jss.crypto.TokenException;
+
+import com.netscape.certsrv.base.EBaseException;
+import com.netscape.certsrv.base.IConfigStore;
+import com.netscape.certsrv.base.ISubsystem;
+import com.netscape.certsrv.common.NameValuePairs;
 
 
 /**
diff --git a/pki/base/common/src/com/netscape/certsrv/security/IEncryptionUnit.java b/pki/base/common/src/com/netscape/certsrv/security/IEncryptionUnit.java
index af7030f06..984425a52 100644
--- a/pki/base/common/src/com/netscape/certsrv/security/IEncryptionUnit.java
+++ b/pki/base/common/src/com/netscape/certsrv/security/IEncryptionUnit.java
@@ -18,16 +18,12 @@
 package com.netscape.certsrv.security;
 
 
-import java.util.*;
-import java.io.*;
-import java.net.*;
-import java.security.*;
-import java.security.cert.X509Certificate;
-import netscape.security.x509.*;
-import netscape.security.util.*;
-import com.netscape.certsrv.base.*;
+import java.security.PublicKey;
+
 import org.mozilla.jss.crypto.PrivateKey;
 
+import com.netscape.certsrv.base.EBaseException;
+
 
 /**
  * An interface represents a encryption unit.
diff --git a/pki/base/common/src/com/netscape/certsrv/security/ISigningUnit.java b/pki/base/common/src/com/netscape/certsrv/security/ISigningUnit.java
index ac46a271d..664d5c1f8 100644
--- a/pki/base/common/src/com/netscape/certsrv/security/ISigningUnit.java
+++ b/pki/base/common/src/com/netscape/certsrv/security/ISigningUnit.java
@@ -18,13 +18,14 @@
 package com.netscape.certsrv.security;
 
 
-import java.security.*;
-import org.mozilla.jss.*;
-import org.mozilla.jss.crypto.*;
-import org.mozilla.jss.util.*;
-import org.mozilla.jss.crypto.Signature;
-import com.netscape.certsrv.base.*;
-import netscape.security.x509.*;
+import java.security.PublicKey;
+
+import netscape.security.x509.X509CertImpl;
+
+import org.mozilla.jss.crypto.SignatureAlgorithm;
+import org.mozilla.jss.crypto.X509Certificate;
+
+import com.netscape.certsrv.base.EBaseException;
 
 /**
  * A class represents the signing unit which is
diff --git a/pki/base/common/src/com/netscape/certsrv/security/IStorageKeyUnit.java b/pki/base/common/src/com/netscape/certsrv/security/IStorageKeyUnit.java
index 0b484bdc7..02ebc616b 100644
--- a/pki/base/common/src/com/netscape/certsrv/security/IStorageKeyUnit.java
+++ b/pki/base/common/src/com/netscape/certsrv/security/IStorageKeyUnit.java
@@ -18,16 +18,11 @@
 package com.netscape.certsrv.security;
 
 
-import java.util.*;
-import java.io.*;
-import java.net.*;
-import java.security.*;
-import java.security.cert.X509Certificate;
-import netscape.security.x509.*;
-import netscape.security.util.*;
-import com.netscape.certsrv.base.*;
-import org.mozilla.jss.crypto.*;
-import org.mozilla.jss.crypto.PrivateKey;
+import java.util.Enumeration;
+
+import org.mozilla.jss.crypto.CryptoToken;
+
+import com.netscape.certsrv.base.EBaseException;
 
 
 /**
diff --git a/pki/base/common/src/com/netscape/certsrv/security/IToken.java b/pki/base/common/src/com/netscape/certsrv/security/IToken.java
index 4211806fc..0b79cfcf3 100644
--- a/pki/base/common/src/com/netscape/certsrv/security/IToken.java
+++ b/pki/base/common/src/com/netscape/certsrv/security/IToken.java
@@ -18,14 +18,7 @@
 package com.netscape.certsrv.security;
 
 
-import java.util.*;
-import java.io.*;
-import java.net.*;
-import java.security.*;
-import java.security.cert.*;
-import netscape.security.x509.*;
-import netscape.security.util.*;
-import com.netscape.certsrv.base.*;
+import com.netscape.certsrv.base.EBaseException;
 
 
 /**
diff --git a/pki/base/common/src/com/netscape/certsrv/security/ITransportKeyUnit.java b/pki/base/common/src/com/netscape/certsrv/security/ITransportKeyUnit.java
index 1ad0e378c..2edfa12a9 100644
--- a/pki/base/common/src/com/netscape/certsrv/security/ITransportKeyUnit.java
+++ b/pki/base/common/src/com/netscape/certsrv/security/ITransportKeyUnit.java
@@ -18,16 +18,13 @@
 package com.netscape.certsrv.security;
 
 
-import java.util.*;
-import java.io.*;
-import java.net.*;
-import java.security.*;
-import java.security.cert.X509Certificate;
-import netscape.security.x509.*;
-import netscape.security.util.*;
-import com.netscape.certsrv.base.*;
-import org.mozilla.jss.crypto.*;
+import java.security.PublicKey;
+
+import org.mozilla.jss.crypto.CryptoToken;
 import org.mozilla.jss.crypto.PrivateKey;
+import org.mozilla.jss.crypto.SymmetricKey;
+
+import com.netscape.certsrv.base.EBaseException;
 
 
 /**
diff --git a/pki/base/common/src/com/netscape/certsrv/security/KeyCertData.java b/pki/base/common/src/com/netscape/certsrv/security/KeyCertData.java
index 87dd298f7..513edfd42 100644
--- a/pki/base/common/src/com/netscape/certsrv/security/KeyCertData.java
+++ b/pki/base/common/src/com/netscape/certsrv/security/KeyCertData.java
@@ -18,13 +18,18 @@
 package com.netscape.certsrv.security;
 
 
-import java.util.*;
-import java.security.*;
-import java.math.*;
-import com.netscape.certsrv.base.*;
-import com.netscape.certsrv.common.*;
-import org.mozilla.jss.crypto.*;
-import netscape.security.x509.*;
+import java.math.BigInteger;
+import java.security.KeyPair;
+import java.util.Properties;
+
+import netscape.security.x509.AlgorithmId;
+import netscape.security.x509.CertificateExtensions;
+
+import org.mozilla.jss.crypto.SignatureAlgorithm;
+
+import com.netscape.certsrv.base.IConfigStore;
+import com.netscape.certsrv.common.ConfigConstants;
+import com.netscape.certsrv.common.Constants;
 
 /**
  * This class represents a container for storaging