From 2a7306a1d92522569a8bb6e5a7c0bcdd5cf4cfaa Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Thu, 26 May 2011 17:11:38 -0400
Subject: [PATCH] Findbugs. CodePro Audit. Checkstyle. Unit test refactoring.
---
src/com/gitblit/Build.java | 200 +++++++++++++++++++++++++++++++++++--------------
1 files changed, 143 insertions(+), 57 deletions(-)
diff --git a/src/com/gitblit/Build.java b/src/com/gitblit/Build.java
index 3f63fda..da0c3e0 100644
--- a/src/com/gitblit/Build.java
+++ b/src/com/gitblit/Build.java
@@ -19,6 +19,7 @@
import java.io.ByteArrayOutputStream;
import java.io.File;
import java.io.FileInputStream;
+import java.io.FileWriter;
import java.io.IOException;
import java.io.InputStream;
import java.io.RandomAccessFile;
@@ -80,6 +81,9 @@
downloadFromApache(MavenObject.BOUNCYCASTLE, BuildType.COMPILETIME);
downloadFromApache(MavenObject.BOUNCYCASTLE_MAIL, BuildType.COMPILETIME);
+ downloadFromApache(MavenObject.JSCH, BuildType.RUNTIME);
+ downloadFromApache(MavenObject.JSCH, BuildType.COMPILETIME);
+
downloadFromEclipse(MavenObject.JGIT, BuildType.COMPILETIME);
downloadFromEclipse(MavenObject.JGIT_HTTP, BuildType.COMPILETIME);
}
@@ -87,10 +91,20 @@
public static void buildSettingKeys() {
// Load all keys
Properties properties = new Properties();
+ FileInputStream is = null;
try {
- properties.load(new FileInputStream(Constants.PROPERTIES_FILE));
+ is = new FileInputStream(Constants.PROPERTIES_FILE);
+ properties.load(is);
} catch (Throwable t) {
t.printStackTrace();
+ } finally {
+ if (is != null) {
+ try {
+ is.close();
+ } catch (Throwable t) {
+ // IGNORE
+ }
+ }
}
List<String> keys = new ArrayList<String>(properties.stringPropertyNames());
Collections.sort(keys);
@@ -114,13 +128,13 @@
// Assemble Keys source file
StringBuilder sb = new StringBuilder();
sb.append("package com.gitblit;\n");
- sb.append("\n");
+ sb.append('\n');
sb.append("/*\n");
sb.append(" * This class is auto-generated from the properties file.\n");
sb.append(" * Do not version control!\n");
sb.append(" */\n");
sb.append("public final class Keys {\n");
- sb.append("\n");
+ sb.append('\n');
List<String> classSet = new ArrayList<String>(staticClasses.keySet());
Collections.sort(classSet);
for (String clazz : classSet) {
@@ -128,27 +142,31 @@
if (clazz.equals("")) {
// root keys
for (String key : keySet) {
- sb.append(MessageFormat.format("\tpublic static final String {0} = \"{1}\";\n\n", key.replace('.', '_'), key));
+ sb.append(MessageFormat.format(
+ "\tpublic static final String {0} = \"{1}\";\n\n",
+ key.replace('.', '_'), key));
}
} else {
// class keys
sb.append(MessageFormat.format("\tpublic static final class {0} '{'\n\n", clazz));
- sb.append(MessageFormat.format("\t\tpublic static final String _ROOT = \"{0}\";\n\n", clazz));
+ sb.append(MessageFormat.format(
+ "\t\tpublic static final String _ROOT = \"{0}\";\n\n", clazz));
for (String key : keySet) {
- sb.append(MessageFormat.format("\t\tpublic static final String {0} = \"{1}\";\n\n", key.replace('.', '_'), clazz + "." + key));
+ sb.append(MessageFormat.format(
+ "\t\tpublic static final String {0} = \"{1}\";\n\n",
+ key.replace('.', '_'), clazz + "." + key));
}
sb.append("\t}\n\n");
}
}
- sb.append("}");
+ sb.append('}');
// Save Keys class definition
try {
File file = new File("src/com/gitblit/Keys.java");
- file.delete();
- RandomAccessFile raf = new RandomAccessFile(file, "rw");
- raf.writeBytes(sb.toString());
- raf.close();
+ FileWriter fw = new FileWriter(file, false);
+ fw.write(sb.toString());
+ fw.close();
} catch (Throwable t) {
t.printStackTrace();
}
@@ -217,7 +235,7 @@
byte[] buffer = new byte[4096];
int downloadedLen = 0;
float lastProgress = 0f;
-
+
updateDownload(0, targetFile);
while (true) {
int len = in.read(buffer);
@@ -234,7 +252,7 @@
}
in.close();
updateDownload(1f, targetFile);
-
+
} catch (IOException e) {
throw new RuntimeException("Error downloading " + mavenURL + " to " + targetFile, e);
}
@@ -263,7 +281,7 @@
}
return downloads;
}
-
+
private static void updateDownload(float progress, File file) {
updateProgress(progress, "d/l: " + file.getName());
}
@@ -273,72 +291,140 @@
int width = Math.round(anim.length() * progress);
System.out.print("\r[");
System.out.print(anim.substring(0, width));
- for (int i = 0; (i < anim.length() - width); i++) {
- System.out.print(" ");
+ for (int i = 0; i < anim.length() - width; i++) {
+ System.out.print(' ');
}
System.out.print("] " + url);
}
private static class MavenObject {
- public static final MavenObject JCOMMANDER = new MavenObject("jCommander", "com/beust", "jcommander", "1.17", 34000, 32000, 141000, "219a3540f3b27d7cc3b1d91d6ea046cd8723290e", "0bb50eec177acf0e94d58e0cf07262fe5164331d", "c7adc475ca40c288c93054e0f4fe58f3a98c0cb5");
+ public static final MavenObject JCOMMANDER = new MavenObject("jCommander", "com/beust",
+ "jcommander", "1.17", 34000, 32000, 141000,
+ "219a3540f3b27d7cc3b1d91d6ea046cd8723290e",
+ "0bb50eec177acf0e94d58e0cf07262fe5164331d",
+ "c7adc475ca40c288c93054e0f4fe58f3a98c0cb5");
- public static final MavenObject JETTY = new MavenObject("Jetty", "org/eclipse/jetty/aggregate", "jetty-all", "7.4.1.v20110513", 1500000, 1000000, 4100000, "1e2de9ed25a7c6ae38717d5ffdc7cfcd6be4bd46", "7b6279d16ce8f663537d9faf55ea353e748dbbaa", "fa06212e751296f1a7abc15c843b135bf49a112b");
+ public static final MavenObject JETTY = new MavenObject("Jetty",
+ "org/eclipse/jetty/aggregate", "jetty-all", "7.4.1.v20110513", 1500000, 1000000,
+ 4100000, "1e2de9ed25a7c6ae38717d5ffdc7cfcd6be4bd46",
+ "7b6279d16ce8f663537d9faf55ea353e748dbbaa",
+ "fa06212e751296f1a7abc15c843b135bf49a112b");
- 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 2.5", "javax/servlet",
+ "servlet-api", "2.5", 105000, 158000, 0,
+ "5959582d97d8b61f4d154ca9e495aafd16726e34",
+ "021599814ad9a605b86f3e6381571beccd861a32", 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 SLF4JAPI = new MavenObject("SLF4J API", "org/slf4j",
+ "slf4j-api", "1.6.1", 25500, 45000, 182000,
+ "6f3b8a24bf970f17289b234284c94f43eb42f0e4",
+ "46a386136c901748e6a3af67ebde6c22bc6b4524",
+ "e223571d77769cdafde59040da235842f3326453");
- public static final MavenObject SLF4LOG4J = new MavenObject("SLF4J LOG4J", "org/slf4j", "slf4j-log4j12", "1.6.1", 9800, 9500, 52400, "bd245d6746cdd4e6203e976e21d597a46f115802", "7a26b08b265f55622fa1fed3bda68bbd37a465ba", "6e4b16bce7994e3692e82002f322a0dd2f32741e");
+ public static final MavenObject SLF4LOG4J = new MavenObject("SLF4J LOG4J", "org/slf4j",
+ "slf4j-log4j12", "1.6.1", 9800, 9500, 52400,
+ "bd245d6746cdd4e6203e976e21d597a46f115802",
+ "7a26b08b265f55622fa1fed3bda68bbd37a465ba",
+ "6e4b16bce7994e3692e82002f322a0dd2f32741e");
- public static final MavenObject LOG4J = new MavenObject("Apache LOG4J", "log4j", "log4j", "1.2.16", 481000, 471000, 1455000, "7999a63bfccbc7c247a9aea10d83d4272bd492c6", "bf945d1dc995be7fe64923625f842fbb6bf443be", "78aa1cbf0fa3b259abdc7d87f9f6788d785aac2a");
+ public static final MavenObject LOG4J = new MavenObject("Apache LOG4J", "log4j", "log4j",
+ "1.2.16", 481000, 471000, 1455000, "7999a63bfccbc7c247a9aea10d83d4272bd492c6",
+ "bf945d1dc995be7fe64923625f842fbb6bf443be",
+ "78aa1cbf0fa3b259abdc7d87f9f6788d785aac2a");
- public static final MavenObject WICKET = new MavenObject("Apache Wicket", "org/apache/wicket", "wicket", "1.4.17", 1960000, 1906000, 6818000, "39815e37a6f56465b2d2c3d3017c4f3bf17db50a", "a792ebae4123253ffd039c3be49e773f8622f94e", "f2f244ca72d10081529b017e89d6276eab62c621");
+ public static final MavenObject WICKET = new MavenObject("Apache Wicket",
+ "org/apache/wicket", "wicket", "1.4.17", 1960000, 1906000, 6818000,
+ "39815e37a6f56465b2d2c3d3017c4f3bf17db50a",
+ "a792ebae4123253ffd039c3be49e773f8622f94e",
+ "f2f244ca72d10081529b017e89d6276eab62c621");
- 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");
+ 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");
- 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");
+ 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");
- 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");
+ 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");
- public static final MavenObject JUNIT = new MavenObject("JUnit", "junit", "junit", "3.8.2", 120000, 0, 0, "07e4cde26b53a9a0e3fe5b00d1dbbc7cc1d46060", "", "");
+ public static final MavenObject JUNIT = new MavenObject("JUnit", "junit", "junit", "3.8.2",
+ 120000, 0, 0, "07e4cde26b53a9a0e3fe5b00d1dbbc7cc1d46060", "", "");
- public static final MavenObject MARKDOWNPAPERS = new MavenObject("MarkdownPapers", "org/tautua/markdownpapers", "markdownpapers-core", "1.0.0", 87000, 58000, 278000, "feda63bd149f3315da210e397d45d02277038ad5", "a9a6c4d163af81e265a15138fcaeafa9829c6054", "f932656266a7f9593488d3f89e815d0af44d0853");
+ public static final MavenObject MARKDOWNPAPERS = new MavenObject("MarkdownPapers",
+ "org/tautua/markdownpapers", "markdownpapers-core", "1.0.0", 87000, 58000, 278000,
+ "feda63bd149f3315da210e397d45d02277038ad5",
+ "a9a6c4d163af81e265a15138fcaeafa9829c6054",
+ "f932656266a7f9593488d3f89e815d0af44d0853");
+
+ public static final MavenObject BOUNCYCASTLE = new MavenObject("BouncyCastle",
+ "org/bouncycastle", "bcprov-jdk16", "1.46", 1900000, 1400000, 4670000,
+ "ce091790943599535cbb4de8ede84535b0c1260c",
+ "d2b70567594225923450d7e3f80cd022c852725e",
+ "873a6fe765f33fc27df498a5d1f5bf077e503b2f");
+
+ public static final MavenObject BOUNCYCASTLE_MAIL = new MavenObject("BouncyCastle Mail",
+ "org/bouncycastle", "bcmail-jdk16", "1.46", 502000, 420000, 482000,
+ "08a9233bfd6ad38ea32df5e6ff91035b650584b9",
+ "3ebd62bc56854767512dc5deec0a17795f2e671d",
+ "3b7c5f3938f202311bdca0bf7ed46bc0118af081");
+
+ public static final MavenObject JGIT = new MavenObject("JGit", "org/eclipse/jgit",
+ "org.eclipse.jgit", "0.12.1", 1318000, 1354000, 2993000,
+ "fd77699699b9651d2fc31c7ed63af98b14fc1975",
+ "c8b3d84922c7802cfe6a661e13a002641a78583d",
+ "5609aa3ce3ac3d52030befd27ddd2941f6c07570");
+
+ public static final MavenObject JGIT_HTTP = new MavenObject("JGit", "org/eclipse/jgit",
+ "org.eclipse.jgit.http.server", "0.12.1", 68000, 62000, 99000,
+ "384058ca906dffb8b8708c2db8849c9754359b28",
+ "7b026658ed8de2eccc2d11d647d43d7c84a56911",
+ "6c19e37b3caafd70c1b7b024ae1858c725181688");
- public static final MavenObject BOUNCYCASTLE = new MavenObject("BouncyCastle", "org/bouncycastle", "bcprov-jdk16", "1.46", 1900000, 1400000, 4670000, "ce091790943599535cbb4de8ede84535b0c1260c", "d2b70567594225923450d7e3f80cd022c852725e", "873a6fe765f33fc27df498a5d1f5bf077e503b2f");
-
- public static final MavenObject BOUNCYCASTLE_MAIL = new MavenObject("BouncyCastle Mail", "org/bouncycastle", "bcmail-jdk16", "1.46", 502000, 420000, 482000, "08a9233bfd6ad38ea32df5e6ff91035b650584b9", "3ebd62bc56854767512dc5deec0a17795f2e671d", "3b7c5f3938f202311bdca0bf7ed46bc0118af081");
-
- public static final MavenObject JGIT = new MavenObject("JGit", "org/eclipse/jgit", "org.eclipse.jgit", "0.12.1", 1318000, 1354000, 2993000, "fd77699699b9651d2fc31c7ed63af98b14fc1975", "c8b3d84922c7802cfe6a661e13a002641a78583d", "5609aa3ce3ac3d52030befd27ddd2941f6c07570");
-
- public static final MavenObject JGIT_HTTP = new MavenObject("JGit", "org/eclipse/jgit", "org.eclipse.jgit.http.server", "0.12.1", 68000, 62000, 99000, "384058ca906dffb8b8708c2db8849c9754359b28", "7b026658ed8de2eccc2d11d647d43d7c84a56911", "6c19e37b3caafd70c1b7b024ae1858c725181688");
+ public static final MavenObject JSCH = new MavenObject("JSch", "com/jcraft",
+ "jsch", "0.1.44-1", 214000, 211000, 413000,
+ "2e9ae08de5a71bd0e0d3ba2558598181bfa71d4e",
+ "e528f593b19b04d500992606f58b87fcfded8883",
+ "d0ffadd0a4ab909d94a577b5aad43c13b617ddcb");
public final String name;
public final String group;
public final String artifact;
public final String version;
- public final int len_library;
- public final int len_sources;
- public final int len_javadoc;
- public final String sha1_library;
- public final String sha1_sources;
- public final String sha1_javadoc;
+ public final int approxLibraryLen;
+ public final int approxSourcesLen;
+ public final int approxJavadocLen;
+ public final String librarySHA1;
+ public final String sourcesSHA1;
+ public final String javadocSHA1;
- private MavenObject(String name, String group, String artifact, String version, int len_library, int len_sources, int len_javadoc, String sha1_library, String sha1_sources, String sha1_javadoc) {
+ private MavenObject(String name, String group, String artifact, String version,
+ int approxLibraryLen, int approxSourcesLen, int approxJavadocLen,
+ String librarySHA1, String sourcesSHA1, String javadocSHA1) {
this.name = name;
this.group = group;
this.artifact = artifact;
this.version = version;
- this.len_library = len_library;
- this.len_sources = len_sources;
- this.len_javadoc = len_javadoc;
- this.sha1_library = sha1_library;
- this.sha1_sources = sha1_sources;
- this.sha1_javadoc = sha1_javadoc;
+ this.approxLibraryLen = approxLibraryLen;
+ this.approxSourcesLen = approxSourcesLen;
+ this.approxJavadocLen = approxJavadocLen;
+ this.librarySHA1 = librarySHA1;
+ this.sourcesSHA1 = sourcesSHA1;
+ this.javadocSHA1 = javadocSHA1;
}
private String getRepositoryPath(String jar) {
- return group + "/" + artifact + "/" + version + "/" + artifact + "-" + version + jar + ".jar";
+ return group + "/" + artifact + "/" + version + "/" + artifact + "-" + version + jar
+ + ".jar";
}
private File getLocalFile(String basePath, String jar) {
@@ -347,24 +433,24 @@
private String getSHA1(String jar) {
if (jar.equals("")) {
- return sha1_library;
+ return librarySHA1;
} else if (jar.equals("-sources")) {
- return sha1_sources;
+ return sourcesSHA1;
} else if (jar.equals("-javadoc")) {
- return sha1_javadoc;
+ return javadocSHA1;
}
- return sha1_library;
+ return librarySHA1;
}
private int getApproximateLength(String jar) {
if (jar.equals("")) {
- return len_library;
+ return approxLibraryLen;
} else if (jar.equals("-sources")) {
- return len_sources;
+ return approxSourcesLen;
} else if (jar.equals("-javadoc")) {
- return len_javadoc;
+ return approxJavadocLen;
}
- return len_library;
+ return approxLibraryLen;
}
@Override
--
Gitblit v1.9.1