Bug 271: Adpation auf neue Struktur des Konfigurationsfiles abgeschlossen. Noch ungetestet.

git-svn-id: https://joinup.ec.europa.eu/svn/moa-idspss/trunk@414 d688527b-c9ab-4aba-bd8d-4036d912da1d

1 files changed, 9 insertions, 29 deletions

diff --git a/spss.server/src/at/gv/egovernment/moa/spss/server/iaik/config/RevocationConfigurationImpl.java b/spss.server/src/at/gv/egovernment/moa/spss/server/iaik/config/RevocationConfigurationImpl.java
index 466234a11..bccb04a09 100644
--- a/spss.server/src/at/gv/egovernment/moa/spss/server/iaik/config/RevocationConfigurationImpl.java
+++ b/spss.server/src/at/gv/egovernment/moa/spss/server/iaik/config/RevocationConfigurationImpl.java
@@ -1,16 +1,11 @@
 package at.gv.egovernment.moa.spss.server.iaik.config;
 
+import iaik.pki.revocation.RevocationConfiguration;
+
 import java.security.cert.X509Certificate;
 import java.util.Date;
-import java.util.HashSet;
-import java.util.Iterator;
 import java.util.Set;
 
-import iaik.pki.revocation.RevocationConfiguration;
-
-import at.gv.egovernment.moa.util.BoolUtils;
-
-import at.gv.egovernment.moa.spss.server.config.DistributionPoint;
 import at.gv.egovernment.moa.spss.server.config.ConfigurationProvider;
 
 /**
@@ -40,34 +35,19 @@ public class RevocationConfigurationImpl
   }
 
   /**
-   * @see iaik.pki.revocation.RevocationConfiguration#getAlternativeDistributionPoints(java.security.cert.X509Certificate, java.util.Date)
+   * @see iaik.pki.revocation.RevocationConfiguration#getAlternativeDistributionPoints
    */
-  public Set getAlternativeDistributionPoints(
-    X509Certificate cert,
-    Date date) {
-
-    Set configuredPoints = config.getCRLDP(cert);
-    Set distributionPoints = new HashSet();
-    Iterator iter;
-
-    for (iter = configuredPoints.iterator(); iter.hasNext();) {
-      DistributionPoint dp = (DistributionPoint) iter.next();
-      distributionPoints.add(new CRLDistributionPointAdapter(dp));
-    }
-
-    return distributionPoints;
+  public Set getAlternativeDistributionPoints(X509Certificate cert, X509Certificate issuer, Date date) 
+  {
+    return config.getDistributionPoints(cert);
   }
 
   /**
    * @see iaik.pki.revocation.RevocationConfiguration#archiveRevocationInfo(java.lang.String, java.lang.String)
    */
-  public boolean archiveRevocationInfo(String type, String uri) {
-    String info =
-      config.getGenericConfiguration(
-        ConfigurationProvider.ARCHIVE_REVOCATION_INFO_PROPERTY,
-        "false");
-    
-    return info != null ? BoolUtils.valueOf(info) : false;
+  public boolean archiveRevocationInfo(String type, String uri) 
+  {
+    return config.getEnableRevocationArchiving();
   }
 
 }