*** empty log message ***

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

1 files changed, 13 insertions, 8 deletions

diff --git a/id.server/src/at/gv/egovernment/moa/id/iaik/config/CertStoreConfigurationImpl.java b/id.server/src/at/gv/egovernment/moa/id/iaik/config/CertStoreConfigurationImpl.java
index 421286876..012dbfbe3 100644
--- a/id.server/src/at/gv/egovernment/moa/id/iaik/config/CertStoreConfigurationImpl.java
+++ b/id.server/src/at/gv/egovernment/moa/id/iaik/config/CertStoreConfigurationImpl.java
@@ -5,6 +5,7 @@ import java.io.File;
 import at.gv.egovernment.moa.id.config.ConfigurationException;
 import at.gv.egovernment.moa.id.config.ConfigurationProvider;
 import at.gv.egovernment.moa.id.iaik.servertools.observer.ObservableImpl;
+import at.gv.egovernment.moa.util.FileUtils;
 import iaik.pki.store.certstore.CertStoreConfiguration;
 import iaik.pki.store.certstore.CertStoreParameters;
 import iaik.pki.store.certstore.CertStoreTypes;
@@ -31,16 +32,20 @@ public class CertStoreConfigurationImpl extends ObservableImpl
    */
   public CertStoreConfigurationImpl(ConfigurationProvider conf) throws ConfigurationException {
     String paramName = ConfigurationProvider.DIRECTORY_CERTSTORE_PARAMETER_PROPERTY;
-    String rootDirParam = conf.getGenericConfigurationParameter(paramName);
-    if (rootDirParam == null)
+    String certStoreRootDirParam = conf.getGenericConfigurationParameter(paramName);
+    if (certStoreRootDirParam == null)
       throw new ConfigurationException(
         "config.08", new Object[] {paramName});
-    File f = new File(rootDirParam);
-    if (f.isDirectory())
-      rootDirectory = f.getAbsolutePath();
-    else
-      throw new ConfigurationException(
-        "config.05", new Object[] {paramName});
+
+		System.out.print("certStoreRootDirParam: " + certStoreRootDirParam);
+		System.out.print("configRootDirectory: " + getRootDirectory());
+		    
+		rootDirectory = FileUtils.makeAbsoluteURL(certStoreRootDirParam, getRootDirectory());
+		
+		File f = new File(rootDirectory);
+				if (!f.isDirectory())
+					throw new ConfigurationException(
+						"config.05", new Object[] {paramName});
     
     parameters = new CertStoreParameters[] { this };
   }