From 6fec6196a0dffc3d6ae0988af66f89bc613b165e Mon Sep 17 00:00:00 2001
From: Sebastian Sdorra <sebastian.sdorra@cloudogu.com>
Date: Tue, 28 Sep 2010 20:19:18 +0200
Subject: [PATCH] improve utils

---
 .../scm/repository/HgRepositoryHandler.java   |   3 +-
 .../main/java/sonia/scm/web/HgCGIServlet.java |  74 +++++++
 .../java/sonia/scm/web/HgServletModule.java   |  29 +--
 .../java/sonia/scm/web/HgWebConfigWriter.java |   6 +-
 .../main/java/sonia/scm/web/HgWebPlugin.java  |   2 +-
 .../scm/repository/SvnRepositoryHandler.java  |   5 +-
 .../sonia/scm/io/INIConfigurationReader.java  |   4 +-
 .../sonia/scm/io/INIConfigurationWriter.java  |   4 +-
 .../sonia/scm/io/RegexResourceProcessor.java  |   6 +-
 .../main/java/sonia/scm/io/SimpleCommand.java |   4 +-
 .../AbstractSimpleRepositoryHandler.java      |   5 +-
 .../src/main/java/sonia/scm/util/IOUtil.java  | 192 ++++++++++++++++++
 .../src/main/java/sonia/scm/util/Util.java    |  71 +------
 .../sonia/scm/web/cgi/AbstractCGIServlet.java | 148 ++++++++++++++
 .../java/sonia/scm/web/cgi/CGIRunner.java     |  16 +-
 .../java/sonia/scm/web/cgi/CGIServlet.java    |   3 +
 .../main/java/sonia/scm/ContextListener.java  |  23 +++
 .../scm/plugin/AbstractResourceServlet.java   |   6 +-
 .../scm/plugin/ScriptResourceServlet.java     |   8 +-
 19 files changed, 483 insertions(+), 126 deletions(-)
 create mode 100644 plugins/scm-hg-plugin/src/main/java/sonia/scm/web/HgCGIServlet.java
 create mode 100644 scm-core/src/main/java/sonia/scm/util/IOUtil.java
 create mode 100644 scm-web-api/src/main/java/sonia/scm/web/cgi/AbstractCGIServlet.java

diff --git a/plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/HgRepositoryHandler.java b/plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/HgRepositoryHandler.java
index 5f839bc016..74a35728dc 100644
--- a/plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/HgRepositoryHandler.java
+++ b/plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/HgRepositoryHandler.java
@@ -16,6 +16,7 @@ import sonia.scm.io.INIConfiguration;
 import sonia.scm.io.INIConfigurationReader;
 import sonia.scm.io.INIConfigurationWriter;
 import sonia.scm.io.INISection;
+import sonia.scm.util.IOUtil;
 import sonia.scm.util.Util;
 
 //~--- JDK imports ------------------------------------------------------------
