From fd1145f37450009ee84f3de90f61704beaece06a Mon Sep 17 00:00:00 2001 From: Sebastian Sdorra Date: Tue, 29 May 2012 13:38:27 +0200 Subject: [PATCH 1/3] show exception when trying to fetch remote packages --- .../src/main/java/sonia/scm/installer/HgPackageReader.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/installer/HgPackageReader.java b/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/installer/HgPackageReader.java index b4554111f6..70943105d2 100644 --- a/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/installer/HgPackageReader.java +++ b/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/installer/HgPackageReader.java @@ -234,7 +234,7 @@ public class HgPackageReader } catch (IOException ex) { - logger.error("could not read HgPackages from {}", PACKAGEURL); + logger.error("could not read HgPackages from ".concat(PACKAGEURL), ex); } finally { From fb20a69c6be9a3b1509eb06b867b2829e2d9aa22 Mon Sep 17 00:00:00 2001 From: Sebastian Sdorra Date: Tue, 29 May 2012 14:15:52 +0200 Subject: [PATCH 2/3] use uncompressed version of mercurial package xml, because many proxyservers do not allow gzip encoding --- .../main/java/sonia/scm/installer/HgPackageReader.java | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/installer/HgPackageReader.java b/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/installer/HgPackageReader.java index 70943105d2..b4ee9cc2c9 100644 --- a/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/installer/HgPackageReader.java +++ b/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/installer/HgPackageReader.java @@ -45,7 +45,6 @@ import sonia.scm.PlatformType; import sonia.scm.cache.Cache; import sonia.scm.cache.CacheManager; import sonia.scm.net.HttpClient; -import sonia.scm.net.HttpRequest; import sonia.scm.net.HttpResponse; import sonia.scm.util.IOUtil; import sonia.scm.util.SystemUtil; @@ -73,7 +72,7 @@ public class HgPackageReader /** Field description */ public static final String PACKAGEURL = - "http://download.scm-manager.org/pkg/mercurial/packages.xml.gz"; + "http://download.scm-manager.org/pkg/mercurial/packages.xml"; /** the logger for HgPackageReader */ private static final Logger logger = @@ -223,11 +222,7 @@ public class HgPackageReader try { - HttpRequest request = new HttpRequest(PACKAGEURL); - - request.setDecodeGZip(true); - - HttpResponse response = httpClientProvider.get().get(request); + HttpResponse response = httpClientProvider.get().get(PACKAGEURL); input = response.getContent(); packages = JAXB.unmarshal(input, HgPackages.class); From 9342316885bcdf6644ed40a7070bcc520d43a559 Mon Sep 17 00:00:00 2001 From: Sebastian Sdorra Date: Sun, 3 Jun 2012 10:15:11 +0200 Subject: [PATCH 3/3] close branch issue-162