aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--id.server/src/at/gv/egovernment/moa/id/iaik/config/CertStoreConfigurationImpl.java10
1 files changed, 5 insertions, 5 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 012dbfbe3..c338e96fc 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
@@ -20,6 +20,8 @@ public class CertStoreConfigurationImpl extends ObservableImpl
implements CertStoreConfiguration, DirectoryCertStoreParameters {
/** identifies the rootDirectory */
private String rootDirectory;
+ /** ConfigurationProvider */
+ private ConfigurationProvider conf;
/** Array for storing all CertStoreParameters */
private CertStoreParameters[] parameters;
@@ -31,17 +33,15 @@ public class CertStoreConfigurationImpl extends ObservableImpl
* being read.
*/
public CertStoreConfigurationImpl(ConfigurationProvider conf) throws ConfigurationException {
+ this.conf=conf;
String paramName = ConfigurationProvider.DIRECTORY_CERTSTORE_PARAMETER_PROPERTY;
String certStoreRootDirParam = conf.getGenericConfigurationParameter(paramName);
if (certStoreRootDirParam == null)
throw new ConfigurationException(
"config.08", new Object[] {paramName});
- System.out.print("certStoreRootDirParam: " + certStoreRootDirParam);
- System.out.print("configRootDirectory: " + getRootDirectory());
-
- rootDirectory = FileUtils.makeAbsoluteURL(certStoreRootDirParam, getRootDirectory());
-
+ rootDirectory = FileUtils.makeAbsoluteURL(certStoreRootDirParam, conf.getRootConfigFileDir());
+ if(rootDirectory.startsWith("file:")) rootDirectory = rootDirectory.substring(6);
File f = new File(rootDirectory);
if (!f.isDirectory())
throw new ConfigurationException(