Configuration changes unified Config Constants interface

4 files changed, 38 insertions, 40 deletions

diff --git a/pdf-as-lib/src/configuration/cfg/config.properties b/pdf-as-lib/src/configuration/cfg/config.properties
index 5598bba6..ea10d76e 100644
--- a/pdf-as-lib/src/configuration/cfg/config.properties
+++ b/pdf-as-lib/src/configuration/cfg/config.properties
@@ -48,6 +48,7 @@ moa.sign.url=http://localhost:8080/moa-spss/services/SignatureCreation
 # Identifier fuer den zu verwendenden serverseitig hinterlegten Signaturschluessel.

 # Siehe auch http://joinup.ec.europa.eu/site/moa-idspss/moa-spss-1.5.1/doc/handbook/config/config.html#konfigurationsparameter_ss

 moa.sign.KeyIdentifier=KG_allgemein

+moa.sign.Certificate=test.cer

 

 ##

 # MOA Verifikation

diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/api/IConfigurationConstants.java b/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/api/IConfigurationConstants.java
index 127120d2..96c31348 100644
--- a/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/api/IConfigurationConstants.java
+++ b/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/api/IConfigurationConstants.java
@@ -23,6 +23,9 @@
  ******************************************************************************/
 package at.gv.egiz.pdfas.lib.api;
 
+/**
+ * Collection of useful configuration key
+ */
 public interface IConfigurationConstants {
 
 	public static final String TRUE = "true";
@@ -41,4 +44,38 @@ public interface IConfigurationConstants {
 	
 	public static final String PLACEHOLDER_SEARCH_ENABLED = "enable_placeholder_search";
 	public static final String DEFAULT_SIGNATURE_PROFILE = SIG_OBJECT + SEPERATOR + TYPE + SEPERATOR + DEFAULT;
+	
+	/**
+	 * Signature object Prefix
+	 */
+	public static final String SIG_OBJECT_PREFIX = "sig_obj.";
+	
+	/**
+	 * MOA SS Signing Key Identifier
+	 */
+	public static final String MOA_SS_KEY_IDENTIFIER = "moa.sign.KeyIdentifier";
+	
+	/**
+	 * MOA SS Signing Certificate
+	 */
+	public static final String MOA_SS_KEY_CERTIFICATE = "moa.sign.Certificate";
+	
+	
+	/**
+	 * MOA Trustprofile configuration Key
+	 */
+	public static final String MOA_TRUSTPROFILE_ID = "moa.verify.TrustProfileID";
+	
+	
+	/**
+	 * MOA Verify URL configuration Key
+	 */
+	public static final String MOA_VERIFY_URL = "moa.verify.url";
+	
+	
+	/**
+	 * MOA Sign URL configuration Key
+	 */
+	public static final String MOA_SIGN_URL = "moa.sign.url";
+	
 }
diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/api/PdfAsConfigurationConstants.java b/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/api/PdfAsConfigurationConstants.java
deleted file mode 100644
index da0b3487..00000000
--- a/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/api/PdfAsConfigurationConstants.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package at.gv.egiz.pdfas.lib.api;
-
-/**
- * Collection of useful configuration key
- */
-public interface PdfAsConfigurationConstants {
-	/**
-	 * Signature object Prefix
-	 */
-	public static final String SIG_OBJECT_PREFIX = "sig_obj.";
-	
-	/**
-	 * MOA SS Signing Key Identifier
-	 */
-	public static final String MOA_SS_KEY_IDENTIFIER = "moa.sign.KeyIdentifier";
-	
-	/**
-	 * MOA SS Signing Certificate
-	 */
-	public static final String MOA_SS_KEY_CERTIFICATE = "moa.sign.Certificate";
-	
-	
-	/**
-	 * MOA Trustprofile configuration Key
-	 */
-	public static final String MOA_TRUSTPROFILE_ID = "moa.verify.TrustProfileID";
-	
-	
-	/**
-	 * MOA Verify URL configuration Key
-	 */
-	public static final String MOA_VERIFY_URL = "moa.verify.url";
-	
-	
-	/**
-	 * MOA Sign URL configuration Key
-	 */
-	public static final String MOA_SIGN_URL = "moa.sign.url";
-	
-}
diff --git a/pdf-as-lib/src/main/resources/config/config.zip b/pdf-as-lib/src/main/resources/config/config.zip
index ca7869d0..ecda415b 100644
--- a/pdf-as-lib/src/main/resources/config/config.zip
+++ b/pdf-as-lib/src/main/resources/config/config.zip