From 1c72a260e3633eb8e411992ac25fc747ec71513c Mon Sep 17 00:00:00 2001 From: Florian Reimair Date: Thu, 30 Jan 2014 17:43:18 +0100 Subject: fixed samlengine config loading --- .../java/eu/stork/peps/auth/engine/core/impl/SignSW.java | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) (limited to 'id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl') diff --git a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/SignSW.java b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/SignSW.java index 9f0a88c84..4554a9586 100644 --- a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/SignSW.java +++ b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/SignSW.java @@ -74,6 +74,7 @@ import org.slf4j.LoggerFactory; import eu.stork.peps.auth.engine.core.CustomAttributeQuery; import eu.stork.peps.auth.engine.core.SAMLEngineSignI; +import eu.stork.peps.configuration.ConfigurationReader; import eu.stork.peps.exceptions.SAMLEngineException; @@ -159,8 +160,16 @@ public class SignSW implements SAMLEngineSignI { throws SAMLEngineException { InputStream fileProperties = null; try { - fileProperties = SignSW.class.getResourceAsStream("/" - + fileConf); + // 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) + fileProperties = new FileInputStream(base + fileConf); + else + fileProperties = SignSW.class.getResourceAsStream("/" + fileConf); properties = new Properties(); properties.loadFromXML(fileProperties); -- cgit v1.2.3