Merge branch 'master' of ssh://gsa1/humgen/gsa-scr1/gsa-engineering/git/unstable

public/packages/GATKEngine.xml

@@ -29,7 +29,7 @@
       <!-- Core walkers -->
       <package name="org.broadinstitute.sting.gatk.walkers.**" />
       <!-- All non-oneoff GATK-specific RODs -->
-      <package name="org.broadinstitute.sting.gatk.refdata.**" />
+      <package name="org.broadinstitute.sting.utils.codecs.**" />
       <!-- Filters -->
       <package name="org.broadinstitute.sting.gatk.filters" />
       <!-- Tribble codecs -->

public/scala/src/org/broadinstitute/sting/queue/QCommandLine.scala

@@ -37,7 +37,7 @@ import org.broadinstitute.sting.utils.exceptions.UserException
 /**
  * Entry point of Queue.  Compiles and runs QScripts passed in to the command line.
  */
-object QCommandLine {
+object QCommandLine extends Logging {
   /**
    * Main.
    * @param argv Arguments.
@@ -45,22 +45,23 @@ object QCommandLine {
   def main(argv: Array[String]) {
     val qCommandLine = new QCommandLine
 
-    Runtime.getRuntime.addShutdownHook(new Thread {
-      /** Cleanup as the JVM shuts down. */
+    val shutdownHook = new Thread {
       override def run() {
+        logger.info("Shutting down jobs. Please wait...")
         ProcessController.shutdown()
         qCommandLine.shutdown()
       }
-    })
+    }
+
+    Runtime.getRuntime.addShutdownHook(shutdownHook)
 
     try {
       CommandLineProgram.start(qCommandLine, argv);
+      Runtime.getRuntime.removeShutdownHook(shutdownHook)
       if (CommandLineProgram.result != 0)
         System.exit(CommandLineProgram.result);
     } catch {
       case e: Exception => CommandLineProgram.exitSystemWithError(e)
-    } finally {
-
     }
   }
 }