improve utils

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;
+}

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;

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
 {