fixed samlengine config loading

1 files changed, 11 insertions, 2 deletions

diff --git a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/configuration/ConfigurationCreator.java b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/configuration/ConfigurationCreator.java
index 2fabff7d6..b40e3f7dd 100644
--- a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/configuration/ConfigurationCreator.java
+++ b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/configuration/ConfigurationCreator.java
@@ -15,6 +15,7 @@
 

 package eu.stork.peps.configuration;

 

+import java.io.FileInputStream;

 import java.io.IOException;

 import java.io.InputStream;

 import java.util.HashMap;

@@ -103,8 +104,16 @@ public final class ConfigurationCreator {
 	LOGGER.info("Create file configuration properties to Stork Saml Engine.");

 	InputStream fileEngineProp = null;

 	try {

-	    fileEngineProp = ConfigurationCreator.class

-		    .getResourceAsStream("/" + fileName);

+		// fetch base from system properties, give a default if there is nothing configured

+		String base = System.getProperty("eu.stork.samlengine.config.location");

+		if(null != base)

+		    if(!base.endsWith("/"))

+		    	base += "/";

+		

+	    if(null != base)

+	    	fileEngineProp = new FileInputStream(base + fileName);

+	    else

+	    	fileEngineProp = ConfigurationCreator.class.getResourceAsStream("/" + fileName);

 	    final Properties configuration = new Properties();

 	    configuration.loadFromXML(fileEngineProp);	    

 	    return configuration;