Changeset 1620

Timestamp:

11/17/11 23:05:42 (13 years ago)

Author:

gaba

Message:

new lib hierarchy

Location:

SMC/trunk/SMC/src

Files:

• eu/clarin/cmdi/smc/SMC.java (modified) (6 diffs)
• smc.properties (modified) (1 diff)

SMC/trunk/SMC/src/eu/clarin/cmdi/smc/SMC.java

@@ -9 +9 @@
 import java.util.List;
 import java.util.Map;
+import java.util.Properties;
+//import org.apache.commons.configuration.Configuration;
+//import org.apache.commons.lang.exception.NestableException;
+//import org.apache.commons.configuration.ConfigurationException;
+//import org.apache.commons.configuration.PropertiesConfiguration;
+//
+
+
 
 import javax.xml.transform.TransformerException;
@@ -26 +34 @@
         
         public SMC () {
-                Utils.loadConfig("smc.properties");
+                //Utils.loadConfig("smc.properties");
+                
+                this.configure();
                 this.addParam("cache_dir", Utils.getConfig("cache.dir"));
+                //this.addParam("cache_dir", config.getString("cache.dir"));
+                
         }
         private Map<String,String[]> params;
         
         public static Logger log = Logger.getLogger("SMC");
+        
         
         public static void main(String[] args) {
@@ -45 +58 @@
         }
 
+        public void configure(){
+                Utils.loadConfig("smc", "smc.properties", this.getClass().getClassLoader());
+        }
+        public void configure(String configPath) {
+                try {
+                        Utils.loadConfig("smc", configPath, this.getClass().getClassLoader());
+                        //config = new PropertiesConfiguration("smc.properties");
+                } catch (Exception e) {
+                        // TODO Auto-generated catch block
+                        e.printStackTrace();
+                }
+        }
 /**
  * load data from registries based on configuration
@@ -52 +77 @@
  
                 InputStream is =null;
-                is = Utils.load2Stream(Utils.getConfig("termsets.config.file"));
+                is = Utils.load2Stream(Utils.getConfig("termsets.config.file"),this.getClass().getClassLoader());
+                //is = Utils.load2Stream(config.getString("termsets.config.file"));
                 
                 MDTransformer transformer = new MDTransformer();
+                //transformer.configure(config, this.getClass().getClassLoader());
                 // set URL as srcFile (for MDTransformer to pass to xsl-scripts)
                 // TODO: WHY??
@@ -70 +97 @@
                         // store the result in the cache
                         String output_path = Utils.getConfig("cache.dir") +  getParam("data_key") + ".xml" ;            
+                        //String output_path = config.getString("cache.dir") +  getParam("data_key") + ".xml" ;
                         File f = Utils.write2File(output_path, resultStream);
                         log.debug("result stored in: " + f.getAbsolutePath());
@@ -165 +193 @@
         public InputStream listTermsets(String context) {
                 InputStream is =null;
-                is = Utils.load2Stream(Utils.getConfig("termsets.config.file"));
+                is = Utils.load2Stream(Utils.getConfig("termsets.config.file").trim(), this.getClass().getClassLoader());
                 return is;
         }

SMC/trunk/SMC/src/smc.properties

@@ -1 @@
-termsets.config.file = smc_config.xml  
-cache.dir = C:/Users/m/3lingua/clarin/CMDI/SMC/cache/
+termsets.config.file = smc_config.xml
+#cache.dir = C:/Users/m/3lingua/clarin/CMDI/SMC/cache/
+cache.dir = C:/apache-tomcat-6.0.26/webapps/SMC_cache/
 
 scripts.path = scripts/