From cb285cbfddfc0b633d6b8cdb4dc0d2bd2b8b51ef Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Thu, 05 Jan 2012 17:34:05 -0500
Subject: [PATCH] Fixed bug in receive hook for repositories in subfolders
---
src/com/gitblit/build/Build.java | 161 +++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 123 insertions(+), 38 deletions(-)
diff --git a/src/com/gitblit/build/Build.java b/src/com/gitblit/build/Build.java
index 641b7aa..1f8554c 100644
--- a/src/com/gitblit/build/Build.java
+++ b/src/com/gitblit/build/Build.java
@@ -35,11 +35,34 @@
import com.gitblit.Constants;
import com.gitblit.utils.StringUtils;
+/**
+ * The Build class downloads runtime and compile-time jar files from the Apache
+ * or Eclipse Maven repositories.
+ *
+ * It also generates the Keys class from the gitblit.properties file.
+ *
+ * Its important that this class have minimal compile dependencies since its
+ * called very early in the build script.
+ *
+ * @author James Moger
+ *
+ */
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
+ * a development environment.
+ */
public static enum BuildType {
RUNTIME, COMPILETIME;
}
+
+ private static DownloadListener downloadListener;
public static void main(String... args) {
runtime();
@@ -64,6 +87,9 @@
downloadFromApache(MavenObject.JSCH, BuildType.RUNTIME);
downloadFromApache(MavenObject.ROME, BuildType.RUNTIME);
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);
@@ -87,7 +113,10 @@
downloadFromApache(MavenObject.JSCH, BuildType.COMPILETIME);
downloadFromApache(MavenObject.ROME, BuildType.COMPILETIME);
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);
@@ -95,6 +124,33 @@
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.ROME, BuildType.RUNTIME);
+ downloadFromApache(MavenObject.JDOM, BuildType.RUNTIME);
+ downloadFromApache(MavenObject.JSCH, BuildType.RUNTIME);
+
+ downloadFromEclipse(MavenObject.JGIT, BuildType.RUNTIME);
+ }
+
+ /**
+ * Builds the Keys class based on the gitblit.properties file and inserts
+ * the class source into the project source folder.
+ */
public static void buildSettingKeys() {
// Load all keys
Properties properties = new Properties();
@@ -235,6 +291,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);
@@ -255,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);
@@ -297,13 +363,18 @@
String anim = "==========";
int width = Math.round(anim.length() * progress);
System.out.print("\r[");
- System.out.print(anim.substring(0, width));
+ System.out.print(anim.substring(0, Math.min(width, anim.length())));
for (int i = 0; i < anim.length() - width; i++) {
System.out.print(' ');
}
System.out.print("] " + url);
}
+ /**
+ * MavenObject represents a complete maven artifact (binary, sources, and
+ * javadoc). MavenObjects can be downloaded and checksummed to confirm
+ * authenticity.
+ */
private static class MavenObject {
public static final MavenObject JCOMMANDER = new MavenObject("jCommander", "com/beust",
@@ -313,15 +384,15 @@
"c7adc475ca40c288c93054e0f4fe58f3a98c0cb5");
public static final MavenObject JETTY = new MavenObject("Jetty",
- "org/eclipse/jetty/aggregate", "jetty-webapp", "7.4.2.v20110526", 1000000, 680000,
- 2720000, "56331143afa22d24d9faba96e86e6371b0686c7c",
- "9f38230fd589e29c8be0fc3c80fb51c5093c2e1e",
- "0d48212889c25252c5c14bef62703e28215d80cc");
+ "org/eclipse/jetty/aggregate", "jetty-webapp", "7.4.3.v20110701", 1000000, 680000,
+ 2720000, "bde072b178f9650e2308f0babe58a4baaa469e3c",
+ "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,
@@ -341,37 +412,37 @@
"78aa1cbf0fa3b259abdc7d87f9f6788d785aac2a");
public static final MavenObject WICKET = new MavenObject("Apache Wicket",
- "org/apache/wicket", "wicket", "1.4.17", 1960000, 1906000, 6818000,
- "39815e37a6f56465b2d2c3d3017c4f3bf17db50a",
- "a792ebae4123253ffd039c3be49e773f8622f94e",
- "f2f244ca72d10081529b017e89d6276eab62c621");
+ "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.17", 1180000, 1118000, 1458000,
- "01111d0dbffdc425581b006a43864c22797ce72a",
- "f194f40ea6e361bb745dfa22e2f9171eb63a9355",
- "bd42e5ba9444a426bb2d7cacce91c6033b663b57");
+ "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.17",
- 44000, 45000, 166000, "86d20ff32f62d3026213ff11a78555da643bc676",
- "37e815350a2d6b97734b250a8a03d8bf3712bba7",
- "ac3896368bfb372d178041a4ac3ee2c44f62e21c");
+ "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.17",
- 34000, 18750, 161000, "c567b98b0c5efe4147e77ef2d0d3c2d45c49dea5",
- "3d32d958b2f7aa58388af5701ea3aafc433e573f",
- "c37518b67ea85af485dd61fe854137eeacc50318");
+ "Apache Wicket Google Charts Add-On", "org/wicketstuff", "googlecharts", "1.4.18",
+ 34000, 18750, 161000, "1f763cc8a04e62840b63787a77a479b04ad99c75",
+ "1521ed6397192c464e89787502f937bc96ece8f8",
+ "8b0398d58bce63ba7f7a9232c4ca24160c9b1a11");
public static final MavenObject JUNIT = new MavenObject("JUnit", "junit", "junit", "4.8.2",
237000, 0, 0, "c94f54227b08100974c36170dcb53329435fe5ad", "", "");
public static final MavenObject MARKDOWNPAPERS = new MavenObject("MarkdownPapers",
- "org/tautua/markdownpapers", "markdownpapers-core", "1.0.0", 87000, 58000, 278000,
- "feda63bd149f3315da210e397d45d02277038ad5",
- "a9a6c4d163af81e265a15138fcaeafa9829c6054",
- "f932656266a7f9593488d3f89e815d0af44d0853");
+ "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,
@@ -386,16 +457,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.2.0.201112221803-r", 1318000, 1354000, 3300000,
+ "f3bbea50b64c2c8e20176f412d2f063bd132878f",
+ "f6c616413540e226a6b72bc573a40410412e234f",
+ "a77e5ee65ba284d12ae444ac42e12948a9314c20");
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.2.0.201112221803-r", 68000, 62000, 110000,
+ "0d0004423b71bf7c29cd4ad85010c293c4fab95f",
+ "89be774b6db17bbc47b4757ae9e5178750064880",
+ "4cde29a085200ccf46ac677aeb1abb39352a3a6a");
public static final MavenObject JSCH = new MavenObject("JSch", "com/jcraft", "jsch",
"0.1.44-1", 214000, 211000, 413000, "2e9ae08de5a71bd0e0d3ba2558598181bfa71d4e",
@@ -416,6 +487,20 @@
"a7ed425c4c46605b8f2bf2ee118c1609682f4f2c",
"f3df91edccba2f07a0fced70887c2f7b7836cb75");
+ public static final MavenObject GSON = new MavenObject("gson", "com/google/code/gson",
+ "gson", "1.7.1", 174000, 142000, 247000,
+ "0697e3a1fa094a983cd12f7f6f61abf9c6ea52e2",
+ "51f6f78aec2d30d0c2bfb4a5f00d456a6f7a5e7e",
+ "f0872fe17d484815328538b89909d5e46d85db74");
+
+ public static final MavenObject MAIL = new MavenObject("javax.mail", "javax/mail", "mail",
+ "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