@@ -115,7 +116,7 @@ public class HgRepositoryHandler extends AbstractRepositoryHandler<HgConfig>
 
     if (new File(directory, ".hg").exists())
     {
-      Util.delete(directory);
+      IOUtil.delete(directory);
     }
     else
     {
diff --git a/plugins/scm-hg-plugin/src/main/java/sonia/scm/web/HgCGIServlet.java b/plugins/scm-hg-plugin/src/main/java/sonia/scm/web/HgCGIServlet.java
new file mode 100644
index 0000000000..ac34612e4e
--- /dev/null
+++ b/plugins/scm-hg-plugin/src/main/java/sonia/scm/web/HgCGIServlet.java
@@ -0,0 +1,74 @@
+/*
+ * To change this template, choose Tools | Templates
+ * and open the template in the editor.
+ */
+
+
+
+package sonia.scm.web;
+
+//~--- non-JDK imports --------------------------------------------------------
+
+import com.google.inject.Singleton;
+
+import sonia.scm.web.cgi.AbstractCGIServlet;
+
+//~--- JDK imports ------------------------------------------------------------
+
+import java.io.File;
+import java.io.IOException;
+
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+
+/**
+ *
+ * @author Sebastian Sdorra
+ */
+@Singleton
+public class HgCGIServlet extends AbstractCGIServlet
+{
+
+  /** Field description */
+  private static final long serialVersionUID = -3492811300905099810L;
+
+  //~--- methods --------------------------------------------------------------
+
+  /**
+   * Method description
+   *
+   *
+   * @throws ServletException
+   */
+  @Override
+  public void init() throws ServletException
+  {
+    command = HgUtil.getCGI();
+    super.init();
+  }
+
+  //~--- get methods ----------------------------------------------------------
+
+  /**
+   * Method description
+   *
+   *
+   * @param req
+   *
+   * @return
+   *
+   * @throws IOException
+   * @throws ServletException
+   */
+  @Override
+  protected File getCommand(HttpServletRequest req)
+          throws ServletException, IOException
+  {
+    return command;
+  }
+
+  //~--- fields ---------------------------------------------------------------
+
+  /** Field description */
+  private File command;
+}
diff --git a/plugins/scm-hg-plugin/src/main/java/sonia/scm/web/HgServletModule.java b/plugins/scm-hg-plugin/src/main/java/sonia/scm/web/HgServletModule.java
index 1820bd5ba6..141d9a76ef 100644
--- a/plugins/scm-hg-plugin/src/main/java/sonia/scm/web/HgServletModule.java
+++ b/plugins/scm-hg-plugin/src/main/java/sonia/scm/web/HgServletModule.java
@@ -9,18 +9,9 @@ package sonia.scm.web;
 
 //~--- non-JDK imports --------------------------------------------------------
 
-import com.google.inject.Scopes;
 import com.google.inject.servlet.ServletModule;
 
 import sonia.scm.web.filter.BasicAuthenticationFilter;
-import sonia.scm.web.cgi.CGIServlet;
-
-//~--- JDK imports ------------------------------------------------------------
-
-import java.util.HashMap;
-import java.util.Map;
-
-import javax.servlet.ServletContext;
 
 /**
  *
@@ -29,19 +20,6 @@ import javax.servlet.ServletContext;
 public class HgServletModule extends ServletModule
 {
 
-  /**
-   * Constructs ...
-   *
-   *
-   * @param servletContext
-   */
-  HgServletModule(ServletContext servletContext)
-  {
-    cgiPath = HgUtil.getCGI().getAbsolutePath();
-  }
-
-  //~--- methods --------------------------------------------------------------
-
   /**
    * Method description
    *
@@ -50,12 +28,7 @@ public class HgServletModule extends ServletModule
   protected void configureServlets()
   {
     filter("/hg/*").through(BasicAuthenticationFilter.class);
-
-    Map<String, String> initParams = new HashMap<String, String>();
-
-    initParams.put("command", cgiPath);
-    bind(CGIServlet.class).in(Scopes.SINGLETON);
-    serve("/hg/*").with(CGIServlet.class, initParams);
+    serve("/hg/*").with(HgCGIServlet.class);
   }
 
   //~--- fields ---------------------------------------------------------------
diff --git a/plugins/scm-hg-plugin/src/main/java/sonia/scm/web/HgWebConfigWriter.java b/plugins/scm-hg-plugin/src/main/java/sonia/scm/web/HgWebConfigWriter.java
index 189f91bf42..5e5150f90b 100644
--- a/plugins/scm-hg-plugin/src/main/java/sonia/scm/web/HgWebConfigWriter.java
+++ b/plugins/scm-hg-plugin/src/main/java/sonia/scm/web/HgWebConfigWriter.java
@@ -15,7 +15,7 @@ import sonia.scm.io.INISection;
 import sonia.scm.io.RegexResourceProcessor;
 import sonia.scm.io.ResourceProcessor;
 import sonia.scm.repository.HgConfig;
-import sonia.scm.util.Util;
+import sonia.scm.util.IOUtil;
 
 //~--- JDK imports ------------------------------------------------------------
 
@@ -102,8 +102,8 @@ public class HgWebConfigWriter
     }
     finally
     {
-      Util.close(input);
-      Util.close(output);
+      IOUtil.close(input);
+      IOUtil.close(output);
     }
   }
 
diff --git a/plugins/scm-hg-plugin/src/main/java/sonia/scm/web/HgWebPlugin.java b/plugins/scm-hg-plugin/src/main/java/sonia/scm/web/HgWebPlugin.java
index 25a32953d8..dea962509a 100644
--- a/plugins/scm-hg-plugin/src/main/java/sonia/scm/web/HgWebPlugin.java
+++ b/plugins/scm-hg-plugin/src/main/java/sonia/scm/web/HgWebPlugin.java
@@ -42,6 +42,6 @@ public class HgWebPlugin implements ScmWebPlugin
   public void contextInitialized(ScmWebPluginContext context)
   {
     context.addScriptResource(new ClasspathWebResource(SCRIPT));
-    context.addInjectModule(new HgServletModule( context.getServletContext() ));
+    context.addInjectModule(new HgServletModule());
   }
 }
diff --git a/plugins/scm-svn-plugin/src/main/java/sonia/scm/repository/SvnRepositoryHandler.java b/plugins/scm-svn-plugin/src/main/java/sonia/scm/repository/SvnRepositoryHandler.java
index 4a3a9a2c30..60e1bd1845 100644
--- a/plugins/scm-svn-plugin/src/main/java/sonia/scm/repository/SvnRepositoryHandler.java
+++ b/plugins/scm-svn-plugin/src/main/java/sonia/scm/repository/SvnRepositoryHandler.java
@@ -28,6 +28,7 @@ import java.util.logging.Level;
 import java.util.logging.Logger;
 
 import javax.xml.bind.JAXB;
+import sonia.scm.util.IOUtil;
 
 /**
  *
@@ -114,8 +115,8 @@ public class SvnRepositoryHandler extends AbstractRepositoryHandler<SvnConfig>
 
     if (directory.exists() && repositoryFile.exists())
     {
-      Util.delete(directory);
-      Util.delete(repositoryFile);
+      IOUtil.delete(directory);
+      IOUtil.delete(repositoryFile);
     }
     else
     {
diff --git a/scm-core/src/main/java/sonia/scm/io/INIConfigurationReader.java b/scm-core/src/main/java/sonia/scm/io/INIConfigurationReader.java
index 5e94a6934f..c4e6c63133 100644
--- a/scm-core/src/main/java/sonia/scm/io/INIConfigurationReader.java
+++ b/scm-core/src/main/java/sonia/scm/io/INIConfigurationReader.java
@@ -9,7 +9,7 @@ package sonia.scm.io;
 
 //~--- non-JDK imports --------------------------------------------------------
 
-import sonia.scm.util.Util;
+import sonia.scm.util.IOUtil;
 
 //~--- JDK imports ------------------------------------------------------------
 
@@ -96,7 +96,7 @@ public class INIConfigurationReader extends AbstractReader<INIConfiguration>
     }
     finally
     {
-      Util.close(input);
+      IOUtil.close(input);
     }
 
     return configuration;
diff --git a/scm-core/src/main/java/sonia/scm/io/INIConfigurationWriter.java b/scm-core/src/main/java/sonia/scm/io/INIConfigurationWriter.java
index 954d504d1c..53ca6f0ad9 100644
--- a/scm-core/src/main/java/sonia/scm/io/INIConfigurationWriter.java
+++ b/scm-core/src/main/java/sonia/scm/io/INIConfigurationWriter.java
@@ -9,7 +9,7 @@ package sonia.scm.io;
 
 //~--- non-JDK imports --------------------------------------------------------
 
-import sonia.scm.util.Util;
+import sonia.scm.util.IOUtil;
 
 //~--- JDK imports ------------------------------------------------------------
 
@@ -52,7 +52,7 @@ public class INIConfigurationWriter extends AbstractWriter<INIConfiguration>
     }
     finally
     {
-      Util.close(writer);
+      IOUtil.close(writer);
     }
   }
 }
diff --git a/scm-core/src/main/java/sonia/scm/io/RegexResourceProcessor.java b/scm-core/src/main/java/sonia/scm/io/RegexResourceProcessor.java
index c98ee96961..835623c1e2 100644
--- a/scm-core/src/main/java/sonia/scm/io/RegexResourceProcessor.java
+++ b/scm-core/src/main/java/sonia/scm/io/RegexResourceProcessor.java
@@ -9,7 +9,7 @@ package sonia.scm.io;
 
 //~--- non-JDK imports --------------------------------------------------------
 
-import sonia.scm.util.Util;
+import sonia.scm.util.IOUtil;
 
 //~--- JDK imports ------------------------------------------------------------
 
@@ -66,8 +66,8 @@ public class RegexResourceProcessor extends AbstractResourceProcessor
     }
     finally
     {
-      Util.close(reader);
-      Util.close(writer);
+      IOUtil.close(reader);
+      IOUtil.close(writer);
     }
   }
 
diff --git a/scm-core/src/main/java/sonia/scm/io/SimpleCommand.java b/scm-core/src/main/java/sonia/scm/io/SimpleCommand.java
index 3bff17a838..26fdc1c5d0 100644
--- a/scm-core/src/main/java/sonia/scm/io/SimpleCommand.java
+++ b/scm-core/src/main/java/sonia/scm/io/SimpleCommand.java
@@ -9,7 +9,7 @@ package sonia.scm.io;
 
 //~--- non-JDK imports --------------------------------------------------------
 
-import sonia.scm.util.Util;
+import sonia.scm.util.IOUtil;
 
 //~--- JDK imports ------------------------------------------------------------
 
@@ -150,7 +150,7 @@ public class SimpleCommand implements Command
     }
     finally
     {
-      Util.close(input);
+      IOUtil.close(input);
     }
 
     return result;
diff --git a/scm-core/src/main/java/sonia/scm/repository/AbstractSimpleRepositoryHandler.java b/scm-core/src/main/java/sonia/scm/repository/AbstractSimpleRepositoryHandler.java
index c41874a04d..023222c429 100644
--- a/scm-core/src/main/java/sonia/scm/repository/AbstractSimpleRepositoryHandler.java
+++ b/scm-core/src/main/java/sonia/scm/repository/AbstractSimpleRepositoryHandler.java
@@ -28,6 +28,7 @@ import java.util.logging.Level;
 import java.util.logging.Logger;
 
 import javax.xml.bind.JAXB;
+import sonia.scm.util.IOUtil;
 
 /**
  *
@@ -115,8 +116,8 @@ public abstract class AbstractSimpleRepositoryHandler<T extends SimpleRepository
 
     if (directory.exists() && repositoryFile.exists())
     {
-      Util.delete(directory);
-      Util.delete(repositoryFile);
+      IOUtil.delete(directory);
+      IOUtil.delete(repositoryFile);
     }
     else
     {
diff --git a/scm-core/src/main/java/sonia/scm/util/IOUtil.java b/scm-core/src/main/java/sonia/scm/util/IOUtil.java
new file mode 100644
index 0000000000..c0e60da058
--- /dev/null
+++ b/scm-core/src/main/java/sonia/scm/util/IOUtil.java
@@ -0,0 +1,192 @@
+/*
+ * To change this template, choose Tools | Templates
+ * and open the template in the editor.
+ */
+
+
+
+package sonia.scm.util;
+
+//~--- JDK imports ------------------------------------------------------------
+
+import java.io.Closeable;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.io.Reader;
+import java.io.Writer;
+
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+/**
+ *
+ * @author Sebastian Sdorra
+ */
+public class IOUtil
+{
+
+  /** Field description */
+  private static final Logger logger = Logger.getLogger(IOUtil.class.getName());
+
+  //~--- methods --------------------------------------------------------------
+
+  /**
+   * Method description
+   *
+   *
+   * @param closeable
+   */
+  public static void close(Closeable closeable)
+  {
+    if (closeable != null)
+    {
+      try
+      {
+        closeable.close();
+      }
+      catch (IOException ex)
+      {
+        logger.log(Level.SEVERE, null, ex);
+      }
+    }
+  }
+
+  /**
+   * Method description
+   *
+   *
+   * @param reader
+   * @param writer
+   *
+   * @throws IOException
+   */
+  public static void copy(Reader reader, Writer writer) throws IOException
+  {
+    char[] buffer = new char[0xFFFF];
+
+    for (int len; (len = reader.read(buffer)) != -1; )
+    {
+      writer.write(buffer, 0, len);
+    }
+  }
+
+  /**
+   * Method description
+   *
+   *
+   * @param in
+   * @param out
+   *
+   * @throws IOException
+   */
+  public static void copy(InputStream in, OutputStream out) throws IOException
+  {
+    byte[] buffer = new byte[0xFFFF];
+
+    for (int len; (len = in.read(buffer)) != -1; )
+    {
+      out.write(buffer, 0, len);
+    }
+  }
+
+  /**
+   * Method description
+   *
+   *
+   * @param reader
+   * @param writer
+   */
+  public static void copyThread(Reader reader, Writer writer)
+  {
+    new Thread(new IOCopyThread(reader, writer)).start();
+  }
+
+  /**
+   *   Method description
+   *
+   *
+   *   @param file
+   *
+   *   @throws IOException
+   */
+  public static void delete(File file) throws IOException
+  {
+    if (file.isDirectory())
+    {
+      File[] children = file.listFiles();
+
+      if (children != null)
+      {
+        for (File child : children)
+        {
+          delete(child);
+        }
+      }
+    }
+
+    if (!file.delete())
+    {
+      throw new IOException("could not delete file ".concat(file.getPath()));
+    }
+  }
+
+  //~--- inner classes --------------------------------------------------------
+
+  /**
+   * Class description
+   *
+   *
+   * @version        Enter version here..., 10/09/28
+   * @author         Enter your name here...
+   */
+  private static class IOCopyThread implements Runnable
+  {
+
+    /**
+     * Constructs ...
+     *
+     *
+     * @param reader
+     * @param writer
+     */
+    public IOCopyThread(Reader reader, Writer writer)
+    {
+      this.reader = reader;
+      this.writer = writer;
+    }
+
+    //~--- methods ------------------------------------------------------------
+
+    /**
+     * Method description
+     *
+     */
+    @Override
+    public void run()
+    {
+      try
+      {
+        copy(reader, writer);
+      }
+      catch (IOException ex)
+      {
+        logger.log(Level.SEVERE, null, ex);
+      }
+      finally
+      {
+        close(reader);
+        close(writer);
+      }
+    }
+
+    //~--- fields -------------------------------------------------------------
+
+    /** Field description */
+    private Reader reader;
+
+    /** Field description */
+    private Writer writer;
+  }
+}
diff --git a/scm-core/src/main/java/sonia/scm/util/Util.java b/scm-core/src/main/java/sonia/scm/util/Util.java
index d756c05267..49e34bc050 100644
--- a/scm-core/src/main/java/sonia/scm/util/Util.java
+++ b/scm-core/src/main/java/sonia/scm/util/Util.java
@@ -14,6 +14,8 @@ import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
+import java.io.Reader;
+import java.io.Writer;
 
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
@@ -39,75 +41,6 @@ public class Util
 
   //~--- methods --------------------------------------------------------------
 
-  /**
-   * Method description
-   *
-   *
-   * @param closeable
-   */
-  public static void close(Closeable closeable)
-  {
-    if (closeable != null)
-    {
-      try
-      {
-        closeable.close();
-      }
-      catch (IOException ex)
-      {
-        logger.log(Level.SEVERE, null, ex);
-      }
-    }
-  }
-
-  /**
-   * Method description
-   *
-   *
-   * @param in
-   * @param out
-   *
-   * @throws IOException
-   */
-  public static void copy(InputStream in, OutputStream out) throws IOException
-  {
-    byte[] buffer = new byte[0xFFFF];
-
-    for (int len; (len = in.read(buffer)) != -1; )
-    {
-      out.write(buffer, 0, len);
-    }
-  }
-
-  /**
-   *   Method description
-   *
-   *
-   *   @param file
-   *
-   *   @throws IOException
-   */
-  public static void delete(File file) throws IOException
-  {
-    if (file.isDirectory())
-    {
-      File[] children = file.listFiles();
-
-      if (children != null)
-      {
-        for (File child : children)
-        {
-          delete(child);
-        }
-      }
-    }
-
-    if (!file.delete())
-    {
-      throw new IOException("could not delete file ".concat(file.getPath()));
-    }
-  }
-
   /**
    * Method description
    *
diff --git a/scm-web-api/src/main/java/sonia/scm/web/cgi/AbstractCGIServlet.java b/scm-web-api/src/main/java/sonia/scm/web/cgi/AbstractCGIServlet.java
new file mode 100644
index 0000000000..b4adbce035
--- /dev/null
+++ b/scm-web-api/src/main/java/sonia/scm/web/cgi/AbstractCGIServlet.java
@@ -0,0 +1,148 @@
+/*
+ * To change this template, choose Tools | Templates
+ * and open the template in the editor.
+ */
+
+
+
+package sonia.scm.web.cgi;
+
+//~--- JDK imports ------------------------------------------------------------
+
+import java.io.File;
+import java.io.IOException;
+
+import java.util.Enumeration;
+
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+/**
+ *
+ * @author Sebastian Sdorra
+ */
+public abstract class AbstractCGIServlet extends HttpServlet
+{
+
+  /** Field description */
+  private static final long serialVersionUID = -8638099037069714140L;
+
+  //~--- get methods ----------------------------------------------------------
+
+  /**
+   * Method description
+   *
+   *
+   * @param req
+   *
+   * @return
+   *
+   * @throws IOException
+   * @throws ServletException
+   */
+  protected abstract File getCommand(HttpServletRequest req)
+          throws ServletException, IOException;
+
+  //~--- methods --------------------------------------------------------------
+
+  /**
+   * Method description
+   *
+   *
+   * @throws ServletException
+   */
+  @Override
+  public void init() throws ServletException
+  {
+    cgiRunner = new CGIRunner(getServletContext(), createEnvironment(),
+                              getCmdPrefix(), isExitStateIgnored());
+  }
+
+  /**
+   * Method description
+   *
+   *
+   * @return
+   */
+  protected EnvList createEnvironment()
+  {
+    EnvList env = new EnvList();
+    Enumeration e = getInitParameterNames();
+
+    while (e.hasMoreElements())
+    {
+      String n = (String) e.nextElement();
+
+      if ((n != null) && n.startsWith("ENV_"))
+      {
+        env.set(n.substring(4), getInitParameter(n));
+      }
+    }
+
+    if (!env.containsKey("SystemRoot"))
+    {
+      String os = System.getProperty("os.name");
+
+      if ((os != null) && (os.toLowerCase().indexOf("windows") != -1))
+      {
+        env.set("SystemRoot", "C:\\WINDOWS");
+      }
+    }
+
+    return env;
+  }
+
+  /**
+   * Method description
+   *
+   *
+   * @param req
+   * @param resp
+   *
+   * @throws IOException
+   * @throws ServletException
+   */
+  @Override
+  protected void service(HttpServletRequest req, HttpServletResponse resp)
+          throws ServletException, IOException
+  {
+    cgiRunner.exec(getCommand(req), req.getPathInfo(), req, resp);
+  }
+
+  //~--- get methods ----------------------------------------------------------
+
+  /**
+   * Method description
+   *
+   *
+   * @return
+   */
+  protected String getCmdPrefix()
+  {
+    return null;
+  }
+
+  ;
+
+  //~--- get methods ----------------------------------------------------------
+
+  /**
+   * Method description
+   *
+   *
+   * @return
+   */
+  protected boolean isExitStateIgnored()
+  {
+    return false;
+  }
+
+  ;
+
+  //~--- fields ---------------------------------------------------------------
+
+  /** Field description */
+  private CGIRunner cgiRunner;
+}
diff --git a/scm-web-api/src/main/java/sonia/scm/web/cgi/CGIRunner.java b/scm-web-api/src/main/java/sonia/scm/web/cgi/CGIRunner.java
index 7aac6e9bb7..b83f08b5bd 100644
--- a/scm-web-api/src/main/java/sonia/scm/web/cgi/CGIRunner.java
+++ b/scm-web-api/src/main/java/sonia/scm/web/cgi/CGIRunner.java
@@ -9,7 +9,7 @@ package sonia.scm.web.cgi;
 
 //~--- non-JDK imports --------------------------------------------------------
 
-import sonia.scm.util.Util;
+import sonia.scm.util.IOUtil;
 
 //~--- JDK imports ------------------------------------------------------------
 
@@ -164,6 +164,11 @@ public class CGIRunner
       execCmd = cmdPrefix + " " + execCmd;
     }
 
