added HttpClient api to fix proxy problems, see #14

scm-core/src/main/java/sonia/scm/config/ScmConfiguration.java

@@ -96,6 +96,9 @@ public class ScmConfiguration
     this.anonymousAccessEnabled = other.anonymousAccessEnabled;
     this.adminUsers = other.adminUsers;
     this.adminGroups = other.adminGroups;
+    this.enableProxy = other.enableProxy;
+    this.proxyPort = other.proxyPort;
+    this.proxyServer = other.proxyServer;
   }
 
   //~--- get methods ----------------------------------------------------------
@@ -155,6 +158,28 @@ public class ScmConfiguration
     return pluginUrl;
   }
 
+  /**
+   * Method description
+   *
+   *
+   * @return
+   */
+  public int getProxyPort()
+  {
+    return proxyPort;
+  }
+
+  /**
+   * Method description
+   *
+   *
+   * @return
+   */
+  public String getProxyServer()
+  {
+    return proxyServer;
+  }
+
   /**
    * Method description
    *
@@ -199,6 +224,17 @@ public class ScmConfiguration
     return enablePortForward;
   }
 
+  /**
+   * Method description
+   *
+   *
+   * @return
+   */
+  public boolean isEnableProxy()
+  {
+    return enableProxy;
+  }
+
   /**
    * Method description
    *
@@ -267,6 +303,17 @@ public class ScmConfiguration
     this.enablePortForward = enablePortForward;
   }
 
+  /**
+   * Method description
+   *
+   *
+   * @param enableProxy
+   */
+  public void setEnableProxy(boolean enableProxy)
+  {
+    this.enableProxy = enableProxy;
+  }
+
   /**
    * Method description
    *
@@ -300,6 +347,28 @@ public class ScmConfiguration
     this.pluginUrl = pluginUrl;
   }
 
+  /**
+   * Method description
+   *
+   *
+   * @param proxyPort
+   */
+  public void setProxyPort(int proxyPort)
+  {
+    this.proxyPort = proxyPort;
+  }
+
+  /**
+   * Method description
+   *
+   *
+   * @param proxyServer
+   */
+  public void setProxyServer(String proxyServer)
+  {
+    this.proxyServer = proxyServer;
+  }
+
   /**
    * Method description
    *
@@ -334,6 +403,9 @@ public class ScmConfiguration
   @XmlJavaTypeAdapter(XmlSetStringAdapter.class)
   private Set<String> adminUsers;
 
+  /** Field description */
+  private boolean enableProxy;
+
   /** Field description */
   private int forwardPort = 80;
 
@@ -341,6 +413,12 @@ public class ScmConfiguration
   @XmlElement(name = "plugin-url")
   private String pluginUrl = DEFAULT_PLUGINURL;
 
+  /** Field description */
+  private int proxyPort;
+
+  /** Field description */
+  private String proxyServer;
+
   /** Field description */
   private String servername = "localhost";
 

scm-core/src/main/java/sonia/scm/net/HttpClient.java

@@ -0,0 +1,92 @@
+/**
+ * Copyright (c) 2010, Sebastian Sdorra
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ * 3. Neither the name of SCM-Manager; nor the names of its
+ *    contributors may be used to endorse or promote products derived from this
+ *    software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * http://bitbucket.org/sdorra/scm-manager
+ *
+ */
+
+
+
+package sonia.scm.net;
+
+//~--- JDK imports ------------------------------------------------------------
+
+import java.io.IOException;
+import java.util.List;
+import java.util.Map;
+
+/**
+ *
+ * @author Sebastian Sdorra
+ */
+public interface HttpClient
+{
+
+  /**
+   * Method description
+   *
+   *
+   * @param url
+   *
+   * @return
+   */
+  public HttpResponse post(String url) throws IOException;
+
+  /**
+   * Method description
+   *
+   *
+   * @param url
+   * @param parameters
+   *
+   * @return
+   */
+  public HttpResponse post(String url, Map<String, List<String>> parameters) throws IOException;
+
+  //~--- get methods ----------------------------------------------------------
+
+  /**
+   * Method description
+   *
+   *
+   * @param url
+   *
+   * @return
+   */
+  public HttpResponse get(String url) throws IOException;
+
+  /**
+   * Method description
+   *
+   *
+   * @param url
+   * @param parameters
+   *
+   * @return
+   */
+  public HttpResponse get(String url, Map<String, List<String>> parameters) throws IOException;
+}

scm-core/src/main/java/sonia/scm/net/HttpResponse.java

@@ -0,0 +1,99 @@
+/**
+ * Copyright (c) 2010, Sebastian Sdorra
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ * 3. Neither the name of SCM-Manager; nor the names of its
+ *    contributors may be used to endorse or promote products derived from this
+ *    software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * http://bitbucket.org/sdorra/scm-manager
+ *
+ */
+
+
+
+package sonia.scm.net;
+
+//~--- JDK imports ------------------------------------------------------------
+
+import java.io.Closeable;
+import java.io.IOException;
+import java.io.InputStream;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ *
+ * @author Sebastian Sdorra
+ */
+public interface HttpResponse extends Closeable
+{
+
+  /**
+   * Method description
+   *
+   *
+   * @return
+   *
+   * @throws IOException
+   */
+  public InputStream getContent() throws IOException;
+
+  /**
+   * Method description
+   *
+   *
+   * @return
+   *
+   * @throws IOException
+   */
+  public String getContentAsString() throws IOException;
+
+  /**
+   * Method description
+   *
+   *
+   * @param name
+   *
+   * @return
+   */
+  public String getHeader(String name);
+
+  /**
+   * Method description
+   *
+   *
+   * @return
+   */
+  public Map<String, List<String>> getHeaderMap();
+
+  /**
+   * Method description
+   *
+   *
+   * @return
+   *
+   * @throws IOException
+   */
+  public int getStatusCode() throws IOException;
+}