svn commit: r1542495 - /ofbiz/trunk/framework/entityext/src/org/ofbiz/entityext/data/EntityDataLoadContainer.java

[adrianc]

Author: adrianc
Date: Sat Nov 16 12:26:16 2013
New Revision: 1542495

URL: http://svn.apache.org/r1542495
Log:
Fixed a bug in EntityDataLoadContainer.java - do not use System.exit, throw an exception instead. Also moved help text to the exception message because it was not being logged before shutdown.

Modified:
    ofbiz/trunk/framework/entityext/src/org/ofbiz/entityext/data/EntityDataLoadContainer.java

Modified: ofbiz/trunk/framework/entityext/src/org/ofbiz/entityext/data/EntityDataLoadContainer.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entityext/src/org/ofbiz/entityext/data/EntityDataLoadContainer.java?rev=1542495&r1=1542494&r2=1542495&view=diff
==============================================================================
--- ofbiz/trunk/framework/entityext/src/org/ofbiz/entityext/data/EntityDataLoadContainer.java (original)
+++ ofbiz/trunk/framework/entityext/src/org/ofbiz/entityext/data/EntityDataLoadContainer.java Sat Nov 16 12:26:16 2013
@@ -174,22 +174,22 @@ public class EntityDataLoadContainer imp
                         createConstraints = true;
                     }
                 } else if ("help".equalsIgnoreCase(argumentName)) {
-                    Debug.logInfo("--------------------------------------", module);
-                    Debug.logInfo("java -jar ofbiz.jar -install [options]", module);
-                    Debug.logInfo("-component=[name] .... only load from a specific component", module);
-                    Debug.logInfo("-delegator=[name] .... use the defined delegator (default-no-eca", module);
-                    Debug.logInfo("-group=[name] ........ override the entity group (org.ofbiz)", module);
-                    Debug.logInfo("-file=[path] ......... load a single file from location, several files separated by commas.", module);
-                    Debug.logInfo("-createfks ........... create dummy (placeholder) FKs", module);
-                    Debug.logInfo("-maintainTxs ......... maintain timestamps in data file", module);
-                    Debug.logInfo("-inserts ............. use mostly inserts option", module);
-                    Debug.logInfo("-repair-columns ........... repair column sizes", module);
-                    Debug.logInfo("-drop-pks ............ drop primary keys", module);
-                    Debug.logInfo("-create-pks .......... create primary keys", module);
-                    Debug.logInfo("-drop-constraints..... drop indexes and foreign keys before loading", module);
-                    Debug.logInfo("-create-constraints... create indexes and foreign keys after loading (default is true w/ drop-constraints)", module);
-                    Debug.logInfo("-help ................ display this information", module);
-                    System.exit(1);
+                    String helpStr = "\n--------------------------------------\n" +
+                    "java -jar ofbiz.jar -install [options]\n" +
+                    "-component=[name] .... only load from a specific component\n" +
+                    "-delegator=[name] .... use the defined delegator (default-no-eca)\n" +
+                    "-group=[name] ........ override the entity group (org.ofbiz)\n" +
+                    "-file=[path] ......... load a single file from location, several files separated by commas\n" +
+                    "-createfks ........... create dummy (placeholder) FKs\n" +
+                    "-maintainTxs ......... maintain timestamps in data file\n" +
+                    "-inserts ............. use mostly inserts option\n" +
+                    "-repair-columns ........... repair column sizes\n" +
+                    "-drop-pks ............ drop primary keys\n" +
+                    "-create-pks .......... create primary keys\n" +
+                    "-drop-constraints..... drop indexes and foreign keys before loading\n" +
+                    "-create-constraints... create indexes and foreign keys after loading (default is true w/ drop-constraints)\n" +
+                    "-help ................ display this information\n";
+                    throw new ContainerException(helpStr);
                 }
 
                 // special case