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 9c74c2420a..4cf7bb67d1 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
@@ -303,6 +303,100 @@ public class CGIRunner
     }
   }
 
+  //~--- get methods ----------------------------------------------------------
+
+  /**
+   * Method description
+   *
+   *
+   * @return
+   */
+  public String getCmdPrefix()
+  {
+    return cmdPrefix;
+  }
+
+  /**
+   * Method description
+   *
+   *
+   * @return
+   */
+  public ServletContext getContext()
+  {
+    return context;
+  }
+
+  /**
+   * Method description
+   *
+   *
+   * @return
+   */
+  public EnvList getEnvironment()
+  {
+    return environment;
+  }
+
+  /**
+   * Method description
+   *
+   *
+   * @return
+   */
+  public boolean isIgnoreExitState()
+  {
+    return ignoreExitState;
+  }
+
+  //~--- set methods ----------------------------------------------------------
+
+  /**
+   * Method description
+   *
+   *
+   * @param cmdPrefix
+   */
+  public void setCmdPrefix(String cmdPrefix)
+  {
+    this.cmdPrefix = cmdPrefix;
+  }
+
+  /**
+   * Method description
+   *
+   *
+   * @param context
+   */
+  public void setContext(ServletContext context)
+  {
+    this.context = context;
+  }
+
+  /**
+   * Method description
+   *
+   *
+   * @param environment
+   */
+  public void setEnvironment(EnvList environment)
+  {
+    this.environment = environment;
+  }
+
+  /**
+   * Method description
+   *
+   *
+   * @param ignoreExitState
+   */
+  public void setIgnoreExitState(boolean ignoreExitState)
+  {
+    this.ignoreExitState = ignoreExitState;
+  }
+
+  //~--- methods --------------------------------------------------------------
+
   /**
    * Method description
    *
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
deleted file mode 100644
index 0a1a69aca7..0000000000
--- a/scm-web-api/src/main/java/sonia/scm/web/cgi/CGIServlet.java
+++ /dev/null
@@ -1,130 +0,0 @@
-/*
- * To change this template, choose Tools | Templates
- * and open the template in the editor.
- */
-
-
-
-package sonia.scm.web.cgi;
-
-//~--- non-JDK imports --------------------------------------------------------
-
-import com.google.inject.Singleton;
-
-import sonia.scm.util.Util;
-
-//~--- 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;
-
-/**
- * CGI Servlet.
- *
- * The cgi bin directory can be set with the "cgibinResourceBase" init parameter
- * or it will default to the resource base of the context.
- *
- * The "commandPrefix" init parameter may be used to set a prefix to all
- * commands passed to exec. This can be used on systems that need assistance to
- * execute a particular file type. For example on windows this can be set to
- * "perl" so that perl scripts are executed.
- *
- * The "Path" init param is passed to the exec environment as PATH. Note: Must
- * be run unpacked somewhere in the filesystem.
- *
- * Any initParameter that starts with ENV_ is used to set an environment
- * variable with the name stripped of the leading ENV_ and using the init
- * parameter value.
- *
- * Based on org.eclipse.jetty.servlets.CGI
- *
- * @author Sebastian Sdorra
- *
- */
-@Singleton
-public class CGIServlet extends HttpServlet
-{
-
-  /** Field description */
-  private static final long serialVersionUID = 5719539505555835833L;
-
-  //~--- methods --------------------------------------------------------------
-
-  /**
-   * Method description
-   *
-   *
-   * @throws ServletException
-   */
-  @Override
-  public void init() throws ServletException
-  {
-    EnvList env = new EnvList();
-    String cmdPrefix = getInitParameter("commandPrefix");
-    boolean ignoreExitStatus =
-      "true".equalsIgnoreCase(getInitParameter("ignoreExitState"));
-    String commandPath = getInitParameter("command");
-
-    if (Util.isNotEmpty(commandPath))
-    {
-      command = new File(commandPath);
-    }
-
-    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");
-      }
-    }
-
-    cgiRunner = new CGIRunner(getServletContext(), env, cmdPrefix,
-                              ignoreExitStatus);
-  }
-
-  /**
-   * Method description
-   *
-   *
-   * @param req
-   * @param resp
-   *
-   * @throws IOException
-   * @throws ServletException
-   */
-  @Override
-  protected void service(HttpServletRequest req, HttpServletResponse resp)
-          throws ServletException, IOException
-  {
-    cgiRunner.exec(command, req.getPathInfo(), req, resp);
-  }
-
-  //~--- fields ---------------------------------------------------------------
-
-  /** Field description */
-  private CGIRunner cgiRunner;
-
-  /** Field description */
-  private File command;
-}