+    if (logger.isLoggable(Level.FINE))
+    {
+      logger.fine("execute cgi: ".concat(execCmd));
+    }
+
     Process p = (dir == null)
                 ? Runtime.getRuntime().exec(execCmd, env.getEnvArray())
                 : Runtime.getRuntime().exec(execCmd, env.getEnvArray(), dir);
@@ -193,6 +198,11 @@ public class CGIRunner
         {
           logger.log(Level.FINEST, null, e);
         }
+        finally
+        {
+          IOUtil.close(inFromReq);
+          IOUtil.close(outToCgi);
+        }
       }
     }).start();
 
@@ -244,7 +254,7 @@ public class CGIRunner
 
       // copy cgi content to response stream...
       os = res.getOutputStream();
-      Util.copy(inFromCgi, os);
+      IOUtil.copy(inFromCgi, os);
       p.waitFor();
 
       if (!ignoreExitState)
@@ -280,7 +290,7 @@ public class CGIRunner
     {
       if (os != null)
       {
-        Util.close(os);
+        IOUtil.close(os);
       }
 
       os = null;
diff --git a/scm-web-api/src/main/java/sonia/scm/web/cgi/CGIServlet.java b/scm-web-api/src/main/java/sonia/scm/web/cgi/CGIServlet.java
index 04830d2a5c..0a1a69aca7 100644
--- a/scm-web-api/src/main/java/sonia/scm/web/cgi/CGIServlet.java
+++ b/scm-web-api/src/main/java/sonia/scm/web/cgi/CGIServlet.java
@@ -9,6 +9,8 @@ package sonia.scm.web.cgi;
 
 //~--- non-JDK imports --------------------------------------------------------
 
+import com.google.inject.Singleton;
+
 import sonia.scm.util.Util;
 
 //~--- JDK imports ------------------------------------------------------------
@@ -46,6 +48,7 @@ import javax.servlet.http.HttpServletResponse;
  * @author Sebastian Sdorra
  *
  */
+@Singleton
 public class CGIServlet extends HttpServlet
 {
 
diff --git a/scm-webapp/src/main/java/sonia/scm/ContextListener.java b/scm-webapp/src/main/java/sonia/scm/ContextListener.java
index 0be650c1bf..13bdcd4dbd 100644
--- a/scm-webapp/src/main/java/sonia/scm/ContextListener.java
+++ b/scm-webapp/src/main/java/sonia/scm/ContextListener.java
@@ -24,6 +24,10 @@ import sonia.scm.web.ScmWebPluginContext;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
+import java.util.logging.ConsoleHandler;
+import java.util.logging.Level;
+import java.util.logging.LogManager;
+import java.util.logging.Logger;
 
 import javax.servlet.ServletContextEvent;
 
@@ -62,6 +66,7 @@ public class ContextListener extends GuiceServletContextListener
   @Override
   public void contextInitialized(ServletContextEvent servletContextEvent)
   {
+    enableDebugLogging();
     webPluginContext =
       new ScmWebPluginContext(servletContextEvent.getServletContext());
 
@@ -100,6 +105,24 @@ public class ContextListener extends GuiceServletContextListener
     return Guice.createInjector(modules);
   }
 
+  //~--- methods --------------------------------------------------------------
+
+  /**
+   * Method description
+   *
+   */
+  private void enableDebugLogging()
+  {
+    Logger logger = LogManager.getLogManager().getLogger("");
+
+    logger.setLevel(Level.FINEST);
+
+    ConsoleHandler handler = new ConsoleHandler();
+
+    handler.setLevel(Level.FINEST);
+    logger.addHandler(handler);
+  }
+
   //~--- fields ---------------------------------------------------------------
 
   /** Field description */
diff --git a/scm-webapp/src/main/java/sonia/scm/plugin/AbstractResourceServlet.java b/scm-webapp/src/main/java/sonia/scm/plugin/AbstractResourceServlet.java
index 512b17d4ce..84b83c1c04 100644
--- a/scm-webapp/src/main/java/sonia/scm/plugin/AbstractResourceServlet.java
+++ b/scm-webapp/src/main/java/sonia/scm/plugin/AbstractResourceServlet.java
@@ -9,7 +9,7 @@ package sonia.scm.plugin;
 
 //~--- non-JDK imports --------------------------------------------------------
 
-import sonia.scm.util.Util;
+import sonia.scm.util.IOUtil;
 
 //~--- JDK imports ------------------------------------------------------------
 
@@ -82,7 +82,7 @@ public abstract class AbstractResourceServlet extends HttpServlet
     }
     finally
     {
-      Util.close(output);
+      IOUtil.close(output);
     }
 
     this.content = output.toByteArray();
@@ -164,7 +164,7 @@ public abstract class AbstractResourceServlet extends HttpServlet
     }
     finally
     {
-      Util.close(output);
+      IOUtil.close(output);
     }
   }
 
