# HG changeset patch # User Tim Englich # Date 1252682392 0 # Node ID d7b4a77ba8920aa8cac9178a943fbc870bac22ac # Parent 5e94403971afedea958e51948662e86a50a16c97 Infrastructur for Providing Applicationsettings gnv/trunk@72 c6561f87-3c4e-4783-a992-168aeb5c3f6f diff -r 5e94403971af -r d7b4a77ba892 gnv/Changelog --- a/gnv/Changelog Fri Sep 11 15:17:38 2009 +0000 +++ b/gnv/Changelog Fri Sep 11 15:19:52 2009 +0000 @@ -1,3 +1,12 @@ +2009-09-11 Tim Englich + + * src/main/java/de/intevation/gnv/propertiesreader/ServletPropertiesReader.java Added, + src/main/java/de/intevation/gnv/propertiesreader/PropertiesReaderFactory.java Added, + src/main/java/de/intevation/gnv/propertiesreader/PropertiesReader.java Added, + src/main/java/de/intevation/gnv/propertiesreader/MapPropertiesReader.java Added: + Infrastructur for Reading Properties from a Map or SercletConfig an provide them + to the whole Application. + 2009-09-11 Tim Englich * src/main/java/de/intevation/gnv/artifactdatabase/objects/ArtifactObject.java Added, diff -r 5e94403971af -r d7b4a77ba892 gnv/src/main/java/de/intevation/gnv/propertiesreader/MapPropertiesReader.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/gnv/src/main/java/de/intevation/gnv/propertiesreader/MapPropertiesReader.java Fri Sep 11 15:19:52 2009 +0000 @@ -0,0 +1,40 @@ +/** + * + */ +package de.intevation.gnv.propertiesreader; + +import java.util.Map; + +import org.apache.log4j.Logger; + +/** + * @author Tim Englich + * + */ +public class MapPropertiesReader implements PropertiesReader { + /** + * the logger, used to log exceptions and additonaly information + */ + private static Logger log = Logger.getLogger(MapPropertiesReader.class); + + private Map properties = null; + /** + * Constructor + */ + public MapPropertiesReader(Map properties) { + super(); + this.properties = properties; + } + + /** + * @see de.intevation.gnv.propertiesreader.PropertiesReader#getPropertieValue(java.lang.String, java.lang.String) + */ + public String getPropertieValue(String key, String defaultValue) { + String value = this.properties.get(key); + if (value == null){ + value = defaultValue; + } + return value; + } + +} diff -r 5e94403971af -r d7b4a77ba892 gnv/src/main/java/de/intevation/gnv/propertiesreader/PropertiesReader.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/gnv/src/main/java/de/intevation/gnv/propertiesreader/PropertiesReader.java Fri Sep 11 15:19:52 2009 +0000 @@ -0,0 +1,13 @@ +/** + * + */ +package de.intevation.gnv.propertiesreader; +/** + * @author Tim Englich + * + */ +public interface PropertiesReader { + + public String getPropertieValue(String key, String defaultValue); + +} diff -r 5e94403971af -r d7b4a77ba892 gnv/src/main/java/de/intevation/gnv/propertiesreader/PropertiesReaderFactory.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/gnv/src/main/java/de/intevation/gnv/propertiesreader/PropertiesReaderFactory.java Fri Sep 11 15:19:52 2009 +0000 @@ -0,0 +1,77 @@ +/** + * + */ +package de.intevation.gnv.propertiesreader; + +import java.util.Map; + +import javax.servlet.ServletConfig; + +import org.apache.log4j.Logger; + +/** + * @author Tim Englich + * + */ +public class PropertiesReaderFactory { + + + + /** + * the logger, used to log exceptions and additonaly information + */ + private static Logger log = Logger.getLogger(PropertiesReaderFactory.class); + + + /** + * The singleton Instance of this Factory. + */ + private static PropertiesReaderFactory instance = null; + + /** + * The ConnectionPool providing the Connections to the DatabaseBackends + */ + private PropertiesReader propertiesReader = null; + /** + * Constructor + */ + private PropertiesReaderFactory() { + super(); + } + + /** + * This Method provides an singleton Instance of this Class. + * @return an singleton Instance of this Class + */ + public static PropertiesReaderFactory getInstance(){ + if (instance == null){ + instance = null; + } + return instance; + } + + + /** + * Getting the ConnectionPool + * @return the ConnectionPool + */ + public PropertiesReader getPropertiesReader(){ + return this.propertiesReader; + } + + /** + * Getting the ConnectionPool + * @param config The Config that should be read + */ + public void initPropertiesReader(Object config){ + if (config instanceof ServletConfig){ + this.propertiesReader = new ServletPropertiesReader((ServletConfig)config); + }else if (config instanceof Map){ + this.propertiesReader = new MapPropertiesReader((Map)config); + }else{ + log.error("No PropertiesReader for Instance "+ config.getClass().getName()); + } + + } + +} diff -r 5e94403971af -r d7b4a77ba892 gnv/src/main/java/de/intevation/gnv/propertiesreader/ServletPropertiesReader.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/gnv/src/main/java/de/intevation/gnv/propertiesreader/ServletPropertiesReader.java Fri Sep 11 15:19:52 2009 +0000 @@ -0,0 +1,56 @@ +/** + * + */ +package de.intevation.gnv.propertiesreader; + +import java.util.Enumeration; +import java.util.HashMap; +import java.util.Map; + +import javax.servlet.ServletConfig; + +import org.apache.log4j.Logger; + +/** + * @author Tim Englich + * + */ +public class ServletPropertiesReader implements PropertiesReader { + + /** + * the logger, used to log exceptions and additonaly information + */ + private static Logger log = Logger.getLogger(ServletPropertiesReader.class); + + private Map properties = null; + /** + * Constructor + */ + public ServletPropertiesReader(ServletConfig config) { + super(); + log.info("ServletPropertiesReader will be initialized"); + if (config != null){ + + Enumeration keys = config.getInitParameterNames(); + properties = new HashMap(); + while(keys.hasMoreElements()){ + String key = keys.nextElement(); + String value = config.getInitParameter(key); + log.info("New ConbfigurationValue; "+ key + " ==> "+ value); + this.properties.put(key, value); + } + } + } + + /** + * @see de.intevation.gnv.propertiesreader.PropertiesReader#getPropertieValue(java.lang.String, java.lang.String) + */ + public String getPropertieValue(String key, String defaultValue) { + String value = this.properties.get(key); + if (value == null){ + value = defaultValue; + } + return value; + } + +}