CSPACE-3338: 'ant import' target now fails with exit code 1 if an Exception is thrown...

diff --git a/services/authorization-mgt/import/src/main/java/org/collectionspace/ImportAuthz.java b/services/authorization-mgt/import/src/main/java/org/collectionspace/ImportAuthz.java
index 9f7730b3900666f689e0d345e6af0224de7d477d..3d53943ca4b5c404fc386a0cd704d099d66038e8 100644 (file)
--- a/services/authorization-mgt/import/src/main/java/org/collectionspace/ImportAuthz.java
+++ b/services/authorization-mgt/import/src/main/java/org/collectionspace/ImportAuthz.java
@@ -27,6 +27,7 @@
  */
 package org.collectionspace;
 
+import net.sf.ehcache.CacheException;
 import org.apache.commons.cli.CommandLine;
 import org.apache.commons.cli.CommandLineParser;
 import org.apache.commons.cli.GnuParser;
@@ -47,6 +48,8 @@ public class ImportAuthz {
     final private static String OPTIONS_EXPORT_DIR = "exportdir";
     final private static String OPTIONS_HELP = "help";
 
+    final private static String MSG_SEPARATOR = "--";
+
     public static void main(String[] args) {
 
         Options options = createOptions();
@@ -76,11 +79,26 @@ public class ImportAuthz {
             System.err.println("Parsing failed.  Reason: " + exp.getMessage());
         } catch (Exception e) {
             System.out.println("Error : " + e.getMessage());
+            System.out.println(MSG_SEPARATOR);
             printUsage();
+            System.out.println(MSG_SEPARATOR);
+            System.out.println("Import failed: ");
+            printInitialErrorCauseMsg(e);
+            System.exit(1);
         }
 
     }
 
+    private static void printInitialErrorCauseMsg(Throwable t) {
+        if (t != null) {
+            if (t.getCause() != null) {
+                printInitialErrorCauseMsg(t.getCause());
+            } else {
+               System.out.println(t.getMessage());
+            }
+        }
+    }
+
     private static Options createOptions() {
         Options options = new Options();
         options.addOption("u", true, OPTIONS_USERNAME);