diff --git a/scm-webapp/src/main/java/sonia/scm/plugin/ScriptResourceServlet.java b/scm-webapp/src/main/java/sonia/scm/plugin/ScriptResourceServlet.java
index 0ec653afc8..08b1888eec 100644
--- a/scm-webapp/src/main/java/sonia/scm/plugin/ScriptResourceServlet.java
+++ b/scm-webapp/src/main/java/sonia/scm/plugin/ScriptResourceServlet.java
@@ -12,20 +12,18 @@ package sonia.scm.plugin;
 import com.google.inject.Inject;
 import com.google.inject.Singleton;
 
+import sonia.scm.util.IOUtil;
 import sonia.scm.util.Util;
-import sonia.scm.web.ScmWebPlugin;
 import sonia.scm.web.ScmWebPluginContext;
 import sonia.scm.web.WebResource;
 
 //~--- JDK imports ------------------------------------------------------------
 
-import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 
 import java.util.Collection;
-import java.util.List;
 
 import javax.servlet.ServletException;
 
@@ -109,11 +107,11 @@ public class ScriptResourceServlet extends AbstractResourceServlet
     {
       try
       {
-        Util.copy(input, stream);
+        IOUtil.copy(input, stream);
       }
       finally
       {
-        Util.close(input);
+        IOUtil.close(input);
       }
     }
   }