From e6935876b97a63bae2ec087b4fc390c832aef155 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Thu, 22 Dec 2011 17:06:35 -0500
Subject: [PATCH] Drop recent activity y-axis labels
---
src/com/gitblit/build/Build.java | 67 ++++++++++++++++++++-------------
1 files changed, 41 insertions(+), 26 deletions(-)
diff --git a/src/com/gitblit/build/Build.java b/src/com/gitblit/build/Build.java
index 6ca8cb6..8ca52c3 100644
--- a/src/com/gitblit/build/Build.java
+++ b/src/com/gitblit/build/Build.java
@@ -48,11 +48,11 @@
*
*/
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
@@ -61,7 +61,7 @@
public static enum BuildType {
RUNTIME, COMPILETIME;
}
-
+
private static DownloadListener downloadListener;
public static void main(String... args) {
@@ -89,6 +89,7 @@
downloadFromApache(MavenObject.JDOM, BuildType.RUNTIME);
downloadFromApache(MavenObject.GSON, BuildType.RUNTIME);
downloadFromApache(MavenObject.MAIL, BuildType.RUNTIME);
+ downloadFromApache(MavenObject.GROOVY, BuildType.RUNTIME);
downloadFromEclipse(MavenObject.JGIT, BuildType.RUNTIME);
downloadFromEclipse(MavenObject.JGIT_HTTP, BuildType.RUNTIME);
@@ -114,14 +115,15 @@
downloadFromApache(MavenObject.JDOM, BuildType.COMPILETIME);
downloadFromApache(MavenObject.GSON, BuildType.COMPILETIME);
downloadFromApache(MavenObject.MAIL, BuildType.COMPILETIME);
-
+ downloadFromApache(MavenObject.GROOVY, BuildType.COMPILETIME);
+
downloadFromEclipse(MavenObject.JGIT, BuildType.COMPILETIME);
downloadFromEclipse(MavenObject.JGIT_HTTP, BuildType.COMPILETIME);
// needed for site publishing
downloadFromApache(MavenObject.COMMONSNET, BuildType.RUNTIME);
}
-
+
public static void federationClient() {
downloadFromApache(MavenObject.JCOMMANDER, BuildType.RUNTIME);
downloadFromApache(MavenObject.SERVLET, BuildType.RUNTIME);
@@ -131,15 +133,17 @@
downloadFromApache(MavenObject.LOG4J, BuildType.RUNTIME);
downloadFromApache(MavenObject.GSON, BuildType.RUNTIME);
downloadFromApache(MavenObject.JSCH, BuildType.RUNTIME);
-
+
downloadFromEclipse(MavenObject.JGIT, BuildType.RUNTIME);
}
-
- public static void rpcClient(DownloadListener listener) {
+
+ public static void manager(DownloadListener listener) {
downloadListener = listener;
downloadFromApache(MavenObject.GSON, BuildType.RUNTIME);
+ downloadFromApache(MavenObject.ROME, BuildType.RUNTIME);
+ downloadFromApache(MavenObject.JDOM, BuildType.RUNTIME);
downloadFromApache(MavenObject.JSCH, BuildType.RUNTIME);
-
+
downloadFromEclipse(MavenObject.JGIT, BuildType.RUNTIME);
}
@@ -288,7 +292,7 @@
}
}
if (downloadListener != null) {
- downloadListener.downloading(mo.name);
+ downloadListener.downloading(mo.name + "...");
}
ByteArrayOutputStream buff = new ByteArrayOutputStream();
try {
@@ -310,10 +314,17 @@
if (progress - lastProgress >= 0.1f) {
lastProgress = progress;
updateDownload(progress, targetFile);
+ if (downloadListener != null) {
+ int percent = Math.min(100, 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);
@@ -401,22 +412,22 @@
"78aa1cbf0fa3b259abdc7d87f9f6788d785aac2a");
public static final MavenObject WICKET = new MavenObject("Apache Wicket",
- "org/apache/wicket", "wicket", "1.4.18", 1960000, 1906000, 6818000,
- "921a50dbbebdf034f0042f2294760e7535cb7041",
- "b432d60b32449fdfb216ac23af8a3ed3e0a3368c",
- "435e70f9de94975ee30c3f1b1aa1401aea9b4e70");
+ "org/apache/wicket", "wicket", "1.4.19", 1960000, 1906000, 6818000,
+ "7e6af5cadaf6c9b7e068e45cf2ffbea3cc91592f",
+ "5e91cf00efaf2fedeef98e13464a4230e5966588",
+ "5dde8afbe5eb2314a704cb74938c1b651b2cf190");
public static final MavenObject WICKET_EXT = new MavenObject("Apache Wicket Extensions",
- "org/apache/wicket", "wicket-extensions", "1.4.18", 1180000, 1118000, 1458000,
- "f568bd2ad382db935ab06fdccfdead3f10ed1f15",
- "c00a4979d7647d3367c6e4897a2fd7d0f78a73cc",
- "5e76ab69f6307e3ecb2638779008b3adf5cbf9aa");
+ "org/apache/wicket", "wicket-extensions", "1.4.19", 1180000, 1118000, 1458000,
+ "c7a1d343e216cdc2e692b6fabc6eaeca9aa24ca4",
+ "6c2e2ad89b69fc9977c24467e3aa0d7f6c75a579",
+ "3a3082fb106173f7ca069a6f5969cc8d347d9f44");
public static final MavenObject WICKET_AUTH_ROLES = new MavenObject(
- "Apache Wicket Auth Roles", "org/apache/wicket", "wicket-auth-roles", "1.4.18",
- 44000, 45000, 166000, "44cf0647e1adca377cc4258cd7fac33aa1dd11ab",
- "2a7e9c6a9687136c2527afa2e53148cfa82696c6",
- "6e280995097e84b72b283132b8fe6796595caa38");
+ "Apache Wicket Auth Roles", "org/apache/wicket", "wicket-auth-roles", "1.4.19",
+ 44000, 45000, 166000, "70c26ac4cd167bf7323372d2d49eb2a9beff73b9",
+ "ca219726c1768a9483e4a0bb6550881babfe46d6",
+ "17753908f8a9e997c464a69765b4682126fa1fd6");
public static final MavenObject WICKET_GOOGLE_CHARTS = new MavenObject(
"Apache Wicket Google Charts Add-On", "org/wicketstuff", "googlecharts", "1.4.18",
@@ -428,10 +439,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.5", 87000, 58000, 268000,
+ "295910b1893d73d4803f9ea2790ee1d10c466364",
+ "2170f358f29886aea8794c4bfdb6f1b27b152b9b",
+ "481599f34cb2abe4a9ebc771d8d81823375ec1ce");
public static final MavenObject BOUNCYCASTLE = new MavenObject("BouncyCastle",
"org/bouncycastle", "bcprov-jdk16", "1.46", 1900000, 1400000, 4670000,
@@ -486,6 +497,10 @@
"1.4.3", 462000, 642000, 0, "8154bf8d666e6db154c548dc31a8d512c273f5ee",
"5875e2729de83a4e46391f8f979ec8bd03810c10", null);
+ public static final MavenObject GROOVY = new MavenObject("groovy", "org/codehaus/groovy", "groovy-all",
+ "1.8.4", 6143000, 2290000, 4608000, "b5e7c2a5e6af43ccccf643ad656d6fe4b773be2b",
+ "a527e83e5c715540108d8f2b86ca19a3c9c78ac1", "8e5da5584fff57b14adbb4ee25cca09f5a00b013");
+
public final String name;
public final String group;
public final String artifact;
--
Gitblit v1.9.1