1 files changed, 15 insertions, 48 deletions
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/stork/SignatureCreationParameter.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/stork/SignatureCreationParameter.java
index 1f66b7752..ee4fc1e20 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/stork/SignatureCreationParameter.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/stork/SignatureCreationParameter.java
@@ -23,6 +23,8 @@
 
 package at.gv.egovernment.moa.id.config.stork;
 
+import java.util.Properties;
+
 /**
  * Encapsulates signature creation parameters according MOA configuration
  * 
@@ -31,32 +33,24 @@ package at.gv.egovernment.moa.id.config.stork;
  */
 public class SignatureCreationParameter {
 	
-	/** KeyStore Path */
-	private String keyStorePath;
+	private static final String PROPS_PREFIX = "stork.samlsigningparameter.signaturecreation.";
+	private static final String PROPS_KEYSTORE_FILE = "keystore.file";
+	private static final String PROPS_KEYSTORE_PASS = "keystore.password";
+	private static final String PROPS_KEYNAME_NAME = "keyname.name";
+	private static final String PROPS_KEYNAME_PASS = "keyname.password";
 	
-	/** KeyStore Password */
-	private String keyStorePassword;
+	private Properties props;
 	
-	/** Signing Key Name */
-	private String keyName;
+	SignatureCreationParameter(Properties props) {
+		this.props = props;
+	}
 	
-	/** Signing Key Password */
-	private String keyPassword;
-
 	/**
 	 * Gets the KeyStore Path
 	 * @return File Path to KeyStore
 	 */
 	public String getKeyStorePath() {
-		return keyStorePath;
-	}
-
-	/**
-	 * Sets the KeyStore Path
-	 * @param keyStorePath Path to KeyStore
-	 */
-	public void setKeyStorePath(String keyStorePath) {
-		this.keyStorePath = keyStorePath;
+		return props.getProperty(PROPS_PREFIX+PROPS_KEYSTORE_FILE);
 	}
 
 	/**
@@ -64,15 +58,7 @@ public class SignatureCreationParameter {
 	 * @return Password to KeyStore
 	 */
 	public String getKeyStorePassword() {
-		return keyStorePassword;
-	}
-
-	/**
-	 * Sets the KeyStore Password
-	 * @param keyStorePassword Password to KeyStore
-	 */
-	public void setKeyStorePassword(String keyStorePassword) {
-		this.keyStorePassword = keyStorePassword;
+		return props.getProperty(PROPS_PREFIX+PROPS_KEYSTORE_PASS);
 	}
 
 	/**
@@ -80,15 +66,7 @@ public class SignatureCreationParameter {
 	 * @return Siging Key Name
 	 */
 	public String getKeyName() {
-		return keyName;
-	}
-
-	/**
-	 * Sets the Signing Key Name
-	 * @param keyName Signing Key Name
-	 */
-	public void setKeyName(String keyName) {
-		this.keyName = keyName;
+		return props.getProperty(PROPS_PREFIX+PROPS_KEYNAME_NAME);
 	}
 
 	/**
@@ -96,17 +74,6 @@ public class SignatureCreationParameter {
 	 * @return Signing Key Password
 	 */
 	public String getKeyPassword() {
-		return keyPassword;
+		return props.getProperty(PROPS_PREFIX+PROPS_KEYNAME_PASS);
 	}
-
-	/**
-	 * Sets the Signing Key Password
-	 * @param keyPassword Signing Key Password
-	 */
-	public void setKeyPassword(String keyPassword) {
-		this.keyPassword = keyPassword;
-	}
-	
-	
-
 }