[jboss-svn-commits] JBL Code SVN: r35514 - labs/jbossrules/trunk/drools-guvnor/bulk-importer-util/guvnor-importer/src/main/java/org/jboss/drools/guvnor/importgenerator.

[jboss-svn-commits at lists.jboss.org]

Author: tsurdilovic
Date: 2010-10-13 15:21:55 -0400 (Wed, 13 Oct 2010)
New Revision: 35514

Modified:
   labs/jbossrules/trunk/drools-guvnor/bulk-importer-util/guvnor-importer/src/main/java/org/jboss/drools/guvnor/importgenerator/CmdArgsParser.java
Log:
GUVNOR-672 - bulk importer - allow to pass parameter to executable jar which takes in path to a properties file with config options


Modified: labs/jbossrules/trunk/drools-guvnor/bulk-importer-util/guvnor-importer/src/main/java/org/jboss/drools/guvnor/importgenerator/CmdArgsParser.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/bulk-importer-util/guvnor-importer/src/main/java/org/jboss/drools/guvnor/importgenerator/CmdArgsParser.java	2010-10-13 18:14:02 UTC (rev 35513)
+++ labs/jbossrules/trunk/drools-guvnor/bulk-importer-util/guvnor-importer/src/main/java/org/jboss/drools/guvnor/importgenerator/CmdArgsParser.java	2010-10-13 19:21:55 UTC (rev 35514)
@@ -16,8 +16,12 @@
 
 package org.jboss.drools.guvnor.importgenerator;
 
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.Properties;
 
 /**
  * Command line argument parser
@@ -67,22 +71,44 @@
   
   public Map<Parameters, String> parse(String[] args){
     if (args.length==0){
-      args=new String[]{ //default arguments
-          "-classpath",
-          "-p", "/home/mallen/workspace/guvnor-importer/my_rules",
-          "-s", "rules",
-          "-e", "[0-9|.]*[.|-]+[SNAPSHOT]+[.|-]*[09|.]*",
-          "-r", "true",
-          "-u","admin",
-          "-f","drl,xls",
-          "-o","generated.xml",
-          "-n","1.0.0-SNAPSHOT",
-          "-c","functions.drl",
-          "-k", "http://localhost:8080/brms/org.drools.guvnor.Guvnor/package/",
-          "-b", "/home/mallen/workspace/guvnor-importer",
-          "-w", "kagentChangeSet.xml",
-          "-V"};
-    }
+//      args=new String[]{ //default arguments
+//          "-classpath",
+//          "-p", "/home/mallen/workspace/guvnor-importer/my_rules",
+//          "-s", "rules",
+//          "-e", "[0-9|.]*[.|-]+[SNAPSHOT]+[.|-]*[09|.]*",
+//          "-r", "true",
+//          "-u","admin",
+//          "-f","drl,xls",
+//          "-o","generated.xml",
+//          "-n","1.0.0-SNAPSHOT",
+//          "-c","functions.drl",
+//          "-k", "http://localhost:8080/brms/org.drools.guvnor.Guvnor/package/",
+//          "-b", "/home/mallen/workspace/guvnor-importer",
+//          "-w", "kagentChangeSet.xml",
+//          "-V"};
+    	System.out.println("Invalid number of parameters - 0");
+    	return options;
+    } else if (args.length == 2) {
+    	String arg = args[0];
+    	String val = args[1];
+    	if(arg.equals("-prop")) {
+    		try {
+    			Properties props = new Properties();
+    			props.load(new FileInputStream(val));
+    			for(Object prop : props.keySet()) {
+    				String key = (String) prop;
+    				String value = props.getProperty(key);
+    				options.put(map.get(key), value);
+    			}
+    		} catch (IOException e) {
+    			System.out.println("Invalid file specified: " + val);
+    		}
+    		options.put(Parameters.OPTIONS_VERBOSE, "true");
+    	} else {
+    		System.out.println("To use a properties file use the \"-prop\" parameter");
+    	}
+    	return options;
+    } else {
     for (int i=0;i<args.length;i++) {
       String arg = args[i];
       if (arg.equalsIgnoreCase("-classpath"))
@@ -103,4 +129,5 @@
     }
     return options;
   }
+  }
 }
\ No newline at end of file