1 files changed, 21 insertions, 9 deletions
diff --git a/eaaf_modules/eaaf_module_pvp2_core/src/test/java/at/gv/egiz/eaaf/modules/pvp2/test/dummy/DummyCredentialProvider.java b/eaaf_modules/eaaf_module_pvp2_core/src/test/java/at/gv/egiz/eaaf/modules/pvp2/test/dummy/DummyCredentialProvider.java
index 0f8eff72..7418e1b3 100644
--- a/eaaf_modules/eaaf_module_pvp2_core/src/test/java/at/gv/egiz/eaaf/modules/pvp2/test/dummy/DummyCredentialProvider.java
+++ b/eaaf_modules/eaaf_module_pvp2_core/src/test/java/at/gv/egiz/eaaf/modules/pvp2/test/dummy/DummyCredentialProvider.java
@@ -1,18 +1,22 @@
 package at.gv.egiz.eaaf.modules.pvp2.test.dummy;
 
-import org.springframework.beans.factory.annotation.Autowired;
-
 import at.gv.egiz.eaaf.core.api.idp.IConfiguration;
+import at.gv.egiz.eaaf.core.exceptions.EaafConfigurationException;
 import at.gv.egiz.eaaf.core.impl.credential.KeyStoreConfiguration;
 import at.gv.egiz.eaaf.core.impl.credential.KeyStoreConfiguration.KeyStoreType;
 import at.gv.egiz.eaaf.modules.pvp2.impl.utils.AbstractCredentialProvider;
 
+import org.springframework.beans.factory.annotation.Autowired;
+
 public class DummyCredentialProvider extends AbstractCredentialProvider {
 
   @Autowired IConfiguration basicConfig;
 
+  public static final String KEYSTORE_TYPE = "keystore.type";
   public static final String KEYSTORE_PATH = "keystore.path";
   public static final String KEYSTORE_PASSWORD = "keystore.pass";
+  public static final String KEYSTORE_NAME = "keystore.name";
+
 
   public static final String KEY_METADATA_ALIAS = "key.metadata.alias";
   public static final String KEY_METADATA_PASSWORD = "key.metadata.pass";
@@ -24,23 +28,31 @@ public class DummyCredentialProvider extends AbstractCredentialProvider {
   public static final String KEY_ENCRYPTION_PASSWORD = "key.enc.pass";
 
   private static final String KEYSTORENAME = "jUnit test credential provider";
-  
+
   @Override
-  public KeyStoreConfiguration getBasicKeyStoreConfig() {
-    KeyStoreConfiguration keyStoreConfig = new KeyStoreConfiguration();
-    keyStoreConfig.setKeyStoreType(KeyStoreType.JKS);
+  public KeyStoreConfiguration getBasicKeyStoreConfig() throws EaafConfigurationException {
+    final KeyStoreConfiguration keyStoreConfig = new KeyStoreConfiguration();
     keyStoreConfig.setFriendlyName(KEYSTORENAME);
-    
+    keyStoreConfig.setKeyStoreType(getKeyStoreType());
+
+    keyStoreConfig.setKeyStoreName(
+        basicConfig.getBasicConfiguration(KEYSTORE_NAME));
+
     keyStoreConfig.setSoftKeyStoreFilePath(getKeyStoreFilePath());
     keyStoreConfig.setSoftKeyStorePassword(getKeyStorePassword());
-    
+
     return keyStoreConfig;
   }
 
+  public String getKeyStoreType() {
+    return basicConfig.getBasicConfiguration(KEYSTORE_TYPE, KeyStoreType.JKS.getKeyStoreType());
+
+  }
+
   public String getKeyStoreFilePath() {
     final String path = basicConfig.getBasicConfiguration(KEYSTORE_PATH);
     return path;
-   
+
   }
 
   public String getKeyStorePassword() {