From c75304637f5535e634e57d4ed933c0fdb594d890 Mon Sep 17 00:00:00 2001 From: James Moger <james.moger@gitblit.com> Date: Fri, 28 Oct 2011 08:08:00 -0400 Subject: [PATCH] Added a list branches rpc --- src/com/gitblit/build/Build.java | 75 +++++++++++++++++++++++++++++-------- 1 files changed, 59 insertions(+), 16 deletions(-) diff --git a/src/com/gitblit/build/Build.java b/src/com/gitblit/build/Build.java index 3fa542b..034efc1 100644 --- a/src/com/gitblit/build/Build.java +++ b/src/com/gitblit/build/Build.java @@ -49,6 +49,10 @@ */ public class Build { + public interface DownloadListener { + public void downloading(String name); + } + /** * BuildType enumeration representing compile-time or runtime. This is used * to download dependencies either for Gitblit GO runtime or for setting up @@ -57,6 +61,8 @@ public static enum BuildType { RUNTIME, COMPILETIME; } + + private static DownloadListener downloadListener; public static void main(String... args) { runtime(); @@ -114,6 +120,27 @@ // needed for site publishing downloadFromApache(MavenObject.COMMONSNET, BuildType.RUNTIME); + } + + public static void federationClient() { + downloadFromApache(MavenObject.JCOMMANDER, BuildType.RUNTIME); + downloadFromApache(MavenObject.SERVLET, BuildType.RUNTIME); + downloadFromApache(MavenObject.MAIL, BuildType.RUNTIME); + downloadFromApache(MavenObject.SLF4JAPI, BuildType.RUNTIME); + downloadFromApache(MavenObject.SLF4LOG4J, BuildType.RUNTIME); + downloadFromApache(MavenObject.LOG4J, BuildType.RUNTIME); + downloadFromApache(MavenObject.GSON, BuildType.RUNTIME); + downloadFromApache(MavenObject.JSCH, BuildType.RUNTIME); + + downloadFromEclipse(MavenObject.JGIT, BuildType.RUNTIME); + } + + public static void manager(DownloadListener listener) { + downloadListener = listener; + downloadFromApache(MavenObject.GSON, BuildType.RUNTIME); + downloadFromApache(MavenObject.JSCH, BuildType.RUNTIME); + + downloadFromEclipse(MavenObject.JGIT, BuildType.RUNTIME); } /** @@ -260,6 +287,9 @@ throw new RuntimeException("Failed to create destination folder structure!"); } } + if (downloadListener != null) { + downloadListener.downloading(mo.name + "..."); + } ByteArrayOutputStream buff = new ByteArrayOutputStream(); try { URL url = new URL(mavenURL); @@ -280,10 +310,17 @@ if (progress - lastProgress >= 0.1f) { lastProgress = progress; updateDownload(progress, targetFile); + if (downloadListener != null) { + int percent = Math.round(100 * progress); + downloadListener.downloading(mo.name + " (" + percent + "%)"); + } } } in.close(); updateDownload(1f, targetFile); + if (downloadListener != null) { + downloadListener.downloading(mo.name + " (100%)"); + } } catch (IOException e) { throw new RuntimeException("Error downloading " + mavenURL + " to " + targetFile, e); @@ -348,16 +385,22 @@ "bc75f05dd4f7fa848720ac669b8b438ee4a6b146", "dcd42f672e734521d1a6ccc0c2f9ecded1a1a281"); - public static final MavenObject SERVLET = new MavenObject("Servlet 2.5", "javax/servlet", - "servlet-api", "2.5", 105000, 158000, 0, - "5959582d97d8b61f4d154ca9e495aafd16726e34", - "021599814ad9a605b86f3e6381571beccd861a32", null); + public static final MavenObject SERVLET = new MavenObject("Servlet 3.0", "org/glassfish", + "javax.servlet", "3.0.1", 84000, 211000, 0, + "58f17c941cd0607bb5edcbcafc491d02265ac9a1", + "63f2f8bcdd3f138020bbadd5c847e8f3847b77d2", null); public static final MavenObject SLF4JAPI = new MavenObject("SLF4J API", "org/slf4j", "slf4j-api", "1.6.1", 25500, 45000, 182000, "6f3b8a24bf970f17289b234284c94f43eb42f0e4", "46a386136c901748e6a3af67ebde6c22bc6b4524", "e223571d77769cdafde59040da235842f3326453"); + + public static final MavenObject SLF4JNOP = new MavenObject("SLF4J NOP", "org/slf4j", + "slf4j-nop", "1.6.1", 4800, 4100, 32300, + "70249094d4e5653b6bdfea46f3a1a4165c1e1993", + "4a8e77f7bf6897a3c3b7fc3acb4c862dfb905baa", + "24b2b46f9025f2db53b5b32143f7832538fa3178"); public static final MavenObject SLF4LOG4J = new MavenObject("SLF4J LOG4J", "org/slf4j", "slf4j-log4j12", "1.6.1", 9800, 9500, 52400, @@ -398,10 +441,10 @@ 237000, 0, 0, "c94f54227b08100974c36170dcb53329435fe5ad", "", ""); public static final MavenObject MARKDOWNPAPERS = new MavenObject("MarkdownPapers", - "org/tautua/markdownpapers", "markdownpapers-core", "1.1.1", 87000, 58000, 278000, - "07046e6d8f33866398dfc3955698925df9ff7719", - "178b49c34dbab6301ce848b67e7957bcf9b94d6a", - "160d370f6cb119a1b46a00f37cc28d23fd27daed"); + "org/tautua/markdownpapers", "markdownpapers-core", "1.2.4", 87000, 58000, 268000, + "cc45684d12399487e49bd1e9eee0af6ab58f3ddc", + "5c6f0e5ad6ef00b8c9a06e822eb88893cd07ec1b", + "1d4c843cb6f44c9ed776ba7ccaa95ffcaf521061"); public static final MavenObject BOUNCYCASTLE = new MavenObject("BouncyCastle", "org/bouncycastle", "bcprov-jdk16", "1.46", 1900000, 1400000, 4670000, @@ -416,16 +459,16 @@ "3b7c5f3938f202311bdca0bf7ed46bc0118af081"); public static final MavenObject JGIT = new MavenObject("JGit", "org/eclipse/jgit", - "org.eclipse.jgit", "1.0.0.201106090707-r", 1318000, 1354000, 2993000, - "34e70691382d67ee5c84ef207fb8d3784594ba2c", - "78dbd385cf40cb266f4fb2de8651b288a72f4e2d", - "dab55685bb6eee8d07cc87faf0cedaa3f9d04a0d"); + "org.eclipse.jgit", "1.1.0.201109151100-r", 1318000, 1354000, 3300000, + "bacc988346c839f79513d7bc7f5c88b22ea6e7a5", + "90abf988d98ce0d4b162f94f63fc99c435eba6b4", + "a46540a2857a0fdbf43debf3383295a897946c79"); public static final MavenObject JGIT_HTTP = new MavenObject("JGit", "org/eclipse/jgit", - "org.eclipse.jgit.http.server", "1.0.0.201106090707-r", 68000, 62000, 99000, - "35e22f7000af95d0c90caaf2012071ef3734ff59", - "4a2368beb1e9db4a6a0d609b7b869f218bf8e7a9", - "3100ce7c40d6968481a12377c59c708cda2d17b5"); + "org.eclipse.jgit.http.server", "1.1.0.201109151100-r", 68000, 62000, 110000, + "3070161a89756aac2dfc2e26d89faf31fe894ab4", + "9cecb8e4351e616688cafbcca906f542d9b1f525", + "20aaab759acd8eb6cb6acbb1b2934a689fb3774d"); public static final MavenObject JSCH = new MavenObject("JSch", "com/jcraft", "jsch", "0.1.44-1", 214000, 211000, 413000, "2e9ae08de5a71bd0e0d3ba2558598181bfa71d4e", -- Gitblit v1.9.1