From 059cdcb1bee9c8fa8aac4bff79706d514082097a Mon Sep 17 00:00:00 2001
From: Matt Hanna <hanna@broadinstitute.org>
Date: Mon, 26 Sep 2011 14:58:19 -0400
Subject: [PATCH 1/2] Changing packaging system path for GATK-only Tribble
 codecs.

---
 public/packages/GATKEngine.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/packages/GATKEngine.xml b/public/packages/GATKEngine.xml
index 4f635f7fb..4364988e7 100644
--- a/public/packages/GATKEngine.xml
+++ b/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 -->

From 648b959361dc15247a1cb9b487f9093f96d2c967 Mon Sep 17 00:00:00 2001
From: Khalid Shakir <kshakir@broadinstitute.org>
Date: Tue, 27 Sep 2011 00:50:19 -0400
Subject: [PATCH 2/2] Minor change to log an info message when a signal such as
 Ctrl-C is caught.

---
 .../broadinstitute/sting/queue/QCommandLine.scala   | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)
 mode change 100755 => 100644 public/scala/src/org/broadinstitute/sting/queue/QCommandLine.scala

diff --git a/public/scala/src/org/broadinstitute/sting/queue/QCommandLine.scala b/public/scala/src/org/broadinstitute/sting/queue/QCommandLine.scala
old mode 100755
new mode 100644
index 297da8cc9..a3e83871e
--- a/public/scala/src/org/broadinstitute/sting/queue/QCommandLine.scala
+++ b/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 {
-
     }
   }
 }