Build infrastructure improvements. Setting to show remote branches.

The JGit team is now publishing 0.12.1 artifacts on the Eclipse Maven
site. Yeah! That was the last missing piece for a slick Git:Blit
deployment. The build has been reworked to download from Eclipse and
to also download source and javadoc jars for setting up a development
environment.

Made the log4j pattern configurable by operating system.
Moved Markdown utils to their own class since I need StringUtils for
Build and that introduced a chicken-and-egg scenario.

3 files changed, 53 insertions, 52 deletions

diff --git a/src/com/gitblit/utils/JGitUtils.java b/src/com/gitblit/utils/JGitUtils.java
index 71fa20e1..f86596d5 100644
--- a/src/com/gitblit/utils/JGitUtils.java
+++ b/src/com/gitblit/utils/JGitUtils.java
@@ -63,12 +63,6 @@ import com.gitblit.wicket.models.TicketModel.Comment;
 

 public class JGitUtils {

 

-	/** Prefix for notes refs */

-	public static final String R_NOTES = "refs/notes/";

-

-	/** Standard notes ref */

-	public static final String R_NOTES_COMMITS = R_NOTES + "commits";

-

 	private final static Logger LOGGER = LoggerFactory.getLogger(JGitUtils.class);

 

 	public static Repository createRepository(File repositoriesFolder, String name, boolean bare) {

diff --git a/src/com/gitblit/utils/MarkdownUtils.java b/src/com/gitblit/utils/MarkdownUtils.java
new file mode 100644
index 00000000..6cdb3bea
--- /dev/null
+++ b/src/com/gitblit/utils/MarkdownUtils.java
@@ -0,0 +1,53 @@
+package com.gitblit.utils;

+

+import java.io.IOException;

+import java.io.Reader;

+import java.io.StringReader;

+import java.io.StringWriter;

+

+import org.tautua.markdownpapers.Markdown;

+import org.tautua.markdownpapers.parser.ParseException;

+

+public class MarkdownUtils {

+

+	public static String transformMarkdown(String markdown) throws java.text.ParseException {

+		// Read raw markdown content and transform it to html		

+		StringReader reader = new StringReader(markdown);

+		StringWriter writer = new StringWriter();

+		try {

+			Markdown md = new Markdown();

+			md.transform(reader, writer);

+			return writer.toString();

+		} catch (ParseException p) {			

+			throw new java.text.ParseException(p.getMessage(), 0);

+		} finally {

+			reader.close();

+			try {

+				writer.close();

+			} catch (IOException e) {

+			}

+		}

+	}

+

+	public static String transformMarkdown(Reader markdownReader) throws java.text.ParseException {

+		// Read raw markdown content and transform it to html				

+		StringWriter writer = new StringWriter();

+		try {

+			Markdown md = new Markdown();

+			md.transform(markdownReader, writer);

+			return writer.toString();

+		} catch (ParseException p) {			

+			throw new java.text.ParseException(p.getMessage(), 0);

+		} finally {

+			try {

+				markdownReader.close();

+			} catch (IOException e) {

+			}

+			try {

+				writer.close();

+			} catch (IOException e) {

+			}

+		}

+	}

+

+}

diff --git a/src/com/gitblit/utils/StringUtils.java b/src/com/gitblit/utils/StringUtils.java
index d52be0e4..ff47a51e 100644
--- a/src/com/gitblit/utils/StringUtils.java
+++ b/src/com/gitblit/utils/StringUtils.java
@@ -1,16 +1,10 @@
 package com.gitblit.utils;

 

-import java.io.IOException;

-import java.io.Reader;

-import java.io.StringReader;

-import java.io.StringWriter;

 import java.io.UnsupportedEncodingException;

 import java.security.MessageDigest;

 import java.security.NoSuchAlgorithmException;

 import java.util.List;

 

-import org.tautua.markdownpapers.Markdown;

-import org.tautua.markdownpapers.parser.ParseException;

 

 public class StringUtils {

 

@@ -113,44 +107,4 @@ public class StringUtils {
 			throw new RuntimeException(t);

 		}

 	}

-

-	public static String transformMarkdown(String markdown) throws java.text.ParseException {

-		// Read raw markdown content and transform it to html		

-		StringReader reader = new StringReader(markdown);

-		StringWriter writer = new StringWriter();

-		try {

-			Markdown md = new Markdown();

-			md.transform(reader, writer);

-			return writer.toString();

-		} catch (ParseException p) {			

-			throw new java.text.ParseException(p.getMessage(), 0);

-		} finally {

-			reader.close();

-			try {

-				writer.close();

-			} catch (IOException e) {

-			}

-		}

-	}

-	

-	public static String transformMarkdown(Reader markdownReader) throws java.text.ParseException {

-		// Read raw markdown content and transform it to html				

-		StringWriter writer = new StringWriter();

-		try {

-			Markdown md = new Markdown();

-			md.transform(markdownReader, writer);

-			return writer.toString();

-		} catch (ParseException p) {			

-			throw new java.text.ParseException(p.getMessage(), 0);

-		} finally {

-			try {

-				markdownReader.close();

-			} catch (IOException e) {

-			}

-			try {

-				writer.close();

-			} catch (IOException e) {

-			}

-		}

-	}

 }