Changeset 1624

Timestamp:

11/22/11 11:09:17 (12 years ago)

Author:

gaba

Message:

 

Location:

SMC/trunk/SMC/src/eu/clarin/cmdi/mdservice/internal

Files:

• MDTransformer.java (modified) (7 diffs)
• Utils.java (modified) (9 diffs)

SMC/trunk/SMC/src/eu/clarin/cmdi/mdservice/internal/MDTransformer.java

@@ -18 +18 @@
 import java.util.Iterator;
 import java.util.Map;
+import java.util.Properties;
 import java.util.Set;
 import java.util.Map.Entry;
@@ -49 +50 @@
         private URL srcFile ;
         private Map<String, String[]> params;
+        
+        private Properties config;
+        private ClassLoader loader = null;
+        
                 
         // don't use singleton!! Bad things happen
@@ -58 +63 @@
         //}
         
+        public ClassLoader getLoader(){
+                if (loader == null){
+                        return Utils.class.getClassLoader();
+                }
+                return loader;
+        }
+        public void configure(String configPath){
+                config = Utils.createConfig(configPath, null);
+        }
+        public void configure(Properties _config, ClassLoader _loader){
+                config = _config;
+                loader = _loader;
+        }
         
         public URL getSrcFile() {
@@ -82 +100 @@
         }
 
+        public Properties getConfig(){
+                if (config == null){
+                         return Utils.getConfig();
+                }
+                return config;
+        }
         /**
          * Get the path to the xsl file from properties, based on the key (aka format-parameter)
@@ -90 +114 @@
         private String getXSLPath (String key) throws NoStylesheetException {           
                 String xslpath = "";
-                String xslfilename= Utils.getConfig().getProperty("xsl." + key);
+                String xslfilename= getConfig().getProperty("xsl." + key);
                 
                 if (xslfilename!=null) {                        
-                        xslpath =  Utils.getConfig().getProperty("scripts.path") + xslfilename;
+                        xslpath =  getConfig().getProperty("scripts.path") + xslfilename;
                 } else {
                         throw new NoStylesheetException("No Stylesheet found for format-key: " + key);
@@ -110 +134 @@
          * @throws NoStylesheetException If the stylesheet could not be located
          */
+        
         private StreamSource getXSLStreamSource (String key) throws NoStylesheetException{              
                 
                 InputStream xslstream;
-                                        
+                        
                 //URL myURL = new URL (getXSLPath(key));
                 //xslstream = myURL.openStream();
                 String xslPath = getXSLPath(key);
-                xslstream = this.getClass().getClassLoader().getResourceAsStream(xslPath);
+                xslstream = getLoader().getResourceAsStream(xslPath);
                 StreamSource streamSource = new StreamSource(xslstream);
 
-                streamSource.setSystemId(this.getClass().getClassLoader().getResource(xslPath).toString());
+                streamSource.setSystemId(getLoader().getResource(xslPath).toString());
                 return streamSource ;   
                 
         }
-        
+
         public void setTranskey(String key){
                 transkey = key;
@@ -131 +156 @@
         public String getTranskey(){
                 //return params.get("x-cmd-format")[0];
-                
+                if (transkey == null & params.containsKey("fullformat")) {
+                        transkey = params.get("fullformat")[0] ;
+                }
                 if (transkey.equals("") & params.containsKey("fullformat")) {
                         transkey = params.get("fullformat")[0] ;        

SMC/trunk/SMC/src/eu/clarin/cmdi/mdservice/internal/Utils.java

@@ -10 +10 @@
 import java.io.InputStreamReader;
 import java.io.OutputStream;
+import java.util.Enumeration;
+import java.util.Hashtable;
+import java.util.Iterator;
+import java.util.Map;
 import java.util.Properties;
 
@@ -57 +61 @@
          */
         private static String config_path = "mdservice.properties";
+        private static Hashtable<String, Properties> config_hashtable;
+        
+        //obsolete
         private static Properties  config;      
 
@@ -74 +81 @@
         public static void loadConfig(String configPath) {
                 
+                config = createConfig(configPath,Utils.class.getClassLoader());
+        }
+        
+        public static Properties createConfig(String configPath, ClassLoader loader) {
+                
+                Properties properties = null;
+                
                 System.setProperty("javax.xml.transform.TransformerFactory", "net.sf.saxon.TransformerFactoryImpl");
                 InputStream config_file;
-                 
+                if (loader == null){
+                        loader = Utils.class.getClassLoader();
+                }
                 try {                   
-                        config_file = Utils.class.getClassLoader().getResourceAsStream(configPath);
+                        config_file = loader.getResourceAsStream(configPath);
                         if (config_file == null) {
                             log.error("CONFIGURATION ERROR: Properties file not found!");
                         } else {
-                                log.debug("Reading configuration from: " + Utils.class.getClassLoader().getResource(configPath));
-                                config = new Properties();
-                                config.load(config_file);       
+                                log.debug("Reading configuration from: " + loader.getResource(configPath));
+                                properties = new Properties();
+                                properties.load(config_file);   
                         }
                         
@@ -90 +106 @@
                         log.error("CONFIGURATION LOAD ERROR: " + e.getLocalizedMessage());
                 } 
-        }
-        
+                
+                return properties;
+        }
+        
+
+        public static void loadConfig(String appname, String configPath, ClassLoader loader) {
+                
+                if (config_hashtable == null){
+                        config_hashtable = new Hashtable<String, Properties>();
+                }
+                if (!config_hashtable.containsKey(appname)){
+                        Properties config = createConfig(configPath,loader);
+                        config_hashtable.put(appname, config);
+                }
+
+        }
+
         /**
          * Returns application configuration properties.
@@ -97 +128 @@
          * @return
          */
+        //obsolete
         public static Properties getConfig() {
                 if (config==null)  {
@@ -103 +135 @@
                 return config;
         }
-        
+        public static Properties getAppConfig(String appname){
+                return config_hashtable.get(appname);
+        }
 /**
  * convenience function to get a config property value
@@ -110 +144 @@
  */
         public static String getConfig(String key) {
-                        return getConfig().getProperty(key);            
-        }
+        
+                        //return getConfig().getProperty(key);
+                        
+                        Enumeration keys = config_hashtable.keys();
+                while (keys.hasMoreElements()) {
+                String _key = (String) keys.nextElement();
+                if (((Properties)config_hashtable.get(_key)).getProperty(key) != null){
+                        return ((Properties)config_hashtable.get(_key)).getProperty(key);
+                }
+                }
+                        return null;
+                                        
+        }
+        
         
         /**
@@ -143 +189 @@
          * @return
          */
-        public static InputStream load2Stream (String path) {
+        public static InputStream load2Stream (String path) {   
+                return load2Stream(path,Utils.class.getClassLoader());
+        }
+        
+        public static InputStream load2Stream (String path, ClassLoader loader) {
                 
                 InputStream file=null;
-                 
+                if (loader == null){
+                        loader = Utils.class.getClassLoader();
+                }
                 try {                   
-                        file = Utils.class.getClassLoader().getResourceAsStream(path);
+                        file = loader.getResourceAsStream(path);
                         if (file == null) {
                             log.error("File not found!: " + path);
                         } else {
-                                log.debug("Reading in: " + Utils.class.getClassLoader().getResource(path));
+                                log.debug("Reading in: " + loader.getResource(path));
                         }
                 }   catch (Exception e) {
@@ -160 +212 @@
                 return file;
         }
+        
         
         /**