use old ConfigTool

2 files changed, 21 insertions, 3 deletions

diff --git a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/config/persistence/MOAIDConfiguration.java b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/config/persistence/MOAIDConfiguration.java
index fbb1597f3..223f29a0b 100644
--- a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/config/persistence/MOAIDConfiguration.java
+++ b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/config/persistence/MOAIDConfiguration.java
@@ -19,6 +19,15 @@ public interface MOAIDConfiguration extends Configuration {
 	 * @return All key/value pairs with this prefix or null if no key is found. The prefix is removed from the key. 
 	 * 
 	 **/
+	public Map<String, String> getPropertySubset(String preFix, boolean removePrefix) throws ConfigurationException;
+	
+	/**
+	 * Get all key/value pairs with a prefix 
+	 * 
+	 * @param preFix: A key prefix 
+	 * @return All key/value pairs with this prefix or null if no key is found. The prefix is removed from the key. 
+	 * 
+	 **/
 	public Map<String, String> getPropertySubset(String preFix) throws ConfigurationException;
 	
 	
diff --git a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/config/persistence/MOAIDConfigurationImpl.java b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/config/persistence/MOAIDConfigurationImpl.java
index 20e2ba598..297c63d7d 100644
--- a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/config/persistence/MOAIDConfigurationImpl.java
+++ b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/config/persistence/MOAIDConfigurationImpl.java
@@ -49,9 +49,11 @@ public class MOAIDConfigurationImpl extends DatabaseConfigPropertyImpl implement
 	}
 	
 	/* (non-Javadoc)
-	 * @see at.gv.egovernment.moa.id.commons.config.persistence.MOAIDConfiguration#getPropertySubset(java.lang.String)
+	 * @see at.gv.egovernment.moa.id.commons.config.persistence.MOAIDConfiguration#getPropertySubset(java.lang.String, boolean)
 	 */
-	public Map<String, String> getPropertySubset(String preFix) throws ConfigurationException{		
+	@Override
+	public Map<String, String> getPropertySubset(String preFix,
+			boolean removePrefix) throws ConfigurationException {
 		EntityManager em = this.getPersistenceContext();
 		if (null == em) {
 			Logger.error("No EntityManager set!");
@@ -72,8 +74,15 @@ public class MOAIDConfigurationImpl extends DatabaseConfigPropertyImpl implement
         
 		//build key/value configuration map from database entries
 		Map<String, String> result = getKeyValueFromDatabaseDAO(
-				configResult.iterator(), preFix, true);					       
+				configResult.iterator(), preFix, removePrefix);					       
 		return result;
+	}
+	
+	/* (non-Javadoc)
+	 * @see at.gv.egovernment.moa.id.commons.config.persistence.MOAIDConfiguration#getPropertySubset(java.lang.String)
+	 */
+	public Map<String, String> getPropertySubset(String preFix) throws ConfigurationException{		
+		return getPropertySubset(preFix, true);
 		
 	}