1 files changed, 43 insertions, 49 deletions

diff --git a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/iaik/config/CertStoreConfigurationImpl.java b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/iaik/config/CertStoreConfigurationImpl.java
index 43483a0..052a3c5 100644
--- a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/iaik/config/CertStoreConfigurationImpl.java
+++ b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/iaik/config/CertStoreConfigurationImpl.java
@@ -23,77 +23,71 @@
 
 package at.gv.egovernment.moa.spss.server.iaik.config;
 
-import java.io.File;
-import java.io.IOException;
-
-import org.apache.commons.io.FileUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import at.gv.egovernment.moa.sig.tsl.exception.TslException;
 import at.gv.egovernment.moa.spss.server.config.ConfigurationProvider;
-import at.gv.egovernment.moa.spss.server.logging.IaikLog;
-import at.gv.egovernment.moa.spss.server.logging.TransactionId;
 import at.gv.egovernment.moa.spss.tsl.TSLServiceFactory;
-import iaik.logging.Log;
 import iaik.pki.store.certstore.CertStoreConfiguration;
 import iaik.pki.store.certstore.CertStoreParameters;
 import iaik.pki.store.certstore.directory.DirectoryCertStoreParameters;
-import iaik.pki.store.certstore.directory.DirectoryStoreException;
-import iaik.pki.store.certstore.utils.DirectoryCertStoreConverter;
 
 /**
  * An implementation of the <code>CertStoreConfiguration</code> interface based
  * on MOA configuration data.
- * 
+ *
  * @see iaik.pki.store.certstore.CertStoreConfiguration
  * @author Patrick Peck
  * @version $Id$
  */
-public class CertStoreConfigurationImpl extends AbstractObservableConfiguration implements CertStoreConfiguration {
+public class CertStoreConfigurationImpl extends AbstractObservableConfiguration implements
+    CertStoreConfiguration {
+
+  private static final Logger logger = LoggerFactory.getLogger(CertStoreConfigurationImpl.class);
+
+  /** The configuration parameters of the <code>CertStore</code>. */
+  private CertStoreParameters[] parameters;
+
+  /**
+   * Create a new <code>CertStoreConfigurationImpl</code>.
+   * 
+   * @param config The MOA configuration from which the configuration data is
+   *               being read.
+   */
+  public CertStoreConfigurationImpl(ConfigurationProvider config) {
+    final String certStoreRoot = config.getCertStoreLocation();
+
+    final DirectoryCertStoreParameters dirParameters = new DirectoryCertStoreParametersImpl(
+        "MOA Directory CertStore",
+        certStoreRoot, true, false);
 
-	private static final Logger logger = LoggerFactory.getLogger(CertStoreConfigurationImpl.class);
+    if (TSLServiceFactory.isInitialized()) {
+      try {
+        final CertStoreParameters tslCertStore = TSLServiceFactory.getTSLServiceClient()
+            .getCertStoreWithTSLCertificates();
+        parameters = new CertStoreParameters[] { dirParameters, tslCertStore };
 
-	/** The configuration parameters of the <code>CertStore</code>. */
-	private CertStoreParameters[] parameters;
+      } catch (final TslException e) {
+        logger.warn("TSL based CertStore initialisation FAILED.", e);
+        logger.warn("Only Directory based CertStore is used ... ");
+        parameters = new CertStoreParameters[] { dirParameters };
+      }
 
-	/**
-	 * Create a new <code>CertStoreConfigurationImpl</code>.
-	 * 
-	 * @param config
-	 *            The MOA configuration from which the configuration data is
-	 *            being read.
-	 */
-	public CertStoreConfigurationImpl(ConfigurationProvider config) {
-		String certStoreRoot = config.getCertStoreLocation();
+    } else {
+      logger.info("Trust-Status List support is not active. Use only Directory based CertStore.");
+      parameters = new CertStoreParameters[] { dirParameters };
 
-		DirectoryCertStoreParameters dirParameters = new DirectoryCertStoreParametersImpl("MOA Directory CertStore",
-				certStoreRoot, true, false);
+    }
 
-		if (TSLServiceFactory.isInitialized()) {
-			try {
-				CertStoreParameters tslCertStore = TSLServiceFactory.getTSLServiceClient().getCertStoreWithTSLCertificates();
-				parameters = new CertStoreParameters[] { dirParameters, tslCertStore};
-				
-			} catch (TslException e) {
-				logger.warn("TSL based CertStore initialisation FAILED.", e);
-				logger.warn("Only Directory based CertStore is used ... ");
-				parameters = new CertStoreParameters[] { dirParameters };
-			}
-									
-		} else {
-			logger.info("Trust-Status List support is not active. Use only Directory based CertStore.");
-			parameters = new CertStoreParameters[] { dirParameters };
-			
-		}
-		
-	}
+  }
 
-	/**
-	 * @see iaik.pki.store.certstore.CertStoreConfiguration#getParameters()
-	 */
-	public CertStoreParameters[] getParameters() {
-		return parameters;
-	}
+  /**
+   * @see iaik.pki.store.certstore.CertStoreConfiguration#getParameters()
+   */
+  @Override
+  public CertStoreParameters[] getParameters() {
+    return parameters;
+  }
 
 }