2 files changed, 57 insertions, 17 deletions
diff --git a/BKUOnline/src/main/java/at/gv/egiz/bku/online/conf/Configurator.java b/BKUOnline/src/main/java/at/gv/egiz/bku/online/conf/Configurator.java
index 0cb717c4..f51335e1 100644
--- a/BKUOnline/src/main/java/at/gv/egiz/bku/online/conf/Configurator.java
+++ b/BKUOnline/src/main/java/at/gv/egiz/bku/online/conf/Configurator.java
@@ -16,29 +16,31 @@
 */
 package at.gv.egiz.bku.online.conf;
 
-import iaik.security.ecc.provider.ECCProvider;
-import iaik.xml.crypto.XSecProvider;
-
-import java.net.HttpURLConnection;
-import java.security.Provider;
-import java.security.Security;
-
-import javax.net.ssl.HttpsURLConnection;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import at.gv.egiz.bku.slcommands.impl.xsect.STALProvider;
+import iaik.security.ecc.provider.ECCProvider;
+import iaik.xml.crypto.XSecProvider;
+
+import java.net.HttpURLConnection;
+import java.security.Provider;
+import java.security.Security;
+import java.util.Properties;
+
+import javax.net.ssl.HttpsURLConnection;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import at.gv.egiz.bku.slcommands.impl.xsect.STALProvider;
 
 /**
  * 
  * TODO currently only the code to get started.  
  */
 public class Configurator {
-  private Log log = LogFactory.getLog(Configurator.class);
+  private Log log = LogFactory.getLog(Configurator.class);
+  
+  protected Properties properties;
 
   public Configurator() {
-    configure();
   }
 
   protected void configUrlConnections() {
@@ -63,7 +65,18 @@ public class Configurator {
   public void configure() {
     configureProviders();
     configUrlConnections();
-
   }
-
+
+  public void setConfiguration(Properties props) {
+  	this.properties = props;
+  	configure();
+  }
+  
+  public String getProperty(String key) {
+  	if (properties != null) {
+  		return properties.getProperty(key);
+  	}
+  	return null;
+  }
+  
 }
diff --git a/BKUOnline/src/main/java/at/gv/egiz/bku/online/conf/SpringConfigurator.java b/BKUOnline/src/main/java/at/gv/egiz/bku/online/conf/SpringConfigurator.java
new file mode 100644
index 00000000..96588d7d
--- /dev/null
+++ b/BKUOnline/src/main/java/at/gv/egiz/bku/online/conf/SpringConfigurator.java
@@ -0,0 +1,27 @@
+package at.gv.egiz.bku.online.conf;
+
+import java.io.IOException;
+import java.util.Properties;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.springframework.core.io.Resource;
+
+public class SpringConfigurator extends Configurator {
+
+	private final static Log log = LogFactory.getLog(SpringConfigurator.class);
+
+	public void setResource(Resource resource) {
+		log.debug("Loading config from: " + resource);
+		if (resource != null) {
+			Properties props = new Properties();
+			try {
+				props.load(resource.getInputStream());
+				super.setConfiguration(props);
+			} catch (IOException e) {
+				log.error("Cannot load config", e);
+			}
+		}
+	}
+
+}