Reorganized to Apache Standard Directory Layout & integrated Moxie

This is a massive commit which reorganizes the entire project structure
(although it is still monolithic), removes the Build classes, and
switches to Moxie, a smarter Ant build tookit based on the original
Gitblit Build classes.

The Ant build script will likely require additional fine-tuning, but
this is big step forward.

662 files changed, 4379 insertions, 1519 deletions

diff --git a/.classpath b/.classpath
index 365b6d44..69989e6c 100644
--- a/.classpath
+++ b/.classpath
@@ -1,55 +1,61 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" path="src" />
-	<classpathentry kind="src" path="resources" />
-	<classpathentry kind="src" path="tests" output="bin/test-classes" />
-	<classpathentry kind="lib" path="ext/jcommander-1.17.jar" sourcepath="ext/src/jcommander-1.17-sources.jar" />
-	<classpathentry kind="lib" path="ext/log4j-1.2.17.jar" sourcepath="ext/src/log4j-1.2.17-sources.jar" />
-	<classpathentry kind="lib" path="ext/slf4j-api-1.6.6.jar" sourcepath="ext/src/slf4j-api-1.6.6-sources.jar" />
-	<classpathentry kind="lib" path="ext/slf4j-log4j12-1.6.6.jar" sourcepath="ext/src/slf4j-log4j12-1.6.6-sources.jar" />
-	<classpathentry kind="lib" path="ext/mail-1.4.3.jar" sourcepath="ext/src/mail-1.4.3-sources.jar" />
-	<classpathentry kind="lib" path="ext/javax.servlet-api-3.0.1.jar" sourcepath="ext/src/javax.servlet-api-3.0.1-sources.jar" />
-	<classpathentry kind="lib" path="ext/jetty-webapp-7.6.8.v20121106.jar" sourcepath="ext/src/jetty-webapp-7.6.8.v20121106-sources.jar" />
-	<classpathentry kind="lib" path="ext/jetty-ajp-7.6.8.v20121106.jar" sourcepath="ext/src/jetty-ajp-7.6.8.v20121106-sources.jar" />
-	<classpathentry kind="lib" path="ext/wicket-1.4.21.jar" sourcepath="ext/src/wicket-1.4.21-sources.jar" />
-	<classpathentry kind="lib" path="ext/wicket-auth-roles-1.4.21.jar" sourcepath="ext/src/wicket-auth-roles-1.4.21-sources.jar" />
-	<classpathentry kind="lib" path="ext/wicket-extensions-1.4.21.jar" sourcepath="ext/src/wicket-extensions-1.4.21-sources.jar" />
-	<classpathentry kind="lib" path="ext/googlecharts-1.4.21.jar" sourcepath="ext/src/googlecharts-1.4.21-sources.jar" />
-	<classpathentry kind="lib" path="ext/lucene-core-3.6.1.jar" sourcepath="ext/src/lucene-core-3.6.1-sources.jar" />
-	<classpathentry kind="lib" path="ext/lucene-highlighter-3.6.1.jar" sourcepath="ext/src/lucene-highlighter-3.6.1-sources.jar" />
-	<classpathentry kind="lib" path="ext/lucene-memory-3.6.1.jar" sourcepath="ext/src/lucene-memory-3.6.1-sources.jar" />
-	<classpathentry kind="lib" path="ext/lucene-queries-3.6.1.jar" sourcepath="ext/src/lucene-queries-3.6.1-sources.jar" />
+	<classpathentry kind="src" path="src/main/java" />
+	<classpathentry kind="src" path="src/test/java" output="bin/test-classes" />
+	<classpathentry kind="src" path="src/main/resources" />
+	<classpathentry kind="lib" path="ext/jcommander-1.17.jar" sourcepath="ext/src/jcommander-1.17.jar" />
+	<classpathentry kind="lib" path="ext/log4j-1.2.17.jar" sourcepath="ext/src/log4j-1.2.17.jar" />
+	<classpathentry kind="lib" path="ext/slf4j-api-1.6.6.jar" sourcepath="ext/src/slf4j-api-1.6.6.jar" />
+	<classpathentry kind="lib" path="ext/slf4j-log4j12-1.6.6.jar" sourcepath="ext/src/slf4j-log4j12-1.6.6.jar" />
+	<classpathentry kind="lib" path="ext/mail-1.4.3.jar" sourcepath="ext/src/mail-1.4.3.jar" />
+	<classpathentry kind="lib" path="ext/javax.servlet-api-3.0.1.jar" sourcepath="ext/src/javax.servlet-api-3.0.1.jar" />
+	<classpathentry kind="lib" path="ext/jetty-webapp-7.6.8.v20121106.jar" sourcepath="ext/src/jetty-webapp-7.6.8.v20121106.jar" />
+	<classpathentry kind="lib" path="ext/jetty-ajp-7.6.8.v20121106.jar" sourcepath="ext/src/jetty-ajp-7.6.8.v20121106.jar" />
+	<classpathentry kind="lib" path="ext/wicket-1.4.21.jar" sourcepath="ext/src/wicket-1.4.21.jar" />
+	<classpathentry kind="lib" path="ext/wicket-auth-roles-1.4.21.jar" sourcepath="ext/src/wicket-auth-roles-1.4.21.jar" />
+	<classpathentry kind="lib" path="ext/wicket-extensions-1.4.21.jar" sourcepath="ext/src/wicket-extensions-1.4.21.jar" />
+	<classpathentry kind="lib" path="ext/googlecharts-1.4.21.jar" sourcepath="ext/src/googlecharts-1.4.21.jar" />
+	<classpathentry kind="lib" path="ext/lucene-core-3.6.1.jar" sourcepath="ext/src/lucene-core-3.6.1.jar" />
+	<classpathentry kind="lib" path="ext/lucene-highlighter-3.6.1.jar" sourcepath="ext/src/lucene-highlighter-3.6.1.jar" />
+	<classpathentry kind="lib" path="ext/lucene-memory-3.6.1.jar" sourcepath="ext/src/lucene-memory-3.6.1.jar" />
+	<classpathentry kind="lib" path="ext/lucene-queries-3.6.1.jar" sourcepath="ext/src/lucene-queries-3.6.1.jar" />
 	<classpathentry kind="lib" path="ext/jakarta-regexp-1.4.jar" />
-	<classpathentry kind="lib" path="ext/markdownpapers-core-1.3.2.jar" sourcepath="ext/src/markdownpapers-core-1.3.2-sources.jar" />
-	<classpathentry kind="lib" path="ext/org.eclipse.jgit-2.2.0.201212191850-r.jar" sourcepath="ext/src/org.eclipse.jgit-2.2.0.201212191850-r-sources.jar" />
-	<classpathentry kind="lib" path="ext/jsch-0.1.44-1.jar" sourcepath="ext/src/jsch-0.1.44-1-sources.jar" />
-	<classpathentry kind="lib" path="ext/org.eclipse.jgit.http.server-2.2.0.201212191850-r.jar" sourcepath="ext/src/org.eclipse.jgit.http.server-2.2.0.201212191850-r-sources.jar" />
-	<classpathentry kind="lib" path="ext/bcprov-jdk15on-1.47.jar" sourcepath="ext/src/bcprov-jdk15on-1.47-sources.jar" />
-	<classpathentry kind="lib" path="ext/bcmail-jdk15on-1.47.jar" sourcepath="ext/src/bcmail-jdk15on-1.47-sources.jar" />
-	<classpathentry kind="lib" path="ext/bcpkix-jdk15on-1.47.jar" sourcepath="ext/src/bcpkix-jdk15on-1.47-sources.jar" />
-	<classpathentry kind="lib" path="ext/rome-0.9.jar" sourcepath="ext/src/rome-0.9-sources.jar" />
-	<classpathentry kind="lib" path="ext/jdom-1.0.jar" sourcepath="ext/src/jdom-1.0-sources.jar" />
-	<classpathentry kind="lib" path="ext/gson-1.7.2.jar" sourcepath="ext/src/gson-1.7.2-sources.jar" />
-	<classpathentry kind="lib" path="ext/groovy-all-1.8.8.jar" sourcepath="ext/src/groovy-all-1.8.8-sources.jar" />
-	<classpathentry kind="lib" path="ext/unboundid-ldapsdk-2.3.0.jar" sourcepath="ext/src/unboundid-ldapsdk-2.3.0-sources.jar" />
-	<classpathentry kind="lib" path="ext/ivy-2.2.0.jar" sourcepath="ext/src/ivy-2.2.0-sources.jar" />
+	<classpathentry kind="lib" path="ext/markdownpapers-core-1.3.2.jar" sourcepath="ext/src/markdownpapers-core-1.3.2.jar" />
+	<classpathentry kind="lib" path="ext/org.eclipse.jgit-2.3.1.201302201838-r.jar" sourcepath="ext/src/org.eclipse.jgit-2.3.1.201302201838-r.jar" />
+	<classpathentry kind="lib" path="ext/jsch-0.1.46.jar" sourcepath="ext/src/jsch-0.1.46.jar" />
+	<classpathentry kind="lib" path="ext/org.eclipse.jgit.http.server-2.3.1.201302201838-r.jar" sourcepath="ext/src/org.eclipse.jgit.http.server-2.3.1.201302201838-r.jar" />
+	<classpathentry kind="lib" path="ext/bcprov-jdk15on-1.47.jar" sourcepath="ext/src/bcprov-jdk15on-1.47.jar" />
+	<classpathentry kind="lib" path="ext/bcmail-jdk15on-1.47.jar" sourcepath="ext/src/bcmail-jdk15on-1.47.jar" />
+	<classpathentry kind="lib" path="ext/bcpkix-jdk15on-1.47.jar" sourcepath="ext/src/bcpkix-jdk15on-1.47.jar" />
+	<classpathentry kind="lib" path="ext/rome-0.9.jar" sourcepath="ext/src/rome-0.9.jar" />
+	<classpathentry kind="lib" path="ext/jdom-1.0.jar" sourcepath="ext/src/jdom-1.0.jar" />
+	<classpathentry kind="lib" path="ext/gson-1.7.2.jar" sourcepath="ext/src/gson-1.7.2.jar" />
+	<classpathentry kind="lib" path="ext/groovy-all-1.8.8.jar" sourcepath="ext/src/groovy-all-1.8.8.jar" />
+	<classpathentry kind="lib" path="ext/unboundid-ldapsdk-2.3.0.jar" sourcepath="ext/src/unboundid-ldapsdk-2.3.0.jar" />
+	<classpathentry kind="lib" path="ext/ivy-2.2.0.jar" sourcepath="ext/src/ivy-2.2.0.jar" />
 	<classpathentry kind="lib" path="ext/jcalendar-1.3.2.jar" />
-	<classpathentry kind="lib" path="ext/commons-compress-1.4.1.jar" sourcepath="ext/src/commons-compress-1.4.1-sources.jar" />
-	<classpathentry kind="lib" path="ext/xz-1.0.jar" sourcepath="ext/src/xz-1.0-sources.jar" />
-	<classpathentry kind="lib" path="ext/junit-4.10.jar" sourcepath="ext/src/junit-4.10-sources.jar" />
-	<classpathentry kind="lib" path="ext/hamcrest-core-1.1.jar" />
-	<classpathentry kind="lib" path="ext/seleniumhq/selenium-java-2.28.0.jar"/>
-	<classpathentry kind="lib" path="ext/seleniumhq/selenium-api-2.28.0.jar"/>
-	<classpathentry kind="lib" path="ext/seleniumhq/selenium-remote-driver-2.28.0.jar"/>
-	<classpathentry kind="lib" path="ext/seleniumhq/selenium-support-2.28.0.jar"/>
-	<classpathentry kind="lib" path="ext/seleniumhq/guava-12.0.jar"/>
-	<classpathentry kind="lib" path="ext/seleniumhq/json-20080701.jar"/>
-	<classpathentry kind="lib" path="ext/seleniumhq/commons-exec-1.1.jar"/>
-	<classpathentry kind="lib" path="ext/seleniumhq/httpcore-4.2.1.jar"/>
-	<classpathentry kind="lib" path="ext/seleniumhq/httpmime-4.2.1.jar"/>
-	<classpathentry kind="lib" path="ext/seleniumhq/httpclient-4.2.1.jar"/>
-	<classpathentry kind="lib" path="ext/seleniumhq/commons-logging-1.1.1.jar"/>
-	<classpathentry kind="lib" path="ext/seleniumhq/selenium-firefox-driver-2.28.0.jar"/>
+	<classpathentry kind="lib" path="ext/commons-compress-1.4.1.jar" sourcepath="ext/src/commons-compress-1.4.1.jar" />
+	<classpathentry kind="lib" path="ext/xz-1.0.jar" sourcepath="ext/src/xz-1.0.jar" />
+	<classpathentry kind="lib" path="ext/commons-daemon-1.0.14.jar" sourcepath="ext/src/commons-daemon-1.0.14.jar" />
+	<classpathentry kind="lib" path="ext/commons-daemon-1.0.14-bin-windows.zip" />
+	<classpathentry kind="lib" path="ext/junit-4.11.jar" sourcepath="ext/src/junit-4.11.jar" />
+	<classpathentry kind="lib" path="ext/hamcrest-core-1.3.jar" sourcepath="ext/src/hamcrest-core-1.3.jar" />
+	<classpathentry kind="lib" path="ext/selenium-java-2.28.0.jar" sourcepath="ext/src/selenium-java-2.28.0.jar" />
+	<classpathentry kind="lib" path="ext/selenium-support-2.28.0.jar" sourcepath="ext/src/selenium-support-2.28.0.jar" />
+	<classpathentry kind="lib" path="ext/selenium-firefox-driver-2.28.0.jar" sourcepath="ext/src/selenium-firefox-driver-2.28.0.jar" />
+	<classpathentry kind="lib" path="ext/selenium-remote-driver-2.28.0.jar" sourcepath="ext/src/selenium-remote-driver-2.28.0.jar" />
+	<classpathentry kind="lib" path="ext/cglib-nodep-2.1_3.jar" sourcepath="ext/src/cglib-nodep-2.1_3.jar" />
+	<classpathentry kind="lib" path="ext/json-20080701.jar" sourcepath="ext/src/json-20080701.jar" />
+	<classpathentry kind="lib" path="ext/selenium-api-2.28.0.jar" sourcepath="ext/src/selenium-api-2.28.0.jar" />
+	<classpathentry kind="lib" path="ext/guava-13.0.1.jar" sourcepath="ext/src/guava-13.0.1.jar" />
+	<classpathentry kind="lib" path="ext/httpclient-4.2.1.jar" sourcepath="ext/src/httpclient-4.2.1.jar" />
+	<classpathentry kind="lib" path="ext/httpcore-4.2.1.jar" sourcepath="ext/src/httpcore-4.2.1.jar" />
+	<classpathentry kind="lib" path="ext/commons-logging-1.1.1.jar" sourcepath="ext/src/commons-logging-1.1.1.jar" />
+	<classpathentry kind="lib" path="ext/commons-codec-1.6.jar" sourcepath="ext/src/commons-codec-1.6.jar" />
+	<classpathentry kind="lib" path="ext/commons-exec-1.1.jar" sourcepath="ext/src/commons-exec-1.1.jar" />
+	<classpathentry kind="lib" path="ext/jna-3.4.0.jar" sourcepath="ext/src/jna-3.4.0.jar" />
+	<classpathentry kind="lib" path="ext/platform-3.4.0.jar" sourcepath="ext/src/platform-3.4.0.jar" />
+	<classpathentry kind="lib" path="ext/commons-io-2.2.jar" sourcepath="ext/src/commons-io-2.2.jar" />
 	<classpathentry kind="output" path="bin/classes" />
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER" />
 </classpath>
\ No newline at end of file
diff --git a/build.moxie b/build.moxie
new file mode 100644
index 00000000..9734473c
--- /dev/null
+++ b/build.moxie
@@ -0,0 +1,161 @@
+#
+# Gitblit project descriptor
+#
+
+# Specify minimum Moxie version required to build
+requires: 0.7.1
+
+# Project Metadata
+name: Gitblit
+description: pure Java Git solution
+groupId: com.gitblit
+artifactId: gitblit
+version: 1.3.0-SNAPSHOT
+inceptionYear: 2011
+
+# Current stable release
+releaseVersion: 1.2.1
+releaseDate: '2013-01-15'
+
+# Project urls
+url: 'http://gitblit.com'
+issuesUrl: 'http://code.google.com/p/gitblit/issues/list'
+socialNetworkUrl: 'https://plus.google.com/114464678392593421684'
+forumUrl: 'http://groups.google.com/group/gitblit'
+
+# Licenses section included for POM generation
+licenses:
+- {
+    name: Apache ASL v2.0
+    url: 'http://www.apache.org/licenses/LICENSE-2.0.html'
+  }
+
+# Developers section included for POM generation
+developers:
+- {
+  id: james
+  name: James Moger
+  url: 'https://plus.google.com/u/0/116428776452027956920'
+  organization: VAS
+  organizationUrl: 'http://www.vas.com'
+  roles: developer
+  }
+
+# SCM section included for POM generation
+scm: {
+  connection: 'scm:git:git://github.com/gitblit/gitblit.git'
+  developerConnection: 'scm:git:https://github.com/gitblit/gitblit.git'
+  url: 'https://github.com/gitblit/gitblit'
+  tag: HEAD
+  }
+
+# Mainclass is used for setting jar manifests and using the mx:run target
+mainclass: com.gitblit.GitBlitServer
+
+# Moxie supports multiple source directories and allows you to assign
+# a scope to each directory.
+sourceDirectories:
+- compile 'src/main/java'
+- test 'src/test/java'
+# Moxie supports one site-scoped directory for mx:doc
+- site 'src/site'
+
+resourceDirectories:
+- compile 'src/main/resources'
+- site 'src/site/resources'
+
+# compile for Java 6 class format
+tasks: {
+	'mx:javac' : {
+        source: 1.6
+        target: 1.6
+        compiler: javac1.6
+        encoding: UTF-8
+        # stop complaints about bootstrap classpath when compiling with Java 7
+        compilerArgs: '-Xlint:-options'
+    }
+}
+
+# Generate Eclipse project files.
+# Generate IntelliJ IDEA module files.
+# Generate a distribution Maven POM (not suitable for building with Maven).
+apply: eclipse, intellij, pom
+
+# Copy all retrieved dependencies to the "ext" directory.
+# Generated IDE settings (.classpath, etc) will use the artifacts
+# from this project-relative directory. This allows the IDE settings
+# to be version-controlled and shared.
+dependencyDirectory: ext
+
+# Register the Eclipse JGit Maven repositories
+registeredRepositories:
+- { id: jgit, url: 'http://download.eclipse.org/jgit/maven' }
+- { id: jgit-snapshots, url: 'https://repo.eclipse.org/content/groups/snapshots' }
+
+# Source all dependencies from the following repositories in the specified order
+repositories: central, jgit-snapshots, jgit
+
+# Convenience properties for dependencies
+properties: {
+  jetty.version  : 7.6.8.v20121106
+  wicket.version : 1.4.21
+  lucene.version : 3.6.1
+  jgit.version   : 2.3.1.201302201838-r
+  groovy.version : 1.8.8
+  bouncycastle.version : 1.47
+  selenium.version : 2.28.0
+  }
+
+# Dependencies
+#
+#   May be tagged with ":label" notation to group dependencies.
+#
+#   "@extension" fetches the artifact with the specified extension
+#   and ignores all transitive dependencies.
+#
+#   "!groupId" or "!groupId:artifactId" excludes all matching transitive
+#   dependencies in that dependency's dependency graph.
+#
+
+dependencies:
+# Standard dependencies
+- compile 'com.beust:jcommander:1.17' :fedclient :authority
+- compile 'log4j:log4j:1.2.17' :war :fedclient :authority
+- compile 'org.slf4j:slf4j-api:1.6.6' :war fedclient :authority
+- compile 'org.slf4j:slf4j-log4j12:1.6.6' :war :fedclient :authority
+- compile 'javax.mail:mail:1.4.3' :war :fedclient :authority
+- compile 'javax.servlet:javax.servlet-api:3.0.1' :fedclient
+- compile 'org.eclipse.jetty.aggregate:jetty-webapp:${jetty.version}' @jar
+- compile 'org.eclipse.jetty:jetty-ajp:${jetty.version}' @jar
+- compile 'org.apache.wicket:wicket:${wicket.version}' :war !org.mockito
+- compile 'org.apache.wicket:wicket-auth-roles:${wicket.version}' :war !org.mockito
+- compile 'org.apache.wicket:wicket-extensions:${wicket.version}' :war !org.mockito
+- compile 'org.wicketstuff:googlecharts:${wicket.version}' :war
+- compile 'org.apache.lucene:lucene-core:${lucene.version}' :war :fedclient
+- compile 'org.apache.lucene:lucene-highlighter:${lucene.version}' :war :fedclient
+- compile 'org.apache.lucene:lucene-memory:${lucene.version}' :war :fedclient
+- compile 'org.tautua.markdownpapers:markdownpapers-core:1.3.2' :war
+- compile 'org.eclipse.jgit:org.eclipse.jgit:${jgit.version}' :war :fedclient :manager :authority
+- compile 'org.eclipse.jgit:org.eclipse.jgit.http.server:${jgit.version}' :war :fedclient :manager :authority
+- compile 'org.bouncycastle:bcprov-jdk15on:${bouncycastle.version}' :war :authority
+- compile 'org.bouncycastle:bcmail-jdk15on:${bouncycastle.version}' :war :authority
+- compile 'org.bouncycastle:bcpkix-jdk15on:${bouncycastle.version}' :war :authority
+- compile 'rome:rome:0.9' :war :manager :api
+- compile 'com.google.code.gson:gson:1.7.2' :war :fedclient :manager :api
+- compile 'org.codehaus.groovy:groovy-all:${groovy.version}' :war
+- compile 'com.unboundid:unboundid-ldapsdk:2.3.0' :war
+- compile 'org.apache.ivy:ivy:2.2.0' :war
+- compile 'com.toedter:jcalendar:1.3.2' :authority
+- compile 'org.apache.commons:commons-compress:1.4.1' :war
+# Commons Daemon is for launching services
+- provided 'commons-daemon:commons-daemon:1.0.14'
+- provided 'commons-daemon:commons-daemon:1.0.14:bin-windows:zip'
+- test 'junit'
+# Dependencies for Selenium web page testing
+- test 'org.seleniumhq.selenium:selenium-java:${selenium.version}' @jar
+- test 'org.seleniumhq.selenium:selenium-support:${selenium.version}' @jar
+- test 'org.seleniumhq.selenium:selenium-firefox-driver:${selenium.version}'
+# Dependencies with the "build" scope are retrieved
+# and injected into the Ant runtime classpath
+- build 'jacoco'
+
diff --git a/build.xml b/build.xml
index ed91f296..2cb2777b 100644
--- a/build.xml
+++ b/build.xml
@@ -1,117 +1,64 @@
 <?xml version="1.0" encoding="UTF-8"?>

-<project name="gitblit" default="compile" basedir=".">

-

-	<!-- Google Code upload task -->

-	<taskdef classname="net.bluecow.googlecode.ant.GoogleCodeUploadTask" 

-		classpath="${basedir}/tools/ant-googlecode-0.0.3.jar" name="gcupload"/>

-

-	<!-- GenJar task -->

-	<taskdef resource="genjar.properties" classpath="${basedir}/tools/GenJar.jar" />

-

-	<!-- Project Properties -->

-	<property name="project.jar" value="gitblit.jar" />

-	<property name="project.mainclass" value="com.gitblit.Launcher" />

-	<property name="project.build.dir" value="${basedir}/build" />

-	<property name="project.deploy.dir" value="${basedir}/deploy" />	

-	<property name="project.war.dir" value="${basedir}/war" />

-	<property name="project.jar.dir" value="${basedir}/jar" />

-	<property name="project.site.dir" value="${basedir}/target/site" />

-	<property name="project.target.dir" value="${basedir}/target" />

-	<property name="project.resources.dir" value="${basedir}/resources" />	

-	<property name="project.express.dir" value="${basedir}/express" />

-	<property name="project.maven.repo.url" value="enter here your Maven repo URL" />

-	<property name="project.maven.repo.id" value="gitblit.maven.repo" />

-	<available property="hasBuildProps" file="${basedir}/build.properties"/>

+<project name="gitblit" default="compile" xmlns:mx="antlib:org.moxie">

 

 	<!--

 		~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

-		Load build.properties, if available

+		Retrieve Moxie Toolkit

 		~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

 	-->

-	<target name="buildprops" if="hasBuildProps">

-		<!-- Load publication servers, paths, and credentials --> 

-		<loadproperties>

-			<file file="${basedir}/build.properties" />

-		</loadproperties>

-	</target>

+	<property name="moxie.version" value="0.7.1" />

+	<property name="moxie.url" value="http://gitblit.github.com/moxie/maven" />

+	<property name="moxie.jar" value="moxie-toolkit-${moxie.version}.jar" />

+	<property name="moxie.dir" value="${user.home}/.moxie" />

+	

+	<!-- Download Moxie from it's Maven repository to user.home -->

+	<get src="${moxie.url}/org/moxie/moxie-toolkit/${moxie.version}/${moxie.jar}"

+		dest="${moxie.dir}" skipexisting="true" verbose="true" />

 	

+	<!-- Register Moxie tasks -->

+	<taskdef uri="antlib:org.moxie">

+		<classpath location="${moxie.dir}/${moxie.jar}" />

+	</taskdef>

+	

+	<!-- Project directories -->

+	<property name="project.src.dir" value="${basedir}/src/main/java" />	

+	<property name="project.resources.dir" value="${basedir}/src/main/resources" />	

+	<property name="project.distrib.dir" value="${basedir}/src/main/distrib" />

 	

 	<!--

 		~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

-		Scrape the version info from code and setup the build properties 

+		Initialize Moxie and setup build properties

 		~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

 	-->

-	<target name="buildinfo" depends="buildprops">

+	<target name="prepare">

 	

-		<!-- extract Gitblit version number from source code -->

-		<loadfile property="gb.version" srcfile="${basedir}/src/com/gitblit/Constants.java">

-			<filterchain>

-				<linecontains>

-					<contains value="public static final String VERSION = " />

-				</linecontains>

-				<striplinebreaks />

-				<tokenfilter>

-					<replacestring from="public static final String VERSION = &quot;" to="" />

-					<replacestring from="&quot;;" to="" />

-					<trim />

-				</tokenfilter>

-			</filterchain>

-		</loadfile>

-

-		<!-- extract Gitblit version date from source code -->

-		<loadfile property="gb.versionDate" srcfile="${basedir}/src/com/gitblit/Constants.java">

-			<filterchain>

-				<linecontains>

-					<contains value="public static final String VERSION_DATE = " />

-				</linecontains>

-				<striplinebreaks />

-				<tokenfilter>

-					<replacestring from="public static final String VERSION_DATE = &quot;" to="" />

-					<replacestring from="&quot;;" to="" />

-					<trim />

-				</tokenfilter>

-			</filterchain>

-		</loadfile>

-					

-		<!-- extract JGit version number from source code -->

-		<loadfile property="jgit.version" srcfile="${basedir}/src/com/gitblit/Constants.java">

-			<filterchain>

-				<linecontains>

-					<contains value="public static final String JGIT_VERSION = " />

-				</linecontains>

-				<striplinebreaks />

-				<tokenfilter>

-					<replacestring from="public static final String JGIT_VERSION = &quot;" to="" />

-					<replacestring from="&quot;;" to="" />

-					<trim />

-				</tokenfilter>

-			</filterchain>

-		</loadfile>	

-		<property name="distribution.zipfile" value="gitblit-${gb.version}.zip" />

-		<property name="distribution.warfile" value="gitblit-${gb.version}.war" />

-		<property name="distribution.jarfile" value="gitblit-${gb.version}.jar" />

-		<property name="distribution.pomfile" value="${basedir}/pom.xml" />

-		<property name="fedclient.zipfile" value="fedclient-${gb.version}.zip" />

-		<property name="manager.zipfile" value="manager-${gb.version}.zip" />

-		<property name="authority.zipfile" value="authority-${gb.version}.zip" />

-		<property name="gbapi.zipfile" value="gbapi-${gb.version}.zip" />

-		<property name="express.zipfile" value="express-${gb.version}.zip" />

-		<property name="distribution.pomfileTmplt" value="tmplt.pom.xml" />

+		<!-- Setup Ant build from build.moxie and resolve dependencies.

+		     if it exists, build.properties is automatically loaded -->

+		<mx:init verbose="no" />

+				

+		<!-- Set Ant project properties -->

+		<property name="distribution.zipfile" value="gitblit-${project.version}.zip" />

+		<property name="distribution.tgzfile" value="gitblit-${project.version}.tar.gz" />

+		<property name="distribution.warfile" value="gitblit-${project.version}.war" />

+		<property name="fedclient.zipfile" value="fedclient-${project.version}.zip" />

+		<property name="manager.zipfile" value="manager-${project.version}.zip" />

+		<property name="authority.zipfile" value="authority-${project.version}.zip" />

+		<property name="gbapi.zipfile" value="gbapi-${project.version}.zip" />

+		<property name="express.zipfile" value="express-${project.version}.zip" />

+		

+		<!-- Download links -->

+		<property name="gc.url" value="http://code.google.com/p/gitblit/downloads/detail?name=" />

 	</target>

-	

+

 	

 	<!--

 		~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

-		Compile

+		Cleanup all build artifacts and directories

 		~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

 	-->

-	<target name="compile" depends="buildinfo" description="Retrieves dependencies and compiles Gitblit from source">

-

-		<!-- cleanup old builds -->

-		<delete dir="${project.target.dir}" />

-		<mkdir dir="${project.target.dir}" />

-		

-		<!-- cleanup old builds -->

+	<target name="clean" depends="prepare" description="Cleanup all build artifacts and directories">

+		<!-- cleanup legacy build structure -->

+		<!-- this can be eliminated after 1.3.0 release -->

 		<delete>

 			<fileset dir="${basedir}">

 				<include name="*.zip" />

@@ -119,33 +66,42 @@
 				<include name="*.jar" />

 			</fileset>

 		</delete>

+		<delete dir="${basedir}/deploy" failonerror="false" />

+		<delete dir="${basedir}/express" failonerror="false" />

+		<delete dir="${basedir}/jar" failonerror="false" />

+		<delete dir="${basedir}/javadoc" failonerror="false" />

+		<delete dir="${basedir}/site" failonerror="false" />

+		<delete dir="${basedir}/temp" failonerror="false" />

+		<delete dir="${basedir}/war" failonerror="false" />

 		

-		<!-- copy required distribution files to data folder -->

+		<!-- Clean build and target directories -->

+		<mx:clean />

+

+	</target>

+

+	

+	<!--

+		~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

+		Setup

+		~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

+	-->

+	<target name="setup" depends="prepare" description="Setup up project">

+

+		<!-- copy distrib/data to project data directory -->

 		<mkdir dir="${basedir}/data" />

 		<copy todir="${basedir}/data" overwrite="false">

-			<fileset dir="${basedir}/distrib">

-				<include name="gitblit.properties" />

-				<include name="users.conf" />

-				<include name="projects.conf" />

-			</fileset>

+			<fileset dir="${project.distrib.dir}/data" />

 		</copy>

 		

-		<!-- copy required distribution files to project folder -->

-		<mkdir dir="${basedir}/data/certs" />

-		<copy todir="${basedir}/data/certs" overwrite="false">

-			<fileset dir="${basedir}/distrib">

-				<include name="authority.conf" />

-				<include name="*.tmpl" />

-			</fileset>

-		</copy>

-		

-		<!-- copy required distribution files to project folder -->

-		<mkdir dir="${basedir}/data/groovy" />

-		<copy todir="${basedir}/data/groovy" overwrite="false">

-			<fileset dir="${basedir}/distrib/groovy" />

-		</copy>

+		<!-- copy gitblit.properties to the WEB-INF directory.

+		     this file is only used for parsing setting descriptions. -->

+		<copy tofile="${project.src.dir}/WEB-INF/reference.properties" overwrite="true"

+			file="${project.distrib.dir}/data/gitblit.properties" />

 		

-		<!-- upgrade existing workspace to data folder -->

+		<!-- 

+			upgrade existing workspace to data directory

+			this code can be eliminated after 1.3.0 release

+		 -->

 		<move todir="${basedir}/data" overwrite="true" failonerror="false">

 			<fileset dir="${basedir}">

 				<include name="users.conf" />

@@ -164,467 +120,173 @@
 		<move todir="${basedir}/data/proposals" overwrite="true" failonerror="false">

 			<fileset dir="${basedir}/proposals" />

 		</move>

-		<delete dir="${basedir}/javadoc" failonerror="false" />

-		<delete dir="${basedir}/site" failonerror="false" />

-		<delete dir="${basedir}/temp" failonerror="false" />

-

-		<!-- copy gitblit.properties to the WEB-INF folder.

-		     this file is only used for parsing setting descriptions. -->

-		<copy tofile="${basedir}/src/WEB-INF/reference.properties" overwrite="true"

-			file="${basedir}/distrib/gitblit.properties" />

-

-		<!-- Compile the build tool and execute it.

-			 This downloads missing compile-time dependencies from Maven. -->

-

-		<delete dir="${project.build.dir}" />

-		<mkdir dir="${project.build.dir}" />

-		<javac debug="true" srcdir="${basedir}/src" destdir="${project.build.dir}" includeantruntime="false">

-			<include name="com/gitblit/build/Build.java" />			

-			<include name="com/gitblit/Constants.java" />

-			<include name="com/gitblit/utils/StringUtils.java" />			

-		</javac>

-

-		<java classpath="${project.build.dir}" classname="com.gitblit.build.Build" failonerror="true">

-			<syspropertyset id="proxy.properties">

-				<propertyref prefix="java.net.useSystemProxies"/>

-				<propertyref prefix="http."/>

-				<propertyref prefix="https."/>

-				<propertyref prefix="ftp."/>

-				<propertyref prefix="socksProxy"/>

-			</syspropertyset>

-		</java>

-

-		<!-- Compile Project -->

-		<path id="master-classpath">

-			<fileset dir="${basedir}/ext">

-				<include name="*.jar" />

-			</fileset>

-			<pathelement path="${project.build.dir}" />				

-		</path>

-		<javac debug="true" destdir="${project.build.dir}" failonerror="false" includeantruntime="false">

-			<src path="${basedir}/src" />

-			<classpath refid="master-classpath" />

-		</javac>

-		<copy todir="${project.build.dir}">

-			<fileset dir="${basedir}/src" excludes="**/*.java,**/thumbs.db" />

-		</copy>

-		

-		<!-- Set Version into web.xml -->

-		<replace file="${project.build.dir}/WEB-INF/web.xml" token="@gb.version@" value="${gb.version}" summary="yes"/>

 	</target>

 

-	

+

 	<!--

 		~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

-		Build Gitblit GO

+		Compile

 		~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

 	-->

-	<target name="buildGO" depends="compile,buildAuthority" description="Build Gitblit GO distribution">

-		

-		<echo>Building Gitblit GO ${gb.version}</echo>

-

-		<!-- Delete the deploy folder -->

-		<delete dir="${project.deploy.dir}" />

-

-		<!-- Create deployment folder structure -->

-		<mkdir dir="${project.deploy.dir}" />

-		<copy todir="${project.deploy.dir}">

-			<fileset dir="${basedir}/distrib">

-				<include name="**/*" />

-				<exclude name="federation.properties" />

-				<exclude name="openshift.mkd" />

-				<exclude name="authority.conf" />

-				<exclude name="users.conf" />

-				<exclude name="projects.conf" />

-				<exclude name="gitblit.properties" />

-				<exclude name="*.tmpl" />

-				<exclude name="groovy/**" />

-			</fileset>

-			<fileset dir="${basedir}">

-				<include name="LICENSE" />

-				<include name="NOTICE" />

-			</fileset>			

-		</copy>

+	<target name="compile" depends="setup" description="compiles Gitblit from source">

 		

-		<!-- Copy the supported Groovy hook scripts -->

-		<mkdir dir="${project.deploy.dir}/data/groovy" />

-		<copy todir="${project.deploy.dir}/data/groovy">

-			<fileset dir="${basedir}/distrib/groovy">

-				<include name="sendmail.groovy" />

-				<include name="sendmail-html.groovy" />

-				<include name="jenkins.groovy" />

-				<include name="protect-refs.groovy" />

-				<include name="fogbugz.groovy" />

-				<include name="thebuggenie.groovy" />

-			</fileset>

-		</copy>

-		

-		<copy tofile="${project.deploy.dir}/authority.jar" file="${project.target.dir}/authority-${gb.version}.jar" />

-		

-		<!-- Prepare the data folder -->

-		<mkdir dir="${project.deploy.dir}/data"/>

-		<copy todir="${project.deploy.dir}/data">

-			<fileset dir="${basedir}/distrib">

-				<include name="users.conf" />

-				<include name="projects.conf" />

-				<include name="gitblit.properties" />

-			</fileset>

-		</copy>

-						

-		<!-- Certificate templates -->

-		<mkdir dir="${project.deploy.dir}/data/certs"/>

-		<mkdir dir="${project.deploy.dir}/data/certs"/>

-		<copy todir="${project.deploy.dir}/data/certs">

-			<fileset dir="${basedir}/distrib">

-				<include name="*.tmpl" />

-				<include name="authority.conf" />

-			</fileset>

-		</copy>

-		

-		<!-- Set Version into web.xml -->

-		<replace file="${project.build.dir}/WEB-INF/web.xml" token="@gb.version@" value="${gb.version}" summary="yes"/>

-						

-		<!-- Build jar -->

-		<jar jarfile="${project.deploy.dir}/${project.jar}">

-			<fileset dir="${project.build.dir}">

-				<include name="**/*" />

-				<exclude name="com/gitblit/client/**" />				

-			</fileset>

-			<fileset dir="${project.resources.dir}">

-				<exclude name="thumbs.db" />

-			</fileset>

-			<manifest>

-				<attribute name="Main-Class" value="${project.mainclass}" />

-			</manifest>

-		</jar>

+		<!-- Generate the Keys class from the properties file -->

+		<mx:keys propertiesfile="${project.distrib.dir}/data/gitblit.properties"

+			 	outputclass="com.gitblit.Keys"

+			 	todir="${project.src.dir}" />

 

-		<!-- Gitblit library dependencies -->

-		<mkdir dir="${project.deploy.dir}/ext"/>

-		<copy todir="${project.deploy.dir}/ext">

-			<fileset dir="${basedir}/ext">

-				<exclude name="src/**" />

-				<exclude name="junit*.jar" />

-				<exclude name="hamcrest*.jar" />

-				<exclude name="commons-net*.jar" />

-			</fileset>

-		</copy>

-		

-		<!-- Build the docs for the deploy -->

-		<antcall target="buildDocs" inheritall="true" inheritrefs="true">

-			<param name="docs.output.dir" value="${project.deploy.dir}/docs" />

-		</antcall>

+		<!-- Compile project incrementally -->

+		<mx:javac scope="compile" clean="false" />

 		

-		<!-- Create Zip deployment -->		

-		<zip destfile="${project.target.dir}/${distribution.zipfile}">

-			<fileset dir="${project.deploy.dir}">

-				<include name="**/*" />

-			</fileset>

-		</zip>

-

 	</target>

-	

-	

+

+		

 	<!--

 		~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

-		Build Gitblit Docs which are bundled with GO and WAR downloads

+		Report the compile dependencies on the console

 		~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

 	-->

-	<target name="buildDocs">

-	<!-- Build Docs -->

-			<mkdir dir="${docs.output.dir}" />

-			<copy todir="${docs.output.dir}">

-				<!-- Copy selected Gitblit resources -->

-				<fileset dir="${project.resources.dir}">

-					<include name="bootstrap/**/*" />

-					<include name="gitblit.css" />

-					<include name="gitblt_25_white.png" />

-					<include name="gitblt-favicon.png" />

-					<include name="lock_go_16x16.png" />

-					<include name="lock_pull_16x16.png" />

-					<include name="shield_16x16.png" />

-					<include name="cold_16x16.png" />

-					<include name="bug_16x16.png" />

-					<include name="book_16x16.png" />

-					<include name="blank.png" />

-					<include name="federated_16x16.png" />

-					<include name="arrow_page.png" />

-				</fileset>

-

-				<!-- Copy Doc images -->

-				<fileset dir="${basedir}/docs">

-					<include name="*.png" />

-					<include name="*.gif" />

-				</fileset>

-			</copy>

-

-			<!-- Copy google-code-prettify -->

-			<mkdir dir="${docs.output.dir}/prettify" />

-			<copy todir="${docs.output.dir}/prettify">

-				<fileset dir="${basedir}/src/com/gitblit/wicket/pages/prettify">

-					<exclude name="thumbs.db" />

-				</fileset>

-			</copy>

-

-			<!-- Build deployment doc pages -->

-			<java classpath="${project.build.dir}" classname="com.gitblit.build.BuildSite">

-				<classpath refid="master-classpath" />

-				<arg value="--sourceFolder" />

-				<arg value="${basedir}/docs" />

-

-				<arg value="--outputFolder" />

-				<arg value="${docs.output.dir}" />

-

-				<arg value="--pageHeader" />

-				<arg value="${basedir}/docs/doc_header.html" />

-

-				<arg value="--pageFooter" />

-				<arg value="${basedir}/docs/doc_footer.html" />

-

-				<arg value="--skip" />

-				<arg value="screenshots" />

-

-				<arg value="--skip" />

-				<arg value="releases" />

-

-				<arg value="--alias" />

-				<arg value="index=overview" />

-

-				<arg value="--alias" />

-				<arg value="properties=settings" />

-

-				<arg value="--substitute" />

-				<arg value="%VERSION%=${gb.version}" />

-

-				<arg value="--substitute" />

-				<arg value="%GO%=${distribution.zipfile}" />

-

-				<arg value="--substitute" />

-				<arg value="%WAR%=${distribution.warfile}" />

-

-				<arg value="--substitute" />

-				<arg value="%FEDCLIENT%=${fedclient.zipfile}" />

-

-				<arg value="--substitute" />

-				<arg value="%MANAGER%=${manager.zipfile}" />

-

-				<arg value="--substitute" />

-				<arg value="%API%=${gbapi.zipfile}" />

-

-				<arg value="--substitute" />

-				<arg value="%EXPRESS%=${express.zipfile}" />

-

-				<arg value="--substitute" />

-				<arg value="%BUILDDATE%=${gb.versionDate}" />

-

-				<arg value="--substitute" />

-				<arg value="%JGIT%=${jgit.version}" />

-

-				<arg value="--properties" />

-				<arg value="%PROPERTIES%=${basedir}/distrib/gitblit.properties" />

-

-				<arg value="--nomarkdown" />

-				<arg value="%BEGINCODE%:%ENDCODE%" />

-

-				<arg value="--substitute" />

-				<arg value="&quot;%BEGINCODE%=&lt;pre class='prettyprint lang-java'&gt;&quot;" />

-

-				<arg value="--substitute" />

-				<arg value="%ENDCODE%=&lt;/pre&gt;" />

-				

-				<arg value="--regex" />

-				<arg value="&quot;\b(issue)(\s*[#]?|-){0,1}(\d+)\b!!!&lt;a href='http://code.google.com/p/gitblit/issues/detail?id=$3'&gt;issue $3&lt;/a&gt;&quot;" />

+	<target name="report" depends="prepare" description="generate dependency report">

+		

+		<!-- Report compile dependencies to the console -->

+		<mx:report scope="compile" destfile="${project.targetDirectory}/dependencies.txt" />

 		

-			</java>

 	</target>

+

 	

-				

 	<!--

 		~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

-		Build Gitblit WAR

+		Test

 		~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

 	-->

-	<target name="buildWAR" depends="compile" description="Build Gitblit WAR">

+	<target name="test" depends="compile" description="compiles Gitblit from source and runs unit tests">

 		

-		<echo>Building Gitblit WAR ${gb.version}</echo>

+		<!-- Compile unit tests -->

+		<mx:javac scope="test" />

 		

-		<delete dir="${project.war.dir}" />

-

-		<!-- Copy web.xml and users.conf to WEB-INF -->

-		<copy todir="${project.war.dir}/WEB-INF">

-			<fileset dir="${basedir}/src/WEB-INF">

-			 	<include name="web.xml" />

-			</fileset>

-			<fileset dir="${basedir}">

-				<include name="LICENSE" />

-				<include name="NOTICE" />

-			</fileset>

-		</copy>

+		<!-- Run unit tests -->

+		<mx:test failonerror="true" />

 		

-		<!-- Set Version into web.xml -->

-		<replace file="${project.war.dir}/WEB-INF/web.xml" token="@gb.version@" value="${gb.version}" summary="yes"/>

-		

-		<!-- Copy gitblit.properties as reference.properties -->

-		<copy tofile="${project.war.dir}/WEB-INF/reference.properties" 

-			file="${basedir}/distrib/gitblit.properties"/>

-		

-		<!-- Build the docs for the WAR build -->

-		<antcall target="buildDocs" inheritall="true" inheritrefs="true">

-			<param name="docs.output.dir" value="${project.war.dir}/WEB-INF/docs" />

-		</antcall>

-

-		<!-- Copy users.conf to WEB-INF/data -->

-		<mkdir dir="${project.war.dir}/WEB-INF/data" />

-		<copy todir="${project.war.dir}/WEB-INF/data">

-			<fileset dir="${basedir}/distrib">

-			 	<include name="users.conf" />

-				<include name="projects.conf" />

-			 	<include name="gitblit.properties" />

-			</fileset>

-		</copy>

+	</target>

 

-		<!-- Copy the supported Groovy hook scripts -->

-		<mkdir dir="${project.war.dir}/WEB-INF/data/groovy" />

-		<copy todir="${project.war.dir}/WEB-INF/data/groovy">

-			<fileset dir="${basedir}/distrib/groovy">

-				<include name="sendmail.groovy" />

-				<include name="sendmail-html.groovy" />

-				<include name="jenkins.groovy" />

-				<include name="protect-refs.groovy" />

-				<include name="fogbugz.groovy" />

-				<include name="thebuggenie.groovy" />

-			</fileset>

-		</copy>

 

-		<!-- Build the WAR web.xml from the prototype web.xml --> 

-		<java classpath="${project.build.dir}" classname="com.gitblit.build.BuildWebXml">

-			<classpath refid="master-classpath" />

-			

-			<arg value="--sourceFile" />

-			<arg value="${basedir}/src/WEB-INF/web.xml" />

-					

-			<arg value="--destinationFile" />

-			<arg value="${project.war.dir}/WEB-INF/web.xml" />

+	<!--

+		~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

+		Run Gitblit GO

+		~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

+	-->

+	<target name="run" depends="compile" description="Run Gitblit GO">

+		

+		<!-- run the mainclass in a separate JVM -->

+		<mx:run fork="true" />

+		

+	</target>			

 			

-		</java>

+	

+	<!--

+		~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

+		Build Gitblit GO

+		~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

+	-->

+	<target name="buildGO" depends="compile" description="Build Gitblit GO distribution">

 		

-		<!-- Set Version into web.xml -->

-		<replace file="${project.war.dir}/WEB-INF/web.xml" token="@gb.version@" value="${gb.version}" summary="yes"/>

+		<echo>Building Gitblit GO ${project.version}</echo>

 

-		<!-- Gitblit resources -->

-		<copy todir="${project.war.dir}">

-			<fileset dir="${project.resources.dir}">

-				<exclude name="thumbs.db" />

-			</fileset>

-		</copy>

+		<local name="go.dir" />

+		<property name="go.dir" value="${project.outputDirectory}/go" />	

+		<delete dir="${go.dir}" />

+

+		<prepareDataDirectory toDir="${go.dir}/data" />

 		

-		<!-- Gitblit library dependencies -->

-		<mkdir dir="${project.war.dir}/WEB-INF/lib"/>

-		<copy todir="${project.war.dir}/WEB-INF/lib">

-			<fileset dir="${basedir}/ext">

-				<exclude name="src/**" />

-				<exclude name="jcommander*.jar" />

-				<exclude name="jetty*.jar" />

-				<exclude name="junit*.jar" />

-				<exclude name="hamcrest*.jar" />

-				<exclude name="servlet*.jar" />

-				<exclude name="javax.servlet*.jar" />

+		<!-- Build jar -->

+		<mx:jar destfile="${go.dir}/gitblit.jar" includeresources="true">

+			<mainclass name="com.gitblit.GitBlitServer" />

+			<launcher paths="ext" />

+		</mx:jar>

+

+		<!-- Generate the docs for the GO build -->

+		<generateDocs toDir="${go.dir}/docs" />

+		

+		<!-- Create GO Windows Zip deployment -->

+		<mx:zip basedir="${go.dir}">

+			<!-- LICENSE and NOTICE -->

+			<fileset dir="${basedir}" >

+				<include name="LICENSE" />

+				<include name="NOTICE" />

 			</fileset>

-		</copy>

+			<!-- Distrib files -->

+			<zipfileset dir="${project.distrib.dir}/win" />

+			<!-- include all dependencies -->

+			<dependencies prefix="ext" />

+		</mx:zip>

 

-		<!-- Gitblit classes -->

-		<mkdir dir="${project.war.dir}/WEB-INF/classes"/>

-		<copy todir="${project.war.dir}/WEB-INF/classes">

-			<fileset dir="${project.build.dir}">

-				<exclude name="WEB-INF/" />

-				<exclude name="com/gitblit/tests/" />

-				<exclude name="com/gitblit/build/**" />

-				<exclude name="com/gitblit/client/**" />

-				<exclude name="com/gitblit/AddIndexedBranch*.class" />

-				<exclude name="com/gitblit/GitBlitServer*.class" />

-				<exclude name="com/gitblit/Launcher*.class" />

-				<exclude name="com/gitblit/authority/**" />

+		<!-- Create GO Linux/OSX tar.gz deployment -->

+		<mx:tar basedir="${go.dir}" longfile="gnu" compression="gzip">

+			<!-- LICENSE and NOTICE -->

+			<fileset dir="${basedir}" >

+				<include name="LICENSE" />

+				<include name="NOTICE" />

 			</fileset>

-		</copy>

+			<!-- Distrib files -->

+			<tarfileset dir="${project.distrib.dir}/linux" filemode="755" />

+			<!-- include all dependencies -->

+			<dependencies prefix="ext" />

+		</mx:tar>		

 

-		<!-- Build the WAR file -->

-		<jar basedir="${project.war.dir}" destfile="${project.target.dir}/${distribution.warfile}" compress="true" />

 	</target>

-

+	

 	

 	<!--

 		~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

-		Build Gitblit JAR for usage in other projects plug-ins (i.e. Gerrit)

+		Build Gitblit WAR

 		~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

 	-->

-	<target name="buildJAR" depends="compile" description="Build Gitblit JAR">

+	<target name="buildWAR" depends="compile" description="Build Gitblit WAR">

+		

+		<echo>Building Gitblit WAR ${project.version}</echo>

 

-		<echo>Building Gitblit JAR ${gb.version}</echo>

+		<local name="war.dir" />

+		<property name="war.dir" value="${project.outputDirectory}/war" />

+		<delete dir="${war.dir}" />

+		

+		<local name="webinf" />

+		<property name="webinf" value="${war.dir}/WEB-INF" />

 

-		<delete dir="${project.jar.dir}" />

+		<!-- Generate the docs for the WAR build -->

+		<generateDocs toDir="${webinf}/docs" />

 

-		<!-- Gitblit classes -->

-		<mkdir dir="${project.jar.dir}"/>

-		<copy todir="${project.jar.dir}">

-			<fileset dir="${project.build.dir}">

-				<exclude name="WEB-INF/" />

-				<exclude name="com/gitblit/tests/" />

-				<exclude name="com/gitblit/build/**" />

-				<exclude name="com/gitblit/client/**" />

-				<exclude name="com/gitblit/authority/**" />

-				<exclude name="com/gitblit/AddIndexedBranch*.class" />

-				<exclude name="com/gitblit/GitBlitServer*.class" />

-				<exclude name="com/gitblit/Launcher*.class" />

-			</fileset>

-		</copy>

-		<copy todir="${project.jar.dir}/static">

+		<!-- Prepare the data directory -->

+		<prepareDataDirectory toDir="${webinf}/data" />

+

+		<!-- Build the WAR web.xml from the prototype web.xml -->

+		<mx:webxml sourcefile="${project.src.dir}/WEB-INF/web.xml" destfile="${webinf}/web.xml" />

+

+		<!-- Build the WAR file -->

+		<mx:zip basedir="${war.dir}" destfile="${project.targetDirectory}/${distribution.warfile}" compress="true" >

+			<!-- Resources in root -->

 			<fileset dir="${project.resources.dir}">

 				<exclude name="thumbs.db" />

+				<exclude name="*.mkd" />

 			</fileset>

-		</copy>

-

-		<!-- Build the JAR file -->

-		<jar basedir="${project.jar.dir}" destfile="${distribution.jarfile}" compress="true" />

-	</target>

-

-	<!--

-		~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

-		Build pom.xml for GitBlit JAR Maven module

-		~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

-	-->

-	<target name="buildMaven" depends="buildJAR" description="Build pom.xml for Gitblit JAR Maven module">

-		<copy tofile="${distribution.pomfile}" file="${distribution.pomfileTmplt}"/>

-		<replace file="${distribution.pomfile}" token="@gb.version@" value="${gb.version}" />

+			<!-- WEB-INF directory -->

+			<zipfileset fullpath="WEB-INF/reference.properties" 

+				file="${project.distrib.dir}/data/gitblit.properties" />

+			<zipfileset prefix="WEB-INF" dir="${basedir}" >

+				<include name="LICENSE" />

+				<include name="NOTICE" />

+			</zipfileset>

+			<!-- Classes and classpath resources -->

+			<zipfileset prefix="WEB-INF/classes" dir="${project.compileOutputDirectory}">

+				<include name="**/*.class" />

+				<include name="**/*.properties" />

+				<include name="**/*.mkd" />

+				<exclude name="WEB-INF" />

+			</zipfileset>

+			<!-- include "war" tagged dependencies -->

+			<dependencies prefix="WEB-INF/lib" tag="war" />

+		</mx:zip>

 	</target>

 

-	<!--

-		~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

-		Install Gitblit JAR for usage as Maven module

-		~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

-	-->

-	<target name="installMaven" depends="buildMaven" description="Install Gitblit JAR as Maven module">

-		<exec executable="mvn">

-			<arg value="install:install-file" />

-			<arg value="-Dfile=${distribution.jarfile}" />

-			<arg value="-DpomFile=${distribution.pomfile}" />

-			<arg value="-DcreateChecksum=true" />

-		</exec>

-	</target>

-

-	<!--

-    	~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

-    	Upload Gitblit JAR to remote Maven repository

-    	~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

-    -->

-	<target name="uploadMaven" depends="buildJAR" description="Upload Gitblit JAR to remote Maven repository">

-		<exec executable="mvn">

-			<arg value="deploy:deploy-file" />

-			<arg value="-Dfile=${distribution.jarfile}" />

-			<arg value="-DpomFile=${distribution.pomfile}" />

-			<arg value="-Durl=${project.maven.repo.url}" />

-			<arg value="-DrepositoryId=${project.maven.repo.id}" />

-			<arg value="-DcreateChecksum=true" />

-		</exec>

-	</target>

 

 	<!-- 

 		~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

@@ -632,145 +294,72 @@
 		~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

 	-->

 	<target name="buildFederationClient" depends="compile" description="Builds the stand-alone Gitblit federation client">

-		<echo>Building Gitblit Federation Client ${gb.version}</echo>

+		<echo>Building Gitblit Federation Client ${project.version}</echo>

 	

-		<genjar jarfile="${project.target.dir}/fedclient.jar">

-			<class name="com.gitblit.FederationClientLauncher" />

-			<resource file="${project.build.dir}/log4j.properties" />

-			<classfilter>

-				<exclude name="org.apache." />

-				<exclude name="org.bouncycastle." />

-				<exclude name="org.eclipse." />

-				<exclude name="org.slf4j." />

-				<exclude name="com.beust." />

-				<exclude name="com.google." />

-				<exclude name="com.unboundid." />

-			</classfilter>

-			<classpath refid="master-classpath" />

-			<manifest>

-				<attribute name="Main-Class" value="com.gitblit.FederationClientLauncher" />

-				<attribute name="Specification-Version" value="${gb.version}" />

-				<attribute name="Release-Date" value="${gb.versionDate}" />

-			</manifest>

-		</genjar>

+		<!-- generate jar by traversing the class hierarchy of the specified

+			 classes, exclude any classes in classpath jars -->

+		<mx:genjar tag="" excludeClasspathJars="true"

+			destfile="${project.targetDirectory}/fedclient.jar">

+			<mainclass name="com.gitblit.FederationClient" />

+			<launcher paths="ext" />

+			<resource file="${project.compileOutputDirectory}/log4j.properties" />

+		</mx:genjar>

 		

 		<!-- Build the federation client zip file -->

-		<zip destfile="${project.target.dir}/${fedclient.zipfile}">

+		<mx:zip destfile="${project.targetDirectory}/${fedclient.zipfile}">

 			<fileset dir="${basedir}">

 				<include name="LICENSE" />

 				<include name="NOTICE" />

 			</fileset>

-			<fileset dir="${project.target.dir}">

+			<fileset dir="${project.targetDirectory}">

 				<include name="fedclient.jar" />

 			</fileset>

-			<fileset dir="${basedir}/distrib">

+			<fileset dir="${project.distrib.dir}">

 				<include name="federation.properties" />

 			</fileset>

-		</zip>

+			<!-- include "fedclient" tagged dependencies -->

+			<dependencies prefix="ext" tag="fedclient" />

+		</mx:zip>

 		

 		<!-- Cleanup -->

-		<delete file="${project.target.dir}/fedclient.jar" />

+		<delete file="${project.targetDirectory}/fedclient.jar" />

+		

 	</target>

 

 

 	<!-- 

 		~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

-		Build a Gitblit filesystem for deployment to RedHat OpenShif Expresst

+		Build a Gitblit filesystem for deployment to RedHat OpenShift Express

 		~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

 	-->

 	<target name="buildExpress" depends="compile" description="Build exploded WAR file suitable for deployment to OpenShift Express">

-		<echo>Building Gitblit Express for RedHat OpenShift ${gb.version}</echo>

+		<echo>Building Gitblit Express for RedHat OpenShift ${project.version}</echo>

 		

-		<delete dir="${project.express.dir}" />

+		<local name="express.dir" />

+		<property name="express.dir" value="${project.outputDirectory}/express" />		

+		<delete dir="${express.dir}" />

 		

 		<!-- Create the OpenShift filesystem -->

-		<property name="deployments.root" value="${project.express.dir}/deployments/ROOT.war"/>

+		<local name="deployments.root" />

+		<property name="deployments.root" value="${express.dir}/deployments/ROOT.war"/>

 		<mkdir dir="${deployments.root}" />

-		<touch file="${project.express.dir}/deployments/ROOT.war.dodeploy" />

+		<touch file="${express.dir}/deployments/ROOT.war.dodeploy" />

 

-		<!-- Copy the Gitblit OpenShift readme file -->

-		<copy tofile="${project.express.dir}/README.gitblit" 

-			file="${basedir}/distrib/openshift.mkd"/>

-

-		<!-- Copy LICENSE and NOTICE to WEB-INF -->

-		<copy todir="${deployments.root}/WEB-INF">

-			<fileset dir="${basedir}">

-				<include name="LICENSE" />

-				<include name="NOTICE" />

-			</fileset>

-		</copy>

+		<local name="webinf" />

+		<property name="webinf" value="${deployments.root}/WEB-INF" />

 

-		<!-- Copy gitblit.properties as reference.properties -->

-		<copy tofile="${deployments.root}/WEB-INF/reference.properties" 

-			file="${basedir}/distrib/gitblit.properties"/>

-

-		<!-- Copy users.conf and gitblit.properties -->

-		<mkdir dir="${deployments.root}/WEB-INF/data" />

-		<copy todir="${deployments.root}/WEB-INF/data">

-			<fileset dir="${basedir}/distrib">

-				<include name="users.conf" />

-				<include name="projects.conf" />

-				<include name="gitblit.properties" />

-			</fileset>

-		</copy>

+		<!-- Prepare the data directory -->

+		<prepareDataDirectory toDir="${webinf}/data" />

 					

-		<!-- Copy the supported Groovy hook scripts -->

-		<mkdir dir="${deployments.root}/WEB-INF/data/groovy" />

-		<copy todir="${deployments.root}/WEB-INF/data/groovy">

-			<fileset dir="${basedir}/distrib/groovy">

-				<include name="sendmail.groovy" />

-				<include name="sendmail-html.groovy" />

-				<include name="jenkins.groovy" />

-				<include name="protect-refs.groovy" />

-				<include name="fogbugz.groovy" />

-				<include name="thebuggenie.groovy" />

-			</fileset>

-		</copy>

-					

-		<!-- Build the WAR web.xml from the prototype web.xml and gitblit.properties -->

+		<!-- Build the Express web.xml from the prototype web.xml and gitblit.properties -->

 		<!-- THIS FILE IS NOT OVERRIDDEN ONCE IT IS BUILT!!! -->

-		<java classpath="${project.build.dir}" classname="com.gitblit.build.BuildWebXml">

-			<classpath refid="master-classpath" />

-

-			<arg value="--sourceFile" />

-			<arg value="${basedir}/src/WEB-INF/web.xml" />

-

-			<arg value="--destinationFile" />

-			<arg value="${deployments.root}/WEB-INF/web.xml" />

-

-			<arg value="--propertiesFile" />

-			<arg value="${basedir}/distrib/gitblit.properties" />

-		</java>

-		

-		<!-- Set Version into web.xml -->

-		<replace file="${deployments.root}/WEB-INF/web.xml" token="@gb.version@" value="${gb.version}" summary="yes"/>

-

-		<!-- Gitblit resources -->

-		<copy todir="${deployments.root}">

-			<fileset dir="${project.resources.dir}">

-				<exclude name="thumbs.db" />

-			</fileset>

-		</copy>

-

-		<!-- Gitblit library dependencies -->

-		<mkdir dir="${deployments.root}/WEB-INF/lib"/>

-		<copy todir="${deployments.root}/WEB-INF/lib">

-			<fileset dir="${basedir}/ext">

-				<exclude name="src/**" />

-				<exclude name="jcommander*.jar" />

-				<exclude name="jetty*.jar" />

-				<exclude name="junit*.jar" />

-				<exclude name="hamcrest*.jar" />

-				<exclude name="servlet*.jar" />

-				<exclude name="javax.servlet*.jar" />

-				<exclude name="jsslutils*.jar" />

-				<exclude name="jcalendar*.jar" />

-			</fileset>

-		</copy>

+		<mx:webxml sourcefile="${project.src.dir}/WEB-INF/web.xml" destfile="${webinf}/web.xml"

+		propertiesFile="${project.distrib.dir}/data/gitblit.properties"

+		skip="server.*" />

 

 		<!-- Gitblit classes -->

-		<jar destfile="${deployments.root}/WEB-INF/lib/gitblit-${gb.version}.jar">

-			<fileset dir="${project.build.dir}">

+		<jar destfile="${webinf}/lib/gitblit.jar">

+			<fileset dir="${project.compileOutputDirectory}">

 				<exclude name="WEB-INF/" />

 				<exclude name="com/gitblit/tests/" />

 				<exclude name="com/gitblit/build/**" />

@@ -782,9 +371,24 @@
 		</jar>

 

 		<!-- Build Express Zip file -->

-		<zip destfile="${project.target.dir}/${express.zipfile}">

-			<fileset dir="${project.express.dir}" />

-		</zip>

+		<mx:zip basedir="${express.dir}" destfile="${project.targetDirectory}/${express.zipfile}">

+			<fileset dir="${basedir}">

+				<include name="LICENSE" />

+				<include name="NOTICE" />

+			</fileset>

+			<!-- README -->

+			<zipfileset fullpath="README.gitblit" file="${project.siteSourceDirectory}/openshift.mkd" />

+			<!-- resources -->

+			<zipfileset prefix="deployments/ROOT.war" dir="${project.resources.dir}">

+				<exclude name="thumbs.db" />

+				<exclude name="*.mkd" />

+			</zipfileset>

+			<!-- reference.properties -->

+			<zipfileset fullpath="deployments/ROOT.war/WEB-INF/reference.properties" 

+				file="${project.distrib.dir}/data/gitblit.properties" />

+			<!-- include "war" tagged dependencies -->

+			<dependencies prefix="deployments/ROOT.war/WEB-INF/lib" tag="war" />

+		</mx:zip>

 

 	</target>

 

@@ -795,72 +399,64 @@
 		~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

 	-->

 	<target name="buildManager" depends="compile" description="Builds the stand-alone Gitblit Manager">

-		<echo>Building Gitblit Manager ${gb.version}</echo>

-

-		<genjar jarfile="${project.target.dir}/manager-${gb.version}.jar">

-			<resource file="${basedir}/src/com/gitblit/client/splash.png" />

-			<resource file="${basedir}/resources/gitblt-favicon.png" />

-			<resource file="${basedir}/resources/gitweb-favicon.png" />

-			<resource file="${basedir}/resources/git-orange-16x16.png" />

-			<resource file="${basedir}/resources/user_16x16.png" />

-			<resource file="${basedir}/resources/users_16x16.png" />

-			<resource file="${basedir}/resources/settings_16x16.png" />

-			<resource file="${basedir}/resources/lock_go_16x16.png" />

-			<resource file="${basedir}/resources/lock_pull_16x16.png" />

-			<resource file="${basedir}/resources/shield_16x16.png" />

-			<resource file="${basedir}/resources/federated_16x16.png" />

-			<resource file="${basedir}/resources/cold_16x16.png" />

-			<resource file="${basedir}/resources/book_16x16.png" />

-			<resource file="${basedir}/resources/bug_16x16.png" />

-			<resource file="${basedir}/resources/health_16x16.png" />

-			<resource file="${basedir}/resources/feed_16x16.png" />

-			<resource file="${basedir}/resources/bullet_feed.png" />

-			<resource file="${basedir}/resources/search-icon.png" />

-			<resource file="${basedir}/resources/commit_changes_16x16.png" />

-			<resource file="${basedir}/resources/commit_merge_16x16.png" />

-			<resource file="${basedir}/resources/commit_divide_16x16.png" />

-			<resource file="${basedir}/resources/star_16x16.png" />

-			<resource file="${basedir}/resources/blank.png" />

-			<resource file="${basedir}/src/com/gitblit/wicket/GitBlitWebApp.properties" />

-			<resource file="${basedir}/src/com/gitblit/wicket/GitBlitWebApp_es.properties" />

-			<resource file="${basedir}/src/com/gitblit/wicket/GitBlitWebApp_ja.properties" />

-			<resource file="${basedir}/src/com/gitblit/wicket/GitBlitWebApp_ko.properties" />

-			<resource file="${basedir}/src/com/gitblit/wicket/GitBlitWebApp_nl.properties" />

-			<resource file="${basedir}/src/com/gitblit/wicket/GitBlitWebApp_pl.properties" />

-			<resource file="${basedir}/src/com/gitblit/wicket/GitBlitWebApp_pt_BR.properties" />

-

-			<class name="com.gitblit.client.GitblitManagerLauncher" />

-			<classfilter>

-				<exclude name="org.apache." />

-				<exclude name="org.bouncycastle." />

-				<exclude name="org.eclipse." />

-				<exclude name="org.slf4j." />

-				<exclude name="com.beust." />

-				<exclude name="com.google." />

-				<exclude name="com.unboundid." />

-			</classfilter>

-			<classpath refid="master-classpath" />

+		<echo>Building Gitblit Manager ${project.version}</echo>

+

+		<!-- generate jar by traversing the class hierarchy of the specified

+			 classes, exclude any classes in classpath jars -->

+		<mx:genjar tag="" excludeClasspathJars="true"

+			destfile="${project.targetDirectory}/manager.jar">

+			<resource file="${project.src.dir}/com/gitblit/client/splash.png" />

+			<resource file="${project.resources.dir}/gitblt-favicon.png" />

+			<resource file="${project.resources.dir}/gitweb-favicon.png" />

+			<resource file="${project.resources.dir}/git-orange-16x16.png" />

+			<resource file="${project.resources.dir}/user_16x16.png" />

+			<resource file="${project.resources.dir}/users_16x16.png" />

+			<resource file="${project.resources.dir}/settings_16x16.png" />

+			<resource file="${project.resources.dir}/lock_go_16x16.png" />

+			<resource file="${project.resources.dir}/lock_pull_16x16.png" />

+			<resource file="${project.resources.dir}/shield_16x16.png" />

+			<resource file="${project.resources.dir}/federated_16x16.png" />

+			<resource file="${project.resources.dir}/cold_16x16.png" />

+			<resource file="${project.resources.dir}/book_16x16.png" />

+			<resource file="${project.resources.dir}/bug_16x16.png" />

+			<resource file="${project.resources.dir}/health_16x16.png" />

+			<resource file="${project.resources.dir}/feed_16x16.png" />

+			<resource file="${project.resources.dir}/bullet_feed.png" />

+			<resource file="${project.resources.dir}/search-icon.png" />

+			<resource file="${project.resources.dir}/commit_changes_16x16.png" />

+			<resource file="${project.resources.dir}/commit_merge_16x16.png" />

+			<resource file="${project.resources.dir}/commit_divide_16x16.png" />

+			<resource file="${project.resources.dir}/star_16x16.png" />

+			<resource file="${project.resources.dir}/blank.png" />

+			<resource file="${project.src.dir}/log4j.properties" />

+			<resource>

+				<!-- inlcude all translations -->

+				<fileset dir="${project.src.dir}/com/gitblit/wicket">

+					<include name="*.properties" />

+				</fileset>

+			</resource>

+

+			<mainclass name="com.gitblit.client.GitblitManagerLauncher" />

 			<manifest>

-				<attribute name="Main-Class" value="com.gitblit.client.GitblitManagerLauncher" />

 				<attribute name="SplashScreen-Image" value="splash.png" />

-				<attribute name="Specification-Version" value="${gb.version}" />

-				<attribute name="Release-Date" value="${gb.versionDate}" />

 			</manifest>

-		</genjar>

+		</mx:genjar>

 

 		<!-- Build Manager Zip file -->

-		<zip destfile="${project.target.dir}/${manager.zipfile}">

+		<mx:zip destfile="${project.targetDirectory}/${manager.zipfile}">

 			<fileset dir="${basedir}">

 				<include name="LICENSE" />

 				<include name="NOTICE" />

 			</fileset>

-			<fileset dir="${project.target.dir}">

-				<include name="manager-${gb.version}.jar" />

+			<fileset dir="${project.targetDirectory}">

+				<include name="manager.jar" />

 			</fileset>

-		</zip>

+			<!-- include "manager" tagged dependencies -->

+			<dependencies prefix="ext" tag="manager" />

+		</mx:zip>

 		

 		<!-- Cleanup -->

-		<delete file="${project.target.dir}/manager-${gb.version}.jar" />

+		<delete file="${project.targetDirectory}/manager.jar" />

 	</target>

 	

 	

@@ -870,69 +466,69 @@
 		~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

 	-->

 	<target name="buildAuthority" depends="compile" description="Builds the stand-alone Gitblit Authority">

-		<echo>Building Gitblit Authority ${gb.version}</echo>

-

-		<genjar jarfile="${project.target.dir}/authority-${gb.version}.jar">

-			<resource file="${basedir}/src/com/gitblit/client/splash.png" />

-			<resource file="${basedir}/resources/gitblt-favicon.png" />

-			<resource file="${basedir}/resources/user_16x16.png" />

-			<resource file="${basedir}/resources/users_16x16.png" />

-			<resource file="${basedir}/resources/rosette_16x16.png" />

-			<resource file="${basedir}/resources/rosette_32x32.png" />

-			<resource file="${basedir}/resources/vcard_16x16.png" />

-			<resource file="${basedir}/resources/settings_16x16.png" />

-			<resource file="${basedir}/resources/settings_32x32.png" />

-			<resource file="${basedir}/resources/search-icon.png" />

-			<resource file="${basedir}/resources/mail_16x16.png" />

-			<resource file="${basedir}/resources/script_16x16.png" />

-			<resource file="${basedir}/resources/blank.png" />

-			<resource file="${basedir}/resources/bullet_green.png" />

-			<resource file="${basedir}/resources/bullet_orange.png" />

-			<resource file="${basedir}/resources/bullet_red.png" />

-			<resource file="${basedir}/resources/bullet_white.png" />

-			<resource file="${basedir}/resources/bullet_delete.png" />

-			<resource file="${basedir}/resources/bullet_key.png" />

-			<resource file="${basedir}/src/log4j.properties" />

-			<resource file="${basedir}/src/com/gitblit/wicket/GitBlitWebApp.properties" />

-			<resource file="${basedir}/src/com/gitblit/wicket/GitBlitWebApp_es.properties" />

-			<resource file="${basedir}/src/com/gitblit/wicket/GitBlitWebApp_ja.properties" />

-			<resource file="${basedir}/src/com/gitblit/wicket/GitBlitWebApp_ko.properties" />

-			<resource file="${basedir}/src/com/gitblit/wicket/GitBlitWebApp_pl.properties" />

-

-			<class name="com.gitblit.authority.GitblitAuthorityLauncher" />

-			<classfilter>

-				<exclude name="org.apache." />

-				<exclude name="org.bouncycastle." />

-				<exclude name="org.eclipse." />

-				<exclude name="org.slf4j." />

-				<exclude name="com.beust." />

-				<exclude name="com.google." />

-				<exclude name="com.unboundid." />

-			</classfilter>

-			<classpath refid="master-classpath" />

+		<echo>Building Gitblit Authority ${project.version}</echo>

+

+		<!-- generate jar by traversing the class hierarchy of the specified

+			 classes, exclude any classes in "authority" classpath jars -->

+		<mx:genjar tag="authority" excludeClasspathJars="true" 

+			destfile="${project.targetDirectory}/authority.jar">

+			<resource file="${project.src.dir}/com/gitblit/client/splash.png" />

+			<resource file="${project.resources.dir}/gitblt-favicon.png" />

+			<resource file="${project.resources.dir}/user_16x16.png" />

+			<resource file="${project.resources.dir}/users_16x16.png" />

+			<resource file="${project.resources.dir}/rosette_16x16.png" />

+			<resource file="${project.resources.dir}/rosette_32x32.png" />

+			<resource file="${project.resources.dir}/vcard_16x16.png" />

+			<resource file="${project.resources.dir}/settings_16x16.png" />

+			<resource file="${project.resources.dir}/settings_32x32.png" />

+			<resource file="${project.resources.dir}/search-icon.png" />

+			<resource file="${project.resources.dir}/mail_16x16.png" />

+			<resource file="${project.resources.dir}/script_16x16.png" />

+			<resource file="${project.resources.dir}/blank.png" />

+			<resource file="${project.resources.dir}/bullet_green.png" />

+			<resource file="${project.resources.dir}/bullet_orange.png" />

+			<resource file="${project.resources.dir}/bullet_red.png" />

+			<resource file="${project.resources.dir}/bullet_white.png" />

+			<resource file="${project.resources.dir}/bullet_delete.png" />

+			<resource file="${project.resources.dir}/bullet_key.png" />

+			<resource file="${project.src.dir}/log4j.properties" />

+			<resource>

+				<!-- inlcude all translations -->

+				<fileset dir="${project.src.dir}/com/gitblit/wicket">

+					<include name="*.properties" />

+				</fileset>

+			</resource>

+

+			<mainclass name="com.gitblit.authority.Launcher" />

 			<manifest>

-				<attribute name="Main-Class" value="com.gitblit.authority.GitblitAuthorityLauncher" />

 				<attribute name="SplashScreen-Image" value="splash.png" />

-				<attribute name="Specification-Version" value="${gb.version}" />

-				<attribute name="Release-Date" value="${gb.versionDate}" />

 			</manifest>

-		</genjar>

+		</mx:genjar>

 

 		<!-- Build Authority Zip file -->

-		<zip destfile="${project.target.dir}/${authority.zipfile}">

+		<mx:zip destfile="${project.targetDirectory}/${authority.zipfile}">

 			<fileset dir="${basedir}">

 				<include name="LICENSE" />

 				<include name="NOTICE" />

 			</fileset>

-			<fileset dir="${project.target.dir}">

-				<include name="authority-${gb.version}.jar" />

+			<fileset dir="${project.targetDirectory}">

+				<include name="authority.jar" />

 			</fileset>

-			<zipfileset dir="${basedir}/distrib" prefix="data/certs">

+			<zipfileset dir="${project.distrib.dir}/data" prefix="data">

+				<include name="users.conf" />

+				<include name="gitblit.properties" />

+			</zipfileset>

+			<zipfileset dir="${project.distrib.dir}/data/certs" prefix="data/certs">

 				<include name="authority.conf" />

 				<include name="mail.tmpl" />

 				<include name="instructions.tmpl" />

 			</zipfileset>

-		</zip>

+			<!-- include "authority" tagged dependencies -->

+			<dependencies prefix="ext" tag="authority" />

+		</mx:zip>

+				

+		<!-- Cleanup -->

+		<delete file="${project.targetDirectory}/authority.jar" />

 	</target>

 					

 	<!-- 

@@ -941,29 +537,25 @@
 		~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

 	-->

 	<target name="buildApiLibrary" depends="compile" description="Builds the Gitblit RPC client library">

-		<echo>Building Gitblit API Library ${gb.version}</echo>

+		<echo>Building Gitblit API Library ${project.version}</echo>

 	

+		<local name="javadoc.dir" />

+		<property name="javadoc.dir" value="${project.outputDirectory}/javadoc" />

+		<delete dir="${javadoc.dir}" />

+

 		<!-- Build API Library jar -->

-		<genjar jarfile="${project.target.dir}/gbapi-${gb.version}.jar">

+		<mx:genjar tag="" excludeClasspathJars="true"

+			destfile="${project.targetDirectory}/gbapi-${project.version}.jar">

 			<class name="com.gitblit.Keys" />

 			<class name="com.gitblit.client.GitblitClient" />

 			<class name="com.gitblit.models.FederationModel" />

 			<class name="com.gitblit.models.FederationProposal" />

 			<class name="com.gitblit.models.FederationSet" />			

-			<classpath refid="master-classpath" />

-			<classfilter>

-				<exclude name="com.google.gson." />

-				<exclude name="com.sun.syndication." />

-			</classfilter>

-			<manifest>

-				<attribute name="Specification-Version" value="${gb.version}" />

-				<attribute name="Release-Date" value="${gb.versionDate}" />

-			</manifest>

-		</genjar>

+		</mx:genjar>

 		

 		<!-- Build API sources jar -->

-		<zip destfile="${project.target.dir}/gbapi-${gb.version}-sources.jar">

-			<fileset dir="${basedir}/src" defaultexcludes="yes">

+		<zip destfile="${project.targetDirectory}/gbapi-${project.version}-sources.jar">

+			<fileset dir="${project.src.dir}" defaultexcludes="yes">

 				<include name="com/gitblit/Constants.java"/>

 				<include name="com/gitblit/GitBlitException.java"/>

 				<include name="com/gitblit/Keys.java"/>

@@ -974,8 +566,8 @@
 		</zip>

 		

 		<!-- Build API JavaDoc jar -->

-		<javadoc destdir="${project.target.dir}/javadoc">

-			<fileset dir="${basedir}/src" defaultexcludes="yes">

+		<mx:javadoc destdir="${javadoc.dir}" redirect="true">

+			<fileset dir="${project.src.dir}" defaultexcludes="yes">

 				<include name="com/gitblit/Constants.java"/>

 				<include name="com/gitblit/GitBlitException.java"/>

 				<include name="com/gitblit/Keys.java"/>

@@ -983,37 +575,34 @@
 		  		<include name="com/gitblit/models/**/*.java"/>

 		  		<include name="com/gitblit/utils/**/*.java"/>			  		

 			</fileset>

-		</javadoc>

-		<zip destfile="${project.target.dir}/gbapi-${gb.version}-javadoc.jar">

-			<fileset dir="${project.target.dir}/javadoc" />

+		</mx:javadoc>

+		  			

+		<zip destfile="${project.targetDirectory}/gbapi-${project.version}-javadoc.jar">

+			<fileset dir="${javadoc.dir}" />

 		</zip>

 		

 		<!-- Build the API library zip file -->

-		<zip destfile="${project.target.dir}/${gbapi.zipfile}">

+		<mx:zip destfile="${project.targetDirectory}/${gbapi.zipfile}">

 			<fileset dir="${basedir}">

 				<include name="LICENSE" />

 				<include name="NOTICE" />

 			</fileset>

-			<fileset dir="${project.target.dir}">

-				<include name="gbapi-${gb.version}.jar" />

-				<include name="gbapi-${gb.version}-sources.jar" />

-				<include name="gbapi-${gb.version}-javadoc.jar" />

-			</fileset>

-			<fileset dir="${basedir}/ext">

-				<exclude name="src/**" />

-				<include name="gson*.jar" />

-				<include name="rome*.jar" />

-				<include name="jdom*.jar" />

+			<fileset dir="${project.targetDirectory}">

+				<include name="gbapi-${project.version}.jar" />

+				<include name="gbapi-${project.version}-sources.jar" />

+				<include name="gbapi-${project.version}-javadoc.jar" />

 			</fileset>

-		</zip>

+			<!-- include "api" tagged dependencies -->

+			<dependencies prefix="ext" tag="api" />

+		</mx:zip>

 		

 		<!-- Cleanup -->

 		<delete>

-			<fileset dir="${project.target.dir}">

+			<fileset dir="${project.targetDirectory}">

 				<include name="javadoc/**" />

-				<include name="gbapi-${gb.version}.jar" />

-				<include name="gbapi-${gb.version}-sources.jar" />

-				<include name="gbapi-${gb.version}-javadoc.jar" />

+				<include name="gbapi-${project.version}.jar" />

+				<include name="gbapi-${project.version}-sources.jar" />

+				<include name="gbapi-${project.version}-javadoc.jar" />

 		</fileset>

 		</delete>

 	</target>

@@ -1024,162 +613,122 @@
 		Build the Gitblit Website

 		~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

 	-->

-	<target name="buildSite" depends="compile" description="Build the Gitblit website">

+	<target name="buildSite" depends="prepare" description="Build the Gitblit website">

 		

-		<echo>Building Gitblit Website ${gb.version}</echo>

+		<echo>Building Gitblit Website ${project.version}</echo>

 

-		<!-- Build Site -->

-		<delete dir="${project.site.dir}" />

-		<mkdir dir="${project.site.dir}" />

-		<copy todir="${project.site.dir}">

-			<!-- Copy selected Gitblit resources -->

-			<fileset dir="${project.resources.dir}">

-				<include name="bootstrap/**/*" />

-				<include name="gitblit.css" />

-				<include name="gitblt_25_white.png" />

-				<include name="gitblt-favicon.png" />

-				<include name="lock_go_16x16.png" />

-				<include name="lock_pull_16x16.png" />

-				<include name="shield_16x16.png" />

-				<include name="cold_16x16.png" />

-				<include name="bug_16x16.png" />

-				<include name="book_16x16.png" />

-				<include name="blank.png" />

-				<include name="federated_16x16.png" />

-				<include name="arrow_page.png" />

-			</fileset>

+		<property name="releaselog" value="${basedir}/releases.moxie" />

 

-			<!-- Copy Doc images -->

-			<fileset dir="${basedir}/docs">

-				<include name="*.png" />

-				<include name="*.gif" />

-				<include name="*.js" />

-			</fileset>

-		</copy>

+		<!-- Build Site -->

+		<mx:doc	googleplusid="114464678392593421684" googleanalyticsid="UA-24377072-1"

+			googlePlusOne="true" minify="true" customless="custom.less">

+			<structure>

+				<menu name="about">

+					<page name="overview" src="siteindex.mkd" out="index.html" headerLinks="false" />

+					<page name="features" src="features.mkd" />

+					<page name="screenshots" src="screenshots.mkd" />

+				</menu>

+				<menu name="documentation">

+					<page name="setup" src="setup.mkd" />

+					<page name="federation" src="federation.mkd" />

+					<divider />

+					<page name="settings" src="properties.mkd" />

+					<page name="faq" src="faq.mkd" />

+					<divider />

+					<page name="design" src="design.mkd" />

+					<page name="rpc" src="rpc.mkd" />

+				</menu>

+				

+				<menu name="releases">

+					<page name="release notes" out="releasenotes.html">

+						<template src="releasecurrent.ftl" data="${releaselog}" />

+					</page>

+					<page name="release history" out="releases.html">

+						<template src="releasehistory.ftl" data="${releaselog}" />

+					</page>

+					<divider />

+					<page name="roadmap" src="roadmap.mkd" />					

+				</menu>

+				

+				<menu name="downloads">

+					<link name="Gitblit GO (Windows)" src="${gc.url}gitblit-${project.releaseVersion}.zip" />

+					<link name="Gitblit GO (Linux/OSX)" src="${gc.url}gitblit-${project.releaseVersion}.tar.gz" />

+					<link name="Gitblit WAR" src="${gc.url}gitblit-${project.releaseVersion}.war" />

+					<link name="Gitblit Express" src="${gc.url}express-${project.releaseVersion}.zip" />

+					<divider />

+					<link name="Gitblit Manager" src="${gc.url}manager-${project.releaseVersion}.zip" />

+					<link name="Federation Client" src="${gc.url}fedclient-${project.releaseVersion}.zip" />

+					<divider />

+					<link name="API Library" src="${gc.url}gbapi-${project.releaseVersion}.zip" />

+				</menu>

+				

+				<menu name="links">

+					<link name="Demo" src="https://demo-gitblit.rhcloud.com" />

+					<divider />

+					<link name="Github" src="${project.scmUrl}" />

+					<link name="Issues" src="${project.issuesUrl}" />

+					<link name="Discussion" src="${project.forumUrl}" />

+					<link name="Google+" src="${project.socialNetworkUrl}" />

+					<link name="Ohloh" src="http://www.ohloh.net/p/gitblit" />

+				</menu>

+				<divider />

+			</structure>

+			

+			<replace token="%GCURL%" value="${gc.url}" />

+			

+			<properties token="%PROPERTIES%" file="${project.distrib.dir}/data/gitblit.properties" />

+			

+			<regex searchPattern="\b(issue)(\s*[#]?|-){0,1}(\d+)\b" replacePattern="&lt;a href='http://code.google.com/p/gitblit/issues/detail?id=$3'&gt;issue $3&lt;/a&gt;" />

+			

+			<!-- Set the logo from the mx:doc resources -->

+			<logo file="${project.resources.dir}/gitblt_25_white.png" />

+			<favicon file="${project.resources.dir}/gitblt-favicon.png" />

+			

+			<resource>

+				<fileset dir="${project.resources.dir}">

+					<include name="lock_go_16x16.png" />

+					<include name="lock_pull_16x16.png" />

+					<include name="shield_16x16.png" />

+					<include name="cold_16x16.png" />

+					<include name="bug_16x16.png" />

+					<include name="book_16x16.png" />

+					<include name="blank.png" />

+					<include name="federated_16x16.png" />

+					<include name="arrow_page.png" />

+				</fileset>

+			</resource>

+		</mx:doc>		

 

 		<!-- Copy Fancybox -->

-		<mkdir dir="${project.site.dir}/fancybox" />

-		<copy todir="${project.site.dir}/fancybox">

-			<fileset dir="${basedir}/docs/fancybox">

-				<exclude name="thumbs.db" />

-			</fileset>

-		</copy>

-

-		<!-- Copy google-code-prettify -->

-		<mkdir dir="${basedir}/src/com/gitblit/wicket/pages/prettify" />

-		<copy todir="${project.site.dir}/prettify">

-			<fileset dir="${basedir}/src/com/gitblit/wicket/pages/prettify">

+		<mkdir dir="${project.siteTargetDirectory}/fancybox" />

+		<copy todir="${project.siteTargetDirectory}/fancybox">

+			<fileset dir="${project.siteSourceDirectory}/fancybox">

 				<exclude name="thumbs.db" />

 			</fileset>

 		</copy>

 

 		<!-- Generate thumbnails of screenshots -->

-		<java classpath="${project.build.dir}" classname="com.gitblit.build.BuildThumbnails">

-			<classpath refid="master-classpath" />

-				

-			<arg value="--sourceFolder" />

-			<arg value="${basedir}/docs/screenshots" />

-		

-			<arg value="--destinationFolder" />

-			<arg value="${project.site.dir}/thumbs" />

-			

-			<arg value="--maximumDimension" />

-			<arg value="250" />

-		</java>

+		<mx:thumbs input="png" output="png" maximumDimension="250" 

+			sourceDir="${project.siteSourceDirectory}/screenshots"

+			destDir="${project.siteTargetDirectory}/thumbs" />

 

 		<!-- Copy screenshots -->

-		<mkdir dir="${project.site.dir}/screenshots" />

-		<copy todir="${project.site.dir}/screenshots">

-			<fileset dir="${basedir}/docs/screenshots">

+		<mkdir dir="${project.siteTargetDirectory}/screenshots" />

+		<copy todir="${project.siteTargetDirectory}/screenshots">

+			<fileset dir="${project.siteSourceDirectory}/screenshots">

 				<include name="*.png" />

 			</fileset>

 		</copy>

 

-		<!-- Build site pages -->

-		<java classpath="${project.build.dir}" classname="com.gitblit.build.BuildSite">

-			<classpath refid="master-classpath" />

-			<arg value="--sourceFolder" />

-			<arg value="${basedir}/docs" />

-

-			<arg value="--outputFolder" />

-			<arg value="${project.site.dir}" />

-

-			<arg value="--pageHeader" />

-			<arg value="${basedir}/docs/site_header.html" />

-			

-			<arg value="--pageFooter" />

-			<arg value="${basedir}/docs/site_footer.html" />

-

-			<arg value="--analyticsSnippet" />

-			<arg value="${basedir}/docs/site_analytics.html" />

-				

-			<arg value="--adSnippet" />

-			<arg value="${basedir}/docs/site_ads.html" />

-

-			<arg value="--alias" />

-			<arg value="index=overview" />

-

-			<arg value="--alias" />

-			<arg value="properties=settings" />

-

-			<arg value="--substitute" />

-			<arg value="%VERSION%=${gb.version}" />

-

-			<arg value="--substitute" />

-			<arg value="%GO%=${distribution.zipfile}" />

-

-			<arg value="--substitute" />

-			<arg value="%WAR%=${distribution.warfile}" />

-

-			<arg value="--substitute" />

-			<arg value="%FEDCLIENT%=${fedclient.zipfile}" />

-

-			<arg value="--substitute" />

-			<arg value="%MANAGER%=${manager.zipfile}" />

-

-			<arg value="--substitute" />

-			<arg value="%API%=${gbapi.zipfile}" />

-

-			<arg value="--substitute" />

-			<arg value="%EXPRESS%=${express.zipfile}" />

-

-			<arg value="--substitute" />

-			<arg value="%BUILDDATE%=${gb.versionDate}" />

-

-			<arg value="--substitute" />

-			<arg value="%JGIT%=${jgit.version}" />

-

-			<arg value="--properties" />

-			<arg value="%PROPERTIES%=${basedir}/distrib/gitblit.properties" />

-			

-			<arg value="--nomarkdown" />

-			<arg value="%BEGINCODE%:%ENDCODE%" />

-

-			<arg value="--substitute" />

-			<arg value="&quot;%BEGINCODE%=&lt;pre class='prettyprint lang-java'&gt;&quot;" />

-

-			<arg value="--substitute" />

-			<arg value="%ENDCODE%=&lt;/pre&gt;" />

-

-			<arg value="--regex" />

-			<arg value="&quot;\b(issue)(\s*[#]?|-){0,1}(\d+)\b!!!&lt;a href='http://code.google.com/p/gitblit/issues/detail?id=$3'&gt;issue $3&lt;/a&gt;&quot;" />

-

-		</java>	

 	</target>

 

 

 	<!--

 		~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 

-		Compile from source, publish binaries, and build & deploy site

+		Build all binaries and site

 		~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

 	-->

-	<target name="buildAll" depends="buildAuthority,buildGO,buildWAR,buildExpress,buildFederationClient,buildManager,buildApiLibrary,buildSite">		

-		<!-- Cleanup -->

-		<delete dir="${project.build.dir}" />

-		<delete dir="${project.war.dir}" />

-		<delete dir="${project.deploy.dir}" />

-		<delete dir="${project.express.dir}" />

-	</target>

+	<target name="buildAll" depends="buildAuthority,buildGO,buildWAR,buildExpress,buildFederationClient,buildManager,buildApiLibrary,buildSite" />		

 

 	

 	<!--

@@ -1189,16 +738,7 @@
 	-->

 	<target name="updateGhPages" depends="buildSite">

 		<!-- Build gh-pages branch -->

-		<java classpath="${project.build.dir}" classname="com.gitblit.build.BuildGhPages">

-			<classpath refid="master-classpath" />

-			<arg value="--sourceFolder" />

-			<arg value="${basedir}/target/site" />

-

-			<arg value="--repository" />

-			<arg value="${basedir}" />

-			

-			<arg value="--obliterate" />

-		</java>

+		<mx:ghpages repositorydir="${basedir}" obliterate="true" />

 	</target>

 	

 

@@ -1207,69 +747,51 @@
 		Publish binaries to Google Code

 		~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

 	-->

-	<target name="publishBinaries" depends="buildGO,buildWAR,buildExpress,buildFederationClient,buildManager,buildApiLibrary" description="Publish the Gitblit binaries to Google Code">

+	<target name="publishBinaries" depends="clean,buildGO,buildWAR,buildExpress,buildFederationClient,buildManager,buildApiLibrary" description="Publish the Gitblit binaries to Google Code">

+

+		<echo>Uploading Gitblit ${project.version} binaries</echo>

 

-		<echo>Uploading Gitblit ${gb.version} binaries</echo>

+		<!-- Upload Gitblit GO Windows ZIP file -->

+		<mx:gcupload 

+			 sourceFile="${distribution.zipfile}" 

+			 targetFile="gitblit-${project.version}.zip"

+			 description="Gitblit GO v${project.version} (standalone, integrated Gitblit server for Windows)" />

 

-		<!-- Upload Gitblit GO ZIP file -->

-		<gcupload 

-			 username="${googlecode.user}" 

-			 password="${googlecode.password}" 

-			 projectname="gitblit" 

-			 filename="${project.target.dir}/${distribution.zipfile}" 

-			 targetfilename="gitblit-${gb.version}.zip"

-			 summary="Gitblit GO v${gb.version} (standalone, integrated Gitblit server)"

-			 labels="Featured, Type-Package, OpSys-All" />

+		<!-- Upload Gitblit GO Linux/Unix tar.gz file -->

+		<mx:gcupload

+			 sourceFile="${distribution.tgzfile}" 

+			 targetFile="gitblit-${project.version}.tar.gz"

+			 description="Gitblit GO v${project.version} (standalone, integrated Gitblit server for Linux/Unix)" />

 

 		<!-- Upload Gitblit WAR file -->

-		<gcupload 

-		     username="${googlecode.user}" 

-		     password="${googlecode.password}" 

-		     projectname="gitblit" 

-		     filename="${project.target.dir}/${distribution.warfile}" 

-		     targetfilename="gitblit-${gb.version}.war"

-		     summary="Gitblit WAR v${gb.version} (standard WAR webapp for servlet containers)"

-		     labels="Featured, Type-Package, OpSys-All" />

+		<mx:gcupload 

+		     sourceFile="${distribution.warfile}" 

+		     targetFile="gitblit-${project.version}.war"

+		     description="Gitblit WAR v${project.version} (standard WAR webapp for servlet containers)" />

 

 		<!-- Upload Gitblit FedClient -->

-		<gcupload 

-			username="${googlecode.user}" 

-			password="${googlecode.password}" 

-			projectname="gitblit" 

-			filename="${project.target.dir}/${fedclient.zipfile}" 

-			targetfilename="fedclient-${gb.version}.zip"

-			summary="Gitblit Federation Client v${gb.version} (command-line tool to clone data from federated Gitblit instances)"

-			labels="Featured, Type-Package, OpSys-All" />

+		<mx:gcupload 

+			sourceFile="${fedclient.zipfile}" 

+			targetFile="fedclient-${project.version}.zip"

+			description="Gitblit Federation Client v${project.version} (command-line tool to clone data from federated Gitblit instances)" />

 

 		<!-- Upload Gitblit Manager -->

-		<gcupload 

-			username="${googlecode.user}" 

-			password="${googlecode.password}" 

-			projectname="gitblit" 

-			filename="${project.target.dir}/${manager.zipfile}" 

-			targetfilename="manager-${gb.version}.zip"

-			summary="Gitblit Manager v${gb.version} (Swing tool to remotely administer a Gitblit server)"

-			labels="Featured, Type-Package, OpSys-All" />

+		<mx:gcupload

+			sourceFile="${manager.zipfile}" 

+			targetFile="manager-${project.version}.zip"

+			description="Gitblit Manager v${project.version} (Swing tool to remotely administer a Gitblit server)" />

 

 		<!-- Upload Gitblit API Library -->

-		<gcupload 

-			username="${googlecode.user}" 

-			password="${googlecode.password}" 

-			projectname="gitblit" 

-			filename="${project.target.dir}/${gbapi.zipfile}" 

-			targetfilename="gbapi-${gb.version}.zip"

-			summary="Gitblit API Library v${gb.version} (JSON RPC library to integrate with your software)"

-			labels="Featured, Type-Package, OpSys-All" />

+		<mx:gcupload

+			sourceFile="${gbapi.zipfile}" 

+			targetFile="gbapi-${project.version}.zip"

+			description="Gitblit API Library v${project.version} (JSON RPC library to integrate with your software)" />

 

 		<!-- Upload Gitblit Express for RedHat OpenShift -->

-		<gcupload 

-			username="${googlecode.user}" 

-			password="${googlecode.password}" 

-			projectname="gitblit" 

-			filename="${project.target.dir}/${express.zipfile}" 

-			targetfilename="express-${gb.version}.zip"

-			summary="Gitblit Express v${gb.version} (run Gitblit on RedHat's OpenShift cloud)"

-			labels="Featured, Type-Package, OpSys-All" />

+		<mx:gcupload 

+			sourceFile="${express.zipfile}" 

+			targetFile="express-${project.version}.zip"

+			description="Gitblit Express v${project.version} (run Gitblit on RedHat's OpenShift cloud)" />

 

 	</target>

 

@@ -1280,9 +802,9 @@
 		You must add ext/commons-net-1.4.0.jar to your ANT classpath.

 		~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

 	-->

-	<target name="publishSite" depends="buildSite,updateGhPages" description="Publish the Gitblit site to a webserver (requires ext/commons-net-1.4.0.jar)" >

+	<target name="publishSite" depends="clean,buildSite,updateGhPages" description="Publish the Gitblit site to a webserver (requires ext/commons-net-1.4.0.jar)" >

 

-		<echo>Uploading Gitblit ${gb.version} website</echo>

+		<echo>Uploading Gitblit ${project.version} website</echo>

 

 		<ftp server="${ftp.server}"

 			userid="${ftp.user}"

@@ -1290,7 +812,7 @@
 			remotedir="${ftp.dir}"

 			passive="true"

 			verbose="yes">

-		<fileset dir="${project.site.dir}" />

+			<fileset dir="${project.siteTargetDirectory}" />

 		</ftp>

 	</target>

 

@@ -1300,10 +822,189 @@
 		Compile from source, publish binaries, and build & deploy site

 		~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

 	-->

-	<target name="publishAll" depends="publishBinaries,publishSite">

-		<!-- Cleanup -->

-		<delete dir="${project.build.dir}" />

-		<delete dir="${project.war.dir}" />

-		<delete dir="${project.deploy.dir}" />

+	<target name="publishAll" depends="publishBinaries,publishSite" />

+

+	

+	<!--

+		~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 

+		Tag a new version and prepare for the next development cycle.

+		~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 

+	-->

+	<target name="tagRelease" depends="prepare">

+		<!-- release -->

+		<property name="dryrun" value="false" />

+		<mx:version stage="release" dryrun="${dryrun}" />		

+		<!-- commit build.moxie & releases.moxie (automatic) -->

+		<mx:commit showtitle="no">

+		    <message>Prepare ${project.version} release</message>

+			<tag name="v${project.version}">

+				<message>${project.name} ${project.version} release</message>

+			</tag>

+		</mx:commit>

+

+		<!-- next cycle -->

+		<mx:version stage="snapshot" incrementNumber="incremental" dryrun="${dryrun}" />

+		<mx:commit showtitle="no">

+		    <message>Reset build identifiers for next development cycle</message>

+		</mx:commit>

 	</target>

+

+		

+	<!--

+		~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

+		Build Gitblit Docs

+		~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

+	-->

+	<macrodef name="generateDocs">

+		<attribute name="toDir"/>

+		<sequential>

+			<mx:doc toDir="@{toDir}" minify="true" customless="custom.less">

+				<structure>

+					<menu name="about">

+						<page name="overview" src="siteindex.mkd" out="index.html" headerLinks="false" />

+						<page name="features" src="features.mkd" />

+					</menu>

+					<menu name="documentation">

+						<page name="setup" src="setup.mkd" />

+						<page name="federation" src="federation.mkd" />

+						<divider />

+						<page name="faq" src="faq.mkd" />

+						<page name="settings" src="properties.mkd" />

+						<divider />

+						<page name="design" src="design.mkd" />

+						<page name="rpc" src="rpc.mkd" />

+					</menu>

+					<menu name="changelog">

+						<page name="current release" src="releasecurrent.mkd" />

+						<page name="older releases" src="releasehistory.mkd" />

+					</menu>

+					<menu name="links">

+						<link name="Demo" src="https://demo-gitblit.rhcloud.com" />

+						<divider />

+						<link name="Github" src="${project.scmUrl}" />

+						<link name="Issues" src="${project.issuesUrl}" />

+						<link name="Discussion" src="${project.forumUrl}" />

+						<link name="Google+" src="${project.socialNetworkUrl}" />

+						<link name="Ohloh" src="http://www.ohloh.net/p/gitblit" />

+					</menu>

+				</structure>

+				

+				<properties token="%PROPERTIES%" file="${project.distrib.dir}/data/gitblit.properties" />

+				

+				<regex searchPattern="\b(issue)(\s*[#]?|-){0,1}(\d+)\b" replacePattern="&lt;a href='http://code.google.com/p/gitblit/issues/detail?id=$3'&gt;issue $3&lt;/a&gt;" />

+				

+				<!-- Set the logo from the mx:doc resources -->

+				<logo file="${project.resources.dir}/gitblt_25_white.png" />

+				<favicon file="${project.resources.dir}/gitblt-favicon.png" />

+				

+				<resource>

+					<fileset dir="${project.resources.dir}">

+						<include name="lock_go_16x16.png" />

+						<include name="lock_pull_16x16.png" />

+						<include name="shield_16x16.png" />

+						<include name="cold_16x16.png" />

+						<include name="bug_16x16.png" />

+						<include name="book_16x16.png" />

+						<include name="blank.png" />

+						<include name="federated_16x16.png" />

+						<include name="arrow_page.png" />

+					</fileset>

+				</resource>

+			</mx:doc>

+	    </sequential>

+	</macrodef>

+	

+	<!--

+		~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 

+		Macro to create a pristine data directory for the target build

+		~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

+	-->

+	<macrodef name="prepareDataDirectory">

+		<attribute name="toDir"/>

+		<sequential>

+			<mkdir dir="@{toDir}" />

+			<copy todir="@{toDir}" overwrite="false">

+				<fileset dir="${project.distrib.dir}/data">

+					<include name="users.conf" />

+					<include name="projects.conf" />

+					<include name="gitblit.properties" />

+				</fileset>

+			</copy>

+			<mkdir dir="@{toDir}/groovy" />

+			<copy todir="@{toDir}/groovy">

+				<fileset dir="${project.distrib.dir}/data/groovy">					

+					<include name="sendmail.groovy" />

+					<include name="sendmail-html.groovy" />

+					<include name="jenkins.groovy" />

+					<include name="protect-refs.groovy" />

+					<include name="fogbugz.groovy" />

+					<include name="thebuggenie.groovy" />

+				</fileset>

+			</copy>

+      </sequential>

+	</macrodef>

+	

+	<!--

+		~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 

+		Macro to upload binaries to GoogleCode

+		~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

+	-->

+	<macrodef name="googleUpload">

+		<attribute name="sourceFile"/>

+		<attribute name="targetFile"/>

+		<attribute name="description"/>

+		<sequential>

+			<gcupload 

+				username="${googlecode.user}" 

+				password="${googlecode.password}" 

+				projectname="gitblit" 

+				filename="${project.targetDirectory}/@{sourceFile}" 

+				targetfilename="@{targetFile}"

+				summary="@{description}"

+				labels="Featured, Type-Package, OpSys-All" />		

+	     </sequential>

+	</macrodef>

+

+

+	<!--

+		~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

+		Install Gitblit JAR for usage as Maven module

+		~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

+	-->

+	<target name="installMaven" depends="compile" description="Install Gitblit JAR as Maven module">

+		<local name="project.jar" />

+		<property name="project.jar" value="${project.outputDirectory}/gitblit.jar" />

+		<mx:jar destfile="${project.jar}" includeresources="true" />

+

+		<exec executable="mvn">

+			<arg value="install:install-file" />

+			<arg value="-Dfile=${project.jar}" />

+			<arg value="-DpomFile=${basedir}/pom.xml" />

+			<arg value="-DcreateChecksum=true" />

+		</exec>

+	</target>

+

+	<!--

+    	~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

+    	Upload Gitblit JAR to remote Maven repository

+    	

+    	build.properties:

+    	   project.maven.repo.url = http://whatever.com/maven2

+    	   project.maven.repo.id = whateverId

+    	~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

+    -->

+	<target name="uploadMaven" depends="compile" description="Upload Gitblit JAR to remote Maven repository">

+		<local name="project.jar" />

+		<property name="project.jar" value="${project.outputDirectory}/gitblit.jar" />

+		<mx:jar destfile="${project.jar}" includeresources="true" />

+

+		<exec executable="mvn">

+			<arg value="deploy:deploy-file" />

+			<arg value="-Dfile=${project.jar}" />

+			<arg value="-DpomFile=${basedir}/pom.xml" />

+			<arg value="-Durl=${project.maven.repo.url}" />

+			<arg value="-DrepositoryId=${project.maven.repo.id}" />

+			<arg value="-DcreateChecksum=true" />

+		</exec>

+	</target>					

 </project>

diff --git a/distrib/amd64/gitblit.exe b/distrib/amd64/gitblit.exe
deleted file mode 100644
index b867810d..00000000
--- a/distrib/amd64/gitblit.exe
+++ /dev/null
diff --git a/distrib/authority.cmd b/distrib/authority.cmd
deleted file mode 100644
index 805815e6..00000000
--- a/distrib/authority.cmd
+++ /dev/null
@@ -1 +0,0 @@
-@java -jar authority.jar --baseFolder data %*

diff --git a/distrib/gitblit b/distrib/gitblit
deleted file mode 100644
index 6c74d547..00000000
--- a/distrib/gitblit
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/bin/sh
-
-set -e
-
-GITBLIT_PATH=/opt/gitblit
-GITBLIT_BASE_FOLDER=/opt/gitblit/data
-GITBLIT_HTTP_PORT=0
-GITBLIT_HTTPS_PORT=8443
-source ${GITBLIT_PATH}/java-proxy-config.sh
-JAVA="java -server -Xmx1024M ${JAVA_PROXY_CONFIG} -Djava.awt.headless=true -jar"
-
-. /lib/lsb/init-functions
-
-case "$1" in
-  start)
-        log_action_begin_msg "Starting gitblit server"
-        cd $GITBLIT_PATH
-        $JAVA $GITBLIT_PATH/gitblit.jar --httpsPort $GITBLIT_HTTPS_PORT --httpPort $GITBLIT_HTTP_PORT --baseFolder $GITBLIT_BASE_FOLDER > /dev/null &
-        log_action_end_msg $?
-        ;;
-  stop)
-        log_action_begin_msg "Stopping gitblit server"
-        cd $GITBLIT_PATH
-        $JAVA $GITBLIT_PATH/gitblit.jar --baseFolder $GITBLIT_BASE_FOLDER --stop > /dev/null &
-        log_action_end_msg $?
-        ;;
-  force-reload|restart)
-        $0 stop
-        $0 start
-        ;;
-  *)
-        echo "Usage: /etc/init.d/gitblit {start|stop|restart|force-reload}"
-        exit 1
-        ;;
-esac
-
-exit 0
diff --git a/distrib/gitblitw.exe b/distrib/gitblitw.exe
deleted file mode 100644
index dde1279c..00000000
--- a/distrib/gitblitw.exe
+++ /dev/null
diff --git a/distrib/ia64/gitblit.exe b/distrib/ia64/gitblit.exe
deleted file mode 100644
index 784f3c45..00000000
--- a/distrib/ia64/gitblit.exe
+++ /dev/null
diff --git a/distrib/install-service-centos.sh b/distrib/install-service-centos.sh
deleted file mode 100644
index 5e2e5928..00000000
--- a/distrib/install-service-centos.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-cp gitblit-centos /etc/init.d/gitblit
-chmod +x /etc/init.d/gitblit
-sudo chkconfig --add gitblit
diff --git a/distrib/install-service.sh b/distrib/install-service.sh
deleted file mode 100644
index 75d7fcce..00000000
--- a/distrib/install-service.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-cp gitblit /etc/init.d/
-chmod +x /etc/init.d/gitblit
-sudo update-rc.d gitblit defaults
\ No newline at end of file
diff --git a/distrib/x86/gitblit.exe b/distrib/x86/gitblit.exe
deleted file mode 100644
index 75079faf..00000000
--- a/distrib/x86/gitblit.exe
+++ /dev/null
diff --git a/docs/doc_footer.html b/docs/doc_footer.html
deleted file mode 100644
index 577380ea..00000000
--- a/docs/doc_footer.html
+++ /dev/null
@@ -1,8 +0,0 @@
-		</div> <!-- markdown -->

-		<footer>

-			<p class="pull-right">{0}</p>

-		The content of this page is licensed under the <a href="http://creativecommons.org/licenses/by/3.0">Creative Commons Attribution 3.0 License</a>.

-		</footer>			

-	</div> <!-- container -->	

-</body>

-</html>
\ No newline at end of file
diff --git a/docs/doc_header.html b/docs/doc_header.html
deleted file mode 100644
index c5ba366b..00000000
--- a/docs/doc_header.html
+++ /dev/null
@@ -1,33 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">

-<html>

-	<head>

-		<title>Gitblit</title>

-		<link rel="stylesheet" href="./bootstrap/css/bootstrap.css"/>

-		<link rel="stylesheet" type="text/css" href="./gitblit.css"/>

-		<link rel="shortcut icon" type="image/png" href="./gitblt-favicon.png" />

-		<meta name="ROBOTS" content="INDEX, NOFOLLOW">

-		<meta http-equiv="imagetoolbar" content="no" />

-		<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />

-		<meta name="keywords" content="java git server" />

-

-		<script type="text/javascript" src="./bootstrap/js/jquery.js"></script>

-		<script type="text/javascript" src="./bootstrap/js/bootstrap.js"></script>

-		

-		<script type="text/javascript" src="prettify/prettify.js"></script>

-		<link href="prettify/prettify.css" type="text/css" rel="stylesheet" />		

-	</head>

-	<body onload="prettyPrint()">

-		<div class="navbar navbar-fixed-top">

-			<div class="navbar-inner">

-				<div class="container">

-					<a class="brand" href="http://gitblit.com" title="gitblit homepage">

-						<img src="gitblt_25_white.png" width="79" height="25" alt="gitblit" class="logo"/>

-					</a>

-					<ul class="nav">

-						{1}		

-					</ul>

-				</div>

-			</div>

-		</div>

-		<div class="container">

-			<div class="markdown">
\ No newline at end of file
diff --git a/docs/site_footer.html b/docs/site_footer.html
deleted file mode 100644
index 577380ea..00000000
--- a/docs/site_footer.html
+++ /dev/null
@@ -1,8 +0,0 @@
-		</div> <!-- markdown -->

-		<footer>

-			<p class="pull-right">{0}</p>

-		The content of this page is licensed under the <a href="http://creativecommons.org/licenses/by/3.0">Creative Commons Attribution 3.0 License</a>.

-		</footer>			

-	</div> <!-- container -->	

-</body>

-</html>
\ No newline at end of file
diff --git a/docs/site_header.html b/docs/site_header.html
deleted file mode 100644
index ecfa67dc..00000000
--- a/docs/site_header.html
+++ /dev/null
@@ -1,51 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">

-<html>

-	<head>

-		<title>Gitblit</title>

-		<link rel="stylesheet" href="./bootstrap/css/bootstrap.css"/>

-		<link rel="stylesheet" type="text/css" href="./gitblit.css"/>

-		<link rel="shortcut icon" type="image/png" href="./gitblt-favicon.png" />

-		<meta name="ROBOTS" content="INDEX">

-		<meta http-equiv="imagetoolbar" content="no" />

-		<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />

-		<meta name="keywords" content="java git server" />

-

-		<script type="text/javascript" src="./bootstrap/js/jquery.js"></script>

-		<script type="text/javascript" src="./bootstrap/js/bootstrap.js"></script>

-		

-		<script type="text/javascript" src="./fancybox/query.mousewheel-3.0.4.pack.js"></script>

-		<script type="text/javascript" src="./fancybox/jquery.fancybox-1.3.4.pack.js"></script>

-		<link rel="stylesheet" type="text/css" href="./fancybox/jquery.fancybox-1.3.4.css" media="screen" />

-		

-		<script type="text/javascript" src="./screenshots.js"></script>		

-		

-		<script type="text/javascript" src="prettify/prettify.js"></script>

-		<link href="prettify/prettify.css" type="text/css" rel="stylesheet" />

-		

-		<!-- Place this tag in your head or just before your close body tag -->

-		<link rel="canonical" href="http://gitblit.com" />

-		<link rel="publisher" href="https://plus.google.com/114464678392593421684" />

-		<script type="text/javascript" src="https://apis.google.com/js/plusone.js"></script>

-		

-		<!-- ANALYTICS -->

-	</head>

-	<body onload="prettyPrint()">

-		<div class="navbar navbar-fixed-top">

-			<div class="navbar-inner">

-				<div class="container">

-					<a class="brand" href="http://gitblit.com" title="gitblit homepage">

-						<img src="gitblt_25_white.png" width="79" height="25" alt="gitblit" class="logo"/>

-					</a>

-					

-					<ul class="nav">

-						{1}		

-						<!-- Google Plus Badge -->

-						<li><a href="https://plus.google.com/114464678392593421684?prsrc=3" style="margin-top:3px;text-decoration: none;"><img src="https://ssl.gstatic.com/images/icons/gplus-16.png" width="16" height="16" style="border: 0;"/></a></li>

-						<!-- Google Plus One -->

-						<li><div style="margin-top:14px;"><g:plusone size="small" href="http://gitblit.com"></g:plusone></div></li>

-					</ul>

-				</div>

-			</div>

-		</div>

-		<div class="container">

-			<div class="markdown">
\ No newline at end of file
diff --git a/gitblit.iml b/gitblit.iml
index 232f00d7..51cc7e24 100644
--- a/gitblit.iml
+++ b/gitblit.iml
@@ -5,9 +5,9 @@
     <output-test url="file://$MODULE_DIR$/bin/test-classes" />
     <exclude-output />
     <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/resources" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/tests" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" isTestSource="false" />
     </content>
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module-library">
@@ -17,7 +17,7 @@
         </CLASSES>
         <JAVADOC />
         <SOURCES>
-          <root url="jar://$MODULE_DIR$/ext/src/jcommander-1.17-sources.jar!/" />
+          <root url="jar://$MODULE_DIR$/ext/src/jcommander-1.17.jar!/" />
         </SOURCES>
       </library>
     </orderEntry>
@@ -28,7 +28,7 @@
         </CLASSES>
         <JAVADOC />
         <SOURCES>
-          <root url="jar://$MODULE_DIR$/ext/src/log4j-1.2.17-sources.jar!/" />
+          <root url="jar://$MODULE_DIR$/ext/src/log4j-1.2.17.jar!/" />
         </SOURCES>
       </library>
     </orderEntry>
@@ -39,7 +39,7 @@
         </CLASSES>
         <JAVADOC />
         <SOURCES>
-          <root url="jar://$MODULE_DIR$/ext/src/slf4j-api-1.6.6-sources.jar!/" />
+          <root url="jar://$MODULE_DIR$/ext/src/slf4j-api-1.6.6.jar!/" />
         </SOURCES>
       </library>
     </orderEntry>
@@ -50,7 +50,7 @@
         </CLASSES>
         <JAVADOC />
         <SOURCES>
-          <root url="jar://$MODULE_DIR$/ext/src/slf4j-log4j12-1.6.6-sources.jar!/" />
+          <root url="jar://$MODULE_DIR$/ext/src/slf4j-log4j12-1.6.6.jar!/" />
         </SOURCES>
       </library>
     </orderEntry>
@@ -61,7 +61,7 @@
         </CLASSES>
         <JAVADOC />
         <SOURCES>
-          <root url="jar://$MODULE_DIR$/ext/src/mail-1.4.3-sources.jar!/" />
+          <root url="jar://$MODULE_DIR$/ext/src/mail-1.4.3.jar!/" />
         </SOURCES>
       </library>
     </orderEntry>
@@ -72,7 +72,7 @@
         </CLASSES>
         <JAVADOC />
         <SOURCES>
-          <root url="jar://$MODULE_DIR$/ext/src/javax.servlet-api-3.0.1-sources.jar!/" />
+          <root url="jar://$MODULE_DIR$/ext/src/javax.servlet-api-3.0.1.jar!/" />
         </SOURCES>
       </library>
     </orderEntry>
@@ -83,7 +83,7 @@
         </CLASSES>
         <JAVADOC />
         <SOURCES>
-          <root url="jar://$MODULE_DIR$/ext/src/jetty-webapp-7.6.8.v20121106-sources.jar!/" />
+          <root url="jar://$MODULE_DIR$/ext/src/jetty-webapp-7.6.8.v20121106.jar!/" />
         </SOURCES>
       </library>
     </orderEntry>
@@ -94,7 +94,7 @@
         </CLASSES>
         <JAVADOC />
         <SOURCES>
-          <root url="jar://$MODULE_DIR$/ext/src/jetty-ajp-7.6.8.v20121106-sources.jar!/" />
+          <root url="jar://$MODULE_DIR$/ext/src/jetty-ajp-7.6.8.v20121106.jar!/" />
         </SOURCES>
       </library>
     </orderEntry>
@@ -105,7 +105,7 @@
         </CLASSES>
         <JAVADOC />
         <SOURCES>
-          <root url="jar://$MODULE_DIR$/ext/src/wicket-1.4.21-sources.jar!/" />
+          <root url="jar://$MODULE_DIR$/ext/src/wicket-1.4.21.jar!/" />
         </SOURCES>
       </library>
     </orderEntry>
@@ -116,7 +116,7 @@
         </CLASSES>
         <JAVADOC />
         <SOURCES>
-          <root url="jar://$MODULE_DIR$/ext/src/wicket-auth-roles-1.4.21-sources.jar!/" />
+          <root url="jar://$MODULE_DIR$/ext/src/wicket-auth-roles-1.4.21.jar!/" />
         </SOURCES>
       </library>
     </orderEntry>
@@ -127,7 +127,7 @@
         </CLASSES>
         <JAVADOC />
         <SOURCES>
-          <root url="jar://$MODULE_DIR$/ext/src/wicket-extensions-1.4.21-sources.jar!/" />
+          <root url="jar://$MODULE_DIR$/ext/src/wicket-extensions-1.4.21.jar!/" />
         </SOURCES>
       </library>
     </orderEntry>
@@ -138,7 +138,7 @@
         </CLASSES>
         <JAVADOC />
         <SOURCES>
-          <root url="jar://$MODULE_DIR$/ext/src/googlecharts-1.4.21-sources.jar!/" />
+          <root url="jar://$MODULE_DIR$/ext/src/googlecharts-1.4.21.jar!/" />
         </SOURCES>
       </library>
     </orderEntry>
@@ -149,7 +149,7 @@
         </CLASSES>
         <JAVADOC />
         <SOURCES>
-          <root url="jar://$MODULE_DIR$/ext/src/lucene-core-3.6.1-sources.jar!/" />
+          <root url="jar://$MODULE_DIR$/ext/src/lucene-core-3.6.1.jar!/" />
         </SOURCES>
       </library>
     </orderEntry>
@@ -160,7 +160,7 @@
         </CLASSES>
         <JAVADOC />
         <SOURCES>
-          <root url="jar://$MODULE_DIR$/ext/src/lucene-highlighter-3.6.1-sources.jar!/" />
+          <root url="jar://$MODULE_DIR$/ext/src/lucene-highlighter-3.6.1.jar!/" />
         </SOURCES>
       </library>
     </orderEntry>
@@ -171,7 +171,7 @@
         </CLASSES>
         <JAVADOC />
         <SOURCES>
-          <root url="jar://$MODULE_DIR$/ext/src/lucene-memory-3.6.1-sources.jar!/" />
+          <root url="jar://$MODULE_DIR$/ext/src/lucene-memory-3.6.1.jar!/" />
         </SOURCES>
       </library>
     </orderEntry>
@@ -182,7 +182,7 @@
         </CLASSES>
         <JAVADOC />
         <SOURCES>
-          <root url="jar://$MODULE_DIR$/ext/src/lucene-queries-3.6.1-sources.jar!/" />
+          <root url="jar://$MODULE_DIR$/ext/src/lucene-queries-3.6.1.jar!/" />
         </SOURCES>
       </library>
     </orderEntry>
@@ -202,40 +202,40 @@
         </CLASSES>
         <JAVADOC />
         <SOURCES>
-          <root url="jar://$MODULE_DIR$/ext/src/markdownpapers-core-1.3.2-sources.jar!/" />
+          <root url="jar://$MODULE_DIR$/ext/src/markdownpapers-core-1.3.2.jar!/" />
         </SOURCES>
       </library>
     </orderEntry>
     <orderEntry type="module-library">
-      <library name="org.eclipse.jgit-2.2.0.201212191850-r.jar">
+      <library name="org.eclipse.jgit-2.3.1.201302201838-r.jar">
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/ext/org.eclipse.jgit-2.2.0.201212191850-r.jar!/" />
+          <root url="jar://$MODULE_DIR$/ext/org.eclipse.jgit-2.3.1.201302201838-r.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES>
-          <root url="jar://$MODULE_DIR$/ext/src/org.eclipse.jgit-2.2.0.201212191850-r-sources.jar!/" />
+          <root url="jar://$MODULE_DIR$/ext/src/org.eclipse.jgit-2.3.1.201302201838-r.jar!/" />
         </SOURCES>
       </library>
     </orderEntry>
     <orderEntry type="module-library">
-      <library name="jsch-0.1.44-1.jar">
+      <library name="jsch-0.1.46.jar">
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/ext/jsch-0.1.44-1.jar!/" />
+          <root url="jar://$MODULE_DIR$/ext/jsch-0.1.46.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES>
-          <root url="jar://$MODULE_DIR$/ext/src/jsch-0.1.44-1-sources.jar!/" />
+          <root url="jar://$MODULE_DIR$/ext/src/jsch-0.1.46.jar!/" />
         </SOURCES>
       </library>
     </orderEntry>
     <orderEntry type="module-library">
-      <library name="org.eclipse.jgit.http.server-2.2.0.201212191850-r.jar">
+      <library name="org.eclipse.jgit.http.server-2.3.1.201302201838-r.jar">
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/ext/org.eclipse.jgit.http.server-2.2.0.201212191850-r.jar!/" />
+          <root url="jar://$MODULE_DIR$/ext/org.eclipse.jgit.http.server-2.3.1.201302201838-r.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES>
-          <root url="jar://$MODULE_DIR$/ext/src/org.eclipse.jgit.http.server-2.2.0.201212191850-r-sources.jar!/" />
+          <root url="jar://$MODULE_DIR$/ext/src/org.eclipse.jgit.http.server-2.3.1.201302201838-r.jar!/" />
         </SOURCES>
       </library>
     </orderEntry>
@@ -246,7 +246,7 @@
         </CLASSES>
         <JAVADOC />
         <SOURCES>
-          <root url="jar://$MODULE_DIR$/ext/src/bcprov-jdk15on-1.47-sources.jar!/" />
+          <root url="jar://$MODULE_DIR$/ext/src/bcprov-jdk15on-1.47.jar!/" />
         </SOURCES>
       </library>
     </orderEntry>
@@ -257,7 +257,7 @@
         </CLASSES>
         <JAVADOC />
         <SOURCES>
-          <root url="jar://$MODULE_DIR$/ext/src/bcmail-jdk15on-1.47-sources.jar!/" />
+          <root url="jar://$MODULE_DIR$/ext/src/bcmail-jdk15on-1.47.jar!/" />
         </SOURCES>
       </library>
     </orderEntry>
@@ -268,7 +268,7 @@
         </CLASSES>
         <JAVADOC />
         <SOURCES>
-          <root url="jar://$MODULE_DIR$/ext/src/bcpkix-jdk15on-1.47-sources.jar!/" />
+          <root url="jar://$MODULE_DIR$/ext/src/bcpkix-jdk15on-1.47.jar!/" />
         </SOURCES>
       </library>
     </orderEntry>
@@ -279,7 +279,7 @@
         </CLASSES>
         <JAVADOC />
         <SOURCES>
-          <root url="jar://$MODULE_DIR$/ext/src/rome-0.9-sources.jar!/" />
+          <root url="jar://$MODULE_DIR$/ext/src/rome-0.9.jar!/" />
         </SOURCES>
       </library>
     </orderEntry>
@@ -290,7 +290,7 @@
         </CLASSES>
         <JAVADOC />
         <SOURCES>
-          <root url="jar://$MODULE_DIR$/ext/src/jdom-1.0-sources.jar!/" />
+          <root url="jar://$MODULE_DIR$/ext/src/jdom-1.0.jar!/" />
         </SOURCES>
       </library>
     </orderEntry>
@@ -301,7 +301,7 @@
         </CLASSES>
         <JAVADOC />
         <SOURCES>
-          <root url="jar://$MODULE_DIR$/ext/src/gson-1.7.2-sources.jar!/" />
+          <root url="jar://$MODULE_DIR$/ext/src/gson-1.7.2.jar!/" />
         </SOURCES>
       </library>
     </orderEntry>
@@ -312,7 +312,7 @@
         </CLASSES>
         <JAVADOC />
         <SOURCES>
-          <root url="jar://$MODULE_DIR$/ext/src/groovy-all-1.8.8-sources.jar!/" />
+          <root url="jar://$MODULE_DIR$/ext/src/groovy-all-1.8.8.jar!/" />
         </SOURCES>
       </library>
     </orderEntry>
@@ -323,7 +323,7 @@
         </CLASSES>
         <JAVADOC />
         <SOURCES>
-          <root url="jar://$MODULE_DIR$/ext/src/unboundid-ldapsdk-2.3.0-sources.jar!/" />
+          <root url="jar://$MODULE_DIR$/ext/src/unboundid-ldapsdk-2.3.0.jar!/" />
         </SOURCES>
       </library>
     </orderEntry>
@@ -334,7 +334,7 @@
         </CLASSES>
         <JAVADOC />
         <SOURCES>
-          <root url="jar://$MODULE_DIR$/ext/src/ivy-2.2.0-sources.jar!/" />
+          <root url="jar://$MODULE_DIR$/ext/src/ivy-2.2.0.jar!/" />
         </SOURCES>
       </library>
     </orderEntry>
@@ -354,7 +354,7 @@
         </CLASSES>
         <JAVADOC />
         <SOURCES>
-          <root url="jar://$MODULE_DIR$/ext/src/commons-compress-1.4.1-sources.jar!/" />
+          <root url="jar://$MODULE_DIR$/ext/src/commons-compress-1.4.1.jar!/" />
         </SOURCES>
       </library>
     </orderEntry>
@@ -365,28 +365,226 @@
         </CLASSES>
         <JAVADOC />
         <SOURCES>
-          <root url="jar://$MODULE_DIR$/ext/src/xz-1.0-sources.jar!/" />
+          <root url="jar://$MODULE_DIR$/ext/src/xz-1.0.jar!/" />
         </SOURCES>
       </library>
     </orderEntry>
+    <orderEntry type="module-library" scope="PROVIDED">
+      <library name="commons-daemon-1.0.14.jar">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/ext/commons-daemon-1.0.14.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES>
+          <root url="jar://$MODULE_DIR$/ext/src/commons-daemon-1.0.14.jar!/" />
+        </SOURCES>
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library" scope="PROVIDED">
+      <library name="commons-daemon-1.0.14-bin-windows.zip">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/ext/commons-daemon-1.0.14-bin-windows.zip!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
     <orderEntry type="module-library" scope="TEST">
-      <library name="junit-4.10.jar">
+      <library name="junit-4.11.jar">
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/ext/junit-4.10.jar!/" />
+          <root url="jar://$MODULE_DIR$/ext/junit-4.11.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES>
-          <root url="jar://$MODULE_DIR$/ext/src/junit-4.10-sources.jar!/" />
+          <root url="jar://$MODULE_DIR$/ext/src/junit-4.11.jar!/" />
         </SOURCES>
       </library>
     </orderEntry>
     <orderEntry type="module-library" scope="TEST">
-      <library name="hamcrest-core-1.1.jar">
+      <library name="hamcrest-core-1.3.jar">
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/ext/hamcrest-core-1.1.jar!/" />
+          <root url="jar://$MODULE_DIR$/ext/hamcrest-core-1.3.jar!/" />
         </CLASSES>
         <JAVADOC />
-        <SOURCES />
+        <SOURCES>
+          <root url="jar://$MODULE_DIR$/ext/src/hamcrest-core-1.3.jar!/" />
+        </SOURCES>
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library" scope="TEST">
+      <library name="selenium-java-2.28.0.jar">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/ext/selenium-java-2.28.0.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES>
+          <root url="jar://$MODULE_DIR$/ext/src/selenium-java-2.28.0.jar!/" />
+        </SOURCES>
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library" scope="TEST">
+      <library name="selenium-support-2.28.0.jar">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/ext/selenium-support-2.28.0.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES>
+          <root url="jar://$MODULE_DIR$/ext/src/selenium-support-2.28.0.jar!/" />
+        </SOURCES>
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library" scope="TEST">
+      <library name="selenium-firefox-driver-2.28.0.jar">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/ext/selenium-firefox-driver-2.28.0.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES>
+          <root url="jar://$MODULE_DIR$/ext/src/selenium-firefox-driver-2.28.0.jar!/" />
+        </SOURCES>
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library" scope="TEST">
+      <library name="selenium-remote-driver-2.28.0.jar">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/ext/selenium-remote-driver-2.28.0.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES>
+          <root url="jar://$MODULE_DIR$/ext/src/selenium-remote-driver-2.28.0.jar!/" />
+        </SOURCES>
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library" scope="TEST">
+      <library name="cglib-nodep-2.1_3.jar">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/ext/cglib-nodep-2.1_3.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES>
+          <root url="jar://$MODULE_DIR$/ext/src/cglib-nodep-2.1_3.jar!/" />
+        </SOURCES>
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library" scope="TEST">
+      <library name="json-20080701.jar">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/ext/json-20080701.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES>
+          <root url="jar://$MODULE_DIR$/ext/src/json-20080701.jar!/" />
+        </SOURCES>
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library" scope="TEST">
+      <library name="selenium-api-2.28.0.jar">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/ext/selenium-api-2.28.0.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES>
+          <root url="jar://$MODULE_DIR$/ext/src/selenium-api-2.28.0.jar!/" />
+        </SOURCES>
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library" scope="TEST">
+      <library name="guava-13.0.1.jar">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/ext/guava-13.0.1.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES>
+          <root url="jar://$MODULE_DIR$/ext/src/guava-13.0.1.jar!/" />
+        </SOURCES>
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library" scope="TEST">
+      <library name="httpclient-4.2.1.jar">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/ext/httpclient-4.2.1.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES>
+          <root url="jar://$MODULE_DIR$/ext/src/httpclient-4.2.1.jar!/" />
+        </SOURCES>
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library" scope="TEST">
+      <library name="httpcore-4.2.1.jar">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/ext/httpcore-4.2.1.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES>
+          <root url="jar://$MODULE_DIR$/ext/src/httpcore-4.2.1.jar!/" />
+        </SOURCES>
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library" scope="TEST">
+      <library name="commons-logging-1.1.1.jar">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/ext/commons-logging-1.1.1.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES>
+          <root url="jar://$MODULE_DIR$/ext/src/commons-logging-1.1.1.jar!/" />
+        </SOURCES>
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library" scope="TEST">
+      <library name="commons-codec-1.6.jar">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/ext/commons-codec-1.6.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES>
+          <root url="jar://$MODULE_DIR$/ext/src/commons-codec-1.6.jar!/" />
+        </SOURCES>
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library" scope="TEST">
+      <library name="commons-exec-1.1.jar">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/ext/commons-exec-1.1.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES>
+          <root url="jar://$MODULE_DIR$/ext/src/commons-exec-1.1.jar!/" />
+        </SOURCES>
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library" scope="TEST">
+      <library name="jna-3.4.0.jar">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/ext/jna-3.4.0.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES>
+          <root url="jar://$MODULE_DIR$/ext/src/jna-3.4.0.jar!/" />
+        </SOURCES>
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library" scope="TEST">
+      <library name="platform-3.4.0.jar">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/ext/platform-3.4.0.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES>
+          <root url="jar://$MODULE_DIR$/ext/src/platform-3.4.0.jar!/" />
+        </SOURCES>
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library" scope="TEST">
+      <library name="commons-io-2.2.jar">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/ext/commons-io-2.2.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES>
+          <root url="jar://$MODULE_DIR$/ext/src/commons-io-2.2.jar!/" />
+        </SOURCES>
       </library>
     </orderEntry>
     <orderEntry type="inheritedJdk" />
diff --git a/releases.moxie b/releases.moxie
new file mode 100644
index 00000000..453709c5
--- /dev/null
+++ b/releases.moxie
@@ -0,0 +1,694 @@
+#

+# ${project.version}

+#

+r17: {

+    title: Gitblit ${project.version} Released

+    id: ${project.version}

+    date: ${project.buildDate}

+    fixes:

+     - Could not reset settings with $ or { characters through Gitblit Manager because they are not properly escaped

+

+    additions: 

+	 - Option to force client-side basic authentication instead of form-based authentication if web.authenticateViewPages=true (issue 222)

+     - Optional periodic LDAP user and team pre-fetching & synchronization

+     - Display name and version in Tomcat Manager

+     - FogBugz post-receive hook script

+     - Implemented multiple repository owners

+     - Chinese translation

+

+    contributors:

+	- github/furinzen

+    - github/mschaefers

+    - github/thefake

+    - github/djschny

+    - github/akquinet

+    - github/dapengme

+    - github/yin8086

+}

+

+#

+# 1.2.1

+#

+r16: {

+    title: Gitblit 1.2.1 Released

+    id: 1.2.1

+    date: 2013-01-15

+    note: ''

+          Because there are now several types of files and folders that must be considered Gitblit data, the default location for data has changed.

+          

+          You will need to move a few files around when upgrading.  Please see the Upgrading section of the <a href="setup.html">setup</a> page for details.

+

+          <b>Express Users</b> make sure to update your web.xml file with the ${baseFolder} values!

+          ''

+    fixes:

+    - Fixed nullpointer on recursively calculating folder sizes when there is a named pipe or symlink in the hierarchy

+    - Added nullchecking when concurrently forking a repository and trying to display the fork network (issue-187)

+    - Fixed bug where permission changes were not visible in the web ui to a logged-in user until the user logged-out and then logged back in again (issue-186)

+    - Fixed nullpointer on creating a repository with mixed case (issue 185)

+    - Include missing model classes in api library (issue-184)

+    - Fixed nullpointer when using *web.allowForking = true* && *git.cacheRepositoryList = false* (issue 182)

+    - Likely fix for commit and commitdiff page failures when a submodule reference changes (issue 178)

+    - Build project models from the repository model cache, when possible, to reduce page load time (issue 172)

+    - Fixed loading of Brazilian Portuguese translation from *nix server

+

+    additions:

+    - ''Fanout PubSub service for self-hosted [Sparkleshare](http://sparkleshare.org) notifications.

+      This service is disabled by default.''

+    - ''Implemented a simple push log based on a hidden, orphan branch refs/gitblit/pushes (issue 177)

+      The push log is not currently visible in the ui, but the data will be collected and it will be exposed to the ui in the next release.''

+    - Support for locally and remotely authenticated accounts in LdapUserService and RedmineUserService (issue 183)

+    - Added Dutch translation

+

+    changes:

+    - ''Gitblit GO and Gitblit WAR are now both configured by `gitblit.properties`. WAR is no longer configured by `web.xml`.

+      However, Express for OpenShift continues to be configured by `web.xml`.''

+    - Support for a *--baseFolder* command-line argument for Gitblit GO and Gitblit Certificate Authority

+    - Support for specifying a *${baseFolder}* parameter in `gitblit.properties` and `web.xml` for several settings

+    - Improve history display of a submodule link

+    - Updated Korean translation

+    - Updated checkstyle definition

+    

+    settings:

+    - { name: fanout.bindInterface, defaultValue: localhost }

+    - { name: fanout.port, defaultValue: 0 }

+    - { name: fanout.useNio, defaultValue: 'true' }

+    - { name: fanout.connectionLimit, defaultValue: 0 }

+

+    contributors:

+    - github/mystygage

+    - github/ds5apn

+    - github/kwoot

+    - github/inaiat

+}

+

+#

+# 1.2.0

+#

+r15: {

+    title: Gitblit 1.2.0 Released

+    id: 1.2.0

+    date: 2012-12-31

+    note: ''

+          The permissions model has changed in the 1.2.0 release.

+          If you are updating your server, you must also update any Gitblit Manager and Federation Client installs to 1.2.0 as well.  The data model used by the RPC mechanism has changed slightly for the new permissions infrastructure.

+          ''

+    fixes:

+    - Fixed regression in *isFrozen* (issue 181)

+    - Author metrics can be broken by newlines in email addresses from converted repositories (issue 176)

+    - Set subjectAlternativeName on generated SSL cert if CN is an ip address (issue 170)

+    - Fixed incorrect links on history page for files not in the current/active commit (issue 166)

+    - Empty repository page failed to handle missing repository (issue 160)

+    - Fixed broken ticgit urls (issue 157)

+    - Exclude submodules from zip downloads (issue 151)

+    - Fixed bug where repository ownership was not updated on rename user

+    - Fixed bug in create/rename repository if you explicitly specified the alias for the root group (e.g. main/myrepo) (issue 143)

+    - Wrapped Markdown parser with improved exception handler (issue 142)

+    - Fixed duplicate entries in repository cache (issue 140)

+    - Fixed connection leak in LDAPUserService (issue 139)

+    - Fixed bug in commit page where changes to a submodule threw a null pointer exception (issue 132)

+    - Fixed bug in the diff view for filenames that have non-ASCII characters (issue 128)

+

+    additions:

+    - ''

+      Implemented discrete repository permissions (issue 36)

+      

+        - V (view in web ui, RSS feeds, download zip)

+        - R (clone)

+        - RW (clone and push)

+        - RWC (clone and push with ref creation)

+        - RWD (clone and push with ref creation, deletion)

+        - RW+ (clone and push with ref creation, deletion, rewind)

+        

+      While not as sophisticated as Gitolite, this does give finer access controls.  These permissions fit in cleanly with the existing users.conf and users.properties files.  In Gitblit <= 1.1.0, all your existing user accounts have RW+ access.   If you are upgrading to 1.2.0, the RW+ access is *preserved* and you will have to lower/adjust accordingly.

+      ''

+    - ''Implemented *case-insensitive* regex repository permission matching (issue 36)

+

+      This allows you to specify a permission like `RW:mygroup/.*` to grant push privileges to all repositories within the *mygroup* project/folder.''

+    - Added DELETE, CREATE, and NON-FAST-FORWARD ref change logging

+    - ''Added support for personal repositories.

+      Personal repositories can be created by accounts with the *create* permission and are stored in *git.repositoriesFolder/~username*.  Each user with personal repositories will have a user page, something like the GitHub profile page.  Personal repositories have all the same features as common repositories, except personal repositories can be renamed by their owner.''

+    - ''Added support for server-side forking of a repository to a personal repository (issue 137)

+      In order to fork a repository, the user account must have the *fork* permission **and** the repository must *allow forks*.  The clone inherits the access list of its origin.  i.e. if Team A has clone access to the origin repository, then by default Team A also has clone access to the fork.  This is to facilitate collaboration.  The fork owner may change access to the fork and add/remove users/teams, etc as required <u>however</u> it should be noted that all personal forks will be enumerated in the fork network regardless of access view restrictions.  If you really must have an invisible fork, the clone it locally, create a new repository for your invisible fork, and push it back to Gitblit.''

+    - Added optional *create-on-push* support

+    - Added **experimental** JGit-based garbage collection service.  This service is disabled by default.

+    - ''Added support for X509 client certificate authentication.  (issue 106)

+      You can require all git servlet access be authenticated by a client certificate.  You may also specify the OID fingerprint to use for mapping a certificate to a username.  It should be noted that the user account MUST already exist in Gitblit for this authentication mechanism to work; this mechanism can not be used to automatically create user accounts from a certificate.''

+    - Revised clean install certificate generation to create a Gitblit GO Certificate Authority certificate; an SSL certificate signed by the CA certificate; and to create distinct server key and server trust stores.  <u>The store files have been renamed!</u>

+    - Added support for Gitblit GO to require usage of client certificates to access the entire server.

+    - Added **Gitblit Certificate Authority**, an x509 PKI management tool for Gitblit GO to encourage use of x509 client certificate authentication.

+    - Added web.shortCommitId setting to control length of shortened commit ids

+    - Added alternate compressed download formats: tar.gz, tar.xz, tar.bzip2 (issue 174)

+    - Added simple project pages.  A project is a subfolder off the *git.repositoriesFolder*.

+    - Added support for X-Forwarded-Context for Apache subdomain proxy configurations (issue 135)

+    - Delete branch feature (issue 121)

+    - Added line links to blob view (issue 130)

+    - Added HTML sendmail hook script and Gitblit.sendHtmlMail method

+    - Added RedmineUserService

+    - Support for committer verification.  Requires use of *--no-ff* when merging branches or pull requests.  See setup page for details.

+    - Added Brazilian Portuguese translation

+

+    changes:

+    - Added server setting to specify keystore alias for ssl certificate (issue 98)

+    - Added optional global and per-repository activity page commit contribution throttle to help tame *really* active repositories (issue 173)

+    - Added support for symlinks in tree page and commit page (issue 171)

+    - All access restricted servlets (e.g. DownloadZip, RSS, etc) will try to authenticate using X509 certificates, container principals, cookies, and BASIC headers, in that order.

+    - Added *groovy* and *scala* to *web.prettyPrintExtensions*

+    - Added short commit id column to log and history tables (issue 168)

+    - Teams can now specify the *admin*, *create*, and *fork* roles to simplify user administration

+    - Use https Gravatar urls to avoid browser complaints

+    - Added frm to default pretty print extensions (issue 156)

+    - Expose ReceivePack to Groovy push hooks (issue 125)

+    - Redirect to summary page when refreshing the empty repository page on a repository that is not empty (issue 129)

+    - Emit a warning in the log file if running on a Tomcat-based servlet container which is unfriendly to %2F forward-slash url encoding AND Gitblit is configured to mount parameters with %2F forward-slash url encoding (issue 126)

+    - ''LDAP admin attribute setting is now consistent with LDAP teams setting and admin teams list.

+      If *realm.ldap.maintainTeams==true* **AND** *realm.ldap.admins* is not empty, then User.canAdmin() is controlled by LDAP administrative team membership.  Otherwise, User.canAdmin() is controlled by Gitblit.''

+    - Support servlet container authentication for existing UserModels (issue 68)

+

+	settings:

+	- { name: web.allowForking, defaultValue: 'true' }

+	- { name: git.allowCreateOnPush, defaultValue: 'true' }

+	- { name: git.allowGarbageCollection, defaultValue: 'false' }

+	- { name: git.garbageCollectionHour, defaultValue: 0 }

+	- { name: git.defaultGarbageCollectionThreshold, defaultValue: 500k }

+	- { name: git.defaultGarbageCollectionPeriod, defaultValue: 7 days }

+	- { name: git.requireClientCertificates, defaultValue: 'false' }

+	- { name: git.enforceCertificateValidity, defaultValue: 'true' }

+	- { name: git.certificateUsernameOIDs, defaultValue: CN }

+	- { name: web.shortCommitIdLength, defaultValue: 8 }

+	- { name: web.compressedDownloads, defaultValue: zip gz }

+	- { name: server.requireClientCertificates, defaultValue: 'false' }

+

+    dependencyChanges:

+    - Jetty 7.6.8

+    - JGit 2.2.0.201212191850-r

+    - Groovy 1.8.8

+    - Wicket 1.4.21

+    - Lucene 3.6.1

+    - BouncyCastle 1.47

+    - MarkdownPapers 1.3.2

+    - JCalendar 1.3.2

+    - Commons-Compress 1.4.1

+    - XZ for Java 1.0

+

+    contributors:

+    - github/rafaelcavazin

+    - github/mallowlabs

+    - github/sauthieg

+    - github/ajermakovics

+    - github/kevinanderson1

+    - github/jpyeron

+}

+

+#

+# 1.1.0

+#

+r14: {

+    title: Gitblit 1.1.0 Released

+    id: 1.1.0

+    date: 2012-08-25

+    note: If you are updating from an earlier release AND you have indexed branches with the Lucene indexing feature, you need to be aware that this release will completely re-index your repositories.  Please be sure to provide ample heap resources as appropriate for your installation.

+

+    fixes:

+    - Bypass Wicket's inability to handle direct url addressing of a view-restricted, grouped repository for new, unauthenticated sessions (e.g. click link from email or rss feed without having an active Wicket session)

+    - Fixed MailExecutor's failure to cope with mail server connection troubles resulting in 100% CPU usage

+    - Fixed generated urls in Groovy *sendmail* hook script for grouped repositories

+    - Fixed generated urls in RSS feeds for grouped repositories

+    - Fixed nullpointer exception in git servlet security filter (issue 123)

+    - Eliminated an unnecessary repository enumeration call on the root page which should result in faster page loads (issue 103)

+    - Gitblit could not delete a Lucene index in a working copy on index upgrade

+    - Do not index submodule links (issue 119)

+    - Restore original user or team object on failure to update (issue 118)

+    - Fixes to relative path determination in repository search algorithm for symlinks (issue 116)

+    - Fix to GitServlet to allow pushing to symlinked repositories (issue 116)

+    - Repository URL now uses `X-Forwarded-Proto` and `X-Forwarded-Port`, if available, for reverse proxy configurations (issue 115)

+    - Output real RAW content, not simulated RAW content (issue 114)

+    - Fixed Lucene charset encoding bug when reindexing a repository (issue 112)

+    - Fixed search box linking to Lucene page for grouped repository on Tomcat (issue 111)

+    - Fixed null pointer in LdapUserSerivce if account has a null email address (issue 110)

+    - Really fixed failure to update a GO setting from the manager (issue 85)

+

+    additions:

+    - Identified repository list is now cached by default to reduce disk io and to improve performance (issue 103)

+    - Preliminary bare repository submodule support

+    - ''

+      *git.submoduleUrlPatterns* is a space-delimited list of regular expressions for extracting a repository name from a submodule url.

+      For example, `git.submoduleUrlPatterns = .*?://github.com/(.*)` would extract *gitblit/gitblit.git* from *git://github.git/gitblit/gitblit.git*

+      **Note:** You may not need this control to work with submodules, but it is there if you do.

+        - If there are no matches from *git.submoduleUrlPatterns* then the repository name is assumed to be whatever comes after the last `/` character *(e.g. gitblit.git)*

+        - Gitblit will try to locate this repository relative to the current repository *(e.g. myfolder/myrepo.git, myfolder/mysubmodule.git)* and then at the root level *(mysubmodule.git)* if that fails.

+        - Submodule references in a working copy will be properly identified as gitlinks, but Gitblit will not traverse into the working copy submodule repository.

+      ''

+    - ''

+      Added a repository setting to control authorization as AUTHENTICATED or NAMED. (issue 117)

+

+      NAMED is the original behavior for authorizing against a list of permitted users or permitted teams.

+      AUTHENTICATED allows restricted access for any authenticated user.  This is a looser authorization control.

+      ''

+    - Added default authorization control setting (AUTHENTICATED or NAMED)

+    - Added setting to control how deep Gitblit will recurse into *git.repositoriesFolder* looking for repositories (issue 103)

+    - Added setting to specify regex exclusions for repositories (issue 103)

+    - Blob page now supports displaying images (issue 6)

+    - Non-image binary files can now be downloaded using the RAW link

+    - Support StartTLS in LdapUserService (issue 122)

+    - Added Korean translation

+

+    changes:

+    - Line breaks inserted for readability in raw Markdown content display in the event of a parsing/transformation error.  An error message is now displayed prepended to the raw content.

+    - Improve UTF-8 reading for Markdown files

+    - Updated Polish translation

+    - Updated Japanese translation

+    - Updated Spanish translation

+    

+    settings:

+    - { name: git.cacheRepositoryList, defaultValue: 'true' }

+    - { name: git.submoduleUrlPatterns, defaultValue: * }

+    - { name: git.searchExclusions, defaultValue: * }

+    - { name: git.searchRecursionDepth, defaultValue: -1 }

+    - { name: git.defaultAuthorizationControl, defaultValue: NAMED }

+

+    contributors:

+    - Steffen Gebert

+}

+

+#

+# 1.0.0

+#

+r13: {

+    title: Gitblit 1.0.0 Released

+    id: 1.0.0

+    date: 2012-07-14

+

+    fixes:

+    - Fixed bug in Lucene search where old/stale blobs were never properly deleted during incremental updates.  This resulted in duplicate blob entries in the index.

+    - Fixed intermittent bug in identifying line numbers in Lucene search (issue 105)

+    - Adjust repository identification algorithm to handle the scenario where a repository name collides with a group/folder name (e.g. foo.git and foo/bar.git) (issue 104)

+    - Fixed bug where a repository set as *authenticated push* did not have anonymous clone access (issue 96)

+    - Fixed bug in Basic authentication if passwords had a colon

+    - Fixed bug where the Gitblit Manager could not update a setting that was not referenced in reference.properties (issue 85)

+

+    changes:

+    - ''**Updated Lucene index version which will force a rebuild of ALL your Lucene indexes**

+      Make sure to properly set *web.blobEncodings* before starting Gitblit if you are updating!  (issue 97)''

+    - Changed default layout for web ui from Fixed-Width layout to Responsive layout (issue 101)

+    - ''IUserService interface has changed to better accomodate custom authentication and/or custom authorization<

+      The default `users.conf` now supports persisting display names and email addresses.''

+    - Updated Japanese translation

+

+    additions:

+    - Added setting to allow specification of a robots.txt file (issue 99)

+    - ''Added setting to control Responsive layout or Fixed-Width layout (issue 101)

+      Responsive layout is now the default.  This layout gracefully scales the web ui from a desktop layout to a mobile layout by hiding page components.  It is easy to try, just resize your browser or point your Android/iOS device to the url of your Gitblit install.''

+    - Added setting to control charsets for blob string decoding.  Default encodings are UTF-8, ISO-8859-1, and the server default charset. (issue 97)      

+    - ''Exposed JGit internal configuration settings in gitblit.properties/web.xml (issue 93)

+      Review your `gitblit.properties` or `web.xml` for detailed explanations of these settings.''

+    - Added default access restriction.  Applies to new repositories and repositories that have not been configured with Gitblit. (issue 88)

+    - Added Ivy 2.2.0 dependency which enables Groovy Grapes, a mechanism to resolve and retrieve library dependencies from a Maven 2 repository within a Groovy push hook script

+    - ''Added setting to control Groovy Grape root folder (location where resolved dependencies are stored)

+      [Grape](http://groovy.codehaus.org/Grape) allows you to add Maven dependencies to your pre-/post-receive hook script classpath.''

+    - Added LDAP User Service with many new *realm.ldap* keys

+    - ''Added support for custom repository properties for Groovy hooks

+      Custom repository properties complement hook scripts by providing text field prompts in the web ui and the Gitblit Manager for the defined properties.  This allows your push hooks to be parameterized.''

+    - Added script to facilitate proxy environment setup on Linux

+    - Added Polish translation

+    - Added Spanish translation

+

+    settings:

+    - { name: groovy.grapeFolder, defaultValue: groovy/grape }

+    - { name: web.robots.txt, defaultValue: }

+    - { name: web.useResponsiveLayout, defaultValue: 'true' }

+    - { name: web.blobEncodings, defaultValue: UTF-8 ISO-8859-1 }

+    - { name: git.defaultAccessRestriction, defaultValue: NONE }

+    - { name: git.packedGitWindowSize, defaultValue: 8k }

+    - { name: git.packedGitLimit, defaultValue: 10m }

+    - { name: git.deltaBaseCacheLimit, defaultValue: 10m }

+    - { name: git.packedGitOpenFiles, defaultValue: 128 }

+    - { name: git.streamFileThreshold, defaultValue: 50m }

+    - { name: git.packedGitMmap, defaultValue: 'false' }

+

+    dependencyChanges:

+    - Bootstrap 2.0.4

+    - JGit 2.0.0.201206130900-r

+    - Groovy 1.8.6

+    - Gson 1.7.2

+    - Log4J 1.2.17

+    - SLF4J 1.6.6

+    - Apache Commons Daemon 1.0.10

+    - Ivy 2.2.0

+

+    contributors:

+    - Eduardo Guervos Narvaez

+    - Lukasz Jader

+    - github/mragab

+    - github/jcrygier

+    - github/zakki

+    - github/peterloron

+}

+

+#

+# 0.9.3

+#

+r12: {

+    title: Gitblit 0.9.3 Released

+    id: 0.9.3

+    date: 2012-04-11

+

+    fixes:

+    - Fixed bug where you could not remove all selections from a RepositoryModel list (permitted users, permitted teams, hook scripts, federation sets, etc) (issue 81)

+    - Automatically set *java.awt.headless=true* for Gitblit GO

+}

+

+#

+# 0.9.2

+#

+r11: {

+    title: Gitblit 0.9.2 Released

+    id: 0.9.2

+    date: 2012-04-04

+    

+    changes:

+    - Added *clientLogger* bound variable to Groovy hook mechanism to allow custom info and error messages to be returned to the client

+

+   fixes:

+    - Fixed absolute path/canonical path discrepancy between Gitblit and JGit regarding use of symlinks (issue 78)

+    - Fixed row layout on activity page (issue 79)

+    - Fixed Centos service script

+    - Fixed EditRepositoryPage for IE8; missing save button (issue 80)

+

+    contributors:

+    - github/jonnybbb

+    - github/mohamedmansour

+    - github/jcrygier

+}

+

+#

+# 0.9.1

+#

+r10: {

+    title: Gitblit 0.9.1 Released

+    id: 0.9.1

+    date: 2012-03-27

+

+    fixes:

+    - Lucene folder was stored in working copy instead of in .git folder

+}

+

+#

+# 0.9.0

+#

+r9: {

+    title: Gitblit 0.9.0 Released

+    id: 0.9.0

+    date: 2012-03-27

+

+    security:

+    - Fixed session fixation vulnerability where the session identifier was not reset during the login process (issue 62)

+

+    changes:

+    - Reject pushes to a repository with a working copy (i.e. non-bare repository) (issue-49)

+    - Changed default web.datetimestampLongFormat from *EEEE, MMMM d, yyyy h:mm a z* to *EEEE, MMMM d, yyyy HH:mm Z* (issue 50)

+    - Expanded commit age coloring from 2 days to 30 days (issue 57)

+

+    additions:

+    - ''Added optional Lucene branch indexing (issue 16)

+      Repository branches may be optionally indexed by Lucene for improved searching.  To use this feature you must specify which branches to index within the *Edit Repository* page; _no repositories are automatically indexed_.  Gitblit will build or incrementally update enrolled repositories on a 2 minute cycle. (i.e you will have to wait 2-3 minutes after respecifying indexed branches or pushing new commits before Gitblit will build/update the repository Lucene index.)

+      If a repository has Lucene-indexed branches the *search* form on the repository pages will redirect to the root-level Lucene search page and only the content of those branches can be searched.<br/>

+      If the repository does not specify any indexed branches then repository commit-traversal search is used.

+

+      **Note:** Initial indexing of an existing repository can be memory-exhaustive. Be sure to provide your Gitblit server adequate heap space to index your repositories (e.g. -Xmx1024M).<br/>

+      See the [setup](setup.html) page for additional details.''

+    - Allow specifying timezone to use for Gitblit which is independent of both the JVM and the system timezone (issue 54)

+    - Added a built-in AJP connector for integrating Gitblit GO into an Apache mod_proxy setup (issue 59)

+    - ''On the Repositories page show a bang *!* character in the color swatch of a repository with a working copy (issue 49)

+      Push requests to these repositories will be rejected.''

+    - On all non-bare Repository pages show *WORKING COPY* in the upper right corner (issue 49)

+    - New setting to prevent display/serving non-bare repositories

+    - Added *protect-refs.groovy*

+    - Allow setting default branch (relinking HEAD) to a branch or a tag

+    - Added Ubuntu service init script (issue 72)

+    - Added partial Japanese translation

+

+    fixes:

+    - Ensure that Welcome message is parsed using UTF-8 encoding (issue 74)

+    - Activity page chart layout broken by Google (issue 73)

+    - Uppercase repositories not selectable in edit palettes (issue 71)

+    - Not all git notes were properly displayed on the commit page (issue 70)

+    - Activity page now displays all local branches (issue 65)

+    - Fixed (harmless) nullpointer on pushing to an empty repository (issue 69)

+    - Fixed possible nullpointer from the servlet container on startup (issue 67)

+    - Fixed UTF-8 encoding bug on diff page (issue 66)

+    - Fixed timezone bugs on the activity page (issue 54)

+    - Prevent add/edit team with no selected repositories (issue 56)

+    - Disallow browser autocomplete on add/edit user/team/repository pages

+    - Fixed username case-sensitivity issues (issue 43)

+    - Disregard searching a subfolder if Gitblit does not have filesystem permissions (issue 51)

+

+    settings:

+    - { name: web.allowLuceneIndexing, defaultValue: 'true' }

+    - { name: web.luceneIgnoreExtensions, defaultValue: 7z arc arj bin bmp dll doc docx exe gif gz jar jpg lib lzh odg odf odt pdf ppt png so swf xcf xls xlsx zip }

+    - { name: web.timezone, defaultValue: }

+    - { name: server.ajpPort, defaultValue: 0 }

+    - { name: server.ajpBindInterface, defaultValue: localhost }

+    - { name: git.onlyAccessBareRepositories, defaultValue: 'false' }

+

+    dependencyChanges:

+    - Bootstrap 2.0.2

+    - MarkdownPapers 1.2.7

+    - JGit 1.3.0.201202151440-r

+    - Wicket 1.4.20

+

+    contributors:

+    - github/lemval

+    - github/zakki

+    - github/plm

+}

+

+#

+# 0.8.2

+#

+r8: {

+    title: Gitblit 0.8.2 Released

+    id: 0.8.2

+    date: 2012-01-13

+

+    fixes:

+    - Fixed bug when upgrading from users.properties to users.conf (issue 41)

+}

+

+#

+# 0.8.1

+#

+r7: {

+    title: Gitblit 0.8.1 Released

+    id: 0.8.1

+    date: 2012-01-11

+

+    fixes:

+    - Include missing icon resource for the manager (issue 40)

+    - Fixed sendmail.groovy message content with incorrect tag/branch labels

+}

+

+#

+# 0.8.0

+#

+r6: {

+    title: Gitblit 0.8.0 Released

+    id: 0.8.0

+    date: 2012-01-11

+

+    additions:

+    - ''Platform-independent, Groovy push hook script mechanism.

+      Hook scripts can be set per-repository, per-team, or globally for all repositories.''

+    - ''*sendmail.groovy* for optional email notifications on push.

+      You must properly configure your SMTP server settings in `gitblit.properties` or `web.xml` to use *sendmail.groovy*.''

+    - New global key for mailing lists.  This is used in conjunction with the *sendmail.groovy* hook script.  All repositories that use the *sendmail.groovy* script will include these addresses in the notification process.  Please see the Setup page for more details about configuring sendmail.

+    - *com.gitblit.GitblitUserService*.  This is a wrapper object for the built-in user service implementations.  For those wanting to only implement custom authentication it is recommended to subclass GitblitUserService and override the appropriate methods.  Going forward, this will help insulate custom authentication from new IUserService API and/or changes in model classes.

+    - ''New default user service implementation: *com.gitblit.ConfigUserService* (`users.conf`)

+      This user service implementation allows for serialization and deserialization of more sophisticated Gitblit User objects without requiring the encoding trickery now present in FileUserService (users.properties).  This will open the door for more advanced Gitblit features.

+      For those upgrading from an earlier Gitblit version, a `users.conf` file will automatically be created for you from your existing `users.properties` file on your first launch of Gitblit <u>however</u> you will have to manually set *realm.userService=users.conf* to switch to the new user service.

+      The original `users.properties` file and the corresponding implementation are **deprecated**.''

+    - Teams for specifying user-repository access in bulk.  Teams may also specify mailing lists addresses and pre- & post- receive hook scripts.

+    - Gravatar integration

+    - Activity page for aggregated repository activity.  This is a timeline of commit activity over the last N days for one or more repositories.

+    - *Filters* menu for the Repositories page and Activity page.  You can filter by federation set, team, and simple custom regular expressions.  Custom expressions can be stored in `gitblit.properties` or `web.xml` or directly defined in your url (issue 27)

+    - Flash-based 1-step *copy to clipboard* of the primary repository url based on Clippy

+    - JavaScript-based 3-step (click, ctrl+c, enter) *copy to clipboard* of the primary repository url in the event that you do not want to use Flash on your installation

+    - Empty repositories now link to an *empty repository* page which gives some direction to the user for the next step in using Gitblit.  This page displays the primary push/clone url of the repository and gives sample syntax for the git command-line client. (issue 31)

+    - Repositories with a *gh-pages* branch will now have a *pages* link which will serve the content of this branch.  All resource requests are against the repository, Gitblit does not checkout/export this branch to a temporary filesystem.  Jekyll templating is not supported.

+    - Gitblit Express bundle to get started running Gitblit on RedHat OpenShift cloud <span class="label label-warning">BETA</span>

+

+    changes:

+    - Dropped display of trailing .git from repository names

+    - ''Gitblit GO is now monolithic like the WAR build. (issue 30)

+      This change helps adoption of GO in environments without an internet connection or with a restricted connection.''

+    - Unit testing framework has been migrated to JUnit4 syntax and the test suite has been redesigned to run all unit tests, including rpc, federation, and git push/clone tests

+

+    fixes:

+    - Several a bugs in FileUserService related to cleaning up old repository permissions on a rename or delete

+    - Renaming a repository into a new subfolder failed (issue 33)

+

+    settings:

+    - { name: groovy.scriptsFolder, defaultValue: groovy }

+    - { name: groovy.preReceiveScripts, defaultValue: }

+    - { name: groovy.postReceiveScripts, defaultValue: }

+    - { name: mail.mailingLists, defaultValue: }

+    - { name: realm.userService, defaultValue: users.conf }

+    - { name: web.allowGravatar, defaultValue: 'true' }

+    - { name: web.activityDuration, defaultValue: 14 }

+    - { name: web.timeFormat, defaultValue: HH:mm }

+    - { name: web.datestampLongFormat, defaultValue: "EEEE, MMMM d, yyyy" }

+    - { name: web.customFilters, defaultValue: }

+    - { name: web.allowFlashCopyToClipboard, defaultValue: 'true' }

+

+    dependencyChanges:

+    - JGit 1.2.0

+    - Groovy 1.8.5

+    - Clippy

+}

+

+#

+# 0.7.0

+#

+r5: {

+    title: Gitblit 0.7.0 Released

+    id: 0.7.0

+    date: 2011-11-11

+

+    security:

+    - fixed security hole when cloning clone-restricted repository with TortoiseGit (issue 28)

+

+    fixes:

+    - ''federation protocol timestamps.  dates are now serialized to the [iso8601](http://en.wikipedia.org/wiki/ISO_8601) standard.

+      **This breaks 0.6.0 federation clients/servers.**''

+    - collision on rename for repositories and users

+    - Gitblit can now browse the Linux kernel repository (issue 25)

+    - Gitblit now runs on Servlet 3.0 webservers (e.g. Tomcat 7, Jetty 8) (issue 23)

+    - Set the RSS content type of syndication feeds for Firefox 4 (issue 22)

+    - RSS feeds are now properly encoded to UTF-8

+    - RSS feeds now properly generate parameterized links if *web.mountParameters=false*

+    - Null pointer exception if did not set federation strategy (issue 20)

+    - Gitblit GO allows SSL renegotiation if running on Java 1.6.0_22 or later

+        

+    changes:

+    - updated ui with Twitter Bootstrap CSS toolkit

+    - repositories list performance by caching repository sizes (issue 27)

+    - summary page performance by caching metric calculations (issue 25)

+    

+    additions:

+    - authenticated JSON RPC mechanism

+    - Gitblit API RSS/JSON RPC library

+    - Gitblit Manager (Java/Swing Application) for remote administration of a Gitblit server.

+    - per-repository setting to skip size calculation (faster repositories page loading)

+    - per-repository setting to skip summary metrics calculation (faster summary page loading)

+    - IUserService.setup(IStoredSettings) for custom user service implementations

+    - setting to control Gitblit GO context path for proxy setups

+    - *combined-md5* password storage option which stores the hash of username+password as the password

+    - repository owners are automatically granted access for git, feeds, and zip downloads without explicitly selecting them

+    - RSS feeds now include regex substitutions on commit messages for bug trackers, etc

+    

+    settings:

+    - { name: web.loginMessage, defaultValue: gitblit }

+    - { name: web.enableRpcServlet, defaultValue: 'true' }

+    - { name: web.enableRpcManagement, defaultValue: 'false' }

+    - { name: web.enableRpcAdministration, defaultValue: 'false' }

+    - { name: server.contextPath, defaultValue: / }

+    

+    dependencyChanges:

+    - MarkdownPapers 1.2.5

+    - Wicket 1.4.19

+

+    contributors:

+    - github/dadalar

+    - github/alyandon

+    - github/trygvis

+}

+

+#

+# 0.6.0

+#

+r4: {

+    title: Gitblit 0.6.0 Released

+    id: 0.6.0

+    date: 2011-09-27

+

+    fixes:

+    - syndication urls for WAR deployments

+    - authentication for zip downloads

+

+    additions:

+    - federation feature to allow gitblit instances (or gitblit federation clients) to pull repositories and, optionally, settings and accounts from other gitblit instances.  This is something like [svn-sync](http://svnbook.red-bean.com/en/1.5/svn.ref.svnsync.html) for gitblit.

+    - user role *#notfederated* to prevent a user account from being pulled by a federated Gitblit instance

+

+    settings:

+    - { name: federation.name, defaultValue: }

+    - { name: federation.passphrase, defaultValue: }

+    - { name: federation.allowProposals, defaultValue: 'false' }

+    - { name: federation.proposalsFolder, defaultValue: proposals }

+    - { name: federation.defaultFrequency, defaultValue: 60 mins }

+    - { name: federation.sets, defaultValue: }

+    - { name: "mail.*", defaultValue: }

+        

+    dependencyChanges:

+    - MarkdownPapers 1.1.1

+    - Wicket 1.4.18

+    - JGit 1.1.0

+    - google-gson

+    - javamail

+}

+

+#

+# 0.5.2

+#

+r3: {

+    title: Gitblit 0.5.2 Released

+    id: 0.5.2

+    date: 2011-07-27

+

+    fixes:

+    - active repositories with a HEAD that pointed to an empty branch caused internal errors (issue 14)

+    - bare-cloned repositories were listed as (empty) and were not clickable (issue 13)

+    - default port for Gitblit GO is now 8443 to be more linux/os x friendly (issue 12)

+    - repositories can now be reliably deleted and renamed (issue 10)

+    - users can now change their passwords (issue 1)

+    - always show root repository group first, i.e. do not sort root group with other groups

+    - tone-down repository group header color

+    

+    additions:

+    - optionally display repository on-disk size on repositories page

+    - forward-slashes ('/', %2F) can be encoded using a custom character to workaround some servlet container default security measures for proxy servers

+    

+    settings:

+    - { name: web.showRepositorySizes, defaultValue: 'true' }

+    - { name: web.forwardSlashCharacter, defaultValue: / }

+    

+    dependencyChanges:

+    - MarkdownPapers 1.1.0

+    - Jetty 7.4.3

+}

+

+#

+# 0.5.1

+#

+r2: {

+    title: Gitblit 0.5.1 Released

+    id: 0.5.1

+    date: 2011-06-28

+

+    changes:

+    - clarified SSL certificate generation and configuration for both server-side and client-side

+    - added some more troubleshooting information to documentation

+    - replaced JavaService with Apache Commons Daemon

+}

+

+#

+# 0.5.0

+#

+r1: {

+    title: Gitblit 0.5.0 Released

+    id: 0.5.0

+    date: 2011-06-26

+    text: initial release

+}

+

+snapshot: &r17

+release: &r16

+releases: &r[1..16]

diff --git a/src/com/gitblit/FederationClientLauncher.java b/src/com/gitblit/FederationClientLauncher.java
deleted file mode 100644
index 80f5a3d9..00000000
--- a/src/com/gitblit/FederationClientLauncher.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*

- * Copyright 2011 gitblit.com.

- *

- * Licensed under the Apache License, Version 2.0 (the "License");

- * you may not use this file except in compliance with the License.

- * You may obtain a copy of the License at

- *

- *     http://www.apache.org/licenses/LICENSE-2.0

- *

- * Unless required by applicable law or agreed to in writing, software

- * distributed under the License is distributed on an "AS IS" BASIS,

- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

- * See the License for the specific language governing permissions and

- * limitations under the License.

- */

-package com.gitblit;

-

-import java.io.File;

-import java.io.IOException;

-import java.util.Collections;

-import java.util.List;

-

-import com.gitblit.build.Build;

-

-/**

- * Downloads dependencies and launches command-line Federation client.

- * 

- * @author James Moger

- * 

- */

-public class FederationClientLauncher {

-

-	public static void main(String[] args) {

-		// download federation client runtime dependencies

-		Build.federationClient();

-

-		File libFolder = new File("ext");

-		List<File> jars = Launcher.findJars(libFolder.getAbsoluteFile());

-		

-		// sort the jars by name and then reverse the order so the newer version

-		// of the library gets loaded in the event that this is an upgrade

-		Collections.sort(jars);

-		Collections.reverse(jars);

-		for (File jar : jars) {

-			try {

-				Launcher.addJarFile(jar);

-			} catch (IOException e) {

-

-			}

-		}

-		

-		FederationClient.main(args);

-	}

-}

diff --git a/src/com/gitblit/client/GitblitManagerLauncher.java b/src/com/gitblit/client/GitblitManagerLauncher.java
deleted file mode 100644
index 9b6ee96b..00000000
--- a/src/com/gitblit/client/GitblitManagerLauncher.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/*

- * Copyright 2011 gitblit.com.

- *

- * Licensed under the Apache License, Version 2.0 (the "License");

- * you may not use this file except in compliance with the License.

- * You may obtain a copy of the License at

- *

- *     http://www.apache.org/licenses/LICENSE-2.0

- *

- * Unless required by applicable law or agreed to in writing, software

- * distributed under the License is distributed on an "AS IS" BASIS,

- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

- * See the License for the specific language governing permissions and

- * limitations under the License.

- */

-package com.gitblit.client;

-

-import java.awt.Color;

-import java.awt.EventQueue;

-import java.awt.FontMetrics;

-import java.awt.Graphics2D;

-import java.awt.SplashScreen;

-import java.io.File;

-import java.io.IOException;

-import java.util.Collections;

-import java.util.List;

-

-import com.gitblit.Constants;

-import com.gitblit.Launcher;

-import com.gitblit.build.Build;

-import com.gitblit.build.Build.DownloadListener;

-

-/**

- * Downloads dependencies and launches Gitblit Manager.

- * 

- * @author James Moger

- * 

- */

-public class GitblitManagerLauncher {

-

-	public static void main(String[] args) {

-		final SplashScreen splash = SplashScreen.getSplashScreen();

-		

-		DownloadListener downloadListener = new DownloadListener() {

-			@Override

-			public void downloading(String name) {

-				updateSplash(splash, Translation.get("gb.downloading") + " " + name);				

-			}

-		};

-		

-		// download rpc client runtime dependencies

-		Build.manager(downloadListener);

-

-		File libFolder = new File("ext");

-		List<File> jars = Launcher.findJars(libFolder.getAbsoluteFile());

-		

-		// sort the jars by name and then reverse the order so the newer version

-		// of the library gets loaded in the event that this is an upgrade

-		Collections.sort(jars);

-		Collections.reverse(jars);

-		for (File jar : jars) {

-			try {

-				updateSplash(splash, Translation.get("gb.loading") + " " + jar.getName() + "...");

-				Launcher.addJarFile(jar);

-			} catch (IOException e) {

-

-			}

-		}

-		

-		updateSplash(splash, Translation.get("gb.starting") + " Gitblit Manager...");

-		GitblitManager.main(args);

-	}

-

-	private static void updateSplash(final SplashScreen splash, final String string) {

-		if (splash == null) {

-			return;

-		}

-		try {

-			EventQueue.invokeAndWait(new Runnable() {

-				public void run() {

-					Graphics2D g = splash.createGraphics();

-					if (g != null) {

-						// Splash is 320x120

-						FontMetrics fm = g.getFontMetrics();

-						

-						// paint startup status

-						g.setColor(Color.darkGray);

-						int h = fm.getHeight() + fm.getMaxDescent();

-						int x = 5;

-						int y = 115;

-						int w = 320 - 2 * x;

-						g.fillRect(x, y - h, w, h);

-						g.setColor(Color.lightGray);

-						g.drawRect(x, y - h, w, h);

-						g.setColor(Color.WHITE);

-						int xw = fm.stringWidth(string);

-						g.drawString(string, x + ((w - xw) / 2), y - 5);

-						

-						// paint version

-						String ver = "v" + Constants.VERSION;

-						int vw = g.getFontMetrics().stringWidth(ver);

-						g.drawString(ver, 320 - vw - 5, 34);

-						g.dispose();

-						splash.update();

-					}

-				}

-			});

-		} catch (Throwable t) {

-			t.printStackTrace();

-		}

-	}

-}

diff --git a/checkstyle.xml b/src/main/config/checkstyle.xml
index ee45e7ef..ee45e7ef 100644
--- a/checkstyle.xml
+++ b/src/main/config/checkstyle.xml
diff --git a/distrib/authority.conf b/src/main/distrib/data/certs/authority.conf
index 575e9b1e..575e9b1e 100644
--- a/distrib/authority.conf
+++ b/src/main/distrib/data/certs/authority.conf
diff --git a/distrib/instructions.tmpl b/src/main/distrib/data/certs/instructions.tmpl
index 11ea78ff..11ea78ff 100644
--- a/distrib/instructions.tmpl
+++ b/src/main/distrib/data/certs/instructions.tmpl
diff --git a/distrib/mail.tmpl b/src/main/distrib/data/certs/mail.tmpl
index 463e124d..463e124d 100644
--- a/distrib/mail.tmpl
+++ b/src/main/distrib/data/certs/mail.tmpl
diff --git a/distrib/gitblit.properties b/src/main/distrib/data/gitblit.properties
index ba4fa2c7..a05f5d2d 100644
--- a/distrib/gitblit.properties
+++ b/src/main/distrib/data/gitblit.properties
@@ -440,7 +440,7 @@ fanout.connectionLimit = 0
 # RESTART REQUIRED

 web.authenticateViewPages = false

 

-# if web.authenticateViewPages=true you may optionally require a client-side

+# If web.authenticateViewPages=true you may optionally require a client-side

 # basic authentication prompt instead of the standard form-based login. 

 #

 # SINCE 1.3.0

diff --git a/distrib/groovy/.gitignore b/src/main/distrib/data/groovy/.gitignore
index e58dc47f..e58dc47f 100644
--- a/distrib/groovy/.gitignore
+++ b/src/main/distrib/data/groovy/.gitignore
diff --git a/distrib/groovy/blockpush.groovy b/src/main/distrib/data/groovy/blockpush.groovy
index caef3306..caef3306 100644
--- a/distrib/groovy/blockpush.groovy
+++ b/src/main/distrib/data/groovy/blockpush.groovy
diff --git a/distrib/groovy/jenkins.groovy b/src/main/distrib/data/groovy/jenkins.groovy
index d76a3d66..d76a3d66 100644
--- a/distrib/groovy/jenkins.groovy
+++ b/src/main/distrib/data/groovy/jenkins.groovy
diff --git a/distrib/groovy/localclone.groovy b/src/main/distrib/data/groovy/localclone.groovy
index 49b7f8b3..49b7f8b3 100644
--- a/distrib/groovy/localclone.groovy
+++ b/src/main/distrib/data/groovy/localclone.groovy
diff --git a/distrib/groovy/protect-refs.groovy b/src/main/distrib/data/groovy/protect-refs.groovy
index b1b611f4..b1b611f4 100644
--- a/distrib/groovy/protect-refs.groovy
+++ b/src/main/distrib/data/groovy/protect-refs.groovy
diff --git a/distrib/groovy/sendmail-html.groovy b/src/main/distrib/data/groovy/sendmail-html.groovy
index 16920735..16920735 100644
--- a/distrib/groovy/sendmail-html.groovy
+++ b/src/main/distrib/data/groovy/sendmail-html.groovy
diff --git a/distrib/groovy/sendmail.groovy b/src/main/distrib/data/groovy/sendmail.groovy
index c832bc64..c832bc64 100644
--- a/distrib/groovy/sendmail.groovy
+++ b/src/main/distrib/data/groovy/sendmail.groovy
diff --git a/distrib/groovy/thebuggenie.groovy b/src/main/distrib/data/groovy/thebuggenie.groovy
index b4385a26..b4385a26 100644
--- a/distrib/groovy/thebuggenie.groovy
+++ b/src/main/distrib/data/groovy/thebuggenie.groovy
diff --git a/distrib/projects.conf b/src/main/distrib/data/projects.conf
index d43f4829..d43f4829 100644
--- a/distrib/projects.conf
+++ b/src/main/distrib/data/projects.conf
diff --git a/distrib/users.conf b/src/main/distrib/data/users.conf
index e9dbd83d..e9dbd83d 100644
--- a/distrib/users.conf
+++ b/src/main/distrib/data/users.conf
diff --git a/distrib/federation.properties b/src/main/distrib/federation.properties
index c762b45c..c762b45c 100644
--- a/distrib/federation.properties
+++ b/src/main/distrib/federation.properties
diff --git a/distrib/groovy/fogbugz.groovy b/src/main/distrib/groovy/fogbugz.groovy
index 4c19d3da..4c19d3da 100644
--- a/distrib/groovy/fogbugz.groovy
+++ b/src/main/distrib/groovy/fogbugz.groovy
diff --git a/src/main/distrib/linux/add-indexed-branch.sh b/src/main/distrib/linux/add-indexed-branch.sh
new file mode 100644
index 00000000..d31f43ed
--- /dev/null
+++ b/src/main/distrib/linux/add-indexed-branch.sh
@@ -0,0 +1,21 @@
+#!/bin/bash
+# --------------------------------------------------------------------------
+# This is for Lucene search integration.
+#
+# Allows you to add an indexed branch specification to the repository config
+# for all matching repositories in the specified folder.
+#
+# All repositories are included unless excluded using a --skip parameter.
+# --skip supports simple wildcard fuzzy matching however only 1 asterisk is
+# allowed per parameter.
+#
+# Always use forward-slashes for the path separator in your parameters!!
+#
+# Set FOLDER to the server's git.repositoriesFolder
+# Set BRANCH ("default" or fully qualified ref - i.e. refs/heads/master)
+# Set EXCLUSIONS for any repositories that you do not want to change
+# --------------------------------------------------------------------------
+SET FOLDER=git
+SET EXCLUSIONS=--skip test.git --skip group/test*
+SET BRANCH=default
+java -cp gitblit.jar;"%CD%\ext\*" com.gitblit.AddIndexedBranch --repositoriesFolder %FOLDER% --branch %BRANCH% %EXCLUSIONS%
\ No newline at end of file
diff --git a/src/main/distrib/linux/authority.sh b/src/main/distrib/linux/authority.sh
new file mode 100644
index 00000000..ce5c2377
--- /dev/null
+++ b/src/main/distrib/linux/authority.sh
@@ -0,0 +1,2 @@
+#!/bin/bash
+java -cp gitblit.jar com.gitblit.authority.Launcher --baseFolder data
diff --git a/src/main/distrib/linux/gitblit-stop.sh b/src/main/distrib/linux/gitblit-stop.sh
new file mode 100644
index 00000000..2fef2034
--- /dev/null
+++ b/src/main/distrib/linux/gitblit-stop.sh
@@ -0,0 +1,2 @@
+#!/bin/bash
+java -jar gitblit.jar --baseFolder data --stop
diff --git a/src/main/distrib/linux/gitblit.sh b/src/main/distrib/linux/gitblit.sh
new file mode 100644
index 00000000..7d631e72
--- /dev/null
+++ b/src/main/distrib/linux/gitblit.sh
@@ -0,0 +1,2 @@
+#!/bin/bash
+java -jar gitblit.jar --baseFolder data
diff --git a/src/main/distrib/linux/install-service-centos.sh b/src/main/distrib/linux/install-service-centos.sh
new file mode 100644
index 00000000..19d28c73
--- /dev/null
+++ b/src/main/distrib/linux/install-service-centos.sh
@@ -0,0 +1,3 @@
+#!/bin/bash
+sudo cp service-centos.sh /etc/init.d/gitblit
+sudo chkconfig --add gitblit
diff --git a/src/main/distrib/linux/install-service-ubuntu.sh b/src/main/distrib/linux/install-service-ubuntu.sh
new file mode 100644
index 00000000..72c4e6c2
--- /dev/null
+++ b/src/main/distrib/linux/install-service-ubuntu.sh
@@ -0,0 +1,3 @@
+#!/bin/bash
+sudo cp service-ubuntu.sh /etc/init.d/gitblit
+sudo update-rc.d gitblit defaults
diff --git a/distrib/java-proxy-config.sh b/src/main/distrib/linux/java-proxy-config.sh
index 5f7a2a27..5f7a2a27 100644
--- a/distrib/java-proxy-config.sh
+++ b/src/main/distrib/linux/java-proxy-config.sh
diff --git a/distrib/gitblit-centos b/src/main/distrib/linux/service-centos.sh
index 04c9a9b4..04c9a9b4 100644
--- a/distrib/gitblit-centos
+++ b/src/main/distrib/linux/service-centos.sh
diff --git a/distrib/gitblit-ubuntu b/src/main/distrib/linux/service-ubuntu.sh
index 4ff275d0..4ff275d0 100644
--- a/distrib/gitblit-ubuntu
+++ b/src/main/distrib/linux/service-ubuntu.sh
diff --git a/distrib/add-indexed-branch.cmd b/src/main/distrib/win/add-indexed-branch.cmd
index a7c4451a..a7c4451a 100644
--- a/distrib/add-indexed-branch.cmd
+++ b/src/main/distrib/win/add-indexed-branch.cmd
diff --git a/src/main/distrib/win/authority.cmd b/src/main/distrib/win/authority.cmd
new file mode 100644
index 00000000..f9a18640
--- /dev/null
+++ b/src/main/distrib/win/authority.cmd
@@ -0,0 +1 @@
+@java -cp gitblit.jar com.gitblit.authority.Launcher --baseFolder data %*

diff --git a/distrib/gitblit-stop.cmd b/src/main/distrib/win/gitblit-stop.cmd
index 34f0f4be..34f0f4be 100644
--- a/distrib/gitblit-stop.cmd
+++ b/src/main/distrib/win/gitblit-stop.cmd
diff --git a/distrib/gitblit.cmd b/src/main/distrib/win/gitblit.cmd
index 1a6d7e09..1a6d7e09 100644
--- a/distrib/gitblit.cmd
+++ b/src/main/distrib/win/gitblit.cmd
diff --git a/distrib/installService.cmd b/src/main/distrib/win/installService.cmd
index d254d679..a684ab21 100644
--- a/distrib/installService.cmd
+++ b/src/main/distrib/win/installService.cmd
@@ -23,12 +23,12 @@ SET ARCH=amd64
 		 --StdOutput=auto ^

 		 --StdError=auto ^

 		 --StartPath="%CD%" ^

-		 --StartClass=com.gitblit.Launcher ^

+		 --StartClass=org.moxie.MxLauncher ^

 		 --StartMethod=main ^

 		 --StartParams="--storePassword;gitblit;--baseFolder;%CD%\data" ^

 		 --StartMode=jvm ^

 		 --StopPath="%CD%" ^

-		 --StopClass=com.gitblit.Launcher ^

+		 --StopClass=org.moxie.MxLauncher ^

 		 --StopMethod=main ^

 		 --StopParams="--stop;--baseFolder;%CD%\data" ^

 		 --StopMode=jvm ^

diff --git a/distrib/uninstallService.cmd b/src/main/distrib/win/uninstallService.cmd
index e6c3b98c..e6c3b98c 100644
--- a/distrib/uninstallService.cmd
+++ b/src/main/distrib/win/uninstallService.cmd
diff --git a/src/main/java/WEB-INF/reference.properties b/src/main/java/WEB-INF/reference.properties
new file mode 100644
index 00000000..a05f5d2d
--- /dev/null
+++ b/src/main/java/WEB-INF/reference.properties
@@ -0,0 +1,1311 @@
+#

+# Gitblit Settings

+#

+

+# This settings file supports parameterization from the command-line for the

+# following command-line parameters:

+#

+#   --baseFolder    ${baseFolder}    SINCE 1.2.1

+#

+# Settings that support ${baseFolder} parameter substitution are indicated with the

+# BASEFOLDER attribute.  If the --baseFolder argument is unspecified, ${baseFolder}

+# and it's trailing / will be discarded from the setting value leaving a relative

+# path that is equivalent to pre-1.2.1 releases.

+#

+# e.g. "${baseFolder}/git" becomes "git", if --baseFolder is unspecified 

+#

+# Git Servlet Settings

+#

+

+# Base folder for repositories.

+# This folder may contain bare and non-bare repositories but Gitblit will only

+# allow you to push to bare repositories.

+# Use forward slashes even on Windows!!

+# e.g. c:/gitrepos

+#

+# SINCE 0.5.0

+# RESTART REQUIRED

+# BASEFOLDER

+git.repositoriesFolder = ${baseFolder}/git

+

+# Build the available repository list at startup and cache this list for reuse.

+# This reduces disk io when presenting the repositories page, responding to rpcs,

+# etc, but it means that  Gitblit will not automatically identify repositories

+# added or deleted by external tools.

+#

+# For this case you can use curl, wget, etc to issue an rpc request to clear the

+# cache (e.g. https://localhost/rpc?req=CLEAR_REPOSITORY_CACHE)

+#

+# SINCE 1.1.0

+git.cacheRepositoryList = true

+

+# Search the repositories folder subfolders for other repositories.

+# Repositories MAY NOT be nested (i.e. one repository within another)

+# but they may be grouped together in subfolders.

+# e.g. c:/gitrepos/libraries/mylibrary.git

+#      c:/gitrepos/libraries/myotherlibrary.git

+#

+# SINCE 0.5.0

+git.searchRepositoriesSubfolders = true

+

+# Maximum number of folders to recurse into when searching for repositories.

+# The default value, -1, disables depth limits.

+#

+# SINCE 1.1.0

+git.searchRecursionDepth = -1

+

+# List of regex exclusion patterns to match against folders found in

+# *git.repositoriesFolder*.

+# Use forward slashes even on Windows!!

+# e.g. test/jgit\.git

+#

+# SPACE-DELIMITED

+# CASE-SENSITIVE

+# SINCE 1.1.0

+git.searchExclusions =

+

+# List of regex url patterns for extracting a repository name when locating

+# submodules.

+#   e.g. git.submoduleUrlPatterns = .*?://github.com/(.*) will extract

+#   *gitblit/gitblit.git* from *git://github.com/gitblit/gitblit.git*

+# If no matches are found then the submodule repository name is assumed to be

+# whatever trails the last / character. (e.g. gitblit.git).

+#

+# SPACE-DELIMITED

+# CASE-SENSITIVE

+# SINCE 1.1.0

+git.submoduleUrlPatterns = .*?://github.com/(.*)

+

+# Allow push/pull over http/https with JGit servlet.

+# If you do NOT want to allow Git clients to clone/push to Gitblit set this

+# to false.  You might want to do this if you are only using ssh:// or git://.

+# If you set this false, consider changing the *web.otherUrls* setting to

+# indicate your clone/push urls.

+#

+# SINCE 0.5.0

+git.enableGitServlet = true

+

+# If you want to restrict all git servlet access to those with valid X509 client

+# certificates then set this value to true.

+#

+# SINCE 1.2.0

+git.requiresClientCertificate = false

+

+# Enforce date checks on client certificates to ensure that they are not being

+# used prematurely and that they have not expired.

+#

+# SINCE 1.2.0

+git.enforceCertificateValidity = true

+

+# List of OIDs to extract from a client certificate DN to map a certificate to

+# an account username.

+#

+# e.g. git.certificateUsernameOIDs = CN

+# e.g. git.certificateUsernameOIDs = FirstName LastName

+#

+# SPACE-DELIMITED

+# SINCE 1.2.0

+git.certificateUsernameOIDs = CN

+

+# Only serve/display bare repositories.

+# If there are non-bare repositories in git.repositoriesFolder and this setting

+# is true, they will be excluded from the ui. 

+#

+# SINCE 0.9.0

+git.onlyAccessBareRepositories = false

+

+# Allow an authenticated user to create a destination repository on a push if

+# the repository does not already exist.

+#

+# Administrator accounts can create a repository in any project.

+# These repositories are created with the default access restriction and authorization

+# control values.  The pushing account is set as the owner.

+#

+# Non-administrator accounts with the CREATE role may create personal repositories.

+# These repositories are created as VIEW restricted for NAMED users.

+# The pushing account is set as the owner.

+#

+# SINCE 1.2.0

+git.allowCreateOnPush = true

+

+# The default access restriction for new repositories.

+# Valid values are NONE, PUSH, CLONE, VIEW

+#  NONE = anonymous view, clone, & push

+#  PUSH = anonymous view & clone and authenticated push

+#  CLONE = anonymous view, authenticated clone & push

+#  VIEW = authenticated view, clone, & push

+#

+# SINCE 1.0.0

+git.defaultAccessRestriction = NONE

+

+# The default authorization control for new repositories.

+# Valid values are AUTHENTICATED and NAMED

+#  AUTHENTICATED = any authenticated user is granted restricted access

+#  NAMED = only named users/teams are granted restricted access

+#

+# SINCE 1.1.0

+git.defaultAuthorizationControl = NAMED

+

+# Enable JGit-based garbage collection. (!!EXPERIMENTAL!!)

+#

+# USE AT YOUR OWN RISK!

+#

+# If enabled, the garbage collection executor scans all repositories once a day

+# at the hour of your choosing.  The GC executor will take each repository "offline",

+# one-at-a-time, to check if the repository satisfies it's GC trigger requirements.

+#

+# While the repository is offline it will be inaccessible from the web UI or from

+# any of the other services (git, rpc, rss, etc).

+#

+# Gitblit's GC Executor MAY NOT PLAY NICE with the other Git kids on the block,

+# especially on Windows systems, so if you are using other tools please coordinate

+# their usage with your GC Executor schedule or do not use this feature.

+#

+# The GC algorithm complex and the JGit team advises caution when using their

+# young implementation of GC.

+#

+# http://wiki.eclipse.org/EGit/New_and_Noteworthy/2.1#Garbage_Collector_and_Repository_Storage_Statistics

+#

+# EXPERIMENTAL

+# SINCE 1.2.0

+# RESTART REQUIRED

+git.enableGarbageCollection = false

+

+# Hour of the day for the GC Executor to scan repositories.

+# This value is in 24-hour time.

+#

+# SINCE 1.2.0

+git.garbageCollectionHour = 0

+

+# The default minimum total filesize of loose objects to trigger early garbage

+# collection.

+#

+# You may specify a custom threshold for a repository in the repository's settings.

+# Common unit suffixes of k, m, or g are supported.

+#

+# SINCE 1.2.0

+git.defaultGarbageCollectionThreshold = 500k

+

+# The default period, in days, between GCs for a repository.  If the total filesize

+# of the loose object exceeds *git.garbageCollectionThreshold* or the repository's

+# custom threshold, this period will be short-circuited. 

+#

+# e.g. if a repository collects 100KB of loose objects every day with a 500KB

+# threshold and a period of 7 days, it will take 5 days for the loose objects to

+# be collected, packed, and pruned.

+#

+# OR

+#

+# if a repository collects 10KB of loose objects every day with a 500KB threshold

+# and a period of 7 days, it will take the full 7 days for the loose objects to be

+# collected, packed, and pruned.

+#

+# You may specify a custom period for a repository in the repository's settings.

+#

+# The minimum value is 1 day since the GC Executor only runs once a day.

+#

+# SINCE 1.2.0

+git.defaultGarbageCollectionPeriod = 7

+

+# Number of bytes of a pack file to load into memory in a single read operation.

+# This is the "page size" of the JGit buffer cache, used for all pack access

+# operations. All disk IO occurs as single window reads. Setting this too large

+# may cause the process to load more data than is required; setting this too small

+# may increase the frequency of read() system calls.

+#

+# Default on JGit is 8 KiB on all platforms.

+#

+# Common unit suffixes of k, m, or g are supported.

+# Documentation courtesy of the Gerrit project.

+#

+# SINCE 1.0.0

+# RESTART REQUIRED

+git.packedGitWindowSize = 8k

+

+# Maximum number of bytes to load and cache in memory from pack files. If JGit

+# needs to access more than this many bytes it will unload less frequently used

+# windows to reclaim memory space within the process. As this buffer must be shared

+# with the rest of the JVM heap, it should be a fraction of the total memory available.

+#

+# The JGit team recommends setting this value larger than the size of your biggest

+# repository. This ensures you can serve most requests from memory.

+#

+# Default on JGit is 10 MiB on all platforms.

+#

+# Common unit suffixes of k, m, or g are supported.

+# Documentation courtesy of the Gerrit project.

+#

+# SINCE 1.0.0

+# RESTART REQUIRED

+git.packedGitLimit = 10m

+

+# Maximum number of bytes to reserve for caching base objects that multiple deltafied

+# objects reference. By storing the entire decompressed base object in a cache Git

+# is able to avoid unpacking and decompressing frequently used base objects multiple times.

+#

+# Default on JGit is 10 MiB on all platforms. You probably do not need to adjust

+# this value.

+#

+# Common unit suffixes of k, m, or g are supported.

+# Documentation courtesy of the Gerrit project.

+#

+# SINCE 1.0.0

+# RESTART REQUIRED

+git.deltaBaseCacheLimit = 10m

+

+# Maximum number of pack files to have open at once. A pack file must be opened

+# in order for any of its data to be available in a cached window.

+#

+# If you increase this to a larger setting you may need to also adjust the ulimit

+# on file descriptors for the host JVM, as Gitblit needs additional file descriptors

+# available for network sockets and other repository data manipulation.

+#

+# Default on JGit is 128 file descriptors on all platforms.

+# Documentation courtesy of the Gerrit project.

+#

+# SINCE 1.0.0

+# RESTART REQUIRED

+git.packedGitOpenFiles = 128

+

+# Largest object size, in bytes, that JGit will allocate as a contiguous byte

+# array. Any file revision larger than this threshold will have to be streamed,

+# typically requiring the use of temporary files under $GIT_DIR/objects to implement

+# psuedo-random access during delta decompression.

+#

+# Servers with very high traffic should set this to be larger than the size of

+# their common big files. For example a server managing the Android platform

+# typically has to deal with ~10-12 MiB XML files, so 15 m would be a reasonable

+# setting in that environment. Setting this too high may cause the JVM to run out

+# of heap space when handling very big binary files, such as device firmware or

+# CD-ROM ISO images. Make sure to adjust your JVM heap accordingly. 

+#

+# Default is 50 MiB on all platforms.

+#

+# Common unit suffixes of k, m, or g are supported.

+# Documentation courtesy of the Gerrit project.

+#

+# SINCE 1.0.0

+# RESTART REQUIRED

+git.streamFileThreshold = 50m

+

+# When true, JGit will use mmap() rather than malloc()+read() to load data from

+# pack files.  The use of mmap can be problematic on some JVMs as the garbage

+# collector must deduce that a memory mapped segment is no longer in use before

+# a call to munmap() can be made by the JVM native code.

+#

+# In server applications (such as Gitblit) that need to access many pack files,

+# setting this to true risks artificially running out of virtual address space, 

+# as the garbage collector cannot reclaim unused mapped spaces fast enough.

+#

+# Default on JGit is false. Although potentially slower, it yields much more

+# predictable behavior.

+# Documentation courtesy of the Gerrit project.

+#

+# SINCE 1.0.0

+# RESTART REQUIRED

+git.packedGitMmap = false

+

+#

+# Groovy Integration

+#

+

+# Location of Groovy scripts to use for Pre and Post receive hooks.

+# Use forward slashes even on Windows!!

+# e.g. c:/groovy

+#

+# RESTART REQUIRED

+# SINCE 0.8.0

+# BASEFOLDER

+groovy.scriptsFolder = ${baseFolder}/groovy

+

+# Specify the directory Grape uses for downloading libraries.

+# http://groovy.codehaus.org/Grape

+#

+# RESTART REQUIRED

+# SINCE 1.0.0

+# BASEFOLDER

+groovy.grapeFolder = ${baseFolder}/groovy/grape

+

+# Scripts to execute on Pre-Receive.

+#

+# These scripts execute after an incoming push has been parsed and validated

+# but BEFORE the changes are applied to the repository.  You might reject a

+# push in this script based on the repository and branch the push is attempting

+# to change.

+#

+# Script names are case-sensitive on case-sensitive file systems.  You may omit

+# the traditional ".groovy" from this list if your file extension is ".groovy" 

+#

+# NOTE:

+# These scripts are only executed when pushing to *Gitblit*, not to other Git

+# tooling you may be using.  Also note that these scripts are shared between

+# repositories. These are NOT repository-specific scripts!  Within the script

+# you may customize the control-flow for a specific repository by checking the

+# *repository* variable.

+#

+# SPACE-DELIMITED

+# CASE-SENSITIVE

+# SINCE 0.8.0

+groovy.preReceiveScripts =

+

+# Scripts to execute on Post-Receive.

+#

+# These scripts execute AFTER an incoming push has been applied to a repository.

+# You might trigger a continuous-integration build here or send a notification.

+#

+# Script names are case-sensitive on case-sensitive file systems.  You may omit

+# the traditional ".groovy" from this list if your file extension is ".groovy" 

+#

+# NOTE:

+# These scripts are only executed when pushing to *Gitblit*, not to other Git

+# tooling you may be using.  Also note that these scripts are shared between

+# repositories. These are NOT repository-specific scripts!  Within the script

+# you may customize the control-flow for a specific repository by checking the

+# *repository* variable.

+# 

+# SPACE-DELIMITED

+# CASE-SENSITIVE

+# SINCE 0.8.0

+groovy.postReceiveScripts =

+

+# Repository custom fields for Groovy Hook mechanism

+#

+# List of key=label pairs of custom fields to prompt for in the Edit Repository

+# page.  These keys are stored in the repository's git config file in the 

+# section [gitblit "customFields"].  Key names are alphanumeric only.  These

+# fields are intended to be used for the Groovy hook mechanism where a script

+# can adjust it's execution based on the custom fields stored in the repository

+# config.

+#

+# e.g. "commitMsgRegex=Commit Message Regular Expression" anotherProperty=Another

+#

+# SPACE-DELIMITED

+# SINCE 1.0.0

+groovy.customFields = 

+

+#

+# Fanout Settings

+#

+

+# Fanout is a PubSub notification service that can be used by Sparkleshare

+# to eliminate repository change polling.  The fanout service runs in a separate

+# thread on a separate port from the Gitblit http/https application.

+# This service is provided so that Sparkleshare may be used with Gitblit in

+# firewalled environments or where reliance on Sparkleshare's default notifications

+# server (notifications.sparkleshare.org) is unwanted.

+#

+# This service maintains an open socket connection from the client to the

+# Fanout PubSub service. This service may not work properly behind a proxy server.  

+

+# Specify the interface for Fanout to bind it's service.

+# You may specify an ip or an empty value to bind to all interfaces.

+# Specifying localhost will result in Gitblit ONLY listening to requests to

+# localhost.

+#

+# SINCE 1.2.1

+# RESTART REQUIRED

+fanout.bindInterface = localhost

+

+# port for serving the Fanout PubSub service.  <= 0 disables this service.

+# On Unix/Linux systems, ports < 1024 require root permissions.

+# Recommended value: 17000

+#

+# SINCE 1.2.1

+# RESTART REQUIRED

+fanout.port = 0

+

+# Use Fanout NIO service.  If false, a multi-threaded socket service will be used.

+# Be advised, the socket implementation spawns a thread per connection plus the

+# connection acceptor thread.  The NIO implementation is completely single-threaded.

+#

+# SINCE 1.2.1

+# RESTART REQUIRED

+fanout.useNio = true

+

+# Concurrent connection limit.  <= 0 disables concurrent connection throttling.

+# If > 0, only the specified number of concurrent connections will be allowed

+# and all other connections will be rejected.

+#

+# SINCE 1.2.1

+# RESTART REQUIRED

+fanout.connectionLimit = 0

+

+#

+# Authentication Settings

+#

+

+# Require authentication to see everything but the admin pages

+#

+# SINCE 0.5.0

+# RESTART REQUIRED

+web.authenticateViewPages = false

+

+# If web.authenticateViewPages=true you may optionally require a client-side

+# basic authentication prompt instead of the standard form-based login. 

+#

+# SINCE 1.3.0

+web.enforceHttpBasicAuthentication = false

+

+# Require admin authentication for the admin functions and pages

+#

+# SINCE 0.5.0

+# RESTART REQUIRED

+web.authenticateAdminPages = true

+

+# Allow Gitblit to store a cookie in the user's browser for automatic

+# authentication.  The cookie is generated by the user service.

+#

+# SINCE 0.5.0

+web.allowCookieAuthentication = true

+

+# Config file for storing project metadata

+#

+# SINCE 1.2.0

+# BASEFOLDER

+web.projectsFile = ${baseFolder}/projects.conf

+

+# Either the full path to a user config file (users.conf)

+# OR the full path to a simple user properties file (users.properties)

+# OR a fully qualified class name that implements the IUserService interface.

+#

+# Alternative user services:

+#    com.gitblit.LdapUserService

+#    com.gitblit.RedmineUserService

+#

+# Any custom user service implementation must have a public default constructor.

+#

+# SINCE 0.5.0

+# RESTART REQUIRED

+# BASEFOLDER

+realm.userService = ${baseFolder}/users.conf

+

+# How to store passwords.

+# Valid values are plain, md5, or combined-md5.  md5 is the hash of password.

+# combined-md5 is the hash of username.toLowerCase()+password.

+# Default is md5.

+#

+# SINCE 0.5.0 

+realm.passwordStorage = md5

+

+# Minimum valid length for a plain text password.

+# Default value is 5.  Absolute minimum is 4.

+#

+# SINCE 0.5.0 

+realm.minPasswordLength = 5

+

+#

+# Gitblit Web Settings

+#

+# If blank Gitblit is displayed.

+#

+# SINCE 0.5.0

+web.siteName =

+

+# If *web.authenticateAdminPages*=true, users with "admin" role can create

+# repositories, create users, and edit repository metadata.

+#

+# If *web.authenticateAdminPages*=false, any user can execute the aforementioned

+# functions. 

+#

+# SINCE 0.5.0 

+web.allowAdministration = true

+

+# Allows rpc clients to list repositories and possibly manage or administer the 

+# Gitblit server, if the authenticated account has administrator permissions.

+# See *web.enableRpcManagement* and *web.enableRpcAdministration*.

+#

+# SINCE 0.7.0 

+web.enableRpcServlet = true

+

+# Allows rpc clients to manage repositories and users of the Gitblit instance,

+# if the authenticated account has administrator permissions.

+# Requires *web.enableRpcServlet=true*.

+#

+# SINCE 0.7.0 

+web.enableRpcManagement = false

+

+# Allows rpc clients to control the server settings and monitor the health of this

+# this Gitblit instance, if the authenticated account has administrator permissions.

+# Requires *web.enableRpcServlet=true* and *web.enableRpcManagement*.

+#

+# SINCE 0.7.0 

+web.enableRpcAdministration = false

+

+# Full path to a configurable robots.txt file.  With this file you can control

+# what parts of your Gitblit server respectable robots are allowed to traverse.

+# http://googlewebmastercentral.blogspot.com/2008/06/improving-on-robots-exclusion-protocol.html

+#

+# SINCE 1.0.0

+# BASEFOLDER

+web.robots.txt = ${baseFolder}/robots.txt

+

+# If true, the web ui layout will respond and adapt to the browser's dimensions.

+# if false, the web ui will use a 940px fixed-width layout.

+# http://twitter.github.com/bootstrap/scaffolding.html#responsive

+#

+# SINCE 1.0.0

+web.useResponsiveLayout = true

+

+# Allow Gravatar images to be displayed in Gitblit pages.

+#

+# SINCE 0.8.0

+web.allowGravatar = true

+

+# Allow dynamic zip downloads.

+#

+# SINCE 0.5.0   

+web.allowZipDownloads = true

+

+# If *web.allowZipDownloads=true* the following formats will be displayed for

+# download compressed archive links:

+#

+# zip   = standard .zip

+# tar   = standard tar format (preserves *nix permissions and symlinks)

+# gz    = gz-compressed tar

+# xz    = xz-compressed tar

+# bzip2 = bzip2-compressed tar

+#

+# SPACE-DELIMITED

+# SINCE 1.2.0

+web.compressedDownloads = zip gz

+

+# Allow optional Lucene integration. Lucene indexing is an opt-in feature.

+# A repository may specify branches to index with Lucene instead of using Git

+# commit traversal. There are scenarios where you may want to completely disable

+# Lucene indexing despite a repository specifying indexed branches.  One such

+# scenario is on a resource-constrained federated Gitblit mirror.

+#

+# SINCE 0.9.0

+web.allowLuceneIndexing = true

+

+# Allows an authenticated user to create forks of a repository

+#

+# set this to false if you want to disable all fork controls on the web site

+#

+web.allowForking = true

+

+# Controls the length of shortened commit hash ids

+#

+# SINCE 1.2.0

+web.shortCommitIdLength = 6

+

+# Use Clippy (Flash solution) to provide a copy-to-clipboard button.

+# If false, a button with a more primitive JavaScript-based prompt box will

+# offer a 3-step (click, ctrl+c, enter) copy-to-clipboard alternative.

+#

+# SINCE 0.8.0

+web.allowFlashCopyToClipboard = true

+

+# Default maximum number of commits that a repository may contribute to the

+# activity page, regardless of the selected duration.  This setting may be valuable

+# for an extremely busy server.  This value may also be configed per-repository

+# in Edit Repository. 0 disables this throttle.

+#

+# SINCE 1.2.0

+web.maxActivityCommits = 0

+

+# Default number of entries to include in RSS Syndication links

+#

+# SINCE 0.5.0

+web.syndicationEntries = 25

+

+# Show the size of each repository on the repositories page.

+# This requires recursive traversal of each repository folder.  This may be

+# non-performant on some operating systems and/or filesystems. 

+#

+# SINCE 0.5.2

+web.showRepositorySizes = true

+

+# List of custom regex expressions that can be displayed in the Filters menu

+# of the Repositories and Activity pages.  Keep them very simple because you

+# are likely to run into encoding issues if they are too complex.

+#

+# Use !!! to separate the filters 

+#

+# SINCE 0.8.0

+web.customFilters =

+

+# Show federation registrations (without token) and the current pull status

+# to non-administrator users. 

+#

+# SINCE 0.6.0

+web.showFederationRegistrations = false

+

+# This is the message displayed when *web.authenticateViewPages=true*.

+# This can point to a file with Markdown content.

+# Specifying "gitblit" uses the internal login message.

+#

+# SINCE 0.7.0

+# BASEFOLDER

+web.loginMessage = gitblit

+

+# This is the message displayed above the repositories table.

+# This can point to a file with Markdown content.

+# Specifying "gitblit" uses the internal welcome message.

+#

+# SINCE 0.5.0

+# BASEFOLDER

+web.repositoriesMessage = gitblit

+

+# Ordered list of charsets/encodings to use when trying to display a blob.

+# If empty, UTF-8 and ISO-8859-1 are used.  The server's default charset

+# is always appended to the encoding list.  If all encodings fail to cleanly

+# decode the blob content, UTF-8 will be used with the standard malformed

+# input/unmappable character replacement strings.

+# 

+# SPACE-DELIMITED

+# SINCE 1.0.0

+web.blobEncodings = UTF-8 ISO-8859-1

+

+# Manually set the default timezone to be used by Gitblit for display in the 

+# web ui.  This value is independent of the JVM timezone.  Specifying a blank

+# value will default to the JVM timezone.

+# e.g. America/New_York, US/Pacific, UTC, Europe/Berlin

+#

+# SINCE 0.9.0

+# RESTART REQUIRED

+web.timezone =

+

+# Use the client timezone when formatting dates.

+# This uses AJAX to determine the browser's timezone and may require more

+# server overhead because a Wicket session is created.  All Gitblit pages

+# attempt to be stateless, if possible.

+#

+# SINCE 0.5.0

+# RESTART REQUIRED

+web.useClientTimezone = false

+

+# Time format

+# <http://download.oracle.com/javase/6/docs/api/java/text/SimpleDateFormat.html>

+#

+# SINCE 0.8.0

+web.timeFormat = HH:mm

+

+# Short date format

+# <http://download.oracle.com/javase/6/docs/api/java/text/SimpleDateFormat.html>

+#

+# SINCE 0.5.0

+web.datestampShortFormat = yyyy-MM-dd

+

+# Long date format

+#

+# SINCE 0.8.0

+web.datestampLongFormat = EEEE, MMMM d, yyyy

+

+# Long timestamp format

+# <http://download.oracle.com/javase/6/docs/api/java/text/SimpleDateFormat.html>

+#

+# SINCE 0.5.0

+web.datetimestampLongFormat = EEEE, MMMM d, yyyy HH:mm Z

+

+# Mount URL parameters

+# This setting controls if pretty or parameter URLs are used.

+# i.e.

+# if true:

+#     http://localhost/commit/myrepo/abcdef

+# if false:

+#     http://localhost/commit/?r=myrepo&h=abcdef

+#

+# SINCE 0.5.0

+# RESTART REQUIRED

+web.mountParameters = true

+

+# Some servlet containers (e.g. Tomcat >= 6.0.10) disallow '/' (%2F) encoding

+# in URLs as a security precaution for proxies.  This setting tells Gitblit

+# to preemptively replace '/' with '*' or '!' for url string parameters.

+#

+# <https://issues.apache.org/jira/browse/WICKET-1303>

+# <http://tomcat.apache.org/security-6.html#Fixed_in_Apache_Tomcat_6.0.10>

+# Add *-Dorg.apache.tomcat.util.buf.UDecoder.ALLOW_ENCODED_SLASH=true* to your

+# *CATALINA_OPTS* or to your JVM launch parameters

+#

+# SINCE 0.5.2

+web.forwardSlashCharacter = /

+

+# Show other URLs on the summary page for accessing your git repositories

+# Use spaces to separate urls. {0} is the token for the repository name.

+# e.g.

+# web.otherUrls = ssh://localhost/git/{0} git://localhost/git/{0}

+#

+# SPACE-DELIMITED

+# SINCE 0.5.0

+web.otherUrls = 

+

+# Choose how to present the repositories list.

+#   grouped = group nested/subfolder repositories together (no sorting)

+#   flat = flat list of repositories (sorting allowed)

+#

+# SINCE 0.5.0

+web.repositoryListType = grouped

+

+# If using a grouped repository list and there are repositories at the

+# root level of your repositories folder, you may specify the displayed

+# group name with this setting.  This value is only used for web presentation.

+#

+# SINCE 0.5.0

+web.repositoryRootGroupName = main

+

+# Display the repository swatch color next to the repository name link in the 

+# repositories list. 

+#

+# SINCE 0.8.0

+web.repositoryListSwatches = true

+

+# Choose the diff presentation style: gitblt, gitweb, or plain

+#

+# SINCE 0.5.0

+web.diffStyle = gitblit

+

+# Control if email addresses are shown in web ui

+#

+# SINCE 0.5.0

+web.showEmailAddresses = true

+

+# Shows a combobox in the page links header with commit, committer, and author

+# search selection.  Default search is commit.

+#

+# SINCE 0.5.0

+web.showSearchTypeSelection = false

+

+# Generates a line graph of repository activity over time on the Summary page.

+# This uses the Google Charts API.

+#

+# SINCE 0.5.0 

+web.generateActivityGraph = true

+

+# The number of days to show on the activity page.

+# Value must exceed 0 else default of 14 is used

+#

+# SINCE 0.8.0

+web.activityDuration = 14

+

+# The number of commits to display on the summary page

+# Value must exceed 0 else default of 20 is used

+#

+# SINCE 0.5.0

+web.summaryCommitCount = 16

+

+# The number of tags/branches to display on the summary page.

+# -1 = all tags/branches

+# 0 = hide tags/branches

+# N = N tags/branches

+#

+# SINCE 0.5.0

+web.summaryRefsCount = 5

+

+# The number of items to show on a page before showing the first, prev, next

+# pagination links.  A default if 50 is used for any invalid value.

+#

+# SINCE 0.5.0

+web.itemsPerPage = 50

+

+# Registered file extensions to ignore during Lucene indexing

+#

+# SPACE-DELIMITED

+# SINCE 0.9.0

+web.luceneIgnoreExtensions = 7z arc arj bin bmp dll doc docx exe gif gz jar jpg lib lzh odg odf odt pdf ppt png so swf xcf xls xlsx zip

+

+# Registered extensions for google-code-prettify

+#

+# SPACE-DELIMITED

+# SINCE 0.5.0

+web.prettyPrintExtensions = c cpp cs css frm groovy htm html java js php pl prefs properties py rb scala sh sql xml vb

+

+# Registered extensions for markdown transformation

+#

+# SPACE-DELIMITED

+# CASE-SENSITIVE

+# SINCE 0.5.0

+web.markdownExtensions = md mkd markdown MD MKD

+

+# Image extensions

+#

+# SPACE-DELIMITED

+# SINCE 0.5.0

+web.imageExtensions = bmp jpg gif png 

+

+# Registered extensions for binary blobs

+#

+# SPACE-DELIMITED

+# SINCE 0.5.0

+web.binaryExtensions = jar pdf tar.gz zip

+

+# Aggressive heap management will run the garbage collector on every generated

+# page.  This slows down page generation a little but improves heap consumption. 

+#

+# SINCE 0.5.0

+web.aggressiveHeapManagement = false

+

+# Run the webapp in debug mode

+#

+# SINCE 0.5.0

+# RESTART REQUIRED

+web.debugMode = false

+

+# Enable/disable global regex substitutions (i.e. shared across repositories)

+#

+# SINCE 0.5.0

+regex.global = true

+

+# Example global regex substitutions

+# Use !!! to separate the search pattern and the replace pattern

+# searchpattern!!!replacepattern

+# SINCE 0.5.0

+regex.global.bug = \\b(Bug:)(\\s*[#]?|-){0,1}(\\d+)\\b!!!<a href="http://somehost/bug/$3">Bug-Id: $3</a>

+# SINCE 0.5.0

+regex.global.changeid = \\b(Change-Id:\\s*)([A-Za-z0-9]*)\\b!!!<a href="http://somehost/changeid/$2">Change-Id: $2</a>

+

+# Example per-repository regex substitutions overrides global

+# SINCE 0.5.0

+regex.myrepository.bug = \\b(Bug:)(\\s*[#]?|-){0,1}(\\d+)\\b!!!<a href="http://elsewhere/bug/$3">Bug-Id: $3</a>

+

+#

+# Mail Settings

+# SINCE 0.6.0

+#

+# Mail settings are used to notify administrators of received federation proposals

+#

+

+# ip or hostname of smtp server

+#

+# SINCE 0.6.0

+mail.server =

+

+# port to use for smtp requests

+#

+# SINCE 0.6.0

+mail.port = 25

+

+# debug the mail executor

+#

+# SINCE 0.6.0

+mail.debug = false

+

+# if your smtp server requires authentication, supply the credentials here

+#

+# SINCE 0.6.0

+mail.username =

+# SINCE 0.6.0

+mail.password =

+

+# from address for generated emails

+#

+# SINCE 0.6.0

+mail.fromAddress = 

+

+# List of email addresses for the Gitblit administrators

+#

+# SPACE-DELIMITED

+# SINCE 0.6.0

+mail.adminAddresses = 

+

+# List of email addresses for sending push email notifications.

+#

+# This key currently requires use of the sendemail.groovy hook script.

+# If you set sendemail.groovy in *groovy.postReceiveScripts* then email

+# notifications for all repositories (regardless of access restrictions!)

+# will be sent to these addresses.

+#

+# SPACE-DELIMITED

+# SINCE 0.8.0

+mail.mailingLists =

+

+#

+# Federation Settings

+# SINCE 0.6.0

+#

+# A Gitblit federation is a way to backup one Gitblit instance to another.

+#

+# *git.enableGitServlet* must be true to use this feature.

+

+# Your federation name is used for federation status acknowledgments.  If it is

+# unset, and you elect to send a status acknowledgment, your Gitblit instance

+# will be identified by its hostname, if available, else your internal ip address.

+# The source Gitblit instance will also append your external IP address to your

+# identification to differentiate multiple pulling systems behind a single proxy.

+#

+# SINCE 0.6.0

+federation.name =

+

+# Specify the passphrase of this Gitblit instance.

+#

+# An unspecified (empty) passphrase disables processing federation requests.

+#

+# This value can be anything you want: an integer, a sentence, an haiku, etc.

+# Keep the value simple, though, to avoid Java properties file encoding issues.

+#

+# Changing your passphrase will break any registrations you have established with other

+# Gitblit instances.

+#

+# CASE-SENSITIVE

+# SINCE 0.6.0

+# RESTART REQUIRED *(only to enable or disable federation)*

+federation.passphrase =

+

+# Control whether or not this Gitblit instance can receive federation proposals

+# from another Gitblit instance.  Registering a federated Gitblit is a manual

+# process.  Proposals help to simplify that process by allowing a remote Gitblit

+# instance to send your Gitblit instance the federation pull data.

+#

+# SINCE 0.6.0

+federation.allowProposals = false

+

+# The destination folder for cached federation proposals.

+# Use forward slashes even on Windows!!

+#

+# SINCE 0.6.0

+# BASEFOLDER

+federation.proposalsFolder = ${baseFolder}/proposals

+

+# The default pull frequency if frequency is unspecified on a registration

+#

+# SINCE 0.6.0

+federation.defaultFrequency = 60 mins

+

+# Federation Sets are named groups of repositories.  The Federation Sets are 

+# available for selection in the repository settings page.  You can assign a

+# repository to one or more sets and then distribute the token for the set.

+# This allows you to grant federation pull access to a subset of your available

+# repositories.  Tokens for federation sets only grant repository pull access.

+#

+# SPACE-DELIMITED

+# CASE-SENSITIVE

+# SINCE 0.6.0

+federation.sets = 

+

+# Federation pull registrations

+# Registrations are read once, at startup.

+#

+# RESTART REQUIRED

+#

+# frequency:

+#   The shortest frequency allowed is every 5 minutes

+#   Decimal frequency values are cast to integers

+#   Frequency values may be specified in mins, hours, or days

+#   Values that can not be parsed or are unspecified default to *federation.defaultFrequency*

+#

+# folder:

+#   if unspecified, the folder is *git.repositoriesFolder*

+#   if specified, the folder is relative to *git.repositoriesFolder*

+#

+# bare:

+#   if true, each repository will be created as a *bare* repository and will not

+#   have a working directory.

+#

+#   if false, each repository will be created as a normal repository suitable

+#   for local work.

+#

+# mirror:

+#   if true, each repository HEAD is reset to *origin/master* after each pull.

+#   The repository will be flagged *isFrozen* after the initial clone.

+#

+#   if false, each repository HEAD will point to the FETCH_HEAD of the initial

+#   clone from the origin until pushed to or otherwise manipulated.

+#

+# mergeAccounts:

+#   if true, remote accounts and their permissions are merged into your 

+#   users.properties file 

+#

+# notifyOnError:

+#   if true and the mail configuration is properly set, administrators will be

+#   notified by email of pull failures

+#

+# include and exclude:

+#   Space-delimited list of repositories to include or exclude from pull

+#   may be * wildcard to include or exclude all

+#   may use fuzzy match (e.g. org.eclipse.*)

+

+#

+# (Nearly) Perfect Mirror example

+#

+

+#federation.example1.url = https://go.gitblit.com

+#federation.example1.token = 6f3b8a24bf970f17289b234284c94f43eb42f0e4

+#federation.example1.frequency = 120 mins

+#federation.example1.folder =

+#federation.example1.bare = true 

+#federation.example1.mirror = true 

+#federation.example1.mergeAccounts = true

+

+#

+# Advanced Realm Settings

+#

+

+# URL of the LDAP server.

+# To use encrypted transport, use either ldaps:// URL for SSL or ldap+tls:// to

+# send StartTLS command.

+#

+# SINCE 1.0.0

+realm.ldap.server = ldap://localhost

+

+# Login username for LDAP searches.

+# If this value is unspecified, anonymous LDAP login will be used.

+# 

+# e.g. mydomain\\username

+#

+# SINCE 1.0.0

+realm.ldap.username = cn=Directory Manager

+

+# Login password for LDAP searches.

+#

+# SINCE 1.0.0

+realm.ldap.password = password

+

+# The LdapUserService must be backed by another user service for standard user

+# and team management.

+# default: users.conf

+#

+# SINCE 1.0.0

+# RESTART REQUIRED

+# BASEFOLDER

+realm.ldap.backingUserService = ${baseFolder}/users.conf

+

+# Delegate team membership control to LDAP.

+#

+# If true, team user memberships will be specified by LDAP groups.  This will

+# disable team selection in Edit User and user selection in Edit Team.

+#

+# If false, LDAP will only be used for authentication and Gitblit will maintain

+# team memberships with the *realm.ldap.backingUserService*.

+#

+# SINCE 1.0.0

+realm.ldap.maintainTeams = false

+

+# Root node for all LDAP users

+#

+# This is the root node from which subtree user searches will begin.

+# If blank, Gitblit will search ALL nodes.

+#

+# SINCE 1.0.0

+realm.ldap.accountBase = OU=Users,OU=UserControl,OU=MyOrganization,DC=MyDomain

+

+# Filter criteria for LDAP users

+#

+# Query pattern to use when searching for a user account. This may be any valid 

+# LDAP query expression, including the standard (&) and (|) operators.

+#

+# Variables may be injected via the ${variableName} syntax.

+# Recognized variables are:

+#    ${username} - The text entered as the user name

+#

+# SINCE 1.0.0

+realm.ldap.accountPattern = (&(objectClass=person)(sAMAccountName=${username}))

+

+# Root node for all LDAP groups to be used as Gitblit Teams

+#

+# This is the root node from which subtree team searches will begin.

+# If blank, Gitblit will search ALL nodes.  

+#

+# SINCE 1.0.0

+realm.ldap.groupBase = OU=Groups,OU=UserControl,OU=MyOrganization,DC=MyDomain

+

+# Filter criteria for LDAP groups

+#

+# Query pattern to use when searching for a team. This may be any valid 

+# LDAP query expression, including the standard (&) and (|) operators.

+#

+# Variables may be injected via the ${variableName} syntax.

+# Recognized variables are:

+#    ${username} - The text entered as the user name

+#    ${dn} - The Distinguished Name of the user logged in

+#

+# All attributes from the LDAP User record are available. For example, if a user

+# has an attribute "fullName" set to "John", "(fn=${fullName})" will be 

+# translated to "(fn=John)".

+#

+# SINCE 1.0.0

+realm.ldap.groupMemberPattern = (&(objectClass=group)(member=${dn}))

+

+# LDAP users or groups that should be given administrator privileges.

+#

+# Teams are specified with a leading '@' character.  Groups with spaces in the

+# name can be entered as "@team name".

+#

+# e.g. realm.ldap.admins = john @git_admins "@git admins"

+#

+# SPACE-DELIMITED

+# SINCE 1.0.0

+realm.ldap.admins = @Git_Admins

+

+# Attribute(s) on the USER record that indicate their display (or full) name.

+# Leave blank for no mapping available in LDAP.

+#

+# This may be a single attribute, or a string of multiple attributes.  Examples:

+#  displayName - Uses the attribute 'displayName' on the user record

+#  ${personalTitle}. ${givenName} ${surname} - Will concatenate the 3 

+#       attributes together, with a '.' after personalTitle

+#

+# SINCE 1.0.0

+realm.ldap.displayName = displayName

+

+# Attribute(s) on the USER record that indicate their email address.

+# Leave blank for no mapping available in LDAP.

+#

+# This may be a single attribute, or a string of multiple attributes.  Examples:

+#  email - Uses the attribute 'email' on the user record

+#  ${givenName}.${surname}@gitblit.com -Will concatenate the 2 attributes

+#       together with a '.' and '@' creating something like first.last@gitblit.com 

+#

+# SINCE 1.0.0

+realm.ldap.email = email

+

+# Defines the cache period to be used when caching LDAP queries. This is currently

+# only used for LDAP user synchronization.

+#

+# Must be of the form '<long> <TimeUnit>' where <TimeUnit> is one of 'MILLISECONDS', 'SECONDS', 'MINUTES', 'HOURS', 'DAYS' 

+# default: 2 MINUTES

+#

+# RESTART REQUIRED

+realm.ldap.ldapCachePeriod = 2 MINUTES

+

+# Defines whether to synchronize all LDAP users into the backing user service

+#

+# Valid values: true, false

+# If left blank, false is assumed

+realm.ldap.synchronizeUsers.enable = false

+

+# Defines whether to delete non-existent LDAP users from the backing user service

+# during synchronization. depends on  realm.ldap.synchronizeUsers.enable = true

+#

+# Valid values: true, false

+# If left blank, true is assumed

+realm.ldap.synchronizeUsers.removeDeleted = true

+

+# Attribute on the USER record that indicate their username to be used in gitblit

+# when synchronizing users from LDAP

+# if blank, Gitblit will use uid

+# For MS Active Directory this may be sAMAccountName

+realm.ldap.uid = uid

+

+# The RedmineUserService must be backed by another user service for standard user

+# and team management.

+# default: users.conf

+#

+# RESTART REQUIRED

+# BASEFOLDER

+realm.redmine.backingUserService = ${baseFolder}/users.conf

+

+# URL of the Redmine.

+realm.redmine.url = http://example.com/redmine

+

+#

+# Server Settings

+#

+

+# The temporary folder to decompress the embedded gitblit webapp. 

+#

+# SINCE 0.5.0

+# RESTART REQUIRED

+# BASEFOLDER

+server.tempFolder = ${baseFolder}/temp

+

+# Use Jetty NIO connectors.  If false, Jetty Socket connectors will be used.

+#

+# SINCE 0.5.0

+# RESTART REQUIRED

+server.useNio = true

+

+# Context path for the GO application.  You might want to change the context

+# path if running Gitblit behind a proxy layer such as mod_proxy.

+#

+# SINCE 0.7.0

+# RESTART REQUIRED

+server.contextPath = /

+

+# Standard http port to serve.  <= 0 disables this connector.

+# On Unix/Linux systems, ports < 1024 require root permissions.

+# Recommended value: 80 or 8080

+#

+# SINCE 0.5.0

+# RESTART REQUIRED

+server.httpPort = 0

+

+# Secure/SSL https port to serve. <= 0 disables this connector.

+# On Unix/Linux systems, ports < 1024 require root permissions.

+# Recommended value: 443 or 8443

+#

+# SINCE 0.5.0

+# RESTART REQUIRED

+server.httpsPort = 8443

+

+# Port for serving an Apache JServ Protocol (AJP) 1.3 connector for integrating

+# Gitblit GO into an Apache HTTP server setup.  <= 0 disables this connector.

+# Recommended value: 8009

+#

+# SINCE 0.9.0

+# RESTART REQUIRED

+server.ajpPort = 0

+

+# Specify the interface for Jetty to bind the standard connector.

+# You may specify an ip or an empty value to bind to all interfaces.

+# Specifying localhost will result in Gitblit ONLY listening to requests to

+# localhost.

+#

+# SINCE 0.5.0

+# RESTART REQUIRED

+server.httpBindInterface = localhost

+

+# Specify the interface for Jetty to bind the secure connector.

+# You may specify an ip or an empty value to bind to all interfaces.

+# Specifying localhost will result in Gitblit ONLY listening to requests to

+# localhost.

+#

+# SINCE 0.5.0

+# RESTART REQUIRED

+server.httpsBindInterface = localhost

+

+# Specify the interface for Jetty to bind the AJP connector.

+# You may specify an ip or an empty value to bind to all interfaces.

+# Specifying localhost will result in Gitblit ONLY listening to requests to

+# localhost.

+#

+# SINCE 0.9.0

+# RESTART REQUIRED

+server.ajpBindInterface = localhost

+

+# Alias of certificate to use for https/SSL serving.  If blank the first

+# certificate found in the keystore will be used. 

+#

+# SINCE 1.2.0

+# RESTART REQUIRED

+server.certificateAlias = localhost

+

+# Password for SSL keystore.

+# Keystore password and certificate password must match.

+# This is provided for convenience, its probably more secure to set this value

+# using the --storePassword command line parameter.

+#

+# If you are using the official JRE or JDK from Oracle you may not have the

+# JCE Unlimited Strength Jurisdiction Policy files bundled with your JVM.  Because

+# of this, your store/key password can not exceed 7 characters.  If you require

+# longer passwords you may need to install the JCE Unlimited Strength Jurisdiction

+# Policy files from Oracle.

+#

+# http://www.oracle.com/technetwork/java/javase/downloads/index.html

+#

+# Gitblit and the Gitblit Certificate Authority will both indicate if Unlimited

+# Strength encryption is available.

+#

+# SINCE 0.5.0

+# RESTART REQUIRED

+server.storePassword = gitblit

+

+# If serving over https (recommended) you might consider requiring clients to

+# authenticate with ssl certificates.  If enabled, only https clients with the

+# a valid client certificate will be able to access Gitblit.

+#

+# If disabled, client certificate authentication is optional and will be tried

+# first before falling-back to form authentication or basic authentication.

+#

+# Requiring client certificates to access any of Gitblit may be too extreme,

+# consider this carefully.

+#

+# SINCE 1.2.0

+# RESTART REQUIRED

+server.requireClientCertificates = false

+

+# Port for shutdown monitor to listen on.

+#

+# SINCE 0.5.0

+# RESTART REQUIRED

+server.shutdownPort = 8081

diff --git a/src/WEB-INF/web.xml b/src/main/java/WEB-INF/web.xml
index a9436886..a9436886 100644
--- a/src/WEB-INF/web.xml
+++ b/src/main/java/WEB-INF/web.xml
diff --git a/src/com/gitblit/.gitignore b/src/main/java/com/gitblit/.gitignore
index c6298604..c6298604 100644
--- a/src/com/gitblit/.gitignore
+++ b/src/main/java/com/gitblit/.gitignore
diff --git a/src/com/gitblit/AccessRestrictionFilter.java b/src/main/java/com/gitblit/AccessRestrictionFilter.java
index 495d3438..495d3438 100644
--- a/src/com/gitblit/AccessRestrictionFilter.java
+++ b/src/main/java/com/gitblit/AccessRestrictionFilter.java
diff --git a/src/com/gitblit/AddIndexedBranch.java b/src/main/java/com/gitblit/AddIndexedBranch.java
index 66997060..66997060 100644
--- a/src/com/gitblit/AddIndexedBranch.java
+++ b/src/main/java/com/gitblit/AddIndexedBranch.java
diff --git a/src/com/gitblit/AuthenticationFilter.java b/src/main/java/com/gitblit/AuthenticationFilter.java
index eb6e95b7..eb6e95b7 100644
--- a/src/com/gitblit/AuthenticationFilter.java
+++ b/src/main/java/com/gitblit/AuthenticationFilter.java
diff --git a/src/com/gitblit/ConfigUserService.java b/src/main/java/com/gitblit/ConfigUserService.java
index 7aa09985..7aa09985 100644
--- a/src/com/gitblit/ConfigUserService.java
+++ b/src/main/java/com/gitblit/ConfigUserService.java
diff --git a/src/com/gitblit/Constants.java b/src/main/java/com/gitblit/Constants.java
index bcca8c72..7663f8bd 100644
--- a/src/com/gitblit/Constants.java
+++ b/src/main/java/com/gitblit/Constants.java
@@ -18,7 +18,9 @@ package com.gitblit;
 import java.lang.annotation.Documented;

 import java.lang.annotation.Retention;

 import java.lang.annotation.RetentionPolicy;

-

+import java.net.URL;

+import java.util.jar.Attributes;

+import java.util.jar.Manifest;

 

 /**

  * Constant values used by Gitblit.

@@ -32,18 +34,6 @@ public class Constants {
 

 	public static final String FULL_NAME = "Gitblit - a pure Java Git solution";

 

-	// The build script extracts this exact line so be careful editing it

-	// and only use A-Z a-z 0-9 .-_ in the string.

-	public static final String VERSION = "1.3.0-SNAPSHOT";

-

-	// The build script extracts this exact line so be careful editing it

-	// and only use A-Z a-z 0-9 .-_ in the string.

-	public static final String VERSION_DATE = "PENDING";

-

-	// The build script extracts this exact line so be careful editing it

-	// and only use A-Z a-z 0-9 .-_ in the string.

-	public static final String JGIT_VERSION = "JGit 2.2.0 (201212191850-r)";

-

 	public static final String ADMIN_ROLE = "#admin";

 	

 	public static final String FORK_ROLE = "#fork";

@@ -95,9 +85,40 @@ public class Constants {
 	public static final String baseFolder$ = "${" + baseFolder + "}";

 	

 	public static final String contextFolder$ = "${contextFolder}";

-	

+

+	public static String getVersion() {

+		String v = Constants.class.getPackage().getImplementationVersion();

+		if (v == null) {

+			return "0.0.0-SNAPSHOT";

+		}

+		return v;

+	}

+

 	public static String getGitBlitVersion() {

-		return NAME + " v" + VERSION;

+		return NAME + " v" + getVersion();

+	}

+	

+	public static String getBuildDate() {

+		return getManifestValue("build-date", "PENDING");

+	}

+	

+	private static String getManifestValue(String attrib, String defaultValue) {

+		Class<?> clazz = Constants.class;

+		String className = clazz.getSimpleName() + ".class";

+		String classPath = clazz.getResource(className).toString();

+		if (!classPath.startsWith("jar")) {

+			// Class not from JAR

+			return defaultValue;

+		}

+		try {

+			String manifestPath = classPath.substring(0, classPath.lastIndexOf("!") + 1) + "/META-INF/MANIFEST.MF";

+			Manifest manifest = new Manifest(new URL(manifestPath).openStream());

+			Attributes attr = manifest.getMainAttributes();

+			String value = attr.getValue(attrib);

+			return value;

+		} catch (Exception e) {

+		}

+		return defaultValue;

 	}

 	

 	/**

diff --git a/src/com/gitblit/DownloadZipFilter.java b/src/main/java/com/gitblit/DownloadZipFilter.java
index 90a76493..90a76493 100644
--- a/src/com/gitblit/DownloadZipFilter.java
+++ b/src/main/java/com/gitblit/DownloadZipFilter.java
diff --git a/src/com/gitblit/DownloadZipServlet.java b/src/main/java/com/gitblit/DownloadZipServlet.java
index 0feee879..0feee879 100644
--- a/src/com/gitblit/DownloadZipServlet.java
+++ b/src/main/java/com/gitblit/DownloadZipServlet.java
diff --git a/src/main/java/com/gitblit/EnforceAuthenticationFilter.java b/src/main/java/com/gitblit/EnforceAuthenticationFilter.java
new file mode 100644
index 00000000..2a17996e
--- /dev/null
+++ b/src/main/java/com/gitblit/EnforceAuthenticationFilter.java
@@ -0,0 +1,102 @@
+/*
+ * Copyright 2013 Laurens Vrijnsen
+ * Copyright 2013 gitblit.com.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */package com.gitblit;
+
+import java.io.IOException;
+import java.text.MessageFormat;
+
+import javax.servlet.Filter;
+import javax.servlet.FilterChain;
+import javax.servlet.FilterConfig;
+import javax.servlet.ServletException;
+import javax.servlet.ServletRequest;
+import javax.servlet.ServletResponse;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.gitblit.models.UserModel;
+
+/**
+ * This filter enforces authentication via HTTP Basic Authentication, if the settings indicate so.
+ * It looks at the settings "web.authenticateViewPages" and "web.enforceHttpBasicAuthentication"; if
+ * both are true, any unauthorized access will be met with a HTTP Basic Authentication header.
+ *
+ * @author Laurens Vrijnsen
+ *
+ */
+public class EnforceAuthenticationFilter implements Filter {
+	
+	protected transient Logger logger = LoggerFactory.getLogger(getClass());
+
+	/* 
+	 * @see javax.servlet.Filter#init(javax.servlet.FilterConfig)
+	 */
+	@Override
+	public void init(FilterConfig filterConfig) throws ServletException {
+		// nothing to be done
+
+	} //init
+	
+
+	/* 
+	 * This does the actual filtering: is the user authenticated? If not, enforce HTTP authentication (401)
+	 * 
+	 * @see javax.servlet.Filter#doFilter(javax.servlet.ServletRequest, javax.servlet.ServletResponse, javax.servlet.FilterChain)
+	 */
+	@Override
+	public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException, ServletException {
+		
+		/*
+		 * Determine whether to enforce the BASIC authentication:
+		 */
+		@SuppressWarnings("static-access")
+		Boolean mustForceAuth = GitBlit.self().getBoolean(Keys.web.authenticateViewPages, false)
+								&& GitBlit.self().getBoolean(Keys.web.enforceHttpBasicAuthentication, false);
+		
+		HttpServletRequest  HttpRequest  = (HttpServletRequest)request;
+		HttpServletResponse HttpResponse = (HttpServletResponse)response; 
+		UserModel user = GitBlit.self().authenticate(HttpRequest);
+		
+		if (mustForceAuth && (user == null)) {
+			// not authenticated, enforce now:
+			logger.debug(MessageFormat.format("EnforceAuthFilter: user not authenticated for URL {0}!", request.toString()));
+			@SuppressWarnings("static-access")
+			String CHALLENGE = MessageFormat.format("Basic realm=\"{0}\"", GitBlit.self().getString("web.siteName",""));
+			HttpResponse.setHeader("WWW-Authenticate", CHALLENGE);
+			HttpResponse.sendError(HttpServletResponse.SC_UNAUTHORIZED);
+			return;
+
+		} else {
+			// user is authenticated, or don't care, continue handling
+			chain.doFilter( request, response );
+			
+		} // authenticated
+	} // doFilter
+
+	
+	/* 
+	 * @see javax.servlet.Filter#destroy()
+	 */
+	@Override
+	public void destroy() {
+		// Nothing to be done
+
+	} // destroy
+
+}
diff --git a/src/com/gitblit/FederationClient.java b/src/main/java/com/gitblit/FederationClient.java
index f6661394..4aeb2111 100644
--- a/src/com/gitblit/FederationClient.java
+++ b/src/main/java/com/gitblit/FederationClient.java
@@ -67,7 +67,7 @@ public class FederationClient {
 			System.exit(0);

 		}

 		

-		System.out.println("Gitblit Federation Client v" + Constants.VERSION + " (" + Constants.VERSION_DATE + ")");

+		System.out.println("Gitblit Federation Client v" + Constants.getVersion() + " (" + Constants.getBuildDate() + ")");

 

 		// command-line specified repositories folder

 		if (!StringUtils.isEmpty(params.repositoriesFolder)) {

diff --git a/src/com/gitblit/FederationPullExecutor.java b/src/main/java/com/gitblit/FederationPullExecutor.java
index ad1022cf..ad1022cf 100644
--- a/src/com/gitblit/FederationPullExecutor.java
+++ b/src/main/java/com/gitblit/FederationPullExecutor.java
diff --git a/src/com/gitblit/FederationServlet.java b/src/main/java/com/gitblit/FederationServlet.java
index e7720508..e7720508 100644
--- a/src/com/gitblit/FederationServlet.java
+++ b/src/main/java/com/gitblit/FederationServlet.java
diff --git a/src/com/gitblit/FileSettings.java b/src/main/java/com/gitblit/FileSettings.java
index 3a42cad0..3a42cad0 100644
--- a/src/com/gitblit/FileSettings.java
+++ b/src/main/java/com/gitblit/FileSettings.java
diff --git a/src/com/gitblit/FileUserService.java b/src/main/java/com/gitblit/FileUserService.java
index 32c24cc4..32c24cc4 100644
--- a/src/com/gitblit/FileUserService.java
+++ b/src/main/java/com/gitblit/FileUserService.java
diff --git a/src/com/gitblit/GCExecutor.java b/src/main/java/com/gitblit/GCExecutor.java
index 312baf5b..312baf5b 100644
--- a/src/com/gitblit/GCExecutor.java
+++ b/src/main/java/com/gitblit/GCExecutor.java
diff --git a/src/com/gitblit/GitBlit.java b/src/main/java/com/gitblit/GitBlit.java
index 4cfd61e4..4cfd61e4 100644
--- a/src/com/gitblit/GitBlit.java
+++ b/src/main/java/com/gitblit/GitBlit.java
diff --git a/src/com/gitblit/GitBlitException.java b/src/main/java/com/gitblit/GitBlitException.java
index 7ab0f99d..7ab0f99d 100644
--- a/src/com/gitblit/GitBlitException.java
+++ b/src/main/java/com/gitblit/GitBlitException.java
diff --git a/src/com/gitblit/GitBlitServer.java b/src/main/java/com/gitblit/GitBlitServer.java
index 08c0d2a2..08c0d2a2 100644
--- a/src/com/gitblit/GitBlitServer.java
+++ b/src/main/java/com/gitblit/GitBlitServer.java
diff --git a/src/com/gitblit/GitFilter.java b/src/main/java/com/gitblit/GitFilter.java
index a0d395b1..a0d395b1 100644
--- a/src/com/gitblit/GitFilter.java
+++ b/src/main/java/com/gitblit/GitFilter.java
diff --git a/src/com/gitblit/GitServlet.java b/src/main/java/com/gitblit/GitServlet.java
index 77be963f..77be963f 100644
--- a/src/com/gitblit/GitServlet.java
+++ b/src/main/java/com/gitblit/GitServlet.java
diff --git a/src/com/gitblit/GitblitSslContextFactory.java b/src/main/java/com/gitblit/GitblitSslContextFactory.java
index f025c452..f025c452 100644
--- a/src/com/gitblit/GitblitSslContextFactory.java
+++ b/src/main/java/com/gitblit/GitblitSslContextFactory.java
diff --git a/src/com/gitblit/GitblitTrustManager.java b/src/main/java/com/gitblit/GitblitTrustManager.java
index 4127caf4..4127caf4 100644
--- a/src/com/gitblit/GitblitTrustManager.java
+++ b/src/main/java/com/gitblit/GitblitTrustManager.java
diff --git a/src/com/gitblit/GitblitUserService.java b/src/main/java/com/gitblit/GitblitUserService.java
index fe35db94..fe35db94 100644
--- a/src/com/gitblit/GitblitUserService.java
+++ b/src/main/java/com/gitblit/GitblitUserService.java
diff --git a/src/com/gitblit/IStoredSettings.java b/src/main/java/com/gitblit/IStoredSettings.java
index 790f8b68..790f8b68 100644
--- a/src/com/gitblit/IStoredSettings.java
+++ b/src/main/java/com/gitblit/IStoredSettings.java
diff --git a/src/com/gitblit/IUserService.java b/src/main/java/com/gitblit/IUserService.java
index a57b0da6..a57b0da6 100644
--- a/src/com/gitblit/IUserService.java
+++ b/src/main/java/com/gitblit/IUserService.java
diff --git a/src/com/gitblit/JsonServlet.java b/src/main/java/com/gitblit/JsonServlet.java
index 3ad2b7d2..3ad2b7d2 100644
--- a/src/com/gitblit/JsonServlet.java
+++ b/src/main/java/com/gitblit/JsonServlet.java
diff --git a/src/com/gitblit/LdapUserService.java b/src/main/java/com/gitblit/LdapUserService.java
index 2867b88f..2867b88f 100644
--- a/src/com/gitblit/LdapUserService.java
+++ b/src/main/java/com/gitblit/LdapUserService.java
diff --git a/src/com/gitblit/LuceneExecutor.java b/src/main/java/com/gitblit/LuceneExecutor.java
index 0e4baae9..0e4baae9 100644
--- a/src/com/gitblit/LuceneExecutor.java
+++ b/src/main/java/com/gitblit/LuceneExecutor.java
diff --git a/src/com/gitblit/MailExecutor.java b/src/main/java/com/gitblit/MailExecutor.java
index 9001e836..9001e836 100644
--- a/src/com/gitblit/MailExecutor.java
+++ b/src/main/java/com/gitblit/MailExecutor.java
diff --git a/src/com/gitblit/PagesFilter.java b/src/main/java/com/gitblit/PagesFilter.java
index f88624e1..f88624e1 100644
--- a/src/com/gitblit/PagesFilter.java
+++ b/src/main/java/com/gitblit/PagesFilter.java
diff --git a/src/com/gitblit/PagesServlet.java b/src/main/java/com/gitblit/PagesServlet.java
index 91f25b70..91f25b70 100644
--- a/src/com/gitblit/PagesServlet.java
+++ b/src/main/java/com/gitblit/PagesServlet.java
diff --git a/src/com/gitblit/RedmineUserService.java b/src/main/java/com/gitblit/RedmineUserService.java
index 9d571e37..9d571e37 100644
--- a/src/com/gitblit/RedmineUserService.java
+++ b/src/main/java/com/gitblit/RedmineUserService.java
diff --git a/src/com/gitblit/RobotsTxtServlet.java b/src/main/java/com/gitblit/RobotsTxtServlet.java
index d66ebf43..d66ebf43 100644
--- a/src/com/gitblit/RobotsTxtServlet.java
+++ b/src/main/java/com/gitblit/RobotsTxtServlet.java
diff --git a/src/com/gitblit/RpcFilter.java b/src/main/java/com/gitblit/RpcFilter.java
index 1de9fcc4..1de9fcc4 100644
--- a/src/com/gitblit/RpcFilter.java
+++ b/src/main/java/com/gitblit/RpcFilter.java
diff --git a/src/com/gitblit/RpcServlet.java b/src/main/java/com/gitblit/RpcServlet.java
index f6368dd0..f6368dd0 100644
--- a/src/com/gitblit/RpcServlet.java
+++ b/src/main/java/com/gitblit/RpcServlet.java
diff --git a/src/com/gitblit/ServletRequestWrapper.java b/src/main/java/com/gitblit/ServletRequestWrapper.java
index d74a9ecb..d74a9ecb 100644
--- a/src/com/gitblit/ServletRequestWrapper.java
+++ b/src/main/java/com/gitblit/ServletRequestWrapper.java
diff --git a/src/com/gitblit/SyndicationFilter.java b/src/main/java/com/gitblit/SyndicationFilter.java
index 61bf2258..61bf2258 100644
--- a/src/com/gitblit/SyndicationFilter.java
+++ b/src/main/java/com/gitblit/SyndicationFilter.java
diff --git a/src/com/gitblit/SyndicationServlet.java b/src/main/java/com/gitblit/SyndicationServlet.java
index baaf7eb7..baaf7eb7 100644
--- a/src/com/gitblit/SyndicationServlet.java
+++ b/src/main/java/com/gitblit/SyndicationServlet.java
diff --git a/src/com/gitblit/WebXmlSettings.java b/src/main/java/com/gitblit/WebXmlSettings.java
index 7c8120b7..7c8120b7 100644
--- a/src/com/gitblit/WebXmlSettings.java
+++ b/src/main/java/com/gitblit/WebXmlSettings.java
diff --git a/src/com/gitblit/authority/AuthorityWorker.java b/src/main/java/com/gitblit/authority/AuthorityWorker.java
index 262bbb53..262bbb53 100644
--- a/src/com/gitblit/authority/AuthorityWorker.java
+++ b/src/main/java/com/gitblit/authority/AuthorityWorker.java
diff --git a/src/com/gitblit/authority/CertificateStatus.java b/src/main/java/com/gitblit/authority/CertificateStatus.java
index 79c51628..79c51628 100644
--- a/src/com/gitblit/authority/CertificateStatus.java
+++ b/src/main/java/com/gitblit/authority/CertificateStatus.java
diff --git a/src/com/gitblit/authority/CertificateStatusRenderer.java b/src/main/java/com/gitblit/authority/CertificateStatusRenderer.java
index 7a708ea4..7a708ea4 100644
--- a/src/com/gitblit/authority/CertificateStatusRenderer.java
+++ b/src/main/java/com/gitblit/authority/CertificateStatusRenderer.java
diff --git a/src/com/gitblit/authority/CertificatesTableModel.java b/src/main/java/com/gitblit/authority/CertificatesTableModel.java
index 44d80e3a..44d80e3a 100644
--- a/src/com/gitblit/authority/CertificatesTableModel.java
+++ b/src/main/java/com/gitblit/authority/CertificatesTableModel.java
diff --git a/src/com/gitblit/authority/DefaultOidsPanel.java b/src/main/java/com/gitblit/authority/DefaultOidsPanel.java
index 12b919fa..12b919fa 100644
--- a/src/com/gitblit/authority/DefaultOidsPanel.java
+++ b/src/main/java/com/gitblit/authority/DefaultOidsPanel.java
diff --git a/src/com/gitblit/authority/GitblitAuthority.java b/src/main/java/com/gitblit/authority/GitblitAuthority.java
index c3d81848..1a1f96db 100644
--- a/src/com/gitblit/authority/GitblitAuthority.java
+++ b/src/main/java/com/gitblit/authority/GitblitAuthority.java
@@ -175,7 +175,7 @@ public class GitblitAuthority extends JFrame implements X509Log {
 	

 	public void initialize(String baseFolder) {

 		setIconImage(new ImageIcon(getClass().getResource("/gitblt-favicon.png")).getImage());

-		setTitle("Gitblit Certificate Authority v" + Constants.VERSION + " (" + Constants.VERSION_DATE + ")");

+		setTitle("Gitblit Certificate Authority v" + Constants.getVersion() + " (" + Constants.getBuildDate() + ")");

 		setContentPane(getUI());

 		setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);

 		addWindowListener(new WindowAdapter() {

diff --git a/src/com/gitblit/authority/GitblitAuthorityLauncher.java b/src/main/java/com/gitblit/authority/Launcher.java
index 584ac01f..1da97149 100644
--- a/src/com/gitblit/authority/GitblitAuthorityLauncher.java
+++ b/src/main/java/com/gitblit/authority/Launcher.java
@@ -21,14 +21,18 @@ import java.awt.FontMetrics;
 import java.awt.Graphics2D;

 import java.awt.SplashScreen;

 import java.io.File;

+import java.io.FileFilter;

 import java.io.IOException;

+import java.lang.reflect.Method;

+import java.net.URL;

+import java.net.URLClassLoader;

+import java.text.MessageFormat;

+import java.util.ArrayList;

+import java.util.Arrays;

 import java.util.Collections;

 import java.util.List;

 

 import com.gitblit.Constants;

-import com.gitblit.Launcher;

-import com.gitblit.build.Build;

-import com.gitblit.build.Build.DownloadListener;

 import com.gitblit.client.Translation;

 

 /**

@@ -37,23 +41,21 @@ import com.gitblit.client.Translation;
  * @author James Moger

  * 

  */

-public class GitblitAuthorityLauncher {

+public class Launcher {

+

+	public static final boolean DEBUG = false;

+

+	/**

+	 * Parameters of the method to add an URL to the System classes.

+	 */

+	private static final Class<?>[] PARAMETERS = new Class[] { URL.class };

+

 

 	public static void main(String[] args) {

 		final SplashScreen splash = SplashScreen.getSplashScreen();

 		

-		DownloadListener downloadListener = new DownloadListener() {

-			@Override

-			public void downloading(String name) {

-				updateSplash(splash, Translation.get("gb.downloading") + " " + name);				

-			}

-		};

-		

-		// download authority runtime dependencies

-		Build.authority(downloadListener);

-

 		File libFolder = new File("ext");

-		List<File> jars = Launcher.findJars(libFolder.getAbsoluteFile());

+		List<File> jars = findJars(libFolder.getAbsoluteFile());

 		

 		// sort the jars by name and then reverse the order so the newer version

 		// of the library gets loaded in the event that this is an upgrade

@@ -62,7 +64,7 @@ public class GitblitAuthorityLauncher {
 		for (File jar : jars) {

 			try {

 				updateSplash(splash, Translation.get("gb.loading") + " " + jar.getName() + "...");

-				Launcher.addJarFile(jar);

+				addJarFile(jar);

 			} catch (IOException e) {

 

 			}

@@ -98,7 +100,7 @@ public class GitblitAuthorityLauncher {
 						g.drawString(string, x + ((w - xw) / 2), y - 5);

 						

 						// paint version

-						String ver = "v" + Constants.VERSION;

+						String ver = "v" + Constants.getVersion();

 						int vw = g.getFontMetrics().stringWidth(ver);

 						g.drawString(ver, 320 - vw - 5, 34);

 						g.dispose();

@@ -110,4 +112,54 @@ public class GitblitAuthorityLauncher {
 			t.printStackTrace();

 		}

 	}

+	

+	public static List<File> findJars(File folder) {

+		List<File> jars = new ArrayList<File>();

+		if (folder.exists()) {

+			File[] libs = folder.listFiles(new FileFilter() {

+				@Override

+				public boolean accept(File file) {

+					return !file.isDirectory() && file.getName().toLowerCase().endsWith(".jar");

+				}

+			});

+			if (libs != null && libs.length > 0) {

+				jars.addAll(Arrays.asList(libs));

+				if (DEBUG) {

+					for (File jar : jars) {

+						System.out.println("found " + jar);

+					}

+				}

+			}

+		}

+

+		return jars;

+	}

+

+	/**

+	 * Adds a file to the classpath

+	 * 

+	 * @param f

+	 *            the file to be added

+	 * @throws IOException

+	 */

+	public static void addJarFile(File f) throws IOException {

+		if (f.getName().indexOf("-sources") > -1 || f.getName().indexOf("-javadoc") > -1) {

+			// don't add source or javadoc jars to runtime classpath

+			return;

+		}

+		URL u = f.toURI().toURL();

+		if (DEBUG) {

+			System.out.println("load=" + u.toExternalForm());

+		}

+		URLClassLoader sysloader = (URLClassLoader) ClassLoader.getSystemClassLoader();

+		Class<?> sysclass = URLClassLoader.class;

+		try {

+			Method method = sysclass.getDeclaredMethod("addURL", PARAMETERS);

+			method.setAccessible(true);

+			method.invoke(sysloader, new Object[] { u });

+		} catch (Throwable t) {

+			throw new IOException(MessageFormat.format(

+					"Error, could not add {0} to system classloader", f.getPath()), t);

+		}

+	}

 }

diff --git a/src/com/gitblit/authority/NewCertificateConfig.java b/src/main/java/com/gitblit/authority/NewCertificateConfig.java
index ca047c82..ca047c82 100644
--- a/src/com/gitblit/authority/NewCertificateConfig.java
+++ b/src/main/java/com/gitblit/authority/NewCertificateConfig.java
diff --git a/src/com/gitblit/authority/NewClientCertificateDialog.java b/src/main/java/com/gitblit/authority/NewClientCertificateDialog.java
index 3d214390..3d214390 100644
--- a/src/com/gitblit/authority/NewClientCertificateDialog.java
+++ b/src/main/java/com/gitblit/authority/NewClientCertificateDialog.java
diff --git a/src/com/gitblit/authority/NewSSLCertificateDialog.java b/src/main/java/com/gitblit/authority/NewSSLCertificateDialog.java
index 821e9e9f..821e9e9f 100644
--- a/src/com/gitblit/authority/NewSSLCertificateDialog.java
+++ b/src/main/java/com/gitblit/authority/NewSSLCertificateDialog.java
diff --git a/src/com/gitblit/authority/RequestFocusListener.java b/src/main/java/com/gitblit/authority/RequestFocusListener.java
index e9368686..e9368686 100644
--- a/src/com/gitblit/authority/RequestFocusListener.java
+++ b/src/main/java/com/gitblit/authority/RequestFocusListener.java
diff --git a/src/com/gitblit/authority/UserCertificateConfig.java b/src/main/java/com/gitblit/authority/UserCertificateConfig.java
index 5ec76f77..5ec76f77 100644
--- a/src/com/gitblit/authority/UserCertificateConfig.java
+++ b/src/main/java/com/gitblit/authority/UserCertificateConfig.java
diff --git a/src/com/gitblit/authority/UserCertificateModel.java b/src/main/java/com/gitblit/authority/UserCertificateModel.java
index 6c69a93b..6c69a93b 100644
--- a/src/com/gitblit/authority/UserCertificateModel.java
+++ b/src/main/java/com/gitblit/authority/UserCertificateModel.java
diff --git a/src/com/gitblit/authority/UserCertificatePanel.java b/src/main/java/com/gitblit/authority/UserCertificatePanel.java
index 0c49252c..0c49252c 100644
--- a/src/com/gitblit/authority/UserCertificatePanel.java
+++ b/src/main/java/com/gitblit/authority/UserCertificatePanel.java
diff --git a/src/com/gitblit/authority/UserCertificateTableModel.java b/src/main/java/com/gitblit/authority/UserCertificateTableModel.java
index dde73fc0..dde73fc0 100644
--- a/src/com/gitblit/authority/UserCertificateTableModel.java
+++ b/src/main/java/com/gitblit/authority/UserCertificateTableModel.java
diff --git a/src/com/gitblit/authority/UserOidsPanel.java b/src/main/java/com/gitblit/authority/UserOidsPanel.java
index 8c3adf66..8c3adf66 100644
--- a/src/com/gitblit/authority/UserOidsPanel.java
+++ b/src/main/java/com/gitblit/authority/UserOidsPanel.java
diff --git a/src/com/gitblit/authority/Utils.java b/src/main/java/com/gitblit/authority/Utils.java
index 45e028e7..45e028e7 100644
--- a/src/com/gitblit/authority/Utils.java
+++ b/src/main/java/com/gitblit/authority/Utils.java
diff --git a/src/com/gitblit/authority/X509CertificateViewer.java b/src/main/java/com/gitblit/authority/X509CertificateViewer.java
index 797b9a81..797b9a81 100644
--- a/src/com/gitblit/authority/X509CertificateViewer.java
+++ b/src/main/java/com/gitblit/authority/X509CertificateViewer.java
diff --git a/src/com/gitblit/build/Build.java b/src/main/java/com/gitblit/build/Build.java
index 3a9ed751..3a9ed751 100644
--- a/src/com/gitblit/build/Build.java
+++ b/src/main/java/com/gitblit/build/Build.java
diff --git a/src/com/gitblit/build/BuildGhPages.java b/src/main/java/com/gitblit/build/BuildGhPages.java
index 5982ac30..5982ac30 100644
--- a/src/com/gitblit/build/BuildGhPages.java
+++ b/src/main/java/com/gitblit/build/BuildGhPages.java
diff --git a/src/com/gitblit/build/BuildSite.java b/src/main/java/com/gitblit/build/BuildSite.java
index efff5a34..efff5a34 100644
--- a/src/com/gitblit/build/BuildSite.java
+++ b/src/main/java/com/gitblit/build/BuildSite.java
diff --git a/src/com/gitblit/build/BuildThumbnails.java b/src/main/java/com/gitblit/build/BuildThumbnails.java
index fe06c6ca..fe06c6ca 100644
--- a/src/com/gitblit/build/BuildThumbnails.java
+++ b/src/main/java/com/gitblit/build/BuildThumbnails.java
diff --git a/src/com/gitblit/build/BuildWebXml.java b/src/main/java/com/gitblit/build/BuildWebXml.java
index 49a12ab2..49a12ab2 100644
--- a/src/com/gitblit/build/BuildWebXml.java
+++ b/src/main/java/com/gitblit/build/BuildWebXml.java
diff --git a/src/com/gitblit/client/BooleanCellRenderer.java b/src/main/java/com/gitblit/client/BooleanCellRenderer.java
index c8341df6..c8341df6 100644
--- a/src/com/gitblit/client/BooleanCellRenderer.java
+++ b/src/main/java/com/gitblit/client/BooleanCellRenderer.java
diff --git a/src/com/gitblit/client/BranchRenderer.java b/src/main/java/com/gitblit/client/BranchRenderer.java
index 9a303c38..9a303c38 100644
--- a/src/com/gitblit/client/BranchRenderer.java
+++ b/src/main/java/com/gitblit/client/BranchRenderer.java
diff --git a/src/com/gitblit/client/ClosableTabComponent.java b/src/main/java/com/gitblit/client/ClosableTabComponent.java
index a121806a..a121806a 100644
--- a/src/com/gitblit/client/ClosableTabComponent.java
+++ b/src/main/java/com/gitblit/client/ClosableTabComponent.java
diff --git a/src/com/gitblit/client/DateCellRenderer.java b/src/main/java/com/gitblit/client/DateCellRenderer.java
index 751c7dbb..751c7dbb 100644
--- a/src/com/gitblit/client/DateCellRenderer.java
+++ b/src/main/java/com/gitblit/client/DateCellRenderer.java
diff --git a/src/com/gitblit/client/EditRegistrationDialog.java b/src/main/java/com/gitblit/client/EditRegistrationDialog.java
index 99cd36fa..99cd36fa 100644
--- a/src/com/gitblit/client/EditRegistrationDialog.java
+++ b/src/main/java/com/gitblit/client/EditRegistrationDialog.java
diff --git a/src/com/gitblit/client/EditRepositoryDialog.java b/src/main/java/com/gitblit/client/EditRepositoryDialog.java
index 8851de43..8851de43 100644
--- a/src/com/gitblit/client/EditRepositoryDialog.java
+++ b/src/main/java/com/gitblit/client/EditRepositoryDialog.java
diff --git a/src/com/gitblit/client/EditTeamDialog.java b/src/main/java/com/gitblit/client/EditTeamDialog.java
index 4d7af261..4d7af261 100644
--- a/src/com/gitblit/client/EditTeamDialog.java
+++ b/src/main/java/com/gitblit/client/EditTeamDialog.java
diff --git a/src/com/gitblit/client/EditUserDialog.java b/src/main/java/com/gitblit/client/EditUserDialog.java
index 0400f5c9..0400f5c9 100644
--- a/src/com/gitblit/client/EditUserDialog.java
+++ b/src/main/java/com/gitblit/client/EditUserDialog.java
diff --git a/src/com/gitblit/client/FeedEntryTableModel.java b/src/main/java/com/gitblit/client/FeedEntryTableModel.java
index 0b0ef178..0b0ef178 100644
--- a/src/com/gitblit/client/FeedEntryTableModel.java
+++ b/src/main/java/com/gitblit/client/FeedEntryTableModel.java
diff --git a/src/com/gitblit/client/FeedsPanel.java b/src/main/java/com/gitblit/client/FeedsPanel.java
index 392636e4..392636e4 100644
--- a/src/com/gitblit/client/FeedsPanel.java
+++ b/src/main/java/com/gitblit/client/FeedsPanel.java
diff --git a/src/com/gitblit/client/FeedsTableModel.java b/src/main/java/com/gitblit/client/FeedsTableModel.java
index 0979a4c9..0979a4c9 100644
--- a/src/com/gitblit/client/FeedsTableModel.java
+++ b/src/main/java/com/gitblit/client/FeedsTableModel.java
diff --git a/src/com/gitblit/client/GitblitClient.java b/src/main/java/com/gitblit/client/GitblitClient.java
index cc7d58a6..cc7d58a6 100644
--- a/src/com/gitblit/client/GitblitClient.java
+++ b/src/main/java/com/gitblit/client/GitblitClient.java
diff --git a/src/com/gitblit/client/GitblitManager.java b/src/main/java/com/gitblit/client/GitblitManager.java
index dd0315f2..d2fd7f7b 100644
--- a/src/com/gitblit/client/GitblitManager.java
+++ b/src/main/java/com/gitblit/client/GitblitManager.java
@@ -96,7 +96,7 @@ public class GitblitManager extends JFrame implements RegistrationsDialog.Regist
 	private void initialize() {

 		setContentPane(getCenterPanel());

 		setIconImage(new ImageIcon(getClass().getResource("/gitblt-favicon.png")).getImage());

-		setTitle("Gitblit Manager v" + Constants.VERSION + " (" + Constants.VERSION_DATE + ")");

+		setTitle("Gitblit Manager v" + Constants.getVersion() + " (" + Constants.getBuildDate() + ")");

 		setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);

 		addWindowListener(new WindowAdapter() {

 			@Override

diff --git a/src/com/gitblit/Launcher.java b/src/main/java/com/gitblit/client/GitblitManagerLauncher.java
index a43331b7..d0cc8393 100644
--- a/src/com/gitblit/Launcher.java
+++ b/src/main/java/com/gitblit/client/GitblitManagerLauncher.java
@@ -13,35 +13,34 @@
  * See the License for the specific language governing permissions and

  * limitations under the License.

  */

-package com.gitblit;

+package com.gitblit.client;

 

+import java.awt.Color;

+import java.awt.EventQueue;

+import java.awt.FontMetrics;

+import java.awt.Graphics2D;

+import java.awt.SplashScreen;

 import java.io.File;

 import java.io.FileFilter;

 import java.io.IOException;

 import java.lang.reflect.Method;

 import java.net.URL;

 import java.net.URLClassLoader;

-import java.security.ProtectionDomain;

 import java.text.MessageFormat;

 import java.util.ArrayList;

 import java.util.Arrays;

 import java.util.Collections;

 import java.util.List;

 

-import com.gitblit.build.Build;

+import com.gitblit.Constants;

 

 /**

- * Launch helper class that adds all jars found in the local "lib" & "ext"

- * folders and then calls the application main. Using this technique we do not

- * have to specify a classpath and we can dynamically add jars to the

- * distribution.

- * 

- * This class also downloads all runtime dependencies, if they are not found.

+ * Downloads dependencies and launches Gitblit Manager.

  * 

  * @author James Moger

  * 

  */

-public class Launcher {

+public class GitblitManagerLauncher {

 

 	public static final boolean DEBUG = false;

 

@@ -51,58 +50,67 @@ public class Launcher {
 	private static final Class<?>[] PARAMETERS = new Class[] { URL.class };

 

 	public static void main(String[] args) {

-		if (DEBUG) {

-			System.out.println("jcp=" + System.getProperty("java.class.path"));

-			ProtectionDomain protectionDomain = Launcher.class.getProtectionDomain();

-			System.out.println("launcher="

-					+ protectionDomain.getCodeSource().getLocation().toExternalForm());

-		}

-

-		// download all runtime dependencies

-		Build.runtime();

-

-		// Load the JARs in the lib and ext folder

-		String[] folders = new String[] { "lib", "ext" };

-		List<File> jars = new ArrayList<File>();

-		for (String folder : folders) {

-			if (folder == null) {

-				continue;

-			}

-			File libFolder = new File(folder);

-			if (!libFolder.exists()) {

-				continue;

-			}

-			List<File> found = findJars(libFolder.getAbsoluteFile());

-			jars.addAll(found);

-		}

+		final SplashScreen splash = SplashScreen.getSplashScreen();

+		

+		File libFolder = new File("ext");

+		List<File> jars = findJars(libFolder.getAbsoluteFile());

+		

 		// sort the jars by name and then reverse the order so the newer version

 		// of the library gets loaded in the event that this is an upgrade

 		Collections.sort(jars);

 		Collections.reverse(jars);

+		for (File jar : jars) {

+			try {

+				updateSplash(splash, Translation.get("gb.loading") + " " + jar.getName() + "...");

+				addJarFile(jar);

+			} catch (IOException e) {

 

-		if (jars.size() == 0) {

-			for (String folder : folders) {

-				File libFolder = new File(folder);

-				// this is a test of adding a comment

-				// more really interesting things

-				System.err.println("Failed to find any really cool JARs in " + libFolder.getPath());

-			}

-			System.exit(-1);

-		} else {

-			for (File jar : jars) {

-				try {

-					jar.canRead();

-					addJarFile(jar);

-				} catch (Throwable t) {

-					t.printStackTrace();

-				}

 			}

 		}

-

-		// Start Server

-		GitBlitServer.main(args);

+		

+		updateSplash(splash, Translation.get("gb.starting") + " Gitblit Manager...");

+		GitblitManager.main(args);

 	}

 

+	private static void updateSplash(final SplashScreen splash, final String string) {

+		if (splash == null) {

+			return;

+		}

+		try {

+			EventQueue.invokeAndWait(new Runnable() {

+				public void run() {

+					Graphics2D g = splash.createGraphics();

+					if (g != null) {

+						// Splash is 320x120

+						FontMetrics fm = g.getFontMetrics();

+						

+						// paint startup status

+						g.setColor(Color.darkGray);

+						int h = fm.getHeight() + fm.getMaxDescent();

+						int x = 5;

+						int y = 115;

+						int w = 320 - 2 * x;

+						g.fillRect(x, y - h, w, h);

+						g.setColor(Color.lightGray);

+						g.drawRect(x, y - h, w, h);

+						g.setColor(Color.WHITE);

+						int xw = fm.stringWidth(string);

+						g.drawString(string, x + ((w - xw) / 2), y - 5);

+						

+						// paint version

+						String ver = "v" + Constants.getVersion();

+						int vw = g.getFontMetrics().stringWidth(ver);

+						g.drawString(ver, 320 - vw - 5, 34);

+						g.dispose();

+						splash.update();

+					}

+				}

+			});

+		} catch (Throwable t) {

+			t.printStackTrace();

+		}

+	}

+	

 	public static List<File> findJars(File folder) {

 		List<File> jars = new ArrayList<File>();

 		if (folder.exists()) {

@@ -152,4 +160,5 @@ public class Launcher {
 					"Error, could not add {0} to system classloader", f.getPath()), t);

 		}

 	}

+

 }

diff --git a/src/com/gitblit/client/GitblitPanel.java b/src/main/java/com/gitblit/client/GitblitPanel.java
index f14ce790..f14ce790 100644
--- a/src/com/gitblit/client/GitblitPanel.java
+++ b/src/main/java/com/gitblit/client/GitblitPanel.java
diff --git a/src/com/gitblit/client/GitblitRegistration.java b/src/main/java/com/gitblit/client/GitblitRegistration.java
index f9d07488..f9d07488 100644
--- a/src/com/gitblit/client/GitblitRegistration.java
+++ b/src/main/java/com/gitblit/client/GitblitRegistration.java
diff --git a/src/com/gitblit/client/GitblitWorker.java b/src/main/java/com/gitblit/client/GitblitWorker.java
index 93c35d6b..93c35d6b 100644
--- a/src/com/gitblit/client/GitblitWorker.java
+++ b/src/main/java/com/gitblit/client/GitblitWorker.java
diff --git a/src/com/gitblit/client/HeaderPanel.java b/src/main/java/com/gitblit/client/HeaderPanel.java
index 3cd89a70..3cd89a70 100644
--- a/src/com/gitblit/client/HeaderPanel.java
+++ b/src/main/java/com/gitblit/client/HeaderPanel.java
diff --git a/src/com/gitblit/client/IndicatorsRenderer.java b/src/main/java/com/gitblit/client/IndicatorsRenderer.java
index 44b39d01..44b39d01 100644
--- a/src/com/gitblit/client/IndicatorsRenderer.java
+++ b/src/main/java/com/gitblit/client/IndicatorsRenderer.java
diff --git a/src/com/gitblit/client/JPalette.java b/src/main/java/com/gitblit/client/JPalette.java
index a0c2b258..a0c2b258 100644
--- a/src/com/gitblit/client/JPalette.java
+++ b/src/main/java/com/gitblit/client/JPalette.java
diff --git a/src/com/gitblit/client/MessageRenderer.java b/src/main/java/com/gitblit/client/MessageRenderer.java
index 2fe3415a..2fe3415a 100644
--- a/src/com/gitblit/client/MessageRenderer.java
+++ b/src/main/java/com/gitblit/client/MessageRenderer.java
diff --git a/src/com/gitblit/client/NameRenderer.java b/src/main/java/com/gitblit/client/NameRenderer.java
index 4cbb5906..4cbb5906 100644
--- a/src/com/gitblit/client/NameRenderer.java
+++ b/src/main/java/com/gitblit/client/NameRenderer.java
diff --git a/src/com/gitblit/client/PropertiesTableModel.java b/src/main/java/com/gitblit/client/PropertiesTableModel.java
index 0c803f47..0c803f47 100644
--- a/src/com/gitblit/client/PropertiesTableModel.java
+++ b/src/main/java/com/gitblit/client/PropertiesTableModel.java
diff --git a/src/com/gitblit/client/RegistrantPermissionsPanel.java b/src/main/java/com/gitblit/client/RegistrantPermissionsPanel.java
index 98dbfb72..98dbfb72 100644
--- a/src/com/gitblit/client/RegistrantPermissionsPanel.java
+++ b/src/main/java/com/gitblit/client/RegistrantPermissionsPanel.java
diff --git a/src/com/gitblit/client/RegistrantPermissionsTableModel.java b/src/main/java/com/gitblit/client/RegistrantPermissionsTableModel.java
index 28d25345..28d25345 100644
--- a/src/com/gitblit/client/RegistrantPermissionsTableModel.java
+++ b/src/main/java/com/gitblit/client/RegistrantPermissionsTableModel.java
diff --git a/src/com/gitblit/client/RegistrationsDialog.java b/src/main/java/com/gitblit/client/RegistrationsDialog.java
index 9550e97a..9550e97a 100644
--- a/src/com/gitblit/client/RegistrationsDialog.java
+++ b/src/main/java/com/gitblit/client/RegistrationsDialog.java
diff --git a/src/com/gitblit/client/RegistrationsTableModel.java b/src/main/java/com/gitblit/client/RegistrationsTableModel.java
index 8c6b34ff..8c6b34ff 100644
--- a/src/com/gitblit/client/RegistrationsTableModel.java
+++ b/src/main/java/com/gitblit/client/RegistrationsTableModel.java
diff --git a/src/com/gitblit/client/RepositoriesPanel.java b/src/main/java/com/gitblit/client/RepositoriesPanel.java
index 64bde9b8..64bde9b8 100644
--- a/src/com/gitblit/client/RepositoriesPanel.java
+++ b/src/main/java/com/gitblit/client/RepositoriesPanel.java
diff --git a/src/com/gitblit/client/RepositoriesTableModel.java b/src/main/java/com/gitblit/client/RepositoriesTableModel.java
index 6b295a4b..6b295a4b 100644
--- a/src/com/gitblit/client/RepositoriesTableModel.java
+++ b/src/main/java/com/gitblit/client/RepositoriesTableModel.java
diff --git a/src/com/gitblit/client/SearchDialog.java b/src/main/java/com/gitblit/client/SearchDialog.java
index 829bc52a..829bc52a 100644
--- a/src/com/gitblit/client/SearchDialog.java
+++ b/src/main/java/com/gitblit/client/SearchDialog.java
diff --git a/src/com/gitblit/client/SettingCellRenderer.java b/src/main/java/com/gitblit/client/SettingCellRenderer.java
index d164fb1a..d164fb1a 100644
--- a/src/com/gitblit/client/SettingCellRenderer.java
+++ b/src/main/java/com/gitblit/client/SettingCellRenderer.java
diff --git a/src/com/gitblit/client/SettingPanel.java b/src/main/java/com/gitblit/client/SettingPanel.java
index 6da09e18..6da09e18 100644
--- a/src/com/gitblit/client/SettingPanel.java
+++ b/src/main/java/com/gitblit/client/SettingPanel.java
diff --git a/src/com/gitblit/client/SettingsPanel.java b/src/main/java/com/gitblit/client/SettingsPanel.java
index b0adc0c7..b0adc0c7 100644
--- a/src/com/gitblit/client/SettingsPanel.java
+++ b/src/main/java/com/gitblit/client/SettingsPanel.java
diff --git a/src/com/gitblit/client/SettingsTableModel.java b/src/main/java/com/gitblit/client/SettingsTableModel.java
index f14eae4b..f14eae4b 100644
--- a/src/com/gitblit/client/SettingsTableModel.java
+++ b/src/main/java/com/gitblit/client/SettingsTableModel.java
diff --git a/src/com/gitblit/client/StatusPanel.java b/src/main/java/com/gitblit/client/StatusPanel.java
index 6d004f16..6d004f16 100644
--- a/src/com/gitblit/client/StatusPanel.java
+++ b/src/main/java/com/gitblit/client/StatusPanel.java
diff --git a/src/com/gitblit/client/SubscribedRepositoryRenderer.java b/src/main/java/com/gitblit/client/SubscribedRepositoryRenderer.java
index 9943333f..9943333f 100644
--- a/src/com/gitblit/client/SubscribedRepositoryRenderer.java
+++ b/src/main/java/com/gitblit/client/SubscribedRepositoryRenderer.java
diff --git a/src/com/gitblit/client/SubscriptionsDialog.java b/src/main/java/com/gitblit/client/SubscriptionsDialog.java
index 5ae836a5..5ae836a5 100644
--- a/src/com/gitblit/client/SubscriptionsDialog.java
+++ b/src/main/java/com/gitblit/client/SubscriptionsDialog.java
diff --git a/src/com/gitblit/client/TeamsPanel.java b/src/main/java/com/gitblit/client/TeamsPanel.java
index 92182222..92182222 100644
--- a/src/com/gitblit/client/TeamsPanel.java
+++ b/src/main/java/com/gitblit/client/TeamsPanel.java
diff --git a/src/com/gitblit/client/TeamsTableModel.java b/src/main/java/com/gitblit/client/TeamsTableModel.java
index e6d8a945..e6d8a945 100644
--- a/src/com/gitblit/client/TeamsTableModel.java
+++ b/src/main/java/com/gitblit/client/TeamsTableModel.java
diff --git a/src/com/gitblit/client/Translation.java b/src/main/java/com/gitblit/client/Translation.java
index 16ef20d4..16ef20d4 100644
--- a/src/com/gitblit/client/Translation.java
+++ b/src/main/java/com/gitblit/client/Translation.java
diff --git a/src/com/gitblit/client/UsersPanel.java b/src/main/java/com/gitblit/client/UsersPanel.java
index c53a5791..c53a5791 100644
--- a/src/com/gitblit/client/UsersPanel.java
+++ b/src/main/java/com/gitblit/client/UsersPanel.java
diff --git a/src/com/gitblit/client/UsersTableModel.java b/src/main/java/com/gitblit/client/UsersTableModel.java
index 439d5afb..439d5afb 100644
--- a/src/com/gitblit/client/UsersTableModel.java
+++ b/src/main/java/com/gitblit/client/UsersTableModel.java
diff --git a/src/com/gitblit/client/Utils.java b/src/main/java/com/gitblit/client/Utils.java
index 1e6ab2bf..1e6ab2bf 100644
--- a/src/com/gitblit/client/Utils.java
+++ b/src/main/java/com/gitblit/client/Utils.java
diff --git a/src/com/gitblit/client/splash.png b/src/main/java/com/gitblit/client/splash.png
index d63932fb..d63932fb 100644
--- a/src/com/gitblit/client/splash.png
+++ b/src/main/java/com/gitblit/client/splash.png
diff --git a/src/com/gitblit/fanout/FanoutClient.java b/src/main/java/com/gitblit/fanout/FanoutClient.java
index b9ace4be..b9ace4be 100644
--- a/src/com/gitblit/fanout/FanoutClient.java
+++ b/src/main/java/com/gitblit/fanout/FanoutClient.java
diff --git a/src/com/gitblit/fanout/FanoutConstants.java b/src/main/java/com/gitblit/fanout/FanoutConstants.java
index 6e6964c9..6e6964c9 100644
--- a/src/com/gitblit/fanout/FanoutConstants.java
+++ b/src/main/java/com/gitblit/fanout/FanoutConstants.java
diff --git a/src/com/gitblit/fanout/FanoutNioService.java b/src/main/java/com/gitblit/fanout/FanoutNioService.java
index 65d022ab..65d022ab 100644
--- a/src/com/gitblit/fanout/FanoutNioService.java
+++ b/src/main/java/com/gitblit/fanout/FanoutNioService.java
diff --git a/src/com/gitblit/fanout/FanoutService.java b/src/main/java/com/gitblit/fanout/FanoutService.java
index cbfd8a24..cbfd8a24 100644
--- a/src/com/gitblit/fanout/FanoutService.java
+++ b/src/main/java/com/gitblit/fanout/FanoutService.java
diff --git a/src/com/gitblit/fanout/FanoutServiceConnection.java b/src/main/java/com/gitblit/fanout/FanoutServiceConnection.java
index f7f2c959..f7f2c959 100644
--- a/src/com/gitblit/fanout/FanoutServiceConnection.java
+++ b/src/main/java/com/gitblit/fanout/FanoutServiceConnection.java
diff --git a/src/com/gitblit/fanout/FanoutSocketService.java b/src/main/java/com/gitblit/fanout/FanoutSocketService.java
index 07c18f90..07c18f90 100644
--- a/src/com/gitblit/fanout/FanoutSocketService.java
+++ b/src/main/java/com/gitblit/fanout/FanoutSocketService.java
diff --git a/src/com/gitblit/fanout/FanoutStats.java b/src/main/java/com/gitblit/fanout/FanoutStats.java
index b06884d3..b06884d3 100644
--- a/src/com/gitblit/fanout/FanoutStats.java
+++ b/src/main/java/com/gitblit/fanout/FanoutStats.java
diff --git a/src/com/gitblit/models/Activity.java b/src/main/java/com/gitblit/models/Activity.java
index 59405c7f..59405c7f 100644
--- a/src/com/gitblit/models/Activity.java
+++ b/src/main/java/com/gitblit/models/Activity.java
diff --git a/src/com/gitblit/models/AnnotatedLine.java b/src/main/java/com/gitblit/models/AnnotatedLine.java
index 69b55bcd..69b55bcd 100644
--- a/src/com/gitblit/models/AnnotatedLine.java
+++ b/src/main/java/com/gitblit/models/AnnotatedLine.java
diff --git a/src/com/gitblit/models/FederationModel.java b/src/main/java/com/gitblit/models/FederationModel.java
index 1d211ce9..1d211ce9 100644
--- a/src/com/gitblit/models/FederationModel.java
+++ b/src/main/java/com/gitblit/models/FederationModel.java
diff --git a/src/com/gitblit/models/FederationProposal.java b/src/main/java/com/gitblit/models/FederationProposal.java
index 5cf9182c..5cf9182c 100644
--- a/src/com/gitblit/models/FederationProposal.java
+++ b/src/main/java/com/gitblit/models/FederationProposal.java
diff --git a/src/com/gitblit/models/FederationSet.java b/src/main/java/com/gitblit/models/FederationSet.java
index 357689c9..357689c9 100644
--- a/src/com/gitblit/models/FederationSet.java
+++ b/src/main/java/com/gitblit/models/FederationSet.java
diff --git a/src/com/gitblit/models/FeedEntryModel.java b/src/main/java/com/gitblit/models/FeedEntryModel.java
index e1c00c38..e1c00c38 100644
--- a/src/com/gitblit/models/FeedEntryModel.java
+++ b/src/main/java/com/gitblit/models/FeedEntryModel.java
diff --git a/src/com/gitblit/models/FeedModel.java b/src/main/java/com/gitblit/models/FeedModel.java
index 08f9e48e..08f9e48e 100644
--- a/src/com/gitblit/models/FeedModel.java
+++ b/src/main/java/com/gitblit/models/FeedModel.java
diff --git a/src/com/gitblit/models/ForkModel.java b/src/main/java/com/gitblit/models/ForkModel.java
index 849986c1..849986c1 100644
--- a/src/com/gitblit/models/ForkModel.java
+++ b/src/main/java/com/gitblit/models/ForkModel.java
diff --git a/src/com/gitblit/models/GitNote.java b/src/main/java/com/gitblit/models/GitNote.java
index c333a881..c333a881 100644
--- a/src/com/gitblit/models/GitNote.java
+++ b/src/main/java/com/gitblit/models/GitNote.java
diff --git a/src/com/gitblit/models/GravatarProfile.java b/src/main/java/com/gitblit/models/GravatarProfile.java
index aa128ce0..aa128ce0 100644
--- a/src/com/gitblit/models/GravatarProfile.java
+++ b/src/main/java/com/gitblit/models/GravatarProfile.java
diff --git a/src/com/gitblit/models/IssueModel.java b/src/main/java/com/gitblit/models/IssueModel.java
index c9038913..c9038913 100644
--- a/src/com/gitblit/models/IssueModel.java
+++ b/src/main/java/com/gitblit/models/IssueModel.java
diff --git a/src/com/gitblit/models/Metric.java b/src/main/java/com/gitblit/models/Metric.java
index 2845c527..2845c527 100644
--- a/src/com/gitblit/models/Metric.java
+++ b/src/main/java/com/gitblit/models/Metric.java
diff --git a/src/com/gitblit/models/PathModel.java b/src/main/java/com/gitblit/models/PathModel.java
index 84571cbb..84571cbb 100644
--- a/src/com/gitblit/models/PathModel.java
+++ b/src/main/java/com/gitblit/models/PathModel.java
diff --git a/src/com/gitblit/models/ProjectModel.java b/src/main/java/com/gitblit/models/ProjectModel.java
index 9e5d5233..9e5d5233 100644
--- a/src/com/gitblit/models/ProjectModel.java
+++ b/src/main/java/com/gitblit/models/ProjectModel.java
diff --git a/src/com/gitblit/models/PushLogEntry.java b/src/main/java/com/gitblit/models/PushLogEntry.java
index f625c2a3..f625c2a3 100644
--- a/src/com/gitblit/models/PushLogEntry.java
+++ b/src/main/java/com/gitblit/models/PushLogEntry.java
diff --git a/src/com/gitblit/models/RefModel.java b/src/main/java/com/gitblit/models/RefModel.java
index 8489c817..8489c817 100644
--- a/src/com/gitblit/models/RefModel.java
+++ b/src/main/java/com/gitblit/models/RefModel.java
diff --git a/src/com/gitblit/models/RegistrantAccessPermission.java b/src/main/java/com/gitblit/models/RegistrantAccessPermission.java
index 8f4049a8..8f4049a8 100644
--- a/src/com/gitblit/models/RegistrantAccessPermission.java
+++ b/src/main/java/com/gitblit/models/RegistrantAccessPermission.java
diff --git a/src/com/gitblit/models/RepositoryCommit.java b/src/main/java/com/gitblit/models/RepositoryCommit.java
index e68e8613..e68e8613 100644
--- a/src/com/gitblit/models/RepositoryCommit.java
+++ b/src/main/java/com/gitblit/models/RepositoryCommit.java
diff --git a/src/com/gitblit/models/RepositoryModel.java b/src/main/java/com/gitblit/models/RepositoryModel.java
index a2dab3c5..a2dab3c5 100644
--- a/src/com/gitblit/models/RepositoryModel.java
+++ b/src/main/java/com/gitblit/models/RepositoryModel.java
diff --git a/src/com/gitblit/models/SearchResult.java b/src/main/java/com/gitblit/models/SearchResult.java
index efd1b075..efd1b075 100644
--- a/src/com/gitblit/models/SearchResult.java
+++ b/src/main/java/com/gitblit/models/SearchResult.java
diff --git a/src/com/gitblit/models/ServerSettings.java b/src/main/java/com/gitblit/models/ServerSettings.java
index 27199b41..27199b41 100644
--- a/src/com/gitblit/models/ServerSettings.java
+++ b/src/main/java/com/gitblit/models/ServerSettings.java
diff --git a/src/com/gitblit/models/ServerStatus.java b/src/main/java/com/gitblit/models/ServerStatus.java
index f1650c8d..3a1e0306 100644
--- a/src/com/gitblit/models/ServerStatus.java
+++ b/src/main/java/com/gitblit/models/ServerStatus.java
@@ -53,8 +53,8 @@ public class ServerStatus implements Serializable {
 

 	public ServerStatus(boolean isGO) {

 		this.bootDate = new Date();

-		this.version = Constants.VERSION;

-		this.releaseDate = Constants.VERSION_DATE;

+		this.version = Constants.getVersion();

+		this.releaseDate = Constants.getBuildDate();

 		this.isGO = isGO;

 

 		this.heapMaximum = Runtime.getRuntime().maxMemory();

diff --git a/src/com/gitblit/models/SettingModel.java b/src/main/java/com/gitblit/models/SettingModel.java
index a04126e1..a04126e1 100644
--- a/src/com/gitblit/models/SettingModel.java
+++ b/src/main/java/com/gitblit/models/SettingModel.java
diff --git a/src/com/gitblit/models/SubmoduleModel.java b/src/main/java/com/gitblit/models/SubmoduleModel.java
index 47f84b95..47f84b95 100644
--- a/src/com/gitblit/models/SubmoduleModel.java
+++ b/src/main/java/com/gitblit/models/SubmoduleModel.java
diff --git a/src/com/gitblit/models/TeamModel.java b/src/main/java/com/gitblit/models/TeamModel.java
index 9587ca7a..9587ca7a 100644
--- a/src/com/gitblit/models/TeamModel.java
+++ b/src/main/java/com/gitblit/models/TeamModel.java
diff --git a/src/com/gitblit/models/TicketModel.java b/src/main/java/com/gitblit/models/TicketModel.java
index b8043c6c..b8043c6c 100644
--- a/src/com/gitblit/models/TicketModel.java
+++ b/src/main/java/com/gitblit/models/TicketModel.java
diff --git a/src/com/gitblit/models/UserModel.java b/src/main/java/com/gitblit/models/UserModel.java
index bec011d9..bec011d9 100644
--- a/src/com/gitblit/models/UserModel.java
+++ b/src/main/java/com/gitblit/models/UserModel.java
diff --git a/src/com/gitblit/utils/ActivityUtils.java b/src/main/java/com/gitblit/utils/ActivityUtils.java
index 732fdeb1..732fdeb1 100644
--- a/src/com/gitblit/utils/ActivityUtils.java
+++ b/src/main/java/com/gitblit/utils/ActivityUtils.java
diff --git a/src/com/gitblit/utils/ArrayUtils.java b/src/main/java/com/gitblit/utils/ArrayUtils.java
index 65834673..65834673 100644
--- a/src/com/gitblit/utils/ArrayUtils.java
+++ b/src/main/java/com/gitblit/utils/ArrayUtils.java
diff --git a/src/com/gitblit/utils/Base64.java b/src/main/java/com/gitblit/utils/Base64.java
index 6fd2daf1..6fd2daf1 100644
--- a/src/com/gitblit/utils/Base64.java
+++ b/src/main/java/com/gitblit/utils/Base64.java
diff --git a/src/com/gitblit/utils/ByteFormat.java b/src/main/java/com/gitblit/utils/ByteFormat.java
index cb7da885..cb7da885 100644
--- a/src/com/gitblit/utils/ByteFormat.java
+++ b/src/main/java/com/gitblit/utils/ByteFormat.java
diff --git a/src/com/gitblit/utils/ClientLogger.java b/src/main/java/com/gitblit/utils/ClientLogger.java
index 7d18f3d6..7d18f3d6 100644
--- a/src/com/gitblit/utils/ClientLogger.java
+++ b/src/main/java/com/gitblit/utils/ClientLogger.java
diff --git a/src/com/gitblit/utils/CompressionUtils.java b/src/main/java/com/gitblit/utils/CompressionUtils.java
index a8dcdd8f..a8dcdd8f 100644
--- a/src/com/gitblit/utils/CompressionUtils.java
+++ b/src/main/java/com/gitblit/utils/CompressionUtils.java
diff --git a/src/com/gitblit/utils/ConnectionUtils.java b/src/main/java/com/gitblit/utils/ConnectionUtils.java
index f0b41118..f0b41118 100644
--- a/src/com/gitblit/utils/ConnectionUtils.java
+++ b/src/main/java/com/gitblit/utils/ConnectionUtils.java
diff --git a/src/com/gitblit/utils/ContainerUtils.java b/src/main/java/com/gitblit/utils/ContainerUtils.java
index 919f99d6..919f99d6 100755..100644
--- a/src/com/gitblit/utils/ContainerUtils.java
+++ b/src/main/java/com/gitblit/utils/ContainerUtils.java
diff --git a/src/com/gitblit/utils/DeepCopier.java b/src/main/java/com/gitblit/utils/DeepCopier.java
index 5df30623..5df30623 100644
--- a/src/com/gitblit/utils/DeepCopier.java
+++ b/src/main/java/com/gitblit/utils/DeepCopier.java
diff --git a/src/com/gitblit/utils/DiffUtils.java b/src/main/java/com/gitblit/utils/DiffUtils.java
index 04b5b0b1..04b5b0b1 100644
--- a/src/com/gitblit/utils/DiffUtils.java
+++ b/src/main/java/com/gitblit/utils/DiffUtils.java
diff --git a/src/com/gitblit/utils/FederationUtils.java b/src/main/java/com/gitblit/utils/FederationUtils.java
index 4d6060dd..4d6060dd 100644
--- a/src/com/gitblit/utils/FederationUtils.java
+++ b/src/main/java/com/gitblit/utils/FederationUtils.java
diff --git a/src/com/gitblit/utils/FileUtils.java b/src/main/java/com/gitblit/utils/FileUtils.java
index a21b5128..a21b5128 100644
--- a/src/com/gitblit/utils/FileUtils.java
+++ b/src/main/java/com/gitblit/utils/FileUtils.java
diff --git a/src/com/gitblit/utils/GitBlitDiffFormatter.java b/src/main/java/com/gitblit/utils/GitBlitDiffFormatter.java
index 2966aa8a..2966aa8a 100644
--- a/src/com/gitblit/utils/GitBlitDiffFormatter.java
+++ b/src/main/java/com/gitblit/utils/GitBlitDiffFormatter.java
diff --git a/src/com/gitblit/utils/GitWebDiffFormatter.java b/src/main/java/com/gitblit/utils/GitWebDiffFormatter.java
index e657dc58..e657dc58 100644
--- a/src/com/gitblit/utils/GitWebDiffFormatter.java
+++ b/src/main/java/com/gitblit/utils/GitWebDiffFormatter.java
diff --git a/src/com/gitblit/utils/HttpUtils.java b/src/main/java/com/gitblit/utils/HttpUtils.java
index 86f53cfe..86f53cfe 100644
--- a/src/com/gitblit/utils/HttpUtils.java
+++ b/src/main/java/com/gitblit/utils/HttpUtils.java
diff --git a/src/com/gitblit/utils/IssueUtils.java b/src/main/java/com/gitblit/utils/IssueUtils.java
index dd09235b..dd09235b 100644
--- a/src/com/gitblit/utils/IssueUtils.java
+++ b/src/main/java/com/gitblit/utils/IssueUtils.java
diff --git a/src/com/gitblit/utils/JGitUtils.java b/src/main/java/com/gitblit/utils/JGitUtils.java
index 1f2ae943..1f2ae943 100644
--- a/src/com/gitblit/utils/JGitUtils.java
+++ b/src/main/java/com/gitblit/utils/JGitUtils.java
diff --git a/src/com/gitblit/utils/JsonUtils.java b/src/main/java/com/gitblit/utils/JsonUtils.java
index 24f4ecb8..24f4ecb8 100644
--- a/src/com/gitblit/utils/JsonUtils.java
+++ b/src/main/java/com/gitblit/utils/JsonUtils.java
diff --git a/src/com/gitblit/utils/MarkdownUtils.java b/src/main/java/com/gitblit/utils/MarkdownUtils.java
index 0b8c9c57..0b8c9c57 100644
--- a/src/com/gitblit/utils/MarkdownUtils.java
+++ b/src/main/java/com/gitblit/utils/MarkdownUtils.java
diff --git a/src/com/gitblit/utils/MetricUtils.java b/src/main/java/com/gitblit/utils/MetricUtils.java
index 26e4581c..26e4581c 100644
--- a/src/com/gitblit/utils/MetricUtils.java
+++ b/src/main/java/com/gitblit/utils/MetricUtils.java
diff --git a/src/com/gitblit/utils/ObjectCache.java b/src/main/java/com/gitblit/utils/ObjectCache.java
index 38f2e59a..38f2e59a 100644
--- a/src/com/gitblit/utils/ObjectCache.java
+++ b/src/main/java/com/gitblit/utils/ObjectCache.java
diff --git a/src/com/gitblit/utils/PatchFormatter.java b/src/main/java/com/gitblit/utils/PatchFormatter.java
index 90b3fb16..90b3fb16 100644
--- a/src/com/gitblit/utils/PatchFormatter.java
+++ b/src/main/java/com/gitblit/utils/PatchFormatter.java
diff --git a/src/com/gitblit/utils/PushLogUtils.java b/src/main/java/com/gitblit/utils/PushLogUtils.java
index 665533b3..665533b3 100644
--- a/src/com/gitblit/utils/PushLogUtils.java
+++ b/src/main/java/com/gitblit/utils/PushLogUtils.java
diff --git a/src/com/gitblit/utils/RpcUtils.java b/src/main/java/com/gitblit/utils/RpcUtils.java
index ed23dab6..ed23dab6 100644
--- a/src/com/gitblit/utils/RpcUtils.java
+++ b/src/main/java/com/gitblit/utils/RpcUtils.java
diff --git a/src/com/gitblit/utils/StringUtils.java b/src/main/java/com/gitblit/utils/StringUtils.java
index 86823db5..86823db5 100644
--- a/src/com/gitblit/utils/StringUtils.java
+++ b/src/main/java/com/gitblit/utils/StringUtils.java
diff --git a/src/com/gitblit/utils/SyndicationUtils.java b/src/main/java/com/gitblit/utils/SyndicationUtils.java
index d01d4691..d01d4691 100644
--- a/src/com/gitblit/utils/SyndicationUtils.java
+++ b/src/main/java/com/gitblit/utils/SyndicationUtils.java
diff --git a/src/com/gitblit/utils/TicgitUtils.java b/src/main/java/com/gitblit/utils/TicgitUtils.java
index aab5a3e1..aab5a3e1 100644
--- a/src/com/gitblit/utils/TicgitUtils.java
+++ b/src/main/java/com/gitblit/utils/TicgitUtils.java
diff --git a/src/com/gitblit/utils/TimeUtils.java b/src/main/java/com/gitblit/utils/TimeUtils.java
index ec8871c6..ec8871c6 100644
--- a/src/com/gitblit/utils/TimeUtils.java
+++ b/src/main/java/com/gitblit/utils/TimeUtils.java
diff --git a/src/com/gitblit/utils/X509Utils.java b/src/main/java/com/gitblit/utils/X509Utils.java
index 237c8dad..237c8dad 100644
--- a/src/com/gitblit/utils/X509Utils.java
+++ b/src/main/java/com/gitblit/utils/X509Utils.java
diff --git a/src/com/gitblit/wicket/AuthorizationStrategy.java b/src/main/java/com/gitblit/wicket/AuthorizationStrategy.java
index 765d8608..765d8608 100644
--- a/src/com/gitblit/wicket/AuthorizationStrategy.java
+++ b/src/main/java/com/gitblit/wicket/AuthorizationStrategy.java
diff --git a/src/com/gitblit/wicket/ExternalImage.java b/src/main/java/com/gitblit/wicket/ExternalImage.java
index 33257740..33257740 100644
--- a/src/com/gitblit/wicket/ExternalImage.java
+++ b/src/main/java/com/gitblit/wicket/ExternalImage.java
diff --git a/src/com/gitblit/wicket/GitBlitWebApp.java b/src/main/java/com/gitblit/wicket/GitBlitWebApp.java
index 2300d0ff..2300d0ff 100644
--- a/src/com/gitblit/wicket/GitBlitWebApp.java
+++ b/src/main/java/com/gitblit/wicket/GitBlitWebApp.java
diff --git a/src/com/gitblit/wicket/GitBlitWebApp.properties b/src/main/java/com/gitblit/wicket/GitBlitWebApp.properties
index 7a2b1bb3..7a2b1bb3 100644
--- a/src/com/gitblit/wicket/GitBlitWebApp.properties
+++ b/src/main/java/com/gitblit/wicket/GitBlitWebApp.properties
diff --git a/src/com/gitblit/wicket/GitBlitWebApp_es.properties b/src/main/java/com/gitblit/wicket/GitBlitWebApp_es.properties
index 210a75f9..210a75f9 100644
--- a/src/com/gitblit/wicket/GitBlitWebApp_es.properties
+++ b/src/main/java/com/gitblit/wicket/GitBlitWebApp_es.properties
diff --git a/src/com/gitblit/wicket/GitBlitWebApp_ja.properties b/src/main/java/com/gitblit/wicket/GitBlitWebApp_ja.properties
index d0234f87..d0234f87 100755..100644
--- a/src/com/gitblit/wicket/GitBlitWebApp_ja.properties
+++ b/src/main/java/com/gitblit/wicket/GitBlitWebApp_ja.properties
diff --git a/src/com/gitblit/wicket/GitBlitWebApp_ko.properties b/src/main/java/com/gitblit/wicket/GitBlitWebApp_ko.properties
index 42915df8..42915df8 100644
--- a/src/com/gitblit/wicket/GitBlitWebApp_ko.properties
+++ b/src/main/java/com/gitblit/wicket/GitBlitWebApp_ko.properties
diff --git a/src/com/gitblit/wicket/GitBlitWebApp_nl.properties b/src/main/java/com/gitblit/wicket/GitBlitWebApp_nl.properties
index f1281e14..f1281e14 100644
--- a/src/com/gitblit/wicket/GitBlitWebApp_nl.properties
+++ b/src/main/java/com/gitblit/wicket/GitBlitWebApp_nl.properties
diff --git a/src/com/gitblit/wicket/GitBlitWebApp_pl.properties b/src/main/java/com/gitblit/wicket/GitBlitWebApp_pl.properties
index b75e8f81..b75e8f81 100644
--- a/src/com/gitblit/wicket/GitBlitWebApp_pl.properties
+++ b/src/main/java/com/gitblit/wicket/GitBlitWebApp_pl.properties
diff --git a/src/com/gitblit/wicket/GitBlitWebApp_pt_BR.properties b/src/main/java/com/gitblit/wicket/GitBlitWebApp_pt_BR.properties
index a02d2ffa..a02d2ffa 100644
--- a/src/com/gitblit/wicket/GitBlitWebApp_pt_BR.properties
+++ b/src/main/java/com/gitblit/wicket/GitBlitWebApp_pt_BR.properties
diff --git a/src/com/gitblit/wicket/GitBlitWebApp_zh_CN.properties b/src/main/java/com/gitblit/wicket/GitBlitWebApp_zh_CN.properties
index 96e2067b..96e2067b 100644
--- a/src/com/gitblit/wicket/GitBlitWebApp_zh_CN.properties
+++ b/src/main/java/com/gitblit/wicket/GitBlitWebApp_zh_CN.properties
diff --git a/src/com/gitblit/wicket/GitBlitWebSession.java b/src/main/java/com/gitblit/wicket/GitBlitWebSession.java
index 5195a1fd..5195a1fd 100644
--- a/src/com/gitblit/wicket/GitBlitWebSession.java
+++ b/src/main/java/com/gitblit/wicket/GitBlitWebSession.java
diff --git a/src/com/gitblit/wicket/GitblitParamUrlCodingStrategy.java b/src/main/java/com/gitblit/wicket/GitblitParamUrlCodingStrategy.java
index fb86fb0e..fb86fb0e 100644
--- a/src/com/gitblit/wicket/GitblitParamUrlCodingStrategy.java
+++ b/src/main/java/com/gitblit/wicket/GitblitParamUrlCodingStrategy.java
diff --git a/src/com/gitblit/wicket/GitblitRedirectException.java b/src/main/java/com/gitblit/wicket/GitblitRedirectException.java
index c3df1ac1..c3df1ac1 100644
--- a/src/com/gitblit/wicket/GitblitRedirectException.java
+++ b/src/main/java/com/gitblit/wicket/GitblitRedirectException.java
diff --git a/src/com/gitblit/wicket/PageRegistration.java b/src/main/java/com/gitblit/wicket/PageRegistration.java
index e8eeabae..e8eeabae 100644
--- a/src/com/gitblit/wicket/PageRegistration.java
+++ b/src/main/java/com/gitblit/wicket/PageRegistration.java
diff --git a/src/com/gitblit/wicket/RequiresAdminRole.java b/src/main/java/com/gitblit/wicket/RequiresAdminRole.java
index ce2dcfcf..ce2dcfcf 100644
--- a/src/com/gitblit/wicket/RequiresAdminRole.java
+++ b/src/main/java/com/gitblit/wicket/RequiresAdminRole.java
diff --git a/src/com/gitblit/wicket/SessionlessForm.java b/src/main/java/com/gitblit/wicket/SessionlessForm.java
index 484e85e3..484e85e3 100644
--- a/src/com/gitblit/wicket/SessionlessForm.java
+++ b/src/main/java/com/gitblit/wicket/SessionlessForm.java
diff --git a/src/com/gitblit/wicket/StringChoiceRenderer.java b/src/main/java/com/gitblit/wicket/StringChoiceRenderer.java
index 58ed4798..58ed4798 100644
--- a/src/com/gitblit/wicket/StringChoiceRenderer.java
+++ b/src/main/java/com/gitblit/wicket/StringChoiceRenderer.java
diff --git a/src/com/gitblit/wicket/WicketUtils.java b/src/main/java/com/gitblit/wicket/WicketUtils.java
index e4eb29fb..e4eb29fb 100644
--- a/src/com/gitblit/wicket/WicketUtils.java
+++ b/src/main/java/com/gitblit/wicket/WicketUtils.java
diff --git a/src/com/gitblit/wicket/charting/GoogleChart.java b/src/main/java/com/gitblit/wicket/charting/GoogleChart.java
index b6309ffe..b6309ffe 100644
--- a/src/com/gitblit/wicket/charting/GoogleChart.java
+++ b/src/main/java/com/gitblit/wicket/charting/GoogleChart.java
diff --git a/src/com/gitblit/wicket/charting/GoogleCharts.java b/src/main/java/com/gitblit/wicket/charting/GoogleCharts.java
index 77c522b5..77c522b5 100644
--- a/src/com/gitblit/wicket/charting/GoogleCharts.java
+++ b/src/main/java/com/gitblit/wicket/charting/GoogleCharts.java
diff --git a/src/com/gitblit/wicket/charting/GoogleLineChart.java b/src/main/java/com/gitblit/wicket/charting/GoogleLineChart.java
index fc0bf837..fc0bf837 100644
--- a/src/com/gitblit/wicket/charting/GoogleLineChart.java
+++ b/src/main/java/com/gitblit/wicket/charting/GoogleLineChart.java
diff --git a/src/com/gitblit/wicket/charting/GooglePieChart.java b/src/main/java/com/gitblit/wicket/charting/GooglePieChart.java
index 119a8248..119a8248 100644
--- a/src/com/gitblit/wicket/charting/GooglePieChart.java
+++ b/src/main/java/com/gitblit/wicket/charting/GooglePieChart.java
diff --git a/src/com/gitblit/wicket/pages/ActivityPage.html b/src/main/java/com/gitblit/wicket/pages/ActivityPage.html
index 4b10c2cf..4b10c2cf 100644
--- a/src/com/gitblit/wicket/pages/ActivityPage.html
+++ b/src/main/java/com/gitblit/wicket/pages/ActivityPage.html
diff --git a/src/com/gitblit/wicket/pages/ActivityPage.java b/src/main/java/com/gitblit/wicket/pages/ActivityPage.java
index bceac8f4..bceac8f4 100644
--- a/src/com/gitblit/wicket/pages/ActivityPage.java
+++ b/src/main/java/com/gitblit/wicket/pages/ActivityPage.java
diff --git a/src/com/gitblit/wicket/pages/BasePage.html b/src/main/java/com/gitblit/wicket/pages/BasePage.html
index 4a642e73..4a642e73 100644
--- a/src/com/gitblit/wicket/pages/BasePage.html
+++ b/src/main/java/com/gitblit/wicket/pages/BasePage.html
diff --git a/src/com/gitblit/wicket/pages/BasePage.java b/src/main/java/com/gitblit/wicket/pages/BasePage.java
index c733c992..5c73df33 100644
--- a/src/com/gitblit/wicket/pages/BasePage.java
+++ b/src/main/java/com/gitblit/wicket/pages/BasePage.java
@@ -184,7 +184,7 @@ public abstract class BasePage extends WebPage {
 			add(new Label("userPanel", ""));

 		}

 

-		add(new Label("gbVersion", "v" + Constants.VERSION));

+		add(new Label("gbVersion", "v" + Constants.getVersion()));

 		if (GitBlit.getBoolean(Keys.web.aggressiveHeapManagement, false)) {

 			System.gc();

 		}

diff --git a/src/com/gitblit/wicket/pages/BlamePage.html b/src/main/java/com/gitblit/wicket/pages/BlamePage.html
index 9391eaf0..9391eaf0 100644
--- a/src/com/gitblit/wicket/pages/BlamePage.html
+++ b/src/main/java/com/gitblit/wicket/pages/BlamePage.html
diff --git a/src/com/gitblit/wicket/pages/BlamePage.java b/src/main/java/com/gitblit/wicket/pages/BlamePage.java
index d76181d2..d76181d2 100644
--- a/src/com/gitblit/wicket/pages/BlamePage.java
+++ b/src/main/java/com/gitblit/wicket/pages/BlamePage.java
diff --git a/src/com/gitblit/wicket/pages/BlobDiffPage.html b/src/main/java/com/gitblit/wicket/pages/BlobDiffPage.html
index c6336429..c6336429 100644
--- a/src/com/gitblit/wicket/pages/BlobDiffPage.html
+++ b/src/main/java/com/gitblit/wicket/pages/BlobDiffPage.html
diff --git a/src/com/gitblit/wicket/pages/BlobDiffPage.java b/src/main/java/com/gitblit/wicket/pages/BlobDiffPage.java
index d86d2e63..d86d2e63 100644
--- a/src/com/gitblit/wicket/pages/BlobDiffPage.java
+++ b/src/main/java/com/gitblit/wicket/pages/BlobDiffPage.java
diff --git a/src/com/gitblit/wicket/pages/BlobPage.html b/src/main/java/com/gitblit/wicket/pages/BlobPage.html
index 80f061fd..80f061fd 100644
--- a/src/com/gitblit/wicket/pages/BlobPage.html
+++ b/src/main/java/com/gitblit/wicket/pages/BlobPage.html
diff --git a/src/com/gitblit/wicket/pages/BlobPage.java b/src/main/java/com/gitblit/wicket/pages/BlobPage.java
index e2b8546b..e2b8546b 100644
--- a/src/com/gitblit/wicket/pages/BlobPage.java
+++ b/src/main/java/com/gitblit/wicket/pages/BlobPage.java
diff --git a/src/com/gitblit/wicket/pages/BranchesPage.html b/src/main/java/com/gitblit/wicket/pages/BranchesPage.html
index 65fd9b9d..65fd9b9d 100644
--- a/src/com/gitblit/wicket/pages/BranchesPage.html
+++ b/src/main/java/com/gitblit/wicket/pages/BranchesPage.html
diff --git a/src/com/gitblit/wicket/pages/BranchesPage.java b/src/main/java/com/gitblit/wicket/pages/BranchesPage.java
index 8684fb3d..8684fb3d 100644
--- a/src/com/gitblit/wicket/pages/BranchesPage.java
+++ b/src/main/java/com/gitblit/wicket/pages/BranchesPage.java
diff --git a/src/com/gitblit/wicket/pages/ChangePasswordPage.html b/src/main/java/com/gitblit/wicket/pages/ChangePasswordPage.html
index 36439a91..36439a91 100644
--- a/src/com/gitblit/wicket/pages/ChangePasswordPage.html
+++ b/src/main/java/com/gitblit/wicket/pages/ChangePasswordPage.html
diff --git a/src/com/gitblit/wicket/pages/ChangePasswordPage.java b/src/main/java/com/gitblit/wicket/pages/ChangePasswordPage.java
index c4014208..c4014208 100644
--- a/src/com/gitblit/wicket/pages/ChangePasswordPage.java
+++ b/src/main/java/com/gitblit/wicket/pages/ChangePasswordPage.java
diff --git a/src/com/gitblit/wicket/pages/CommitDiffPage.html b/src/main/java/com/gitblit/wicket/pages/CommitDiffPage.html
index de39f4ca..de39f4ca 100644
--- a/src/com/gitblit/wicket/pages/CommitDiffPage.html
+++ b/src/main/java/com/gitblit/wicket/pages/CommitDiffPage.html
diff --git a/src/com/gitblit/wicket/pages/CommitDiffPage.java b/src/main/java/com/gitblit/wicket/pages/CommitDiffPage.java
index 3ad70742..3ad70742 100644
--- a/src/com/gitblit/wicket/pages/CommitDiffPage.java
+++ b/src/main/java/com/gitblit/wicket/pages/CommitDiffPage.java
diff --git a/src/com/gitblit/wicket/pages/CommitPage.html b/src/main/java/com/gitblit/wicket/pages/CommitPage.html
index 79a038c9..79a038c9 100644
--- a/src/com/gitblit/wicket/pages/CommitPage.html
+++ b/src/main/java/com/gitblit/wicket/pages/CommitPage.html
diff --git a/src/com/gitblit/wicket/pages/CommitPage.java b/src/main/java/com/gitblit/wicket/pages/CommitPage.java
index c5a24c8d..c5a24c8d 100644
--- a/src/com/gitblit/wicket/pages/CommitPage.java
+++ b/src/main/java/com/gitblit/wicket/pages/CommitPage.java
diff --git a/src/com/gitblit/wicket/pages/DocsPage.html b/src/main/java/com/gitblit/wicket/pages/DocsPage.html
index ad93000c..ad93000c 100644
--- a/src/com/gitblit/wicket/pages/DocsPage.html
+++ b/src/main/java/com/gitblit/wicket/pages/DocsPage.html
diff --git a/src/com/gitblit/wicket/pages/DocsPage.java b/src/main/java/com/gitblit/wicket/pages/DocsPage.java
index 9ddc98d3..9ddc98d3 100644
--- a/src/com/gitblit/wicket/pages/DocsPage.java
+++ b/src/main/java/com/gitblit/wicket/pages/DocsPage.java
diff --git a/src/com/gitblit/wicket/pages/EditRepositoryPage.html b/src/main/java/com/gitblit/wicket/pages/EditRepositoryPage.html
index 7fc0de23..7fc0de23 100644
--- a/src/com/gitblit/wicket/pages/EditRepositoryPage.html
+++ b/src/main/java/com/gitblit/wicket/pages/EditRepositoryPage.html
diff --git a/src/com/gitblit/wicket/pages/EditRepositoryPage.java b/src/main/java/com/gitblit/wicket/pages/EditRepositoryPage.java
index d68d6550..d68d6550 100644
--- a/src/com/gitblit/wicket/pages/EditRepositoryPage.java
+++ b/src/main/java/com/gitblit/wicket/pages/EditRepositoryPage.java
diff --git a/src/com/gitblit/wicket/pages/EditTeamPage.html b/src/main/java/com/gitblit/wicket/pages/EditTeamPage.html
index a60d1715..a60d1715 100644
--- a/src/com/gitblit/wicket/pages/EditTeamPage.html
+++ b/src/main/java/com/gitblit/wicket/pages/EditTeamPage.html
diff --git a/src/com/gitblit/wicket/pages/EditTeamPage.java b/src/main/java/com/gitblit/wicket/pages/EditTeamPage.java
index 8344d387..8344d387 100644
--- a/src/com/gitblit/wicket/pages/EditTeamPage.java
+++ b/src/main/java/com/gitblit/wicket/pages/EditTeamPage.java
diff --git a/src/com/gitblit/wicket/pages/EditUserPage.html b/src/main/java/com/gitblit/wicket/pages/EditUserPage.html
index e79011c8..e79011c8 100644
--- a/src/com/gitblit/wicket/pages/EditUserPage.html
+++ b/src/main/java/com/gitblit/wicket/pages/EditUserPage.html
diff --git a/src/com/gitblit/wicket/pages/EditUserPage.java b/src/main/java/com/gitblit/wicket/pages/EditUserPage.java
index c060f237..c060f237 100644
--- a/src/com/gitblit/wicket/pages/EditUserPage.java
+++ b/src/main/java/com/gitblit/wicket/pages/EditUserPage.java
diff --git a/src/com/gitblit/wicket/pages/EmptyRepositoryPage.html b/src/main/java/com/gitblit/wicket/pages/EmptyRepositoryPage.html
index d46a5ded..d46a5ded 100644
--- a/src/com/gitblit/wicket/pages/EmptyRepositoryPage.html
+++ b/src/main/java/com/gitblit/wicket/pages/EmptyRepositoryPage.html
diff --git a/src/com/gitblit/wicket/pages/EmptyRepositoryPage.java b/src/main/java/com/gitblit/wicket/pages/EmptyRepositoryPage.java
index be0dad9e..be0dad9e 100644
--- a/src/com/gitblit/wicket/pages/EmptyRepositoryPage.java
+++ b/src/main/java/com/gitblit/wicket/pages/EmptyRepositoryPage.java
diff --git a/src/com/gitblit/wicket/pages/EmptyRepositoryPage_es.html b/src/main/java/com/gitblit/wicket/pages/EmptyRepositoryPage_es.html
index 2849fc70..2849fc70 100644
--- a/src/com/gitblit/wicket/pages/EmptyRepositoryPage_es.html
+++ b/src/main/java/com/gitblit/wicket/pages/EmptyRepositoryPage_es.html
diff --git a/src/com/gitblit/wicket/pages/EmptyRepositoryPage_ko.html b/src/main/java/com/gitblit/wicket/pages/EmptyRepositoryPage_ko.html
index 591335e4..591335e4 100644
--- a/src/com/gitblit/wicket/pages/EmptyRepositoryPage_ko.html
+++ b/src/main/java/com/gitblit/wicket/pages/EmptyRepositoryPage_ko.html
diff --git a/src/com/gitblit/wicket/pages/EmptyRepositoryPage_nl.html b/src/main/java/com/gitblit/wicket/pages/EmptyRepositoryPage_nl.html
index a8ee2e25..a8ee2e25 100644
--- a/src/com/gitblit/wicket/pages/EmptyRepositoryPage_nl.html
+++ b/src/main/java/com/gitblit/wicket/pages/EmptyRepositoryPage_nl.html
diff --git a/src/com/gitblit/wicket/pages/EmptyRepositoryPage_pl.html b/src/main/java/com/gitblit/wicket/pages/EmptyRepositoryPage_pl.html
index 109899aa..109899aa 100644
--- a/src/com/gitblit/wicket/pages/EmptyRepositoryPage_pl.html
+++ b/src/main/java/com/gitblit/wicket/pages/EmptyRepositoryPage_pl.html
diff --git a/src/com/gitblit/wicket/pages/EmptyRepositoryPage_pt_BR.html b/src/main/java/com/gitblit/wicket/pages/EmptyRepositoryPage_pt_BR.html
index 351ef879..351ef879 100644
--- a/src/com/gitblit/wicket/pages/EmptyRepositoryPage_pt_BR.html
+++ b/src/main/java/com/gitblit/wicket/pages/EmptyRepositoryPage_pt_BR.html
diff --git a/src/com/gitblit/wicket/pages/EmptyRepositoryPage_zh_CN.html b/src/main/java/com/gitblit/wicket/pages/EmptyRepositoryPage_zh_CN.html
index 4b21800e..4b21800e 100644
--- a/src/com/gitblit/wicket/pages/EmptyRepositoryPage_zh_CN.html
+++ b/src/main/java/com/gitblit/wicket/pages/EmptyRepositoryPage_zh_CN.html
diff --git a/src/com/gitblit/wicket/pages/FederationPage.html b/src/main/java/com/gitblit/wicket/pages/FederationPage.html
index bb39d345..bb39d345 100644
--- a/src/com/gitblit/wicket/pages/FederationPage.html
+++ b/src/main/java/com/gitblit/wicket/pages/FederationPage.html
diff --git a/src/com/gitblit/wicket/pages/FederationPage.java b/src/main/java/com/gitblit/wicket/pages/FederationPage.java
index 1f98c172..1f98c172 100644
--- a/src/com/gitblit/wicket/pages/FederationPage.java
+++ b/src/main/java/com/gitblit/wicket/pages/FederationPage.java
diff --git a/src/com/gitblit/wicket/pages/FederationRegistrationPage.html b/src/main/java/com/gitblit/wicket/pages/FederationRegistrationPage.html
index d7b9bdde..d7b9bdde 100644
--- a/src/com/gitblit/wicket/pages/FederationRegistrationPage.html
+++ b/src/main/java/com/gitblit/wicket/pages/FederationRegistrationPage.html
diff --git a/src/com/gitblit/wicket/pages/FederationRegistrationPage.java b/src/main/java/com/gitblit/wicket/pages/FederationRegistrationPage.java
index 19c30a5e..19c30a5e 100644
--- a/src/com/gitblit/wicket/pages/FederationRegistrationPage.java
+++ b/src/main/java/com/gitblit/wicket/pages/FederationRegistrationPage.java
diff --git a/src/com/gitblit/wicket/pages/ForkPage.html b/src/main/java/com/gitblit/wicket/pages/ForkPage.html
index 72093696..72093696 100644
--- a/src/com/gitblit/wicket/pages/ForkPage.html
+++ b/src/main/java/com/gitblit/wicket/pages/ForkPage.html
diff --git a/src/com/gitblit/wicket/pages/ForkPage.java b/src/main/java/com/gitblit/wicket/pages/ForkPage.java
index 340bd823..340bd823 100644
--- a/src/com/gitblit/wicket/pages/ForkPage.java
+++ b/src/main/java/com/gitblit/wicket/pages/ForkPage.java
diff --git a/src/com/gitblit/wicket/pages/ForksPage.html b/src/main/java/com/gitblit/wicket/pages/ForksPage.html
index c18d2a49..c18d2a49 100644
--- a/src/com/gitblit/wicket/pages/ForksPage.html
+++ b/src/main/java/com/gitblit/wicket/pages/ForksPage.html
diff --git a/src/com/gitblit/wicket/pages/ForksPage.java b/src/main/java/com/gitblit/wicket/pages/ForksPage.java
index cc483878..cc483878 100644
--- a/src/com/gitblit/wicket/pages/ForksPage.java
+++ b/src/main/java/com/gitblit/wicket/pages/ForksPage.java
diff --git a/src/com/gitblit/wicket/pages/GitSearchPage.html b/src/main/java/com/gitblit/wicket/pages/GitSearchPage.html
index 9bb1f418..9bb1f418 100644
--- a/src/com/gitblit/wicket/pages/GitSearchPage.html
+++ b/src/main/java/com/gitblit/wicket/pages/GitSearchPage.html
diff --git a/src/com/gitblit/wicket/pages/GitSearchPage.java b/src/main/java/com/gitblit/wicket/pages/GitSearchPage.java
index 6b0714f0..6b0714f0 100644
--- a/src/com/gitblit/wicket/pages/GitSearchPage.java
+++ b/src/main/java/com/gitblit/wicket/pages/GitSearchPage.java
diff --git a/src/com/gitblit/wicket/pages/GravatarProfilePage.html b/src/main/java/com/gitblit/wicket/pages/GravatarProfilePage.html
index 0cc0f1fc..0cc0f1fc 100644
--- a/src/com/gitblit/wicket/pages/GravatarProfilePage.html
+++ b/src/main/java/com/gitblit/wicket/pages/GravatarProfilePage.html
diff --git a/src/com/gitblit/wicket/pages/GravatarProfilePage.java b/src/main/java/com/gitblit/wicket/pages/GravatarProfilePage.java
index ee567d75..ee567d75 100644
--- a/src/com/gitblit/wicket/pages/GravatarProfilePage.java
+++ b/src/main/java/com/gitblit/wicket/pages/GravatarProfilePage.java
diff --git a/src/com/gitblit/wicket/pages/HistoryPage.html b/src/main/java/com/gitblit/wicket/pages/HistoryPage.html
index f9bd2f69..f9bd2f69 100644
--- a/src/com/gitblit/wicket/pages/HistoryPage.html
+++ b/src/main/java/com/gitblit/wicket/pages/HistoryPage.html
diff --git a/src/com/gitblit/wicket/pages/HistoryPage.java b/src/main/java/com/gitblit/wicket/pages/HistoryPage.java
index 563202e6..563202e6 100644
--- a/src/com/gitblit/wicket/pages/HistoryPage.java
+++ b/src/main/java/com/gitblit/wicket/pages/HistoryPage.java
diff --git a/src/com/gitblit/wicket/pages/LogPage.html b/src/main/java/com/gitblit/wicket/pages/LogPage.html
index 8e5cb96a..8e5cb96a 100644
--- a/src/com/gitblit/wicket/pages/LogPage.html
+++ b/src/main/java/com/gitblit/wicket/pages/LogPage.html
diff --git a/src/com/gitblit/wicket/pages/LogPage.java b/src/main/java/com/gitblit/wicket/pages/LogPage.java
index ee8ddfef..ee8ddfef 100644
--- a/src/com/gitblit/wicket/pages/LogPage.java
+++ b/src/main/java/com/gitblit/wicket/pages/LogPage.java
diff --git a/src/main/java/com/gitblit/wicket/pages/LogoutPage.html b/src/main/java/com/gitblit/wicket/pages/LogoutPage.html
new file mode 100644
index 00000000..d4077830
--- /dev/null
+++ b/src/main/java/com/gitblit/wicket/pages/LogoutPage.html
@@ -0,0 +1,33 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"  
+      xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-xhtml1.3-strict.dtd"  
+      xml:lang="en"  
+      lang="en"> 
+<body>
+<wicket:extend>
+	<div class="navbar navbar-fixed-top">
+		<div class="navbar-inner">
+			<div class="container">
+				<a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
+            			<span class="icon-bar"></span>
+            			<span class="icon-bar"></span>
+            			<span class="icon-bar"></span>
+          		</a>
+				<a class="brand" wicket:id="rootLink">
+					<img src="gitblt_25_white.png" width="79" height="25" alt="gitblit" class="logo"/>
+				</a>
+				
+			</div>
+		</div>
+	</div>
+				
+	<!-- subclass content -->
+	<div class="container">
+		<div style="text-align:center" wicket:id="feedback">[Feedback Panel]</div>
+		
+		<h1><wicket:message key="gb.sessionEnded">[Session has ended]</wicket:message></h1>
+		<p><wicket:message key="gb.closeBrowser">[Please close the browser]</wicket:message></p>
+	</div>
+</wicket:extend>
+</body>
+</html>
\ No newline at end of file
diff --git a/src/com/gitblit/wicket/pages/LogoutPage.java b/src/main/java/com/gitblit/wicket/pages/LogoutPage.java
index 982de0ec..982de0ec 100644
--- a/src/com/gitblit/wicket/pages/LogoutPage.java
+++ b/src/main/java/com/gitblit/wicket/pages/LogoutPage.java
diff --git a/src/com/gitblit/wicket/pages/LuceneSearchPage.html b/src/main/java/com/gitblit/wicket/pages/LuceneSearchPage.html
index aba43de8..aba43de8 100644
--- a/src/com/gitblit/wicket/pages/LuceneSearchPage.html
+++ b/src/main/java/com/gitblit/wicket/pages/LuceneSearchPage.html
diff --git a/src/com/gitblit/wicket/pages/LuceneSearchPage.java b/src/main/java/com/gitblit/wicket/pages/LuceneSearchPage.java
index 79795ff2..79795ff2 100644
--- a/src/com/gitblit/wicket/pages/LuceneSearchPage.java
+++ b/src/main/java/com/gitblit/wicket/pages/LuceneSearchPage.java
diff --git a/src/com/gitblit/wicket/pages/MarkdownPage.html b/src/main/java/com/gitblit/wicket/pages/MarkdownPage.html
index 7900625b..7900625b 100644
--- a/src/com/gitblit/wicket/pages/MarkdownPage.html
+++ b/src/main/java/com/gitblit/wicket/pages/MarkdownPage.html
diff --git a/src/com/gitblit/wicket/pages/MarkdownPage.java b/src/main/java/com/gitblit/wicket/pages/MarkdownPage.java
index e032cbf9..e032cbf9 100644
--- a/src/com/gitblit/wicket/pages/MarkdownPage.java
+++ b/src/main/java/com/gitblit/wicket/pages/MarkdownPage.java
diff --git a/src/com/gitblit/wicket/pages/MetricsPage.html b/src/main/java/com/gitblit/wicket/pages/MetricsPage.html
index 4aefc798..4aefc798 100644
--- a/src/com/gitblit/wicket/pages/MetricsPage.html
+++ b/src/main/java/com/gitblit/wicket/pages/MetricsPage.html
diff --git a/src/com/gitblit/wicket/pages/MetricsPage.java b/src/main/java/com/gitblit/wicket/pages/MetricsPage.java
index 5904a64a..5904a64a 100644
--- a/src/com/gitblit/wicket/pages/MetricsPage.java
+++ b/src/main/java/com/gitblit/wicket/pages/MetricsPage.java
diff --git a/src/com/gitblit/wicket/pages/PatchPage.html b/src/main/java/com/gitblit/wicket/pages/PatchPage.html
index 719a46d1..719a46d1 100644
--- a/src/com/gitblit/wicket/pages/PatchPage.html
+++ b/src/main/java/com/gitblit/wicket/pages/PatchPage.html
diff --git a/src/com/gitblit/wicket/pages/PatchPage.java b/src/main/java/com/gitblit/wicket/pages/PatchPage.java
index 878cfb45..878cfb45 100644
--- a/src/com/gitblit/wicket/pages/PatchPage.java
+++ b/src/main/java/com/gitblit/wicket/pages/PatchPage.java
diff --git a/src/com/gitblit/wicket/pages/ProjectPage.html b/src/main/java/com/gitblit/wicket/pages/ProjectPage.html
index 3e73ba52..3e73ba52 100644
--- a/src/com/gitblit/wicket/pages/ProjectPage.html
+++ b/src/main/java/com/gitblit/wicket/pages/ProjectPage.html
diff --git a/src/com/gitblit/wicket/pages/ProjectPage.java b/src/main/java/com/gitblit/wicket/pages/ProjectPage.java
index 7eba0331..7eba0331 100644
--- a/src/com/gitblit/wicket/pages/ProjectPage.java
+++ b/src/main/java/com/gitblit/wicket/pages/ProjectPage.java
diff --git a/src/com/gitblit/wicket/pages/ProjectsPage.html b/src/main/java/com/gitblit/wicket/pages/ProjectsPage.html
index 528ed48f..528ed48f 100644
--- a/src/com/gitblit/wicket/pages/ProjectsPage.html
+++ b/src/main/java/com/gitblit/wicket/pages/ProjectsPage.html
diff --git a/src/com/gitblit/wicket/pages/ProjectsPage.java b/src/main/java/com/gitblit/wicket/pages/ProjectsPage.java
index 7f0b002e..7f0b002e 100644
--- a/src/com/gitblit/wicket/pages/ProjectsPage.java
+++ b/src/main/java/com/gitblit/wicket/pages/ProjectsPage.java
diff --git a/src/com/gitblit/wicket/pages/RawPage.java b/src/main/java/com/gitblit/wicket/pages/RawPage.java
index 28e8bae2..28e8bae2 100644
--- a/src/com/gitblit/wicket/pages/RawPage.java
+++ b/src/main/java/com/gitblit/wicket/pages/RawPage.java
diff --git a/src/com/gitblit/wicket/pages/RepositoriesPage.html b/src/main/java/com/gitblit/wicket/pages/RepositoriesPage.html
index d2d27157..d2d27157 100644
--- a/src/com/gitblit/wicket/pages/RepositoriesPage.html
+++ b/src/main/java/com/gitblit/wicket/pages/RepositoriesPage.html
diff --git a/src/com/gitblit/wicket/pages/RepositoriesPage.java b/src/main/java/com/gitblit/wicket/pages/RepositoriesPage.java
index 4bce77f5..4bce77f5 100644
--- a/src/com/gitblit/wicket/pages/RepositoriesPage.java
+++ b/src/main/java/com/gitblit/wicket/pages/RepositoriesPage.java
diff --git a/src/com/gitblit/wicket/pages/RepositoryPage.html b/src/main/java/com/gitblit/wicket/pages/RepositoryPage.html
index d49f0188..d49f0188 100644
--- a/src/com/gitblit/wicket/pages/RepositoryPage.html
+++ b/src/main/java/com/gitblit/wicket/pages/RepositoryPage.html
diff --git a/src/com/gitblit/wicket/pages/RepositoryPage.java b/src/main/java/com/gitblit/wicket/pages/RepositoryPage.java
index a477b741..a477b741 100644
--- a/src/com/gitblit/wicket/pages/RepositoryPage.java
+++ b/src/main/java/com/gitblit/wicket/pages/RepositoryPage.java
diff --git a/src/com/gitblit/wicket/pages/ReviewProposalPage.html b/src/main/java/com/gitblit/wicket/pages/ReviewProposalPage.html
index 6487a0ac..6487a0ac 100644
--- a/src/com/gitblit/wicket/pages/ReviewProposalPage.html
+++ b/src/main/java/com/gitblit/wicket/pages/ReviewProposalPage.html
diff --git a/src/com/gitblit/wicket/pages/ReviewProposalPage.java b/src/main/java/com/gitblit/wicket/pages/ReviewProposalPage.java
index e1813861..e1813861 100644
--- a/src/com/gitblit/wicket/pages/ReviewProposalPage.java
+++ b/src/main/java/com/gitblit/wicket/pages/ReviewProposalPage.java
diff --git a/src/com/gitblit/wicket/pages/RootPage.html b/src/main/java/com/gitblit/wicket/pages/RootPage.html
index b35b1b3a..b35b1b3a 100644
--- a/src/com/gitblit/wicket/pages/RootPage.html
+++ b/src/main/java/com/gitblit/wicket/pages/RootPage.html
diff --git a/src/com/gitblit/wicket/pages/RootPage.java b/src/main/java/com/gitblit/wicket/pages/RootPage.java
index adcd7b16..adcd7b16 100644
--- a/src/com/gitblit/wicket/pages/RootPage.java
+++ b/src/main/java/com/gitblit/wicket/pages/RootPage.java
diff --git a/src/com/gitblit/wicket/pages/RootSubPage.html b/src/main/java/com/gitblit/wicket/pages/RootSubPage.html
index 2b109f9b..2b109f9b 100644
--- a/src/com/gitblit/wicket/pages/RootSubPage.html
+++ b/src/main/java/com/gitblit/wicket/pages/RootSubPage.html
diff --git a/src/com/gitblit/wicket/pages/RootSubPage.java b/src/main/java/com/gitblit/wicket/pages/RootSubPage.java
index e7e12ccc..e7e12ccc 100644
--- a/src/com/gitblit/wicket/pages/RootSubPage.java
+++ b/src/main/java/com/gitblit/wicket/pages/RootSubPage.java
diff --git a/src/com/gitblit/wicket/pages/SendProposalPage.html b/src/main/java/com/gitblit/wicket/pages/SendProposalPage.html
index cb9f3539..cb9f3539 100644
--- a/src/com/gitblit/wicket/pages/SendProposalPage.html
+++ b/src/main/java/com/gitblit/wicket/pages/SendProposalPage.html
diff --git a/src/com/gitblit/wicket/pages/SendProposalPage.java b/src/main/java/com/gitblit/wicket/pages/SendProposalPage.java
index fc5f95b5..fc5f95b5 100644
--- a/src/com/gitblit/wicket/pages/SendProposalPage.java
+++ b/src/main/java/com/gitblit/wicket/pages/SendProposalPage.java
diff --git a/src/com/gitblit/wicket/pages/SummaryPage.html b/src/main/java/com/gitblit/wicket/pages/SummaryPage.html
index 3e85df99..3e85df99 100644
--- a/src/com/gitblit/wicket/pages/SummaryPage.html
+++ b/src/main/java/com/gitblit/wicket/pages/SummaryPage.html
diff --git a/src/com/gitblit/wicket/pages/SummaryPage.java b/src/main/java/com/gitblit/wicket/pages/SummaryPage.java
index bd40a1b7..bd40a1b7 100644
--- a/src/com/gitblit/wicket/pages/SummaryPage.java
+++ b/src/main/java/com/gitblit/wicket/pages/SummaryPage.java
diff --git a/src/com/gitblit/wicket/pages/TagPage.html b/src/main/java/com/gitblit/wicket/pages/TagPage.html
index 19f828e3..19f828e3 100644
--- a/src/com/gitblit/wicket/pages/TagPage.html
+++ b/src/main/java/com/gitblit/wicket/pages/TagPage.html
diff --git a/src/com/gitblit/wicket/pages/TagPage.java b/src/main/java/com/gitblit/wicket/pages/TagPage.java
index 91c913d2..91c913d2 100644
--- a/src/com/gitblit/wicket/pages/TagPage.java
+++ b/src/main/java/com/gitblit/wicket/pages/TagPage.java
diff --git a/src/com/gitblit/wicket/pages/TagsPage.html b/src/main/java/com/gitblit/wicket/pages/TagsPage.html
index 03f1a0d7..03f1a0d7 100644
--- a/src/com/gitblit/wicket/pages/TagsPage.html
+++ b/src/main/java/com/gitblit/wicket/pages/TagsPage.html
diff --git a/src/com/gitblit/wicket/pages/TagsPage.java b/src/main/java/com/gitblit/wicket/pages/TagsPage.java
index 3ddbde9b..3ddbde9b 100644
--- a/src/com/gitblit/wicket/pages/TagsPage.java
+++ b/src/main/java/com/gitblit/wicket/pages/TagsPage.java
diff --git a/src/com/gitblit/wicket/pages/TicketPage.html b/src/main/java/com/gitblit/wicket/pages/TicketPage.html
index ed3eb229..ed3eb229 100644
--- a/src/com/gitblit/wicket/pages/TicketPage.html
+++ b/src/main/java/com/gitblit/wicket/pages/TicketPage.html
diff --git a/src/com/gitblit/wicket/pages/TicketPage.java b/src/main/java/com/gitblit/wicket/pages/TicketPage.java
index 57233867..57233867 100644
--- a/src/com/gitblit/wicket/pages/TicketPage.java
+++ b/src/main/java/com/gitblit/wicket/pages/TicketPage.java
diff --git a/src/com/gitblit/wicket/pages/TicketsPage.html b/src/main/java/com/gitblit/wicket/pages/TicketsPage.html
index 0913dc2c..0913dc2c 100644
--- a/src/com/gitblit/wicket/pages/TicketsPage.html
+++ b/src/main/java/com/gitblit/wicket/pages/TicketsPage.html
diff --git a/src/com/gitblit/wicket/pages/TicketsPage.java b/src/main/java/com/gitblit/wicket/pages/TicketsPage.java
index b68b7e42..b68b7e42 100644
--- a/src/com/gitblit/wicket/pages/TicketsPage.java
+++ b/src/main/java/com/gitblit/wicket/pages/TicketsPage.java
diff --git a/src/com/gitblit/wicket/pages/TreePage.html b/src/main/java/com/gitblit/wicket/pages/TreePage.html
index b7e55ed6..b7e55ed6 100644
--- a/src/com/gitblit/wicket/pages/TreePage.html
+++ b/src/main/java/com/gitblit/wicket/pages/TreePage.html
diff --git a/src/com/gitblit/wicket/pages/TreePage.java b/src/main/java/com/gitblit/wicket/pages/TreePage.java
index bc27f0c2..bc27f0c2 100644
--- a/src/com/gitblit/wicket/pages/TreePage.java
+++ b/src/main/java/com/gitblit/wicket/pages/TreePage.java
diff --git a/src/com/gitblit/wicket/pages/UserPage.html b/src/main/java/com/gitblit/wicket/pages/UserPage.html
index c7131c09..c7131c09 100644
--- a/src/com/gitblit/wicket/pages/UserPage.html
+++ b/src/main/java/com/gitblit/wicket/pages/UserPage.html
diff --git a/src/com/gitblit/wicket/pages/UserPage.java b/src/main/java/com/gitblit/wicket/pages/UserPage.java
index f4331dd1..f4331dd1 100644
--- a/src/com/gitblit/wicket/pages/UserPage.java
+++ b/src/main/java/com/gitblit/wicket/pages/UserPage.java
diff --git a/src/com/gitblit/wicket/pages/UsersPage.html b/src/main/java/com/gitblit/wicket/pages/UsersPage.html
index edb85f7d..edb85f7d 100644
--- a/src/com/gitblit/wicket/pages/UsersPage.html
+++ b/src/main/java/com/gitblit/wicket/pages/UsersPage.html
diff --git a/src/com/gitblit/wicket/pages/UsersPage.java b/src/main/java/com/gitblit/wicket/pages/UsersPage.java
index 9526deae..9526deae 100644
--- a/src/com/gitblit/wicket/pages/UsersPage.java
+++ b/src/main/java/com/gitblit/wicket/pages/UsersPage.java
diff --git a/src/com/gitblit/wicket/pages/prettify/lang-apollo.js b/src/main/java/com/gitblit/wicket/pages/prettify/lang-apollo.js
index bfc0014c..bfc0014c 100644
--- a/src/com/gitblit/wicket/pages/prettify/lang-apollo.js
+++ b/src/main/java/com/gitblit/wicket/pages/prettify/lang-apollo.js
diff --git a/src/com/gitblit/wicket/pages/prettify/lang-css.js b/src/main/java/com/gitblit/wicket/pages/prettify/lang-css.js
index 61157f38..61157f38 100644
--- a/src/com/gitblit/wicket/pages/prettify/lang-css.js
+++ b/src/main/java/com/gitblit/wicket/pages/prettify/lang-css.js
diff --git a/src/com/gitblit/wicket/pages/prettify/lang-hs.js b/src/main/java/com/gitblit/wicket/pages/prettify/lang-hs.js
index 00cea7cf..00cea7cf 100644
--- a/src/com/gitblit/wicket/pages/prettify/lang-hs.js
+++ b/src/main/java/com/gitblit/wicket/pages/prettify/lang-hs.js
diff --git a/src/com/gitblit/wicket/pages/prettify/lang-lisp.js b/src/main/java/com/gitblit/wicket/pages/prettify/lang-lisp.js
index fab992b8..fab992b8 100644
--- a/src/com/gitblit/wicket/pages/prettify/lang-lisp.js
+++ b/src/main/java/com/gitblit/wicket/pages/prettify/lang-lisp.js
diff --git a/src/com/gitblit/wicket/pages/prettify/lang-lua.js b/src/main/java/com/gitblit/wicket/pages/prettify/lang-lua.js
index 45d0ba28..45d0ba28 100644
--- a/src/com/gitblit/wicket/pages/prettify/lang-lua.js
+++ b/src/main/java/com/gitblit/wicket/pages/prettify/lang-lua.js
diff --git a/src/com/gitblit/wicket/pages/prettify/lang-ml.js b/src/main/java/com/gitblit/wicket/pages/prettify/lang-ml.js
index 5879726e..5879726e 100644
--- a/src/com/gitblit/wicket/pages/prettify/lang-ml.js
+++ b/src/main/java/com/gitblit/wicket/pages/prettify/lang-ml.js
diff --git a/src/com/gitblit/wicket/pages/prettify/lang-proto.js b/src/main/java/com/gitblit/wicket/pages/prettify/lang-proto.js
index f713420c..f713420c 100644
--- a/src/com/gitblit/wicket/pages/prettify/lang-proto.js
+++ b/src/main/java/com/gitblit/wicket/pages/prettify/lang-proto.js
diff --git a/src/com/gitblit/wicket/pages/prettify/lang-scala.js b/src/main/java/com/gitblit/wicket/pages/prettify/lang-scala.js
index 00f4e0c2..00f4e0c2 100644
--- a/src/com/gitblit/wicket/pages/prettify/lang-scala.js
+++ b/src/main/java/com/gitblit/wicket/pages/prettify/lang-scala.js
diff --git a/src/com/gitblit/wicket/pages/prettify/lang-sql.js b/src/main/java/com/gitblit/wicket/pages/prettify/lang-sql.js
index 800b13ea..800b13ea 100644
--- a/src/com/gitblit/wicket/pages/prettify/lang-sql.js
+++ b/src/main/java/com/gitblit/wicket/pages/prettify/lang-sql.js
diff --git a/src/com/gitblit/wicket/pages/prettify/lang-vb.js b/src/main/java/com/gitblit/wicket/pages/prettify/lang-vb.js
index c479c11e..c479c11e 100644
--- a/src/com/gitblit/wicket/pages/prettify/lang-vb.js
+++ b/src/main/java/com/gitblit/wicket/pages/prettify/lang-vb.js
diff --git a/src/com/gitblit/wicket/pages/prettify/lang-vhdl.js b/src/main/java/com/gitblit/wicket/pages/prettify/lang-vhdl.js
index dc81a3fe..dc81a3fe 100644
--- a/src/com/gitblit/wicket/pages/prettify/lang-vhdl.js
+++ b/src/main/java/com/gitblit/wicket/pages/prettify/lang-vhdl.js
diff --git a/src/com/gitblit/wicket/pages/prettify/lang-wiki.js b/src/main/java/com/gitblit/wicket/pages/prettify/lang-wiki.js
index 3b8fb500..3b8fb500 100644
--- a/src/com/gitblit/wicket/pages/prettify/lang-wiki.js
+++ b/src/main/java/com/gitblit/wicket/pages/prettify/lang-wiki.js
diff --git a/src/com/gitblit/wicket/pages/prettify/lang-yaml.js b/src/main/java/com/gitblit/wicket/pages/prettify/lang-yaml.js
index f2f36070..f2f36070 100644
--- a/src/com/gitblit/wicket/pages/prettify/lang-yaml.js
+++ b/src/main/java/com/gitblit/wicket/pages/prettify/lang-yaml.js
diff --git a/src/com/gitblit/wicket/pages/prettify/prettify.css b/src/main/java/com/gitblit/wicket/pages/prettify/prettify.css
index 2925d13a..2925d13a 100644
--- a/src/com/gitblit/wicket/pages/prettify/prettify.css
+++ b/src/main/java/com/gitblit/wicket/pages/prettify/prettify.css
diff --git a/src/com/gitblit/wicket/pages/prettify/prettify.js b/src/main/java/com/gitblit/wicket/pages/prettify/prettify.js
index c9161da9..c9161da9 100644
--- a/src/com/gitblit/wicket/pages/prettify/prettify.js
+++ b/src/main/java/com/gitblit/wicket/pages/prettify/prettify.js
diff --git a/src/com/gitblit/wicket/panels/ActivityPanel.html b/src/main/java/com/gitblit/wicket/panels/ActivityPanel.html
index b818e94a..b818e94a 100644
--- a/src/com/gitblit/wicket/panels/ActivityPanel.html
+++ b/src/main/java/com/gitblit/wicket/panels/ActivityPanel.html
diff --git a/src/com/gitblit/wicket/panels/ActivityPanel.java b/src/main/java/com/gitblit/wicket/panels/ActivityPanel.java
index 669c36be..669c36be 100644
--- a/src/com/gitblit/wicket/panels/ActivityPanel.java
+++ b/src/main/java/com/gitblit/wicket/panels/ActivityPanel.java
diff --git a/src/com/gitblit/wicket/panels/BasePanel.java b/src/main/java/com/gitblit/wicket/panels/BasePanel.java
index ec879178..ec879178 100644
--- a/src/com/gitblit/wicket/panels/BasePanel.java
+++ b/src/main/java/com/gitblit/wicket/panels/BasePanel.java
diff --git a/src/com/gitblit/wicket/panels/BranchesPanel.html b/src/main/java/com/gitblit/wicket/panels/BranchesPanel.html
index 58c86a45..58c86a45 100644
--- a/src/com/gitblit/wicket/panels/BranchesPanel.html
+++ b/src/main/java/com/gitblit/wicket/panels/BranchesPanel.html
diff --git a/src/com/gitblit/wicket/panels/BranchesPanel.java b/src/main/java/com/gitblit/wicket/panels/BranchesPanel.java
index 1262077c..1262077c 100644
--- a/src/com/gitblit/wicket/panels/BranchesPanel.java
+++ b/src/main/java/com/gitblit/wicket/panels/BranchesPanel.java
diff --git a/src/com/gitblit/wicket/panels/BulletListPanel.html b/src/main/java/com/gitblit/wicket/panels/BulletListPanel.html
index 4d28f498..4d28f498 100644
--- a/src/com/gitblit/wicket/panels/BulletListPanel.html
+++ b/src/main/java/com/gitblit/wicket/panels/BulletListPanel.html
diff --git a/src/com/gitblit/wicket/panels/BulletListPanel.java b/src/main/java/com/gitblit/wicket/panels/BulletListPanel.java
index e49223e0..e49223e0 100644
--- a/src/com/gitblit/wicket/panels/BulletListPanel.java
+++ b/src/main/java/com/gitblit/wicket/panels/BulletListPanel.java
diff --git a/src/com/gitblit/wicket/panels/CommitHeaderPanel.html b/src/main/java/com/gitblit/wicket/panels/CommitHeaderPanel.html
index 95304403..95304403 100644
--- a/src/com/gitblit/wicket/panels/CommitHeaderPanel.html
+++ b/src/main/java/com/gitblit/wicket/panels/CommitHeaderPanel.html
diff --git a/src/com/gitblit/wicket/panels/CommitHeaderPanel.java b/src/main/java/com/gitblit/wicket/panels/CommitHeaderPanel.java
index bb960cca..bb960cca 100644
--- a/src/com/gitblit/wicket/panels/CommitHeaderPanel.java
+++ b/src/main/java/com/gitblit/wicket/panels/CommitHeaderPanel.java
diff --git a/src/com/gitblit/wicket/panels/CommitLegendPanel.html b/src/main/java/com/gitblit/wicket/panels/CommitLegendPanel.html
index 71063626..71063626 100644
--- a/src/com/gitblit/wicket/panels/CommitLegendPanel.html
+++ b/src/main/java/com/gitblit/wicket/panels/CommitLegendPanel.html
diff --git a/src/com/gitblit/wicket/panels/CommitLegendPanel.java b/src/main/java/com/gitblit/wicket/panels/CommitLegendPanel.java
index 1e906ef7..1e906ef7 100644
--- a/src/com/gitblit/wicket/panels/CommitLegendPanel.java
+++ b/src/main/java/com/gitblit/wicket/panels/CommitLegendPanel.java
diff --git a/src/com/gitblit/wicket/panels/CompressedDownloadsPanel.html b/src/main/java/com/gitblit/wicket/panels/CompressedDownloadsPanel.html
index 7123d0a7..7123d0a7 100644
--- a/src/com/gitblit/wicket/panels/CompressedDownloadsPanel.html
+++ b/src/main/java/com/gitblit/wicket/panels/CompressedDownloadsPanel.html
diff --git a/src/com/gitblit/wicket/panels/CompressedDownloadsPanel.java b/src/main/java/com/gitblit/wicket/panels/CompressedDownloadsPanel.java
index b22c7587..b22c7587 100644
--- a/src/com/gitblit/wicket/panels/CompressedDownloadsPanel.java
+++ b/src/main/java/com/gitblit/wicket/panels/CompressedDownloadsPanel.java
diff --git a/src/com/gitblit/wicket/panels/DropDownMenu.html b/src/main/java/com/gitblit/wicket/panels/DropDownMenu.html
index 0a8319ec..0a8319ec 100644
--- a/src/com/gitblit/wicket/panels/DropDownMenu.html
+++ b/src/main/java/com/gitblit/wicket/panels/DropDownMenu.html
diff --git a/src/com/gitblit/wicket/panels/DropDownMenu.java b/src/main/java/com/gitblit/wicket/panels/DropDownMenu.java
index 60a8a3d2..60a8a3d2 100644
--- a/src/com/gitblit/wicket/panels/DropDownMenu.java
+++ b/src/main/java/com/gitblit/wicket/panels/DropDownMenu.java
diff --git a/src/com/gitblit/wicket/panels/FederationProposalsPanel.html b/src/main/java/com/gitblit/wicket/panels/FederationProposalsPanel.html
index 89324d56..89324d56 100644
--- a/src/com/gitblit/wicket/panels/FederationProposalsPanel.html
+++ b/src/main/java/com/gitblit/wicket/panels/FederationProposalsPanel.html
diff --git a/src/com/gitblit/wicket/panels/FederationProposalsPanel.java b/src/main/java/com/gitblit/wicket/panels/FederationProposalsPanel.java
index 3e70ccec..3e70ccec 100644
--- a/src/com/gitblit/wicket/panels/FederationProposalsPanel.java
+++ b/src/main/java/com/gitblit/wicket/panels/FederationProposalsPanel.java
diff --git a/src/com/gitblit/wicket/panels/FederationRegistrationsPanel.html b/src/main/java/com/gitblit/wicket/panels/FederationRegistrationsPanel.html
index fbc6f6cb..fbc6f6cb 100644
--- a/src/com/gitblit/wicket/panels/FederationRegistrationsPanel.html
+++ b/src/main/java/com/gitblit/wicket/panels/FederationRegistrationsPanel.html
diff --git a/src/com/gitblit/wicket/panels/FederationRegistrationsPanel.java b/src/main/java/com/gitblit/wicket/panels/FederationRegistrationsPanel.java
index ff947175..ff947175 100644
--- a/src/com/gitblit/wicket/panels/FederationRegistrationsPanel.java
+++ b/src/main/java/com/gitblit/wicket/panels/FederationRegistrationsPanel.java
diff --git a/src/com/gitblit/wicket/panels/FederationTokensPanel.html b/src/main/java/com/gitblit/wicket/panels/FederationTokensPanel.html
index dc5307bb..dc5307bb 100644
--- a/src/com/gitblit/wicket/panels/FederationTokensPanel.html
+++ b/src/main/java/com/gitblit/wicket/panels/FederationTokensPanel.html
diff --git a/src/com/gitblit/wicket/panels/FederationTokensPanel.java b/src/main/java/com/gitblit/wicket/panels/FederationTokensPanel.java
index 3454492f..3454492f 100644
--- a/src/com/gitblit/wicket/panels/FederationTokensPanel.java
+++ b/src/main/java/com/gitblit/wicket/panels/FederationTokensPanel.java
diff --git a/src/com/gitblit/wicket/panels/GravatarImage.html b/src/main/java/com/gitblit/wicket/panels/GravatarImage.html
index 9dda7958..9dda7958 100644
--- a/src/com/gitblit/wicket/panels/GravatarImage.html
+++ b/src/main/java/com/gitblit/wicket/panels/GravatarImage.html
diff --git a/src/com/gitblit/wicket/panels/GravatarImage.java b/src/main/java/com/gitblit/wicket/panels/GravatarImage.java
index 7f1874f2..7f1874f2 100644
--- a/src/com/gitblit/wicket/panels/GravatarImage.java
+++ b/src/main/java/com/gitblit/wicket/panels/GravatarImage.java
diff --git a/src/com/gitblit/wicket/panels/HistoryPanel.html b/src/main/java/com/gitblit/wicket/panels/HistoryPanel.html
index 811eeed1..811eeed1 100644
--- a/src/com/gitblit/wicket/panels/HistoryPanel.html
+++ b/src/main/java/com/gitblit/wicket/panels/HistoryPanel.html
diff --git a/src/com/gitblit/wicket/panels/HistoryPanel.java b/src/main/java/com/gitblit/wicket/panels/HistoryPanel.java
index e5878635..e5878635 100644
--- a/src/com/gitblit/wicket/panels/HistoryPanel.java
+++ b/src/main/java/com/gitblit/wicket/panels/HistoryPanel.java
diff --git a/src/com/gitblit/wicket/panels/LinkPanel.html b/src/main/java/com/gitblit/wicket/panels/LinkPanel.html
index 714d53ab..714d53ab 100644
--- a/src/com/gitblit/wicket/panels/LinkPanel.html
+++ b/src/main/java/com/gitblit/wicket/panels/LinkPanel.html
diff --git a/src/com/gitblit/wicket/panels/LinkPanel.java b/src/main/java/com/gitblit/wicket/panels/LinkPanel.java
index 688a9576..688a9576 100644
--- a/src/com/gitblit/wicket/panels/LinkPanel.java
+++ b/src/main/java/com/gitblit/wicket/panels/LinkPanel.java
diff --git a/src/com/gitblit/wicket/panels/LogPanel.html b/src/main/java/com/gitblit/wicket/panels/LogPanel.html
index 2b2605ac..2b2605ac 100644
--- a/src/com/gitblit/wicket/panels/LogPanel.html
+++ b/src/main/java/com/gitblit/wicket/panels/LogPanel.html
diff --git a/src/com/gitblit/wicket/panels/LogPanel.java b/src/main/java/com/gitblit/wicket/panels/LogPanel.java
index 05397642..05397642 100644
--- a/src/com/gitblit/wicket/panels/LogPanel.java
+++ b/src/main/java/com/gitblit/wicket/panels/LogPanel.java
diff --git a/src/com/gitblit/wicket/panels/NavigationPanel.html b/src/main/java/com/gitblit/wicket/panels/NavigationPanel.html
index f883e49d..f883e49d 100644
--- a/src/com/gitblit/wicket/panels/NavigationPanel.html
+++ b/src/main/java/com/gitblit/wicket/panels/NavigationPanel.html
diff --git a/src/com/gitblit/wicket/panels/NavigationPanel.java b/src/main/java/com/gitblit/wicket/panels/NavigationPanel.java
index 558cc716..558cc716 100644
--- a/src/com/gitblit/wicket/panels/NavigationPanel.java
+++ b/src/main/java/com/gitblit/wicket/panels/NavigationPanel.java
diff --git a/src/com/gitblit/wicket/panels/ObjectContainer.java b/src/main/java/com/gitblit/wicket/panels/ObjectContainer.java
index d7f1f789..d7f1f789 100644
--- a/src/com/gitblit/wicket/panels/ObjectContainer.java
+++ b/src/main/java/com/gitblit/wicket/panels/ObjectContainer.java
diff --git a/src/com/gitblit/wicket/panels/PagerPanel.html b/src/main/java/com/gitblit/wicket/panels/PagerPanel.html
index 099001db..099001db 100644
--- a/src/com/gitblit/wicket/panels/PagerPanel.html
+++ b/src/main/java/com/gitblit/wicket/panels/PagerPanel.html
diff --git a/src/com/gitblit/wicket/panels/PagerPanel.java b/src/main/java/com/gitblit/wicket/panels/PagerPanel.java
index a5dbb9ef..a5dbb9ef 100644
--- a/src/com/gitblit/wicket/panels/PagerPanel.java
+++ b/src/main/java/com/gitblit/wicket/panels/PagerPanel.java
diff --git a/src/com/gitblit/wicket/panels/PathBreadcrumbsPanel.html b/src/main/java/com/gitblit/wicket/panels/PathBreadcrumbsPanel.html
index c51ceac8..c51ceac8 100644
--- a/src/com/gitblit/wicket/panels/PathBreadcrumbsPanel.html
+++ b/src/main/java/com/gitblit/wicket/panels/PathBreadcrumbsPanel.html
diff --git a/src/com/gitblit/wicket/panels/PathBreadcrumbsPanel.java b/src/main/java/com/gitblit/wicket/panels/PathBreadcrumbsPanel.java
index f6c0e4f8..f6c0e4f8 100644
--- a/src/com/gitblit/wicket/panels/PathBreadcrumbsPanel.java
+++ b/src/main/java/com/gitblit/wicket/panels/PathBreadcrumbsPanel.java
diff --git a/src/com/gitblit/wicket/panels/ProjectRepositoryPanel.html b/src/main/java/com/gitblit/wicket/panels/ProjectRepositoryPanel.html
index 9b621d5a..9b621d5a 100644
--- a/src/com/gitblit/wicket/panels/ProjectRepositoryPanel.html
+++ b/src/main/java/com/gitblit/wicket/panels/ProjectRepositoryPanel.html
diff --git a/src/com/gitblit/wicket/panels/ProjectRepositoryPanel.java b/src/main/java/com/gitblit/wicket/panels/ProjectRepositoryPanel.java
index 7b4ee9f0..7b4ee9f0 100644
--- a/src/com/gitblit/wicket/panels/ProjectRepositoryPanel.java
+++ b/src/main/java/com/gitblit/wicket/panels/ProjectRepositoryPanel.java
diff --git a/src/com/gitblit/wicket/panels/RefsPanel.html b/src/main/java/com/gitblit/wicket/panels/RefsPanel.html
index a3c0ec49..a3c0ec49 100644
--- a/src/com/gitblit/wicket/panels/RefsPanel.html
+++ b/src/main/java/com/gitblit/wicket/panels/RefsPanel.html
diff --git a/src/com/gitblit/wicket/panels/RefsPanel.java b/src/main/java/com/gitblit/wicket/panels/RefsPanel.java
index 3ba22c0b..3ba22c0b 100644
--- a/src/com/gitblit/wicket/panels/RefsPanel.java
+++ b/src/main/java/com/gitblit/wicket/panels/RefsPanel.java
diff --git a/src/com/gitblit/wicket/panels/RegistrantPermissionsPanel.html b/src/main/java/com/gitblit/wicket/panels/RegistrantPermissionsPanel.html
index eb82245c..eb82245c 100644
--- a/src/com/gitblit/wicket/panels/RegistrantPermissionsPanel.html
+++ b/src/main/java/com/gitblit/wicket/panels/RegistrantPermissionsPanel.html
diff --git a/src/com/gitblit/wicket/panels/RegistrantPermissionsPanel.java b/src/main/java/com/gitblit/wicket/panels/RegistrantPermissionsPanel.java
index 4156cd19..4156cd19 100644
--- a/src/com/gitblit/wicket/panels/RegistrantPermissionsPanel.java
+++ b/src/main/java/com/gitblit/wicket/panels/RegistrantPermissionsPanel.java
diff --git a/src/com/gitblit/wicket/panels/RepositoriesPanel.html b/src/main/java/com/gitblit/wicket/panels/RepositoriesPanel.html
index 81a4c6eb..81a4c6eb 100644
--- a/src/com/gitblit/wicket/panels/RepositoriesPanel.html
+++ b/src/main/java/com/gitblit/wicket/panels/RepositoriesPanel.html
diff --git a/src/com/gitblit/wicket/panels/RepositoriesPanel.java b/src/main/java/com/gitblit/wicket/panels/RepositoriesPanel.java
index 726af61d..726af61d 100644
--- a/src/com/gitblit/wicket/panels/RepositoriesPanel.java
+++ b/src/main/java/com/gitblit/wicket/panels/RepositoriesPanel.java
diff --git a/src/com/gitblit/wicket/panels/RepositoryUrlPanel.html b/src/main/java/com/gitblit/wicket/panels/RepositoryUrlPanel.html
index d7c76f13..d7c76f13 100644
--- a/src/com/gitblit/wicket/panels/RepositoryUrlPanel.html
+++ b/src/main/java/com/gitblit/wicket/panels/RepositoryUrlPanel.html
diff --git a/src/com/gitblit/wicket/panels/RepositoryUrlPanel.java b/src/main/java/com/gitblit/wicket/panels/RepositoryUrlPanel.java
index 58df028b..58df028b 100644
--- a/src/com/gitblit/wicket/panels/RepositoryUrlPanel.java
+++ b/src/main/java/com/gitblit/wicket/panels/RepositoryUrlPanel.java
diff --git a/src/com/gitblit/wicket/panels/SearchPanel.html b/src/main/java/com/gitblit/wicket/panels/SearchPanel.html
index 74af71c5..74af71c5 100644
--- a/src/com/gitblit/wicket/panels/SearchPanel.html
+++ b/src/main/java/com/gitblit/wicket/panels/SearchPanel.html
diff --git a/src/com/gitblit/wicket/panels/SearchPanel.java b/src/main/java/com/gitblit/wicket/panels/SearchPanel.java
index 9d38ab09..9d38ab09 100644
--- a/src/com/gitblit/wicket/panels/SearchPanel.java
+++ b/src/main/java/com/gitblit/wicket/panels/SearchPanel.java
diff --git a/src/com/gitblit/wicket/panels/ShockWaveComponent.java b/src/main/java/com/gitblit/wicket/panels/ShockWaveComponent.java
index fa989453..fa989453 100644
--- a/src/com/gitblit/wicket/panels/ShockWaveComponent.java
+++ b/src/main/java/com/gitblit/wicket/panels/ShockWaveComponent.java
diff --git a/src/com/gitblit/wicket/panels/TagsPanel.html b/src/main/java/com/gitblit/wicket/panels/TagsPanel.html
index ba9f15dd..ba9f15dd 100644
--- a/src/com/gitblit/wicket/panels/TagsPanel.html
+++ b/src/main/java/com/gitblit/wicket/panels/TagsPanel.html
diff --git a/src/com/gitblit/wicket/panels/TagsPanel.java b/src/main/java/com/gitblit/wicket/panels/TagsPanel.java
index 2bee6a60..2bee6a60 100644
--- a/src/com/gitblit/wicket/panels/TagsPanel.java
+++ b/src/main/java/com/gitblit/wicket/panels/TagsPanel.java
diff --git a/src/com/gitblit/wicket/panels/TeamsPanel.html b/src/main/java/com/gitblit/wicket/panels/TeamsPanel.html
index ff689292..ff689292 100644
--- a/src/com/gitblit/wicket/panels/TeamsPanel.html
+++ b/src/main/java/com/gitblit/wicket/panels/TeamsPanel.html
diff --git a/src/com/gitblit/wicket/panels/TeamsPanel.java b/src/main/java/com/gitblit/wicket/panels/TeamsPanel.java
index b76388b3..b76388b3 100644
--- a/src/com/gitblit/wicket/panels/TeamsPanel.java
+++ b/src/main/java/com/gitblit/wicket/panels/TeamsPanel.java
diff --git a/src/com/gitblit/wicket/panels/UsersPanel.html b/src/main/java/com/gitblit/wicket/panels/UsersPanel.html
index 80159610..80159610 100644
--- a/src/com/gitblit/wicket/panels/UsersPanel.html
+++ b/src/main/java/com/gitblit/wicket/panels/UsersPanel.html
diff --git a/src/com/gitblit/wicket/panels/UsersPanel.java b/src/main/java/com/gitblit/wicket/panels/UsersPanel.java
index f5b95e20..f5b95e20 100644
--- a/src/com/gitblit/wicket/panels/UsersPanel.java
+++ b/src/main/java/com/gitblit/wicket/panels/UsersPanel.java
diff --git a/src/log4j.properties b/src/main/java/log4j.properties
index dc6dd2b5..dc6dd2b5 100644
--- a/src/log4j.properties
+++ b/src/main/java/log4j.properties
diff --git a/resources/add_16x16.png b/src/main/resources/add_16x16.png
index 0ea124a7..0ea124a7 100644
--- a/resources/add_16x16.png
+++ b/src/main/resources/add_16x16.png
diff --git a/resources/arrow_down.png b/src/main/resources/arrow_down.png
index f31cc819..f31cc819 100644
--- a/resources/arrow_down.png
+++ b/src/main/resources/arrow_down.png
diff --git a/resources/arrow_left.png b/src/main/resources/arrow_left.png
index d9c50c4d..d9c50c4d 100644
--- a/resources/arrow_left.png
+++ b/src/main/resources/arrow_left.png
diff --git a/resources/arrow_off.png b/src/main/resources/arrow_off.png
index f9b1ced2..f9b1ced2 100644
--- a/resources/arrow_off.png
+++ b/src/main/resources/arrow_off.png
diff --git a/resources/arrow_page.png b/src/main/resources/arrow_page.png
index 6d930242..6d930242 100644
--- a/resources/arrow_page.png
+++ b/src/main/resources/arrow_page.png
diff --git a/resources/arrow_up.png b/src/main/resources/arrow_up.png
index 63031c33..63031c33 100644
--- a/resources/arrow_up.png
+++ b/src/main/resources/arrow_up.png
diff --git a/resources/background.png b/src/main/resources/background.png
index 6f75e43d..6f75e43d 100644
--- a/resources/background.png
+++ b/src/main/resources/background.png
diff --git a/resources/blank.png b/src/main/resources/blank.png
index 109296b9..109296b9 100644
--- a/resources/blank.png
+++ b/src/main/resources/blank.png
diff --git a/resources/book_16x16.png b/src/main/resources/book_16x16.png
index e48ff95e..e48ff95e 100644
--- a/resources/book_16x16.png
+++ b/src/main/resources/book_16x16.png
diff --git a/resources/bootstrap/css/bootstrap-responsive.css b/src/main/resources/bootstrap/css/bootstrap-responsive.css
index 06e55c0b..06e55c0b 100644
--- a/resources/bootstrap/css/bootstrap-responsive.css
+++ b/src/main/resources/bootstrap/css/bootstrap-responsive.css
diff --git a/resources/bootstrap/css/bootstrap.css b/src/main/resources/bootstrap/css/bootstrap.css
index bb40c85f..bb40c85f 100644
--- a/resources/bootstrap/css/bootstrap.css
+++ b/src/main/resources/bootstrap/css/bootstrap.css
diff --git a/resources/bootstrap/img/glyphicons-halflings-white.png b/src/main/resources/bootstrap/img/glyphicons-halflings-white.png
index 3bf6484a..3bf6484a 100644
--- a/resources/bootstrap/img/glyphicons-halflings-white.png
+++ b/src/main/resources/bootstrap/img/glyphicons-halflings-white.png
diff --git a/resources/bootstrap/img/glyphicons-halflings.png b/src/main/resources/bootstrap/img/glyphicons-halflings.png
index 79bc568c..79bc568c 100644
--- a/resources/bootstrap/img/glyphicons-halflings.png
+++ b/src/main/resources/bootstrap/img/glyphicons-halflings.png
diff --git a/resources/bootstrap/js/bootstrap.js b/src/main/resources/bootstrap/js/bootstrap.js
index 5d6e65b8..5d6e65b8 100644
--- a/resources/bootstrap/js/bootstrap.js
+++ b/src/main/resources/bootstrap/js/bootstrap.js
diff --git a/resources/bootstrap/js/jquery.js b/src/main/resources/bootstrap/js/jquery.js
index 198b3ff0..198b3ff0 100644
--- a/resources/bootstrap/js/jquery.js
+++ b/src/main/resources/bootstrap/js/jquery.js
diff --git a/resources/bug_16x16.png b/src/main/resources/bug_16x16.png
index c7299fd7..c7299fd7 100644
--- a/resources/bug_16x16.png
+++ b/src/main/resources/bug_16x16.png
diff --git a/resources/bullet_black.png b/src/main/resources/bullet_black.png
index 29be5679..29be5679 100644
--- a/resources/bullet_black.png
+++ b/src/main/resources/bullet_black.png
diff --git a/resources/bullet_blue.png b/src/main/resources/bullet_blue.png
index b9c8e024..b9c8e024 100644
--- a/resources/bullet_blue.png
+++ b/src/main/resources/bullet_blue.png
diff --git a/resources/bullet_delete.png b/src/main/resources/bullet_delete.png
index 7736d692..7736d692 100644
--- a/resources/bullet_delete.png
+++ b/src/main/resources/bullet_delete.png
diff --git a/resources/bullet_error.png b/src/main/resources/bullet_error.png
index b2e6b752..b2e6b752 100644
--- a/resources/bullet_error.png
+++ b/src/main/resources/bullet_error.png
diff --git a/resources/bullet_feed.png b/src/main/resources/bullet_feed.png
index c6e5f241..c6e5f241 100644
--- a/resources/bullet_feed.png
+++ b/src/main/resources/bullet_feed.png
diff --git a/resources/bullet_green.png b/src/main/resources/bullet_green.png
index 3e89eb1c..3e89eb1c 100644
--- a/resources/bullet_green.png
+++ b/src/main/resources/bullet_green.png
diff --git a/resources/bullet_key.png b/src/main/resources/bullet_key.png
index 62600135..62600135 100644
--- a/resources/bullet_key.png
+++ b/src/main/resources/bullet_key.png
diff --git a/resources/bullet_orange.png b/src/main/resources/bullet_orange.png
index 456774e9..456774e9 100644
--- a/resources/bullet_orange.png
+++ b/src/main/resources/bullet_orange.png
diff --git a/resources/bullet_red.png b/src/main/resources/bullet_red.png
index 6d2d08fe..6d2d08fe 100644
--- a/resources/bullet_red.png
+++ b/src/main/resources/bullet_red.png
diff --git a/resources/bullet_white.png b/src/main/resources/bullet_white.png
index 5c638737..5c638737 100644
--- a/resources/bullet_white.png
+++ b/src/main/resources/bullet_white.png
diff --git a/resources/bullet_yellow.png b/src/main/resources/bullet_yellow.png
index a0bb7e5f..a0bb7e5f 100644
--- a/resources/bullet_yellow.png
+++ b/src/main/resources/bullet_yellow.png
diff --git a/resources/clipboard_13x13.png b/src/main/resources/clipboard_13x13.png
index 85f6cd7f..85f6cd7f 100644
--- a/resources/clipboard_13x13.png
+++ b/src/main/resources/clipboard_13x13.png
diff --git a/resources/clipboard_16x16.png b/src/main/resources/clipboard_16x16.png
index ee4bd3e9..ee4bd3e9 100644
--- a/resources/clipboard_16x16.png
+++ b/src/main/resources/clipboard_16x16.png
diff --git a/resources/clippy.png b/src/main/resources/clippy.png
index 7a462e16..7a462e16 100644
--- a/resources/clippy.png
+++ b/src/main/resources/clippy.png
diff --git a/resources/clippy.swf b/src/main/resources/clippy.swf
index e46886cd..e46886cd 100644
--- a/resources/clippy.swf
+++ b/src/main/resources/clippy.swf
diff --git a/resources/cold_16x16.png b/src/main/resources/cold_16x16.png
index 79cb7567..79cb7567 100644
--- a/resources/cold_16x16.png
+++ b/src/main/resources/cold_16x16.png
diff --git a/resources/commit_branch_16x16.png b/src/main/resources/commit_branch_16x16.png
index d1fe7175..d1fe7175 100644
--- a/resources/commit_branch_16x16.png
+++ b/src/main/resources/commit_branch_16x16.png
diff --git a/resources/commit_changes_16x16.png b/src/main/resources/commit_changes_16x16.png
index 257cfee3..257cfee3 100644
--- a/resources/commit_changes_16x16.png
+++ b/src/main/resources/commit_changes_16x16.png
diff --git a/resources/commit_divide_16x16.png b/src/main/resources/commit_divide_16x16.png
index e611bd57..e611bd57 100644
--- a/resources/commit_divide_16x16.png
+++ b/src/main/resources/commit_divide_16x16.png
diff --git a/resources/commit_join_16x16.png b/src/main/resources/commit_join_16x16.png
index 51e7de97..51e7de97 100644
--- a/resources/commit_join_16x16.png
+++ b/src/main/resources/commit_join_16x16.png
diff --git a/resources/commit_merge_16x16.png b/src/main/resources/commit_merge_16x16.png
index 5a066e59..5a066e59 100644
--- a/resources/commit_merge_16x16.png
+++ b/src/main/resources/commit_merge_16x16.png
diff --git a/resources/commit_up_16x16.png b/src/main/resources/commit_up_16x16.png
index 30d005f2..30d005f2 100644
--- a/resources/commit_up_16x16.png
+++ b/src/main/resources/commit_up_16x16.png
diff --git a/resources/federated_16x16.png b/src/main/resources/federated_16x16.png
index 8e208515..8e208515 100644
--- a/resources/federated_16x16.png
+++ b/src/main/resources/federated_16x16.png
diff --git a/resources/feed_16x16.png b/src/main/resources/feed_16x16.png
index 99987a30..99987a30 100644
--- a/resources/feed_16x16.png
+++ b/src/main/resources/feed_16x16.png
diff --git a/resources/file_16x16.png b/src/main/resources/file_16x16.png
index eda44886..eda44886 100644
--- a/resources/file_16x16.png
+++ b/src/main/resources/file_16x16.png
diff --git a/resources/file_acrobat_16x16.png b/src/main/resources/file_acrobat_16x16.png
index f1627837..f1627837 100644
--- a/resources/file_acrobat_16x16.png
+++ b/src/main/resources/file_acrobat_16x16.png
diff --git a/resources/file_c_16x16.png b/src/main/resources/file_c_16x16.png
index 44045a9b..44045a9b 100644
--- a/resources/file_c_16x16.png
+++ b/src/main/resources/file_c_16x16.png
diff --git a/resources/file_code_16x16.png b/src/main/resources/file_code_16x16.png
index 931b0d6a..931b0d6a 100644
--- a/resources/file_code_16x16.png
+++ b/src/main/resources/file_code_16x16.png
diff --git a/resources/file_cpp_16x16.png b/src/main/resources/file_cpp_16x16.png
index d3f55ee0..d3f55ee0 100644
--- a/resources/file_cpp_16x16.png
+++ b/src/main/resources/file_cpp_16x16.png
diff --git a/resources/file_cs_16x16.png b/src/main/resources/file_cs_16x16.png
index 80130209..80130209 100644
--- a/resources/file_cs_16x16.png
+++ b/src/main/resources/file_cs_16x16.png
diff --git a/resources/file_doc_16x16.png b/src/main/resources/file_doc_16x16.png
index 225c3b09..225c3b09 100644
--- a/resources/file_doc_16x16.png
+++ b/src/main/resources/file_doc_16x16.png
diff --git a/resources/file_excel_16x16.png b/src/main/resources/file_excel_16x16.png
index 04e03327..04e03327 100644
--- a/resources/file_excel_16x16.png
+++ b/src/main/resources/file_excel_16x16.png
diff --git a/resources/file_h_16x16.png b/src/main/resources/file_h_16x16.png
index 3f7f5394..3f7f5394 100644
--- a/resources/file_h_16x16.png
+++ b/src/main/resources/file_h_16x16.png
diff --git a/resources/file_java_16x16.png b/src/main/resources/file_java_16x16.png
index 16620e5c..16620e5c 100644
--- a/resources/file_java_16x16.png
+++ b/src/main/resources/file_java_16x16.png
diff --git a/resources/file_php_16x16.png b/src/main/resources/file_php_16x16.png
index 4ac56183..4ac56183 100644
--- a/resources/file_php_16x16.png
+++ b/src/main/resources/file_php_16x16.png
diff --git a/resources/file_ppt_16x16.png b/src/main/resources/file_ppt_16x16.png
index 44bbf26f..44bbf26f 100644
--- a/resources/file_ppt_16x16.png
+++ b/src/main/resources/file_ppt_16x16.png
diff --git a/resources/file_ruby_16x16.png b/src/main/resources/file_ruby_16x16.png
index f29349da..f29349da 100644
--- a/resources/file_ruby_16x16.png
+++ b/src/main/resources/file_ruby_16x16.png
diff --git a/resources/file_settings_16x16.png b/src/main/resources/file_settings_16x16.png
index 92953fec..92953fec 100644
--- a/resources/file_settings_16x16.png
+++ b/src/main/resources/file_settings_16x16.png
diff --git a/resources/file_vs_16x16.png b/src/main/resources/file_vs_16x16.png
index 645fa7a0..645fa7a0 100644
--- a/resources/file_vs_16x16.png
+++ b/src/main/resources/file_vs_16x16.png
diff --git a/resources/file_world_16x16.png b/src/main/resources/file_world_16x16.png
index 0a4fa8be..0a4fa8be 100644
--- a/resources/file_world_16x16.png
+++ b/src/main/resources/file_world_16x16.png
diff --git a/resources/file_zip_16x16.png b/src/main/resources/file_zip_16x16.png
index 15845924..15845924 100644
--- a/resources/file_zip_16x16.png
+++ b/src/main/resources/file_zip_16x16.png
diff --git a/resources/folder_16x16.png b/src/main/resources/folder_16x16.png
index f1ed9abe..f1ed9abe 100644
--- a/resources/folder_16x16.png
+++ b/src/main/resources/folder_16x16.png
diff --git a/resources/folder_star_16x16.png b/src/main/resources/folder_star_16x16.png
index ae8fdeda..ae8fdeda 100644
--- a/resources/folder_star_16x16.png
+++ b/src/main/resources/folder_star_16x16.png
diff --git a/resources/folder_star_32x32.png b/src/main/resources/folder_star_32x32.png
index d2a076a9..d2a076a9 100644
--- a/resources/folder_star_32x32.png
+++ b/src/main/resources/folder_star_32x32.png
diff --git a/resources/fork_16x16.png b/src/main/resources/fork_16x16.png
index efb749c1..efb749c1 100644
--- a/resources/fork_16x16.png
+++ b/src/main/resources/fork_16x16.png
diff --git a/resources/git-black-16x16.png b/src/main/resources/git-black-16x16.png
index 559c45a4..559c45a4 100644
--- a/resources/git-black-16x16.png
+++ b/src/main/resources/git-black-16x16.png
diff --git a/resources/git-black.png b/src/main/resources/git-black.png
index 8bc4c439..8bc4c439 100644
--- a/resources/git-black.png
+++ b/src/main/resources/git-black.png
diff --git a/resources/git-black_210x210.png b/src/main/resources/git-black_210x210.png
index 465cd399..465cd399 100644
--- a/resources/git-black_210x210.png
+++ b/src/main/resources/git-black_210x210.png
diff --git a/resources/git-orange-16x16.png b/src/main/resources/git-orange-16x16.png
index 2fefab41..2fefab41 100644
--- a/resources/git-orange-16x16.png
+++ b/src/main/resources/git-orange-16x16.png
diff --git a/resources/gitblit.css b/src/main/resources/gitblit.css
index 811b08a5..811b08a5 100644
--- a/resources/gitblit.css
+++ b/src/main/resources/gitblit.css
diff --git a/resources/gitblt-favicon.png b/src/main/resources/gitblt-favicon.png
index c3c6dc1b..c3c6dc1b 100644
--- a/resources/gitblt-favicon.png
+++ b/src/main/resources/gitblt-favicon.png
diff --git a/resources/gitblt-logo.png b/src/main/resources/gitblt-logo.png
index 7ec945b5..7ec945b5 100644
--- a/resources/gitblt-logo.png
+++ b/src/main/resources/gitblt-logo.png
diff --git a/resources/gitblt2.png b/src/main/resources/gitblt2.png
index c1642941..c1642941 100644
--- a/resources/gitblt2.png
+++ b/src/main/resources/gitblt2.png
diff --git a/resources/gitblt2_white.png b/src/main/resources/gitblt2_white.png
index f4c5463d..f4c5463d 100644
--- a/resources/gitblt2_white.png
+++ b/src/main/resources/gitblt2_white.png
diff --git a/resources/gitblt_25.png b/src/main/resources/gitblt_25.png
index ad580fad..ad580fad 100644
--- a/resources/gitblt_25.png
+++ b/src/main/resources/gitblt_25.png
diff --git a/resources/gitblt_25_white.png b/src/main/resources/gitblt_25_white.png
index eeea0214..eeea0214 100644
--- a/resources/gitblt_25_white.png
+++ b/src/main/resources/gitblt_25_white.png
diff --git a/resources/gitweb-favicon.png b/src/main/resources/gitweb-favicon.png
index de637c06..de637c06 100644
--- a/resources/gitweb-favicon.png
+++ b/src/main/resources/gitweb-favicon.png
diff --git a/resources/health_16x16.png b/src/main/resources/health_16x16.png
index de43e4b1..de43e4b1 100644
--- a/resources/health_16x16.png
+++ b/src/main/resources/health_16x16.png
diff --git a/resources/heart_16x16.png b/src/main/resources/heart_16x16.png
index 53e1013a..53e1013a 100644
--- a/resources/heart_16x16.png
+++ b/src/main/resources/heart_16x16.png
diff --git a/resources/information_16x16.png b/src/main/resources/information_16x16.png
index 85c1876b..85c1876b 100644
--- a/resources/information_16x16.png
+++ b/src/main/resources/information_16x16.png
diff --git a/resources/lock_16x16.png b/src/main/resources/lock_16x16.png
index ddf83d95..ddf83d95 100644
--- a/resources/lock_16x16.png
+++ b/src/main/resources/lock_16x16.png
diff --git a/resources/lock_go_16x16.png b/src/main/resources/lock_go_16x16.png
index 63d42859..63d42859 100644
--- a/resources/lock_go_16x16.png
+++ b/src/main/resources/lock_go_16x16.png
diff --git a/resources/lock_pull_16x16.png b/src/main/resources/lock_pull_16x16.png
index 85c5c53e..85c5c53e 100644
--- a/resources/lock_pull_16x16.png
+++ b/src/main/resources/lock_pull_16x16.png
diff --git a/resources/login.mkd b/src/main/resources/login.mkd
index 51a4cf71..51a4cf71 100644
--- a/resources/login.mkd
+++ b/src/main/resources/login.mkd
diff --git a/resources/login_es.mkd b/src/main/resources/login_es.mkd
index 700d63f4..700d63f4 100644
--- a/resources/login_es.mkd
+++ b/src/main/resources/login_es.mkd
diff --git a/resources/login_ko.mkd b/src/main/resources/login_ko.mkd
index a48099c1..a48099c1 100644
--- a/resources/login_ko.mkd
+++ b/src/main/resources/login_ko.mkd
diff --git a/resources/login_nl.mkd b/src/main/resources/login_nl.mkd
index 38224c96..38224c96 100644
--- a/resources/login_nl.mkd
+++ b/src/main/resources/login_nl.mkd
diff --git a/resources/login_pl.mkd b/src/main/resources/login_pl.mkd
index cc7978b4..cc7978b4 100644
--- a/resources/login_pl.mkd
+++ b/src/main/resources/login_pl.mkd
diff --git a/resources/login_pt_br.mkd b/src/main/resources/login_pt_br.mkd
index 6a4a8570..6a4a8570 100644
--- a/resources/login_pt_br.mkd
+++ b/src/main/resources/login_pt_br.mkd
diff --git a/resources/login_zh_CN.mkd b/src/main/resources/login_zh_CN.mkd
index 09046231..09046231 100644
--- a/resources/login_zh_CN.mkd
+++ b/src/main/resources/login_zh_CN.mkd
diff --git a/resources/mail_16x16.png b/src/main/resources/mail_16x16.png
index 83278739..83278739 100644
--- a/resources/mail_16x16.png
+++ b/src/main/resources/mail_16x16.png
diff --git a/resources/pixel.png b/src/main/resources/pixel.png
index 4d5f6df1..4d5f6df1 100644
--- a/resources/pixel.png
+++ b/src/main/resources/pixel.png
diff --git a/resources/rosette_16x16.png b/src/main/resources/rosette_16x16.png
index 6dedc271..6dedc271 100644
--- a/resources/rosette_16x16.png
+++ b/src/main/resources/rosette_16x16.png
diff --git a/resources/rosette_32x32.png b/src/main/resources/rosette_32x32.png
index ecbcc0a6..ecbcc0a6 100644
--- a/resources/rosette_32x32.png
+++ b/src/main/resources/rosette_32x32.png
diff --git a/resources/script_16x16.png b/src/main/resources/script_16x16.png
index ec93a22f..ec93a22f 100644
--- a/resources/script_16x16.png
+++ b/src/main/resources/script_16x16.png
diff --git a/resources/search-icon.png b/src/main/resources/search-icon.png
index 90e8d2c6..90e8d2c6 100644
--- a/resources/search-icon.png
+++ b/src/main/resources/search-icon.png
diff --git a/resources/settings_16x16.png b/src/main/resources/settings_16x16.png
index 1619e3de..1619e3de 100644
--- a/resources/settings_16x16.png
+++ b/src/main/resources/settings_16x16.png
diff --git a/resources/settings_32x32.png b/src/main/resources/settings_32x32.png
index 39af4be9..39af4be9 100644
--- a/resources/settings_32x32.png
+++ b/src/main/resources/settings_32x32.png
diff --git a/resources/shield_16x16.png b/src/main/resources/shield_16x16.png
index 4eb8031c..4eb8031c 100644
--- a/resources/shield_16x16.png
+++ b/src/main/resources/shield_16x16.png
diff --git a/resources/star_16x16.png b/src/main/resources/star_16x16.png
index 883e4dec..883e4dec 100644
--- a/resources/star_16x16.png
+++ b/src/main/resources/star_16x16.png
diff --git a/resources/star_32x32.png b/src/main/resources/star_32x32.png
index 92865b19..92865b19 100644
--- a/resources/star_32x32.png
+++ b/src/main/resources/star_32x32.png
diff --git a/resources/tag_16x16.png b/src/main/resources/tag_16x16.png
index 7e75cba0..7e75cba0 100644
--- a/resources/tag_16x16.png
+++ b/src/main/resources/tag_16x16.png
diff --git a/resources/user_16x16.png b/src/main/resources/user_16x16.png
index d5edd4d4..d5edd4d4 100644
--- a/resources/user_16x16.png
+++ b/src/main/resources/user_16x16.png
diff --git a/resources/users_16x16.png b/src/main/resources/users_16x16.png
index 247af645..247af645 100644
--- a/resources/users_16x16.png
+++ b/src/main/resources/users_16x16.png
diff --git a/resources/vcard_16x16.png b/src/main/resources/vcard_16x16.png
index b8a9fea4..b8a9fea4 100644
--- a/resources/vcard_16x16.png
+++ b/src/main/resources/vcard_16x16.png
diff --git a/resources/welcome.mkd b/src/main/resources/welcome.mkd
index 130cd8ac..130cd8ac 100644
--- a/resources/welcome.mkd
+++ b/src/main/resources/welcome.mkd
diff --git a/resources/welcome_es.mkd b/src/main/resources/welcome_es.mkd
index 52f290e3..52f290e3 100644
--- a/resources/welcome_es.mkd
+++ b/src/main/resources/welcome_es.mkd
diff --git a/resources/welcome_ko.mkd b/src/main/resources/welcome_ko.mkd
index 27cd65da..27cd65da 100644
--- a/resources/welcome_ko.mkd
+++ b/src/main/resources/welcome_ko.mkd
diff --git a/resources/welcome_nl.mkd b/src/main/resources/welcome_nl.mkd
index 406ca1e0..406ca1e0 100644
--- a/resources/welcome_nl.mkd
+++ b/src/main/resources/welcome_nl.mkd
diff --git a/resources/welcome_pl.mkd b/src/main/resources/welcome_pl.mkd
index bc60770a..bc60770a 100644
--- a/resources/welcome_pl.mkd
+++ b/src/main/resources/welcome_pl.mkd
diff --git a/resources/welcome_pt_br.mkd b/src/main/resources/welcome_pt_br.mkd
index 6b30bbcd..6b30bbcd 100644
--- a/resources/welcome_pt_br.mkd
+++ b/src/main/resources/welcome_pt_br.mkd
diff --git a/resources/welcome_zh_CN.mkd b/src/main/resources/welcome_zh_CN.mkd
index f4a651ef..f4a651ef 100644
--- a/resources/welcome_zh_CN.mkd
+++ b/src/main/resources/welcome_zh_CN.mkd
diff --git a/docs/.gitignore b/src/site/.gitignore
index 45d8a390..45d8a390 100644
--- a/docs/.gitignore
+++ b/src/site/.gitignore
diff --git a/docs/architecture.odg b/src/site/architecture.odg
index 4e5fcd3d..4e5fcd3d 100644
--- a/docs/architecture.odg
+++ b/src/site/architecture.odg
diff --git a/src/site/custom.less b/src/site/custom.less
new file mode 100644
index 00000000..c05058bf
--- /dev/null
+++ b/src/site/custom.less
@@ -0,0 +1,96 @@
+/*!

+ * Gitblit Bootstrap Overrides

+ *

+ * Copyright 2012 gitblit.com

+ * Licensed under the Apache License v2.0

+ * http://www.apache.org/licenses/LICENSE-2.0

+ *

+ */

+

+// GLOBAL VALUES

+// --------------------------------------------------

+@blueDark:					#000060;

+@blueDarker:				#000050;

+@blueDarkest:				#000040;

+@standardGray:				#ccc;

+@cornflower:				#abd4ff;

+@white:						#fff;

+

+

+// Dropdown

+// -------------------------

+@dropdownLinkBackgroundHover:   @blueDark;

+

+// Navbar

+// -------------------------

+@navbarHeight:                    45px;

+@navbarBackground:                @blueDarkest;

+@navbarBackgroundHighlight:       @blueDark;

+@navbarText:                      @white;

+@navbarLinkColor:                 @white;

+@navbarLinkColorHover:            @cornflower;

+@navbarLinkColorActive:           @cornflower;

+@navbarLinkBackgroundHover:       transparent;

+@navbarLinkBackgroundActive:      transparent;

+

+

+.navbar {

+	.nav {

+		margin: 0px;

+

+		li > a {

+			text-shadow: 0 1px 0 #000;

+		}

+

+		li > a:hover {

+			text-shadow: 0 0 1em white;

+		}

+		

+		.active > a, 

+		.active > a:hover,

+		.active > a:focus {

+			box-shadow: none;

+			text-decoration: underline;

+		}

+		

+		ul.dropdown-menu > li > a {

+			text-shadow: none;

+		}

+	}

+

+	.brand {

+		@elementHeight: 27px;

+		padding: 10px 20px;

+	}

+	

+	.pull-right {

+		margin: 0;

+	}

+	

+	ul > li:focus, .active {

+		background-repeat:no-repeat;

+		background-image: url('../../arrow_page.png');

+		background-position: center bottom;

+		outline: 0;

+	}

+}

+

+.navbar-inner {

+	background-color: @blueDarker;

+	border-bottom: 2px solid #ff9900;

+}

+

+h3 small { font-size: @baseFontSize + 3; }

+body { padding-top: @navbarHeight + 15 } /* 60px to make the container go all the way to the bottom of the topbar */

+footer { margin-top: 25px; padding: 15px 0 16px; border-top: 1px solid #E5E5E5; }

+

+a:hover { text-decoration: underline !important; }

+em { color: #b05000; }

+code {

+	color: #000000;

+	background-color: #ffffe0;

+    border: 1px solid orange;

+    border-radius: 3px;

+    padding: 0 0.2em;

+    font-family: monospace;

+}
\ No newline at end of file
diff --git a/docs/04_design.mkd b/src/site/design.mkd
index 622e4a23..5ca83558 100644
--- a/docs/04_design.mkd
+++ b/src/site/design.mkd
@@ -51,7 +51,7 @@ The following dependencies are automatically downloaded by Gitblit GO (or alread
 - [JUnit](http://junit.org) (Common Public License)

 - [commons-net](http://commons.apache.org/net) (Apache 2.0)

 - [ant-googlecode](http://code.google.com/p/ant-googlecode) (New BSD)

-- [GenJar](http://genjar.sourceforge.net) (Apache 1.1)

+- [Moxie](http://moxie.gitblit.com) (Apache 2.0)

 

 ## Building from Source

 [Eclipse](http://eclipse.org) is recommended for development as the project settings are preconfigured.

@@ -73,7 +73,7 @@ Additionally, [Google CodePro AnalytiX](http://code.google.com/javadevtools), [e
 

 

 ## Contributing

-Patches welcome in any form.

+Pull requests are preferred.  Patches are welcome.

 

 Contributions must be your own original work and must licensed under the [Apache License, Version 2.0][apachelicense], the same license used by Gitblit.

 

diff --git a/docs/fancybox/blank.gif b/src/site/fancybox/blank.gif
index 35d42e80..35d42e80 100644
--- a/docs/fancybox/blank.gif
+++ b/src/site/fancybox/blank.gif
diff --git a/docs/fancybox/fancy_close.png b/src/site/fancybox/fancy_close.png
index 07035307..07035307 100644
--- a/docs/fancybox/fancy_close.png
+++ b/src/site/fancybox/fancy_close.png
diff --git a/docs/fancybox/fancy_loading.png b/src/site/fancybox/fancy_loading.png
index 25030179..25030179 100644
--- a/docs/fancybox/fancy_loading.png
+++ b/src/site/fancybox/fancy_loading.png
diff --git a/docs/fancybox/fancy_nav_left.png b/src/site/fancybox/fancy_nav_left.png
index ebaa6a4f..ebaa6a4f 100644
--- a/docs/fancybox/fancy_nav_left.png
+++ b/src/site/fancybox/fancy_nav_left.png
diff --git a/docs/fancybox/fancy_nav_right.png b/src/site/fancybox/fancy_nav_right.png
index 873294e9..873294e9 100644
--- a/docs/fancybox/fancy_nav_right.png
+++ b/src/site/fancybox/fancy_nav_right.png
diff --git a/docs/fancybox/fancy_shadow_e.png b/src/site/fancybox/fancy_shadow_e.png
index 2eda0893..2eda0893 100644
--- a/docs/fancybox/fancy_shadow_e.png
+++ b/src/site/fancybox/fancy_shadow_e.png
diff --git a/docs/fancybox/fancy_shadow_n.png b/src/site/fancybox/fancy_shadow_n.png
index 69aa10e2..69aa10e2 100644
--- a/docs/fancybox/fancy_shadow_n.png
+++ b/src/site/fancybox/fancy_shadow_n.png
diff --git a/docs/fancybox/fancy_shadow_ne.png b/src/site/fancybox/fancy_shadow_ne.png
index 79f6980a..79f6980a 100644
--- a/docs/fancybox/fancy_shadow_ne.png
+++ b/src/site/fancybox/fancy_shadow_ne.png
diff --git a/docs/fancybox/fancy_shadow_nw.png b/src/site/fancybox/fancy_shadow_nw.png
index 7182cd93..7182cd93 100644
--- a/docs/fancybox/fancy_shadow_nw.png
+++ b/src/site/fancybox/fancy_shadow_nw.png
diff --git a/docs/fancybox/fancy_shadow_s.png b/src/site/fancybox/fancy_shadow_s.png
index d8858bfb..d8858bfb 100644
--- a/docs/fancybox/fancy_shadow_s.png
+++ b/src/site/fancybox/fancy_shadow_s.png
diff --git a/docs/fancybox/fancy_shadow_se.png b/src/site/fancybox/fancy_shadow_se.png
index 541e3ffd..541e3ffd 100644
--- a/docs/fancybox/fancy_shadow_se.png
+++ b/src/site/fancybox/fancy_shadow_se.png
diff --git a/docs/fancybox/fancy_shadow_sw.png b/src/site/fancybox/fancy_shadow_sw.png
index b451689f..b451689f 100644
--- a/docs/fancybox/fancy_shadow_sw.png
+++ b/src/site/fancybox/fancy_shadow_sw.png
diff --git a/docs/fancybox/fancy_shadow_w.png b/src/site/fancybox/fancy_shadow_w.png
index 8a4e4a88..8a4e4a88 100644
--- a/docs/fancybox/fancy_shadow_w.png
+++ b/src/site/fancybox/fancy_shadow_w.png
diff --git a/docs/fancybox/fancy_title_left.png b/src/site/fancybox/fancy_title_left.png
index 6049223d..6049223d 100644
--- a/docs/fancybox/fancy_title_left.png
+++ b/src/site/fancybox/fancy_title_left.png
diff --git a/docs/fancybox/fancy_title_main.png b/src/site/fancybox/fancy_title_main.png
index 8044271f..8044271f 100644
--- a/docs/fancybox/fancy_title_main.png
+++ b/src/site/fancybox/fancy_title_main.png
diff --git a/docs/fancybox/fancy_title_over.png b/src/site/fancybox/fancy_title_over.png
index d9f458f4..d9f458f4 100644
--- a/docs/fancybox/fancy_title_over.png
+++ b/src/site/fancybox/fancy_title_over.png
diff --git a/docs/fancybox/fancy_title_right.png b/src/site/fancybox/fancy_title_right.png
index e36d9db2..e36d9db2 100644
--- a/docs/fancybox/fancy_title_right.png
+++ b/src/site/fancybox/fancy_title_right.png
diff --git a/docs/fancybox/fancybox-x.png b/src/site/fancybox/fancybox-x.png
index c2130f86..c2130f86 100644
--- a/docs/fancybox/fancybox-x.png
+++ b/src/site/fancybox/fancybox-x.png
diff --git a/docs/fancybox/fancybox-y.png b/src/site/fancybox/fancybox-y.png
index 7ef399b9..7ef399b9 100644
--- a/docs/fancybox/fancybox-y.png
+++ b/src/site/fancybox/fancybox-y.png
diff --git a/docs/fancybox/fancybox.png b/src/site/fancybox/fancybox.png
index 65e14f68..65e14f68 100644
--- a/docs/fancybox/fancybox.png
+++ b/src/site/fancybox/fancybox.png
diff --git a/docs/fancybox/jquery-1.4.3.min.js b/src/site/fancybox/jquery-1.4.3.min.js
index c941a5f7..c941a5f7 100644
--- a/docs/fancybox/jquery-1.4.3.min.js
+++ b/src/site/fancybox/jquery-1.4.3.min.js
diff --git a/docs/fancybox/jquery.easing-1.3.pack.js b/src/site/fancybox/jquery.easing-1.3.pack.js
index 9028179e..9028179e 100644
--- a/docs/fancybox/jquery.easing-1.3.pack.js
+++ b/src/site/fancybox/jquery.easing-1.3.pack.js
diff --git a/docs/fancybox/jquery.fancybox-1.3.4.css b/src/site/fancybox/jquery.fancybox-1.3.4.css
index 6f53d8f4..6f53d8f4 100644
--- a/docs/fancybox/jquery.fancybox-1.3.4.css
+++ b/src/site/fancybox/jquery.fancybox-1.3.4.css
diff --git a/docs/fancybox/jquery.fancybox-1.3.4.js b/src/site/fancybox/jquery.fancybox-1.3.4.js
index be772753..be772753 100644
--- a/docs/fancybox/jquery.fancybox-1.3.4.js
+++ b/src/site/fancybox/jquery.fancybox-1.3.4.js
diff --git a/docs/fancybox/jquery.fancybox-1.3.4.pack.js b/src/site/fancybox/jquery.fancybox-1.3.4.pack.js
index 1373ed08..1373ed08 100644
--- a/docs/fancybox/jquery.fancybox-1.3.4.pack.js
+++ b/src/site/fancybox/jquery.fancybox-1.3.4.pack.js
diff --git a/docs/fancybox/jquery.mousewheel-3.0.4.pack.js b/src/site/fancybox/jquery.mousewheel-3.0.4.pack.js
index cb66588e..cb66588e 100644
--- a/docs/fancybox/jquery.mousewheel-3.0.4.pack.js
+++ b/src/site/fancybox/jquery.mousewheel-3.0.4.pack.js
diff --git a/docs/03_faq.mkd b/src/site/faq.mkd
index cdf3d59e..cdf3d59e 100644
--- a/docs/03_faq.mkd
+++ b/src/site/faq.mkd
diff --git a/docs/01_features.mkd b/src/site/features.mkd
index b99aa52e..b99aa52e 100644
--- a/docs/01_features.mkd
+++ b/src/site/features.mkd
diff --git a/docs/02_federation.mkd b/src/site/federation.mkd
index d83a9e35..756d3fcd 100644
--- a/docs/02_federation.mkd
+++ b/src/site/federation.mkd
@@ -48,11 +48,11 @@ Changing your *federation.passphrase* will break any registrations you have esta
 If you want your repositories (and optionally users accounts and settings) to be pulled by another Gitblit instance, you need to register your origin Gitblit instance with a pulling Gitblit instance by providing the url of your Gitblit instance and a federation token.

 

 Gitblit generates the following standard federation tokens:

-%BEGINCODE%

+---JAVA---

 String allToken = SHA1(passphrase + "-ALL");

 String usersAndRepositoriesToken = SHA1(passphrase + "-USERS_AND_REPOSITORIES");

 String repositoriesToken = SHA1(passphrase + "-REPOSITORIES");

-%ENDCODE%

+---JAVA---

     

 The *ALL* token allows another Gitblit instance to pull all your repositories, user accounts, server settings, and referenced push scripts.  

 The *USERS_AND_REPOSITORIES* token allows another Gitblit instance to pull all your repositories and  user accounts.  

diff --git a/docs/federation.odg b/src/site/federation.odg
index e2c3ba8a..e2c3ba8a 100644
--- a/docs/federation.odg
+++ b/src/site/federation.odg
diff --git a/docs/gitblit_logo_white.xcf b/src/site/gitblit_logo_white.xcf
index d0d397c2..d0d397c2 100644
--- a/docs/gitblit_logo_white.xcf
+++ b/src/site/gitblit_logo_white.xcf
diff --git a/distrib/openshift.mkd b/src/site/openshift.mkd
index 63b1b007..63b1b007 100644
--- a/distrib/openshift.mkd
+++ b/src/site/openshift.mkd
diff --git a/docs/permissions_matrix.ods b/src/site/permissions_matrix.ods
index 6df0b4db..6df0b4db 100644
--- a/docs/permissions_matrix.ods
+++ b/src/site/permissions_matrix.ods
diff --git a/docs/03_properties.mkd b/src/site/properties.mkd
index 2b0151bb..2b0151bb 100644
--- a/docs/03_properties.mkd
+++ b/src/site/properties.mkd
diff --git a/src/site/releasecurrent.mkd b/src/site/releasecurrent.mkd
new file mode 100644
index 00000000..613f1bf9
--- /dev/null
+++ b/src/site/releasecurrent.mkd
@@ -0,0 +1,67 @@
+## Current Release (${project.releaseVersion})

+

+<div class="alert alert-info">

+<h4>Update Note ${project.releaseVersion}</h4>

+Because there are now several types of files and folders that must be considered Gitblit data, the default location for data has changed.

+<p>You will need to move a few files around when upgrading.  Please see the Upgrading section of the <a href="setup.html">setup</a> page for details.</p>

+

+<b>Express Users</b> make sure to update your web.xml file with the ${baseFolder} values!

+</div>

+

+**downloads:** [GO Windows](%GCURL%gitblit-${project.releaseVersion}.zip) | [GO Linux/OSX](%GCURL%gitblit-${project.releaseVersion}.tar.gz) | [WAR](%GCURL%gitblit-${project.releaseVersion}.war) | [Express](%GCURL%express-${project.releaseVersion}.zip) | [Federatoin Client](%GCURL%fedclient-${project.releaseVersion}.zip) | [Gitblit Manager](%GCURL%manager-${project.releaseVersion}.zip) | [API Library](%GCURL%gbapi-${project.releaseVersion}.zip) &nbsp; *released ${project.releaseDate}*

+

+#### fixes

+

+- Fixed nullpointer on recursively calculating folder sizes when there is a named pipe or symlink in the hierarchy

+- Added nullchecking when concurrently forking a repository and trying to display it's fork network (issue-187)

+- Fixed bug where permission changes were not visible in the web ui to a logged-in user until the user logged-out and then logged back in again (issue-186)

+- Fixed nullpointer on creating a repository with mixed case (issue 185)

+- Include missing model classes in api library (issue-184)

+- Fixed nullpointer when using *web.allowForking = true* && *git.cacheRepositoryList = false* (issue 182)

+- Likely fix for commit and commitdiff page failures when a submodule reference changes (issue 178)

+- Build project models from the repository model cache, when possible, to reduce page load time (issue 172)

+- Fixed loading of Brazilian Portuguese translation from *nix server (github/inaiat)

+

+#### additions

+

+- Fanout PubSub service for self-hosted [Sparkleshare](http://sparkleshare.org) notifications.<br/>

+This service is disabled by default.<br/>

+    **New:** *fanout.bindInterface = localhost*<br/>

+	**New:** *fanout.port = 0*<br/>

+	**New:** *fanout.useNio = true*<br/>

+	**New:** *fanout.connectionLimit = 0*

+- Implemented a simple push log based on a hidden, orphan branch refs/gitblit/pushes (issue 177)<br/>

+The push log is not currently visible in the ui, but the data will be collected and it will be exposed to the ui in the next release.

+- Support for locally and remotely authenticated accounts in LdapUserService and RedmineUserService (issue 183)

+- Added Dutch translation (github/kwoot)

+

+#### changes

+

+- Gitblit GO and Gitblit WAR are now both configured by `gitblit.properties`. WAR is no longer configured by `web.xml`.<br/>

+However, Express for OpenShift continues to be configured by `web.xml`.

+- Support for a *--baseFolder* command-line argument for Gitblit GO and Gitblit Certificate Authority

+- Support for specifying a *${baseFolder}* parameter in `gitblit.properties` and `web.xml` for several settings

+- Improve history display of a submodule link

+- Updated Korean translation (github/ds5apn)

+- Updated checkstyle definition (github/mystygage)

+

+<div style="padding-top:20px;" />

+

+## Next Release (${project.version})

+

+<div class="alert alert-info">

+<h4>Update Note ${project.version}</h4>

+These are the fixes, changes, and additions queued for the next release.

+</div>

+

+#### fixes

+

+- Can't set reset settings with $ or { characters through Gitblit Manager because they are not properly escaped

+

+#### additions

+ 

+ - FogBugz post-receive hook script (github/djschny)

+ - Implemented multiple repository owners (github/akquinet)

+ - Chinese translation (github/dapengme, github/yin8086)

+

+[jgit]: http://eclipse.org/jgit "Eclipse JGit Site"

diff --git a/src/site/releasehistory.mkd b/src/site/releasehistory.mkd
new file mode 100644
index 00000000..7ea76766
--- /dev/null
+++ b/src/site/releasehistory.mkd
@@ -0,0 +1,488 @@
+## Older Releases

+

+<div class="alert alert-info">

+<h4>Update Note 1.2.0</h4>

+The permissions model has changed in the 1.2.0 release.

+<p>If you are updating your server, you must also update any Gitblit Manager and Federation Client installs to 1.2.0 as well.  The data model used by the RPC mechanism has changed slightly for the new permissions infrastructure.</p>

+</div>

+

+**1.2.0** *released 2012-12-31*

+

+#### fixes

+

+- Fixed regression in *isFrozen* (issue 181)

+- Author metrics can be broken by newlines in email addresses from converted repositories (issue 176)

+- Set subjectAlternativeName on generated SSL cert if CN is an ip address (issue 170)

+- Fixed incorrect links on history page for files not in the current/active commit (issue 166)

+- Empty repository page failed to handle missing repository (issue 160)

+- Fixed broken ticgit urls (issue 157)

+- Exclude submodules from zip downloads (issue 151)

+- Fixed bug where repository ownership was not updated on rename user

+- Fixed bug in create/rename repository if you explicitly specified the alias for the root group (e.g. main/myrepo) (issue 143)

+- Wrapped Markdown parser with improved exception handler (issue 142)

+- Fixed duplicate entries in repository cache (issue 140)

+- Fixed connection leak in LDAPUserService (issue 139)

+- Fixed bug in commit page where changes to a submodule threw a null pointer exception (issue 132)

+- Fixed bug in the diff view for filenames that have non-ASCII characters (issue 128)

+

+#### additions

+

+- Implemented discrete repository permissions (issue 36)

+    - V (view in web ui, RSS feeds, download zip)

+    - R (clone)

+    - RW (clone and push)

+    - RWC (clone and push with ref creation)

+    - RWD (clone and push with ref creation, deletion)

+    - RW+ (clone and push with ref creation, deletion, rewind)

+While not as sophisticated as Gitolite, this does give finer access controls.  These permissions fit in cleanly with the existing users.conf and users.properties files.  In Gitblit <= 1.1.0, all your existing user accounts have RW+ access.   If you are upgrading to 1.2.0, the RW+ access is *preserved* and you will have to lower/adjust accordingly.

+- Implemented *case-insensitive* regex repository permission matching (issue 36)<br/>

+This allows you to specify a permission like `RW:mygroup/.*` to grant push privileges to all repositories within the *mygroup* project/folder.

+- Added DELETE, CREATE, and NON-FAST-FORWARD ref change logging

+- Added support for personal repositories.<br/>

+Personal repositories can be created by accounts with the *create* permission and are stored in *git.repositoriesFolder/~username*.  Each user with personal repositories will have a user page, something like the GitHub profile page.  Personal repositories have all the same features as common repositories, except personal repositories can be renamed by their owner.

+- Added support for server-side forking of a repository to a personal repository (issue 137)<br/>

+In order to fork a repository, the user account must have the *fork* permission **and** the repository must *allow forks*.  The clone inherits the access list of its origin.  i.e. if Team A has clone access to the origin repository, then by default Team A also has clone access to the fork.  This is to facilitate collaboration.  The fork owner may change access to the fork and add/remove users/teams, etc as required <u>however</u> it should be noted that all personal forks will be enumerated in the fork network regardless of access view restrictions.  If you really must have an invisible fork, the clone it locally, create a new repository for your invisible fork, and push it back to Gitblit.<br/>

+    **New:** *web.allowForking=true*

+- Added optional *create-on-push* support<br/>

+    **New:** *git.allowCreateOnPush=true*

+- Added **experimental** JGit-based garbage collection service.  This service is disabled by default.<br/>

+    **New:** *git.allowGarbageCollection=false*<br/>

+    **New:** *git.garbageCollectionHour = 0*<br/>

+    **New:** *git.defaultGarbageCollectionThreshold = 500k*<br/>

+    **New:** *git.defaultGarbageCollectionPeriod = 7 days*

+- Added support for X509 client certificate authentication (github/kevinanderson1).  (issue 106)<br/>

+You can require all git servlet access be authenticated by a client certificate.  You may also specify the OID fingerprint to use for mapping a certificate to a username.  It should be noted that the user account MUST already exist in Gitblit for this authentication mechanism to work; this mechanism can not be used to automatically create user accounts from a certificate.<br/>

+    **New:** *git.requireClientCertificates = false*<br/>

+    **New:** *git.enforceCertificateValidity = true*<br/>

+    **New:** *git.certificateUsernameOIDs = CN*

+- Revised clean install certificate generation to create a Gitblit GO Certificate Authority certificate; an SSL certificate signed by the CA certificate; and to create distinct server key and server trust stores.  <u>The store files have been renamed!</u>

+- Added support for Gitblit GO to require usage of client certificates to access the entire server.<br/>

+This is extreme and should be considered carefully since it affects every https access.  The default is to **want** client certificates.  Setting this value to *true* changes that to **need** client certificates.<br/>

+    **New:** *server.requireClientCertificates = false*

+- Added **Gitblit Certificate Authority**, an x509 PKI management tool for Gitblit GO to encourage use of x509 client certificate authentication.

+- Added setting to control length of shortened commit ids<br/>

+    **New:** *web.shortCommitIdLength=8*

+- Added alternate compressed download formats: tar.gz, tar.xz, tar.bzip2 (issue 174)<br/>

+    **New:** *web.compressedDownloads = zip gz*

+- Added simple project pages.  A project is a subfolder off the *git.repositoriesFolder*.

+- Added support for X-Forwarded-Context for Apache subdomain proxy configurations (issue 135)

+- Delete branch feature (issue 121, Github/ajermakovics)

+- Added line links to blob view (issue 130)

+- Added HTML sendmail hook script and Gitblit.sendHtmlMail method (github/sauthieg)

+- Added RedmineUserService (github/mallowlabs)

+- Support for committer verification.  Requires use of *--no-ff* when merging branches or pull requests.  See setup page for details.

+- Added Brazilian Portuguese translation (github/rafaelcavazin)

+

+#### changes

+

+- Added server setting to specify keystore alias for ssl certificate (issue 98)

+- Added optional global and per-repository activity page commit contribution throttle to help tame *really* active repositories (issue 173)

+- Added support for symlinks in tree page and commit page (issue 171)

+- All access restricted servlets (e.g. DownloadZip, RSS, etc) will try to authenticate using X509 certificates, container principals, cookies, and BASIC headers, in that order.

+- Added *groovy* and *scala* to *web.prettyPrintExtensions*

+- Added short commit id column to log and history tables (issue 168)

+- Teams can now specify the *admin*, *create*, and *fork* roles to simplify user administration

+- Use https Gravatar urls to avoid browser complaints

+- Added frm to default pretty print extensions (issue 156)

+- Expose ReceivePack to Groovy push hooks (issue 125)

+- Redirect to summary page when refreshing the empty repository page on a repository that is not empty (issue 129)

+- Emit a warning in the log file if running on a Tomcat-based servlet container which is unfriendly to %2F forward-slash url encoding AND Gitblit is configured to mount parameters with %2F forward-slash url encoding (Github/jpyeron, issue 126)

+- LDAP admin attribute setting is now consistent with LDAP teams setting and admin teams list.

+If *realm.ldap.maintainTeams==true* **AND** *realm.ldap.admins* is not empty, then User.canAdmin() is controlled by LDAP administrative team membership.  Otherwise, User.canAdmin() is controlled by Gitblit.

+- Support servlet container authentication for existing UserModels (issue 68)

+

+#### dependency changes

+

+- updated to Jetty 7.6.8

+- updated to JGit 2.2.0.201212191850-r

+- updated to Groovy 1.8.8

+- updated to Wicket 1.4.21

+- updated to Lucene 3.6.1

+- updated to BouncyCastle 1.47

+- updated to MarkdownPapers 1.3.2

+- added JCalendar 1.3.2

+- added Commons-Compress 1.4.1

+- added XZ for Java 1.0

+<hr/>

+

+<div class="alert alert-error">

+<h4>Update Note 1.1.0</h4>

+If you are updating from an earlier release AND you have indexed branches with the Lucene indexing feature, you need to be aware that this release will completely re-index your repositories.  Please be sure to provide ample heap resources as appropriate for your installation.

+</div>

+

+**1.1.0** *released 2012-08-25*

+

+#### fixes

+

+- Bypass Wicket's inability to handle direct url addressing of a view-restricted, grouped repository for new, unauthenticated sessions (e.g. click link from email or rss feed without having an active Wicket session)

+- Fixed MailExecutor's failure to cope with mail server connection troubles resulting in 100% CPU usage

+- Fixed generated urls in Groovy *sendmail* hook script for grouped repositories

+- Fixed generated urls in RSS feeds for grouped repositories

+- Fixed nullpointer exception in git servlet security filter (issue 123)

+- Eliminated an unnecessary repository enumeration call on the root page which should result in faster page loads (issue 103)

+- Gitblit could not delete a Lucene index in a working copy on index upgrade

+- Do not index submodule links (issue 119)

+- Restore original user or team object on failure to update (issue 118)

+- Fixes to relative path determination in repository search algorithm for symlinks (issue 116)

+- Fix to GitServlet to allow pushing to symlinked repositories (issue 116)

+- Repository URL now uses `X-Forwarded-Proto` and `X-Forwarded-Port`, if available, for reverse proxy configurations (issue 115)

+- Output real RAW content, not simulated RAW content (issue 114)

+- Fixed Lucene charset encoding bug when reindexing a repository (issue 112)

+- Fixed search box linking to Lucene page for grouped repository on Tomcat (issue 111)

+- Fixed null pointer in LdapUserSerivce if account has a null email address (issue 110)

+- Really fixed failure to update a GO setting from the manager (issue 85)

+

+#### additions

+

+- Identified repository list is now cached by default to reduce disk io and to improve performance (issue 103)<br/>

+    **New:** *git.cacheRepositoryList=true*

+- Preliminary bare repository submodule support<br/>

+    **New:** *git.submoduleUrlPatterns=*

+    - *git.submoduleUrlPatterns* is a space-delimited list of regular expressions for extracting a repository name from a submodule url.<br/>

+    For example, `git.submoduleUrlPatterns = .*?://github.com/(.*)` would extract *gitblit/gitblit.git* from *git://github.git/gitblit/gitblit.git*<br/>

+    **Note:** You may not need this control to work with submodules, but it is there if you do.

+    - If there are no matches from *git.submoduleUrlPatterns* then the repository name is assumed to be whatever comes after the last `/` character *(e.g. gitblit.git)*

+    - Gitblit will try to locate this repository relative to the current repository *(e.g. myfolder/myrepo.git, myfolder/mysubmodule.git)* and then at the root level *(mysubmodule.git)* if that fails.

+    - Submodule references in a working copy will be properly identified as gitlinks, but Gitblit will not traverse into the working copy submodule repository.

+- Added a repository setting to control authorization as AUTHENTICATED or NAMED. (issue 117)<br/>

+NAMED is the original behavior for authorizing against a list of permitted users or permitted teams.

+AUTHENTICATED allows restricted access for any authenticated user.  This is a looser authorization control.

+- Added default authorization control setting (AUTHENTICATED or NAMED)<br/>

+    **New:** *git.defaultAuthorizationControl=NAMED*

+- Added setting to control how deep Gitblit will recurse into *git.repositoriesFolder* looking for repositories (issue 103)<br/>

+    **New:** *git.searchRecursionDepth=-1*

+- Added setting to specify regex exclusions for repositories (issue 103)<br/>

+    **New:** *git.searchExclusions=*

+- Blob page now supports displaying images (issue 6)

+- Non-image binary files can now be downloaded using the RAW link

+- Support StartTLS in LdapUserService (Steffen Gebert, issue 122)

+- Added Korean translation

+

+#### changes

+

+- Line breaks inserted for readability in raw Markdown content display in the event of a parsing/transformation error.  An error message is now displayed prepended to the raw content.

+- Improve UTF-8 reading for Markdown files

+- Updated Polish translation

+- Updated Japanese translation

+- Updated Spanish translation

+

+<hr/>

+

+**1.0.0** *released 2012-07-14*

+

+#### fixes

+

+- Fixed bug in Lucene search where old/stale blobs were never properly deleted during incremental updates.  This resulted in duplicate blob entries in the index.

+- Fixed intermittent bug in identifying line numbers in Lucene search (issue 105)

+- Adjust repository identification algorithm to handle the scenario where a repository name collides with a group/folder name (e.g. foo.git and foo/bar.git) (issue 104)

+- Fixed bug where a repository set as *authenticated push* did not have anonymous clone access (issue 96)

+- Fixed bug in Basic authentication if passwords had a colon (Github/peterloron)

+- Fixed bug where the Gitblit Manager could not update a setting that was not referenced in reference.properties (issue 85)

+

+#### changes

+

+- **Updated Lucene index version which will force a rebuild of ALL your Lucene indexes**<br/>

+Make sure to properly set *web.blobEncodings* before starting Gitblit if you are updating!  (issue 97)

+- Changed default layout for web ui from Fixed-Width layout to Responsive layout (issue 101)

+- IUserService interface has changed to better accomodate custom authentication and/or custom authorization<br/>

+    The default `users.conf` now supports persisting display names and email addresses.

+- Updated Japanese translation (Github/zakki)

+

+#### additions

+

+- Added setting to allow specification of a robots.txt file (issue 99)<br/>

+    **New:** *web.robots.txt =*

+- Added setting to control Responsive layout or Fixed-Width layout (issue 101)<br/>

+    Responsive layout is now the default.  This layout gracefully scales the web ui from a desktop layout to a mobile layout by hiding page components.  It is easy to try, just resize your browser or point your Android/iOS device to the url of your Gitblit install.

+    **New:** *web.useResponsiveLayout = true*

+- Added setting to control charsets for blob string decoding.  Default encodings are UTF-8, ISO-8859-1, and server's default charset. (issue 97)<br/>

+    **New:** *web.blobEncodings = UTF-8 ISO-8859-1*

+- Exposed JGit's internal configuration settings in gitblit.properties/web.xml (issue 93)<br/>

+    Review your `gitblit.properties` or `web.xml` for detailed explanations of these settings.<br/>

+    **New:** *git.packedGitWindowSize = 8k*<br/>

+    **New:** *git.packedGitLimit = 10m*<br/>

+    **New:** *git.deltaBaseCacheLimit = 10m*<br/>

+    **New:** *git.packedGitOpenFiles = 128*<br/>

+    **New:** *git.streamFileThreshold = 50m*<br/>

+    **New:** *git.packedGitMmap = false*

+- Added default access restriction.  Applies to new repositories and repositories that have not been configured with Gitblit. (issue 88)<br/>

+    **New:** *git.defaultAccessRestriction = NONE*

+- Added Ivy 2.2.0 dependency which enables Groovy Grapes, a mechanism to resolve and retrieve library dependencies from a Maven 2 repository within a Groovy push hook script

+- Added setting to control Groovy Grape root folder (location where resolved dependencies are stored)<br/>

+    [Grape](http://groovy.codehaus.org/Grape) allows you to add Maven dependencies to your pre-/post-receive hook script classpath.<br/>

+    **New:** *groovy.grapeFolder = groovy/grape*

+- Added LDAP User Service with many new *realm.ldap* keys (Github/jcrygier)

+- Added support for custom repository properties for Groovy hooks (Github/jcrygier)<br/>

+    Custom repository properties complement hook scripts by providing text field prompts in the web ui and the Gitblit Manager for the defined properties.  This allows your push hooks to be parameterized.

+- Added script to facilitate proxy environment setup on Linux (Github/mragab)

+- Added Polish translation (Lukasz Jader)

+- Added Spanish translation (Eduardo Guervos Narvaez)

+

+#### dependency changes

+

+- updated to Bootstrap 2.0.4

+- updated to JGit 2.0.0.201206130900-r

+- updated to Groovy 1.8.6

+- updated to Gson 1.7.2

+- updated to Log4J 1.2.17

+- updated to SLF4J 1.6.6

+- updated to Apache Commons Daemon 1.0.10

+- added Ivy 2.2.0

+

+<hr/>

+

+**0.9.3** *released 2012-04-11*

+

+#### fixes

+

+- Fixed bug where you could not remove all selections from a RepositoryModel list (permitted users, permitted teams, hook scripts, federation sets, etc) (issue 81)

+- Automatically set *java.awt.headless=true* for Gitblit GO

+

+<hr/>

+

+**0.9.2** *released 2012-04-04*

+

+#### changes

+

+- Added *clientLogger* bound variable to Groovy hook mechanism to allow custom info and error messages to be returned to the client (Github/jcrygier)

+

+#### fixes

+

+- Fixed absolute path/canonical path discrepancy between Gitblit and JGit regarding use of symlinks (issue 78)

+- Fixed row layout on activity page (issue 79)

+- Fixed Centos service script (Github/mohamedmansour)

+- Fixed EditRepositoryPage for IE8; missing save button (issue 80, Github/jonnybbb)

+

+<hr/>

+

+**0.9.1** *released 2012-03-27*

+

+#### fixes

+

+- Lucene folder was stored in working copy instead of in .git folder

+

+<hr/>

+

+**0.9.0** *released 2012-03-27*

+

+#### security

+

+- Fixed session fixation vulnerability where the session identifier was not reset during the login process (issue 62)

+

+#### changes

+

+- Reject pushes to a repository with a working copy (i.e. non-bare repository) (issue-49)

+- Changed default web.datetimestampLongFormat from *EEEE, MMMM d, yyyy h:mm a z* to *EEEE, MMMM d, yyyy HH:mm Z* (issue 50)

+- Expanded commit age coloring from 2 days to 30 days (issue 57)

+

+#### additions

+

+- Added optional Lucene branch indexing (issue 16)<br/>

+    **New:** *web.allowLuceneIndexing = true*<br/>

+    **New:** *web.luceneIgnoreExtensions = 7z arc arj bin bmp dll doc docx exe gif gz jar jpg lib lzh odg odf odt pdf ppt png so swf xcf xls xlsx zip*

+Repository branches may be optionally indexed by Lucene for improved searching.  To use this feature you must specify which branches to index within the *Edit Repository* page; _no repositories are automatically indexed_.  Gitblit will build or incrementally update enrolled repositories on a 2 minute cycle. (i.e you will have to wait 2-3 minutes after respecifying indexed branches or pushing new commits before Gitblit will build/update the repository's Lucene index.)

+If a repository has Lucene-indexed branches the *search* form on the repository pages will redirect to the root-level Lucene search page and only the content of those branches can be searched.<br/>

+If the repository does not specify any indexed branches then repository commit-traversal search is used.

+**Note:** Initial indexing of an existing repository can be memory-exhaustive. Be sure to provide your Gitblit server adequate heap space to index your repositories (e.g. -Xmx1024M).<br/>

+See the [setup](setup.html) page for additional details.

+- Allow specifying timezone to use for Gitblit which is independent of both the JVM and the system timezone (issue 54)<br/>

+    **New:** *web.timezone =*

+- Added a built-in AJP connector for integrating Gitblit GO into an Apache mod_proxy setup (issue 59)<br/>

+    **New:** *server.ajpPort = 0*<br/>

+    **New:** *server.ajpBindInterface = localhost*

+- On the Repositories page show a bang *!* character in the color swatch of a repository with a working copy (issue 49)<br/>

+Push requests to these repositories will be rejected.

+- On all non-bare Repository pages show *WORKING COPY* in the upper right corner (issue 49)

+- New setting to prevent display/serving non-bare repositories<br/>

+    **New:** *git.onlyAccessBareRepositories = false*

+- Added *protect-refs.groovy* (Github/plm)

+- Allow setting default branch (relinking HEAD) to a branch or a tag (Github/plm)

+- Added Ubuntu service init script (issue 72)

+- Added partial Japanese translation (Github/zakki)

+

+#### fixes

+

+- Ensure that Welcome message is parsed using UTF-8 encoding (issue 74)

+- Activity page chart layout broken by Google (issue 73)

+- Uppercase repositories not selectable in edit palettes (issue 71)

+- Not all git notes were properly displayed on the commit page (issue 70)

+- Activity page now displays all local branches (issue 65)

+- Fixed (harmless) nullpointer on pushing to an empty repository (issue 69)

+- Fixed possible nullpointer from the servlet container on startup (issue 67)

+- Fixed UTF-8 encoding bug on diff page (issue 66)

+- Fixed timezone bugs on the activity page (issue 54)

+- Prevent add/edit team with no selected repositories (issue 56)

+- Disallow browser autocomplete on add/edit user/team/repository pages

+- Fixed username case-sensitivity issues (issue 43)

+- Disregard searching a subfolder if Gitblit does not have filesystem permissions (Github/lemval issue 51)

+

+#### dependency changes

+

+- updated to Bootstrap 2.0.2

+- added GLYPHICONS (as bundled with Bootstrap 2.0.2)

+- updated to MarkdownPapers 1.2.7

+- updated to JGit 1.3.0.201202151440-r

+- updated to Wicket 1.4.20

+

+<hr/>

+

+**0.8.2** ([go](http://code.google.com/p/gitblit/downloads/detail?name=gitblit-0.8.2.zip) | [war](http://code.google.com/p/gitblit/downloads/detail?name=gitblit-0.8.2.war) | [express](http://code.google.com/p/gitblit/downloads/detail?name=express-0.8.2.zip) | [fedclient](http://code.google.com/p/gitblit/downloads/detail?name=fedclient-0.8.2.zip) | [manager](http://code.google.com/p/gitblit/downloads/detail?name=manager-0.8.2.zip) | [api](http://code.google.com/p/gitblit/downloads/detail?name=gbapi-0.8.2.zip)) based on [JGit 1.2.0 (201112221803-r)][jgit] &nbsp; *released 2012-01-13*

+

+#### fixes

+

+- Fixed bug when upgrading from users.properties to users.conf (issue 41)

+

+<hr/>

+

+**0.8.1** &nbsp; *released 2012-01-11*

+

+#### fixes

+

+- Include missing icon resource for the manager (issue 40)

+- Fixed sendmail.groovy message content with incorrect tag/branch labels

+

+<hr/>

+

+**0.8.0** &nbsp; *released 2012-01-11*

+

+#### additions

+

+- Platform-independent, Groovy push hook script mechanism.<br/>

+Hook scripts can be set per-repository, per-team, or globally for all repositories.<br/>

+    **New:** *groovy.scriptsFolder = groovy*<br/>

+    **New:** *groovy.preReceiveScripts =*<br/>

+    **New:** *groovy.postReceiveScripts =*

+- *sendmail.groovy* for optional email notifications on push.<br/>

+You must properly configure your SMTP server settings in `gitblit.properties` or `web.xml` to use *sendmail.groovy*.

+- New global key for mailing lists.  This is used in conjunction with the *sendmail.groovy* hook script.  All repositories that use the *sendmail.groovy* script will include these addresses in the notification process.  Please see the Setup page for more details about configuring sendmail.<br/>

+    **New:** *mail.mailingLists =*

+- *com.gitblit.GitblitUserService*.  This is a wrapper object for the built-in user service implementations.  For those wanting to only implement custom authentication it is recommended to subclass GitblitUserService and override the appropriate methods.  Going forward, this will help insulate custom authentication from new IUserService API and/or changes in model classes.

+- New default user service implementation: *com.gitblit.ConfigUserService* (`users.conf`)<br/>

+This user service implementation allows for serialization and deserialization of more sophisticated Gitblit User objects without requiring the encoding trickery now present in FileUserService (users.properties).  This will open the door for more advanced Gitblit features.

+For those upgrading from an earlier Gitblit version, a `users.conf` file will automatically be created for you from your existing `users.properties` file on your first launch of Gitblit <u>however</u> you will have to manually set *realm.userService=users.conf* to switch to the new user service.<br/>

+The original `users.properties` file and it's corresponding implementation are **deprecated**.<br/>

+    **New:** *realm.userService = users.conf*

+- Teams for specifying user-repository access in bulk.  Teams may also specify mailing lists addresses and pre- & post- receive hook scripts.

+- Gravatar integration<br/>

+    **New:** *web.allowGravatar = true*

+- Activity page for aggregated repository activity.  This is a timeline of commit activity over the last N days for one or more repositories.<br/>

+   **New:** *web.activityDuration = 14*<br/>

+   **New:** *web.timeFormat = HH:mm*<br/>

+   **New:** *web.datestampLongFormat = EEEE, MMMM d, yyyy*

+- *Filters* menu for the Repositories page and Activity page.  You can filter by federation set, team, and simple custom regular expressions.  Custom expressions can be stored in `gitblit.properties` or `web.xml` or directly defined in your url (issue 27)<br/>

+   **New:** *web.customFilters=*

+- Flash-based 1-step *copy to clipboard* of the primary repository url based on Clippy<br/>

+   **New:** *web.allowFlashCopyToClipboard = true*

+- JavaScript-based 3-step (click, ctrl+c, enter) *copy to clipboard* of the primary repository url in the event that you do not want to use Flash on your installation

+- Empty repositories now link to an *empty repository* page which gives some direction to the user for the next step in using Gitblit.  This page displays the primary push/clone url of the repository and gives sample syntax for the git command-line client. (issue 31)

+- Repositories with a *gh-pages* branch will now have a *pages* link which will serve the content of this branch.  All resource requests are against the repository, Gitblit does not checkout/export this branch to a temporary filesystem.  Jekyll templating is not supported.

+- Gitblit Express bundle to get started running Gitblit on RedHat's OpenShift cloud <span class="label label-warning">BETA</span>

+

+#### changes

+

+- Dropped display of trailing .git from repository names

+- Gitblit GO is now monolithic like the WAR build. (issue 30)<br/>

+This change helps adoption of GO in environments without an internet connection or with a restricted connection.

+- Unit testing framework has been migrated to JUnit4 syntax and the test suite has been redesigned to run all unit tests, including rpc, federation, and git push/clone tests

+

+#### fixes

+

+- Several a bugs in FileUserService related to cleaning up old repository permissions on a rename or delete

+- Renaming a repository into a new subfolder failed (issue 33)

+

+#### dependency changes

+

+- updated to JGit 1.2.0

+- added Groovy 1.8.5

+- added Clippy (bundled)

+

+<hr/>

+

+**0.7.0** &nbsp; *released 2011-11-11*

+

+- **security**: fixed security hole when cloning clone-restricted repository with TortoiseGit (issue 28)

+- improved: updated ui with Twitter's Bootstrap CSS toolkit<br/>

+    **New:** *web.loginMessage = gitblit*

+- improved: repositories list performance by caching repository sizes (issue 27)

+- improved: summary page performance by caching metric calculations (issue 25)

+- added: authenticated JSON RPC mechanism<br/>

+    **New:** *web.enableRpcServlet = true*<br/>

+    **New:** *web.enableRpcManagement = false*<br/>

+    **New:** *web.enableRpcAdministration = false*

+- added: Gitblit API RSS/JSON RPC library

+- added: Gitblit Manager (Java/Swing Application) for remote administration of a Gitblit server.

+- added: per-repository setting to skip size calculation (faster repositories page loading)

+- added: per-repository setting to skip summary metrics calculation (faster summary page loading)

+- added: IUserService.setup(IStoredSettings) for custom user service implementations

+- added: setting to control Gitblit GO context path for proxy setups *(Github/trygvis)*<br/>

+    **New:** *server.contextPath = /*

+- added: *combined-md5* password storage option which stores the hash of username+password as the password *(Github/alyandon)*

+- added: repository owners are automatically granted access for git, feeds, and zip downloads without explicitly selecting them *(Github/dadalar)*

+- added: RSS feeds now include regex substitutions on commit messages for bug trackers, etc

+- fixed: federation protocol timestamps.  dates are now serialized to the [iso8601](http://en.wikipedia.org/wiki/ISO_8601) standard.<br/>

+    **This breaks 0.6.0 federation clients/servers.**

+- fixed: collision on rename for repositories and users

+- fixed: Gitblit can now browse the Linux kernel repository (issue 25)

+- fixed: Gitblit now runs on Servlet 3.0 webservers (e.g. Tomcat 7, Jetty 8) (issue 23)

+- fixed: Set the RSS content type of syndication feeds for Firefox 4 (issue 22)

+- fixed: RSS feeds are now properly encoded to UTF-8

+- fixed: RSS feeds now properly generate parameterized links if *web.mountParameters=false*

+- fixed: Null pointer exception if did not set federation strategy (issue 20)

+- fixed: Gitblit GO allows SSL renegotiation if running on Java 1.6.0_22 or later

+- updated: MarkdownPapers 1.2.5

+- updated: Wicket 1.4.19

+

+<hr/>

+

+**0.6.0** &nbsp; *released 2011-09-27*

+

+- added: federation feature to allow gitblit instances (or gitblit federation clients) to pull repositories and, optionally, settings and accounts from other gitblit instances.  This is something like [svn-sync](http://svnbook.red-bean.com/en/1.5/svn.ref.svnsync.html) for gitblit.<br/>

+    **New:** *federation.name =*<br/>

+    **New:** *federation.passphrase =*<br/>

+    **New:** *federation.allowProposals = false*<br/>

+    **New:** *federation.proposalsFolder = proposals*<br/>

+    **New:** *federation.defaultFrequency = 60 mins*<br/>

+    **New:** *federation.sets =*<br/>

+    **New:** *mail.* settings for sending emails<br/>

+    **New:** user role *#notfederated* to prevent a user account from being pulled by a federated Gitblit instance

+- added: google-gson dependency

+- added: javamail dependency

+- updated: MarkdownPapers 1.1.1

+- updated: Wicket 1.4.18

+- updated: JGit 1.1.0

+- fixed: syndication urls for WAR deployments

+- fixed: authentication for zip downloads

+

+<hr/>

+

+**0.5.2** &nbsp; *released 2011-07-27*

+

+- fixed: active repositories with a HEAD that pointed to an empty branch caused internal errors (issue 14)

+- fixed: bare-cloned repositories were listed as (empty) and were not clickable (issue 13)

+- fixed: default port for Gitblit GO is now 8443 to be more linux/os x friendly (issue 12)

+- fixed: repositories can now be reliably deleted and renamed (issue 10)

+- fixed: users can now change their passwords (issue 1)

+- fixed: always show root repository group first, i.e. don't sort root group with other groups

+- fixed: tone-down repository group header color

+- added: optionally display repository on-disk size on repositories page<br/>

+    **New:** *web.showRepositorySizes = true*

+- added: forward-slashes ('/', %2F) can be encoded using a custom character to workaround some servlet container default security measures for proxy servers<br/>

+    **New:** *web.forwardSlashCharacter = /*

+- updated: MarkdownPapers 1.1.0

+- updated: Jetty 7.4.3

+

+<hr/>

+

+**0.5.1** &nbsp; *released 2011-06-28*

+

+- clarified SSL certificate generation and configuration for both server-side and client-side

+- added some more troubleshooting information to documentation

+- replaced JavaService with Apache Commons Daemon

+

+<hr/>

+

+**0.5.0** &nbsp; *released 2011-06-26*

+

+- initial release

+

+[jgit]: http://eclipse.org/jgit "Eclipse JGit Site"

diff --git a/docs/04_releases.mkd b/src/site/releases.mkd
index 7dd6b174..7dd6b174 100644
--- a/docs/04_releases.mkd
+++ b/src/site/releases.mkd
diff --git a/docs/architecture.png b/src/site/resources/architecture.png
index c6bae52c..c6bae52c 100644
--- a/docs/architecture.png
+++ b/src/site/resources/architecture.png
diff --git a/docs/fed_aggregation.png b/src/site/resources/fed_aggregation.png
index 556d1e47..556d1e47 100644
--- a/docs/fed_aggregation.png
+++ b/src/site/resources/fed_aggregation.png
diff --git a/docs/fed_mirror.png b/src/site/resources/fed_mirror.png
index 3ad238e6..3ad238e6 100644
--- a/docs/fed_mirror.png
+++ b/src/site/resources/fed_mirror.png
diff --git a/docs/ldapSample.png b/src/site/resources/ldapSample.png
index fd8c999a..fd8c999a 100644
--- a/docs/ldapSample.png
+++ b/src/site/resources/ldapSample.png
diff --git a/docs/permissions_matrix.png b/src/site/resources/permissions_matrix.png
index d463ae11..d463ae11 100644
--- a/docs/permissions_matrix.png
+++ b/src/site/resources/permissions_matrix.png
diff --git a/docs/screenshots.js b/src/site/resources/screenshots.js
index c007e6e1..c007e6e1 100644
--- a/docs/screenshots.js
+++ b/src/site/resources/screenshots.js
diff --git a/docs/stjude_150x150.gif b/src/site/resources/stjude_150x150.gif
index 378ab727..378ab727 100644
--- a/docs/stjude_150x150.gif
+++ b/src/site/resources/stjude_150x150.gif
diff --git a/docs/05_roadmap.mkd b/src/site/roadmap.mkd
index 4ac9b478..4ac9b478 100644
--- a/docs/05_roadmap.mkd
+++ b/src/site/roadmap.mkd
diff --git a/docs/02_rpc.mkd b/src/site/rpc.mkd
index 35528bfc..35528bfc 100644
--- a/docs/02_rpc.mkd
+++ b/src/site/rpc.mkd
diff --git a/docs/01_screenshots.mkd b/src/site/screenshots.mkd
index 74f67420..b18408af 100644
--- a/docs/01_screenshots.mkd
+++ b/src/site/screenshots.mkd
@@ -135,4 +135,9 @@
 	<a class="thumbnail" rel="screenshots_group" href="screenshots/m10.png" title="Edit User Dialog"><img alt="Edit User Dialog" src="thumbs/m10.png" /></a>

 	<h5>Edit User Dialog</h5>

 </li>

-</ul>
\ No newline at end of file
+</ul>

+

+<script type="text/javascript" src="./fancybox/jquery.mousewheel-3.0.4.pack.js"> </script>

+<script type="text/javascript" src="./fancybox/jquery.fancybox-1.3.4.pack.js"> </script>

+<link rel="stylesheet" type="text/css" href="./fancybox/jquery.fancybox-1.3.4.css" media="screen" />

+<script type="text/javascript" src="./screenshots.js"> </script>	

diff --git a/docs/screenshots/00.png b/src/site/screenshots/00.png
index b022dd33..b022dd33 100644
--- a/docs/screenshots/00.png
+++ b/src/site/screenshots/00.png
diff --git a/docs/screenshots/00b.png b/src/site/screenshots/00b.png
index 2ad60096..2ad60096 100644
--- a/docs/screenshots/00b.png
+++ b/src/site/screenshots/00b.png
diff --git a/docs/screenshots/00c.png b/src/site/screenshots/00c.png
index 06f4cb8f..06f4cb8f 100644
--- a/docs/screenshots/00c.png
+++ b/src/site/screenshots/00c.png
diff --git a/docs/screenshots/00d.png b/src/site/screenshots/00d.png
index 29c3a07c..29c3a07c 100644
--- a/docs/screenshots/00d.png
+++ b/src/site/screenshots/00d.png
diff --git a/docs/screenshots/01.png b/src/site/screenshots/01.png
index 31fe8372..31fe8372 100644
--- a/docs/screenshots/01.png
+++ b/src/site/screenshots/01.png
diff --git a/docs/screenshots/01b.png b/src/site/screenshots/01b.png
index ca601648..ca601648 100644
--- a/docs/screenshots/01b.png
+++ b/src/site/screenshots/01b.png
diff --git a/docs/screenshots/01c.png b/src/site/screenshots/01c.png
index b483d5c1..b483d5c1 100644
--- a/docs/screenshots/01c.png
+++ b/src/site/screenshots/01c.png
diff --git a/docs/screenshots/02.png b/src/site/screenshots/02.png
index 930be2d0..930be2d0 100644
--- a/docs/screenshots/02.png
+++ b/src/site/screenshots/02.png
diff --git a/docs/screenshots/03.png b/src/site/screenshots/03.png
index fe18ed06..fe18ed06 100644
--- a/docs/screenshots/03.png
+++ b/src/site/screenshots/03.png
diff --git a/docs/screenshots/04.png b/src/site/screenshots/04.png
index 06450bb3..06450bb3 100644
--- a/docs/screenshots/04.png
+++ b/src/site/screenshots/04.png
diff --git a/docs/screenshots/05.png b/src/site/screenshots/05.png
index 8a83cbe2..8a83cbe2 100644
--- a/docs/screenshots/05.png
+++ b/src/site/screenshots/05.png
diff --git a/docs/screenshots/06.png b/src/site/screenshots/06.png
index 7e4b3d03..7e4b3d03 100644
--- a/docs/screenshots/06.png
+++ b/src/site/screenshots/06.png
diff --git a/docs/screenshots/07.png b/src/site/screenshots/07.png
index 77624ea6..77624ea6 100644
--- a/docs/screenshots/07.png
+++ b/src/site/screenshots/07.png
diff --git a/docs/screenshots/08.png b/src/site/screenshots/08.png
index b1d561b3..b1d561b3 100644
--- a/docs/screenshots/08.png
+++ b/src/site/screenshots/08.png
diff --git a/docs/screenshots/09.png b/src/site/screenshots/09.png
index 3f6402bb..3f6402bb 100644
--- a/docs/screenshots/09.png
+++ b/src/site/screenshots/09.png
diff --git a/docs/screenshots/10.png b/src/site/screenshots/10.png
index e57bd01d..e57bd01d 100644
--- a/docs/screenshots/10.png
+++ b/src/site/screenshots/10.png
diff --git a/docs/screenshots/11.png b/src/site/screenshots/11.png
index 3da4531a..3da4531a 100644
--- a/docs/screenshots/11.png
+++ b/src/site/screenshots/11.png
diff --git a/docs/screenshots/12.png b/src/site/screenshots/12.png
index 5ccba882..5ccba882 100644
--- a/docs/screenshots/12.png
+++ b/src/site/screenshots/12.png
diff --git a/docs/screenshots/13.png b/src/site/screenshots/13.png
index 53c3f0ad..53c3f0ad 100644
--- a/docs/screenshots/13.png
+++ b/src/site/screenshots/13.png
diff --git a/docs/screenshots/14.png b/src/site/screenshots/14.png
index d8b6de8f..d8b6de8f 100644
--- a/docs/screenshots/14.png
+++ b/src/site/screenshots/14.png
diff --git a/docs/screenshots/15.png b/src/site/screenshots/15.png
index 583d8750..583d8750 100644
--- a/docs/screenshots/15.png
+++ b/src/site/screenshots/15.png
diff --git a/docs/screenshots/image_processing.txt b/src/site/screenshots/image_processing.txt
index d034062c..d034062c 100644
--- a/docs/screenshots/image_processing.txt
+++ b/src/site/screenshots/image_processing.txt
diff --git a/docs/screenshots/m00.png b/src/site/screenshots/m00.png
index 73e64062..73e64062 100644
--- a/docs/screenshots/m00.png
+++ b/src/site/screenshots/m00.png
diff --git a/docs/screenshots/m01.png b/src/site/screenshots/m01.png
index ed1a2e45..ed1a2e45 100644
--- a/docs/screenshots/m01.png
+++ b/src/site/screenshots/m01.png
diff --git a/docs/screenshots/m02.png b/src/site/screenshots/m02.png
index 53716fca..53716fca 100644
--- a/docs/screenshots/m02.png
+++ b/src/site/screenshots/m02.png
diff --git a/docs/screenshots/m03.png b/src/site/screenshots/m03.png
index a7e2a49d..a7e2a49d 100644
--- a/docs/screenshots/m03.png
+++ b/src/site/screenshots/m03.png
diff --git a/docs/screenshots/m04.png b/src/site/screenshots/m04.png
index 85b4a1dd..85b4a1dd 100644
--- a/docs/screenshots/m04.png
+++ b/src/site/screenshots/m04.png
diff --git a/docs/screenshots/m05.png b/src/site/screenshots/m05.png
index e9cc8246..e9cc8246 100644
--- a/docs/screenshots/m05.png
+++ b/src/site/screenshots/m05.png
diff --git a/docs/screenshots/m06.png b/src/site/screenshots/m06.png
index b616efa2..b616efa2 100644
--- a/docs/screenshots/m06.png
+++ b/src/site/screenshots/m06.png
diff --git a/docs/screenshots/m07.png b/src/site/screenshots/m07.png
index 397439c1..397439c1 100644
--- a/docs/screenshots/m07.png
+++ b/src/site/screenshots/m07.png
diff --git a/docs/screenshots/m08.png b/src/site/screenshots/m08.png
index 808a1140..808a1140 100644
--- a/docs/screenshots/m08.png
+++ b/src/site/screenshots/m08.png
diff --git a/docs/screenshots/m09.png b/src/site/screenshots/m09.png
index 84fa9602..84fa9602 100644
--- a/docs/screenshots/m09.png
+++ b/src/site/screenshots/m09.png
diff --git a/docs/screenshots/m10.png b/src/site/screenshots/m10.png
index 6529ef49..6529ef49 100644
--- a/docs/screenshots/m10.png
+++ b/src/site/screenshots/m10.png
diff --git a/docs/01_setup.mkd b/src/site/setup.mkd
index a7f75264..34078930 100644
--- a/docs/01_setup.mkd
+++ b/src/site/setup.mkd
@@ -1,6 +1,6 @@
 ## Gitblit WAR Installation & Setup

 

-1. Download [Gitblit WAR %VERSION%](http://code.google.com/p/gitblit/downloads/detail?name=%WAR%) to the webapps folder of your servlet container.  

+1. Download [Gitblit WAR ${project.releaseVersion}](%GCURL%gitblit-${project.releaseVersion}.war) to the webapps folder of your servlet container.  

 2. You may have to manually extract the WAR (zip file) to a folder within your webapps folder.

 3. By default, the Gitblit webapp is configured through `WEB-INF/data/gitblit.properties`.<br/>

 Open `WEB-INF/data/gitblit.properties` in your favorite text editor and make sure to review and set:

@@ -20,7 +20,7 @@ Specifying an alternate *baseFolder* also allows for simpler upgrades in the fut
 

 ## Gitblit GO Installation & Setup

 

-1. Download and unzip [Gitblit GO %VERSION%](http://code.google.com/p/gitblit/downloads/detail?name=%GO%).  

+1. Download and unzip [Gitblit GO ${project.releaseVersion}](%GCURL%gitblit-${project.releaseVersion}.zip).  

 *Its best to eliminate spaces in the path name.* 

 2. The server itself is configured through a simple text file.<br/>

 Open `data/gitblit.properties` in your favorite text editor and make sure to review and set:

@@ -30,7 +30,7 @@ Open `data/gitblit.properties` in your favorite text editor and make sure to rev
     **https** is strongly recommended because passwords are insecurely transmitted form your browser/git client using Basic authentication!

     - *git.packedGitLimit* (set larger than the size of your largest repository)

     - *git.streamFileThreshold* (set larger than the size of your largest committed file)

-3. Execute `authority.cmd` or `java -jar authority.jar --baseFolder data` from a command-line

+3. Execute `authority.cmd` or `java -cp gitblit.jar com.gitblit.authority.Launcher --baseFolder data` from a command-line

     1. fill out the fields in the *new certificate defaults* dialog

 	2. enter the store password used in *server.storePassword* when prompted.  This generates an SSL certificate for **localhost**.

 	3. you may want to generate an SSL certificate for the hostname or ip address hostnames you are serving from<br/>**NOTE:** You can only have **one** SSL certificate specified for a port.

@@ -165,16 +165,16 @@ Each Linux distribution may vary on the exact configuration of Apache 2.2.
 Here is a sample configuration that works on Debian 7.0 (Wheezy), your distribution may be different.

 

 1. First we need to make sure we have Apache's proxy modules available.  

-<pre>

+---FIXED---

 sudo su

 cd /etc/apache2/mods-enabled

 ln -s ../mods-available/proxy.load proxy.load

 ln -s ../mods-available/proxy_balancer.load proxy_balancer.load

 ln -s ../mods-available/proxy_http.load proxy_http.load

 ln -s ../mods-available/proxy_ajp.load proxy_ajp.load

-</pre>

+---FIXED---

 2. Then we need to make sure we are configuring Apache to use the proxy modules and to setup the proxied connection from Apache to Gitblit GO or from Apache to your chosen servlet container.  The following snippet is stored as `/etc/apache2/conf.d/gitblit`.  

-%BEGINCODE%

+---FIXED---

 # Turn off support for true Proxy behaviour as we are acting as 

 # a transparent proxy

 ProxyRequests Off

@@ -189,11 +189,11 @@ ProxyVia Off
 ProxyPreserveHost On

  

 # Set the permissions for the proxy

-&lt;Proxy *&gt;

+<Proxy>

 	AddDefaultCharset off

 	Order deny,allow

 	Allow from all

-&lt;/Proxy&gt;

+</Proxy>

  

 # The proxy context path must match the Gitblit context path.

 # For Gitblit GO, see server.contextPath in gitblit.properties.

@@ -214,7 +214,7 @@ ProxyPreserveHost On
 #RequestHeader set X-Forwarded-Context /

 

 #ProxyPass /gitblit ajp://localhost:8009/gitblit

-%ENDCODE%  

+---FIXED---  

 **Please** make sure to:  

     1. Review the security of these settings as appropriate for your deployment

     2. Uncomment the *ProxyPass* setting for whichever connection you prefer (http/ajp)

@@ -619,7 +619,7 @@ Hook contributions and improvements are welcome.
 

 <blockquote>Grape (The Groovy Adaptable Packaging Engine or Groovy Advanced Packaging Engine) is the infrastructure enabling the grab() calls in Groovy, a set of classes leveraging <a href="http://ant.apache.org/ivy">Ivy</a> to allow for a repository driven module system for Groovy. This allows a developer to write a script with an essentially arbitrary library requirement, and ship just the script. Grape will, at runtime, download as needed and link the named libraries and all dependencies forming a transitive closure when the script is run from existing repositories such as Ibiblio, Codehaus, and java.net.</blockquote>

 

-%BEGINCODE%

+---JAVA---

 // create and use a primitive array

 import org.apache.commons.collections.primitives.ArrayIntList

 

@@ -630,7 +630,7 @@ def ints = createEmptyInts()
 ints.add(0, 42)

 assert ints.size() == 1

 assert ints.get(0) == 42

-%ENDCODE%

+---JAVA---

 

 ### Custom Fields

 

diff --git a/docs/00_index.mkd b/src/site/siteindex.mkd
index 0812c3e3..de5c0999 100644
--- a/docs/00_index.mkd
+++ b/src/site/siteindex.mkd
@@ -1,27 +1,26 @@
 ## What is Gitblit?

 <div class="well" style="margin-left:5px;float:right;width:275px;padding: 10px 10px;">

-<b>Current Release %VERSION% (%BUILDDATE%)</b> <a href="releases.html">changelog</a>

-<div style="padding:5px;"><a style="width:175px;text-decoration:none;" class="btn btn-success" href="http://code.google.com/p/gitblit/downloads/detail?name=%GO%">Download Gitblit GO</a></div>

-<div style="padding:5px;"><a style="width:175px;text-decoration:none;" class="btn btn-danger" href="http://code.google.com/p/gitblit/downloads/detail?name=%WAR%">Download Gitblit WAR</a></div>

-<div style="padding:5px;"><a style="width:175px;text-decoration:none;" class="btn btn-info" href="http://code.google.com/p/gitblit/downloads/detail?name=%EXPRESS%">Download Gitblit Express</a></div>

-<div style="padding:5px;"><a style="width:175px;text-decoration:none;" class="btn btn-primary" href="http://code.google.com/p/gitblit/downloads/detail?name=%MANAGER%">Download Gitblit Manager</a></div>

-	<div style="text-align:center">

-		<a href="http://code.google.com/p/gitblit/downloads/detail?name=%API%">Gitblit API</a> | <a href="http://code.google.com/p/gitblit/downloads/detail?name=%FEDCLIENT%">Gitblit Federation Client</a>

-		<br/>

+<div style="text-align:center">

+<b>Current Release ${project.releaseVersion} (${project.releaseDate})</b><br/><a href="releasenotes.html">release notes</a>

+<div style="padding:5px;"><a style="width:175px;text-decoration:none;" class="btn btn-success" href="%GCURL%gitblit-${project.releaseVersion}.zip">Download Gitblit GO (Windows)</a></div>

+<div style="padding:5px;"><a style="width:175px;text-decoration:none;" class="btn btn-success" href="%GCURL%gitblit-${project.releaseVersion}.tar.gz">Download Gitblit GO (Linux/OSX)</a></div>

+<div style="padding:5px;"><a style="width:175px;text-decoration:none;" class="btn btn-danger" href="%GCURL%gitblit-${project.releaseVersion}.war">Download Gitblit WAR</a></div>

+<div style="padding:5px;"><a style="width:175px;text-decoration:none;" class="btn btn-info" href="%GCURL%express-${project.releaseVersion}.zip">Download Gitblit Express</a></div>

+<div style="padding:5px;"><a style="width:175px;text-decoration:none;" class="btn btn-primary" href="%GCURL%manager-${project.releaseVersion}.zip">Download Gitblit Manager</a></div>

 		<a href="screenshots.html" title="Screenshots"><img style="margin-top:5px;border:1px solid #ccc;" src="thumbs/00.png" alt="Screenshots" /></a>

 	</div>

 

 	<div style="padding-top:5px;">

 	<table class="table condensed-table">

 		<tbody>

-		<tr><th>License</th><td><a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, version 2.0</a></td></tr>

-		<tr><th>Sources</th><td><a href="http://github.com/gitblit">GitHub</a> &amp; <a href="http://code.google.com/p/gitblit/source/list">GoogleCode</a></td></tr>		

-		<tr><th>Issues</th><td><a href="http://code.google.com/p/gitblit/issues/list">GoogleCode</a></td></tr>

-		<tr><th>Discussion</th><td><a href="http://groups.google.com/group/gitblit">Gitblit Group</a></td></tr>

-		<tr><th>Google+</th><td><a href="https://plus.google.com/114464678392593421684">Gitblit+</a></td></tr>

+		<tr><th>License</th><td><a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License 2.0</a></td></tr>

+		<tr><th>Sources</th><td><a href="${project.scmUrl}">GitHub</a> &amp; <a href="http://code.google.com/p/gitblit/source/list">GoogleCode</a></td></tr>		

+		<tr><th>Issues</th><td><a href="${project.issuesUrl}">GoogleCode</a></td></tr>

+		<tr><th>Discussion</th><td><a href="${project.forumUrl}">Gitblit Group</a></td></tr>

+		<tr><th>Google+</th><td><a href="${project.socialNetworkUrl}">Gitblit+</a></td></tr>

 		<tr><th>Ohloh</th><td><a target="_top" href="http://www.ohloh.net/p/gitblit"><img border="0" width="100" height="16" src="http://www.ohloh.net/p/gitblit/widgets/project_thin_badge.gif" alt="Ohloh project report for Gitblit" /></a></td></tr>

-		<tr><th>Donations</th><td>If you enjoy Gitblit and want to support its development, please consider making a donation to <a href="http://www.helpmegivetostjude.org/gitblit">St. Jude Children's Research Hospital</a>.

-		<a href="http://www.helpmegivetostjude.org/gitblit" alt="St. Jude Children's Research Hospital"><img style="padding-top:10px;" src="stjude_150x150.gif"/></a></td></tr>

+		<tr><th>Donations</th><td>If you enjoy Gitblit and want to support its development, please consider making a donation to <a href="http://www.stjude.org">St. Jude Children's Research Hospital</a>.

+		<a href="http://www.stjude.org" alt="St. Jude Children's Research Hospital"><img style="padding-top:10px;" src="stjude_150x150.gif"/></a></td></tr>

 		</tbody>

 		</table>

 	</div>

diff --git a/src/site/templates/atom.ftl b/src/site/templates/atom.ftl
new file mode 100644
index 00000000..06d28da7
--- /dev/null
+++ b/src/site/templates/atom.ftl
@@ -0,0 +1,2 @@
+<#include "macros.ftl">

+<@AtomMacro posts=releases posturl="${project.url}/history.html#" />
\ No newline at end of file
diff --git a/src/site/templates/macros.ftl b/src/site/templates/macros.ftl
new file mode 100644
index 00000000..e7c275b8
--- /dev/null
+++ b/src/site/templates/macros.ftl
@@ -0,0 +1,147 @@
+<#macro LogMacro title version date description log logTitle="">

+	<#if log??>

+	<h3 id="${version}" class="section"><a href="#${version}" class="sectionlink"><i class="icon-share-alt"> </i></a>${title} (${version}) <small>${description}</small></h3>

+	<table class="table">

+		<tbody>

+			<tr>

+				<td style="background-color:inherit;width:100px">${date}</td>

+				<td style="background-color:inherit;"><@LogDescriptionMacro log=log title=logTitle /></td>

+			</tr>

+		</tbody>

+	</table>

+	</#if>

+</#macro>

+

+<#macro LogDescriptionMacro log title=log.title>

+	<#if (title!?length > 0)>

+		<p class="lead">${title}</p>		

+	</#if>

+	

+	<#if (log.html!?length > 0)>

+		<p>${log.html}</p>

+	</#if>

+	

+	<#if (log.text!?length > 0)>

+		<blockquote><p>${log.text!?html?replace("\n", "<br />")}</p></blockquote>		

+	</#if>

+

+	<#if (log.note!?length > 0)>

+		<div class="alert alert-info">

+			<h4>Note</h4>

+			${log.note?html?replace("\n", "<p />")}

+		</div>

+	</#if>

+

+	<#if (log.security!?size > 0)>

+		<@SecurityListMacro title="security" list=log.security/>

+	</#if>

+	<#if (log.fixes!?size > 0)>

+		<@UnorderedListMacro title="fixes" list=log.fixes />

+	</#if>

+	<#if (log.changes!?size > 0)>

+		<@UnorderedListMacro title="changes" list=log.changes />

+	</#if>

+	<#if (log.additions!?size > 0)>

+		<@UnorderedListMacro title="additions" list=log.additions />

+	</#if>

+	<#if (log.settings!?size > 0)>

+		<@SettingsTableMacro title="new settings" list=log.settings />		

+	</#if>

+	<#if (log.dependencyChanges!?size > 0)>

+		<@UnorderedListMacro title="dependency changes" list=log.dependencyChanges />

+	</#if>

+	<#if (log.contributors!?size > 0)>

+		<@UnorderedListMacro title="contributors" list=log.contributors?sort />

+	</#if>	

+</#macro>

+

+<#macro SecurityListMacro list title>

+   	<h4 style="color:red;">${title}</h4>

+	<ul>

+	<#list list as item>

+		<li>${item?html?replace("\n", "<br/>")}</li>

+	</#list>

+	</ul>

+</#macro>

+

+<#macro UnorderedListMacro list title>

+   	<h4>${title}</h4>

+	<ul>

+	<#list list as item>

+		<li>${item?html?replace("\n", "<br/>")}</li>

+	</#list>

+	</ul>

+</#macro>

+

+<#macro SettingsTableMacro list title>

+   	<h4>${title}</h4>

+	<table class="table">

+		<#list list as item>

+		<tr>

+			<td><em>${item.name}</em></td><td>${item.defaultValue}</td>

+		</tr>

+		</#list>

+	</table>

+</#macro>

+

+<#macro RssMacro posts posturl>

+<?xml version="1.0" standalone='yes'?>

+<rss version="2.0" xmlns:dc="http://purl.org/dc/elements/1.1/">

+	<channel>

+		<title><![CDATA[${project.name}]]></title>

+		<link>${project.url}</link>

+		<description><![CDATA[${project.description}]]></description>

+		<generator>Moxie Toolkit</generator>

+		<#list posts as post>

+  		<item>

+    		<title><![CDATA[${post.title}]]></title>

+    		<link><![CDATA[${posturl}${post.id}]]></link>

+    		<guid isPermaLink="true">${posturl}${post.id}</guid>

+	   		<#if (post.text!?length > 0)>

+    		<description><![CDATA[${post.text}]]></description>

+    		</#if>

+    		<#if (post.keywords!?size > 0)>

+   			<#list post.keywords as keyword>

+			<category><![CDATA[${keyword}]]></category>

+   			</#list>

+    		</#if>

+    		<#if (post.author!?length > 0)>

+  			<dc:creator><![CDATA[${post.author}]]></dc:creator>

+    		<#else>

+   			<dc:creator><![CDATA[${project.name}]]></dc:creator>

+    		</#if>

+    		<pubDate>${post.date?string("EEE, dd MMM yyyy HH:mm:ss Z")}</pubDate>

+  		</item>

+  		</#list>

+  	</channel>

+</rss>

+</#macro>

+

+<#macro AtomMacro posts posturl>

+<?xml version="1.0" standalone='yes'?>

+<feed xmlns="http://www.w3.org/2005/Atom">

+	<generator uri="${project.url}" version="${project.version}">${project.name}</generator>

+	<title><![CDATA[${project.name}]]></title>

+	<updated>${project.releaseDate}</updated>

+	<#list posts as post>

+	<entry>

+		<content type="text/plain" />

+   		<title type="text"><![CDATA[${post.title}]]></title>

+   		<#if (post.text!?length > 0)>

+   		<summary type="text"><![CDATA[${post.text}]]></summary>

+   		</#if>

+   		<link href="${posturl}${post.id}" rel="via" />

+   		<guid isPermaLink="true">${posturl}${post.id}</guid>

+   		<#if (post.text!?length > 0)>

+   		<content><![CDATA[${post.text}]]></content>

+   		</#if>

+   		<#if (post.keywords!?size > 0)>

+		<#list post.keywords as keyword>

+		<category label="<![CDATA[${keyword}]]>" />

+		</#list>

+   		</#if>

+   		<published>${post.date?string("yyyy-MM-dd'T'HH:mm:ssZ")}</published>

+	</entry>

+	</#list>

+</feed>

+</#macro>
\ No newline at end of file
diff --git a/src/site/templates/releasecurrent.ftl b/src/site/templates/releasecurrent.ftl
new file mode 100644
index 00000000..3bfd7099
--- /dev/null
+++ b/src/site/templates/releasecurrent.ftl
@@ -0,0 +1,25 @@
+<#include "macros.ftl" >
+
+<!-- CURRENT RELEASE -->
+<@LogMacro 
+	title="Current Release"
+	log=release 
+	version=project.releaseVersion 
+	date=reference.releaseDate?string("yyyy-MM-dd") 
+	description="this is the current stable release" />
+
+<!-- NEXT RELEASE -->
+<#if snapshot??>
+<@LogMacro 
+	title="Next Release"
+	log=snapshot
+	version=project.version
+	date="PENDING"
+	description="these changes are queued for an upcoming release" />
+</#if>
+
+<div>
+	<ul class="pager">
+		<li class="next"><a href="releases.html">All Releases &rarr;</a></li>
+	</ul>
+</div>
diff --git a/src/site/templates/releasehistory.ftl b/src/site/templates/releasehistory.ftl
new file mode 100644
index 00000000..eaaaad2d
--- /dev/null
+++ b/src/site/templates/releasehistory.ftl
@@ -0,0 +1,21 @@
+<#include "macros.ftl" >
+
+<!-- HISTORY -->
+<#if (releases!?size > 0)>
+	<p></p>
+	<h2>All Releases</h2>
+	<table class="table">
+		<tbody>
+		<!-- RELEASE HISTORY -->
+		<#list releases?sort_by("date")?reverse as log>
+		<tr id="${log.id}">
+			<td style="width:100px" id="${log.id}">
+				<b><a href="#${log.id}">${log.id}</a></b><br/>
+				${log.date?string("yyyy-MM-dd")}
+			</td>
+			<td><@LogDescriptionMacro log=log /></td>
+		</tr>
+		</#list>
+		</tbody>
+	</table>
+</#if>
\ No newline at end of file
diff --git a/src/site/templates/rss.ftl b/src/site/templates/rss.ftl
new file mode 100644
index 00000000..90e86ebb
--- /dev/null
+++ b/src/site/templates/rss.ftl
@@ -0,0 +1,2 @@
+<#include "macros.ftl">

+<@RssMacro posts=releases posturl="${project.url}/releases.html#" />
\ No newline at end of file
diff --git a/test-gitblit.properties b/src/test/config/test-gitblit.properties
index f16f5c5a..f16f5c5a 100644
--- a/test-gitblit.properties
+++ b/src/test/config/test-gitblit.properties
diff --git a/test-ui-gitblit.properties b/src/test/config/test-ui-gitblit.properties
index c77de1a2..c77de1a2 100644
--- a/test-ui-gitblit.properties
+++ b/src/test/config/test-ui-gitblit.properties
diff --git a/test-ui-users.conf b/src/test/config/test-ui-users.conf
index 5bf35f3b..5bf35f3b 100644
--- a/test-ui-users.conf
+++ b/src/test/config/test-ui-users.conf
diff --git a/test-users.conf b/src/test/config/test-users.conf
index 4f947872..4f947872 100644
--- a/test-users.conf
+++ b/src/test/config/test-users.conf
diff --git a/tests/com/gitblit/tests/ActivityTest.java b/src/test/java/com/gitblit/tests/ActivityTest.java
index 22713260..22713260 100644
--- a/tests/com/gitblit/tests/ActivityTest.java
+++ b/src/test/java/com/gitblit/tests/ActivityTest.java
diff --git a/tests/com/gitblit/tests/ArrayUtilsTest.java b/src/test/java/com/gitblit/tests/ArrayUtilsTest.java
index 8a38afbb..8a38afbb 100644
--- a/tests/com/gitblit/tests/ArrayUtilsTest.java
+++ b/src/test/java/com/gitblit/tests/ArrayUtilsTest.java
diff --git a/tests/com/gitblit/tests/Base64Test.java b/src/test/java/com/gitblit/tests/Base64Test.java
index 2962c36f..2962c36f 100644
--- a/tests/com/gitblit/tests/Base64Test.java
+++ b/src/test/java/com/gitblit/tests/Base64Test.java
diff --git a/tests/com/gitblit/tests/ByteFormatTest.java b/src/test/java/com/gitblit/tests/ByteFormatTest.java
index d59055e7..d59055e7 100644
--- a/tests/com/gitblit/tests/ByteFormatTest.java
+++ b/src/test/java/com/gitblit/tests/ByteFormatTest.java
diff --git a/tests/com/gitblit/tests/DiffUtilsTest.java b/src/test/java/com/gitblit/tests/DiffUtilsTest.java
index 53eff313..53eff313 100644
--- a/tests/com/gitblit/tests/DiffUtilsTest.java
+++ b/src/test/java/com/gitblit/tests/DiffUtilsTest.java
diff --git a/tests/com/gitblit/tests/FanoutServiceTest.java b/src/test/java/com/gitblit/tests/FanoutServiceTest.java
index 28e5d82d..28e5d82d 100644
--- a/tests/com/gitblit/tests/FanoutServiceTest.java
+++ b/src/test/java/com/gitblit/tests/FanoutServiceTest.java
diff --git a/tests/com/gitblit/tests/FederationTests.java b/src/test/java/com/gitblit/tests/FederationTests.java
index ced500a5..ced500a5 100644
--- a/tests/com/gitblit/tests/FederationTests.java
+++ b/src/test/java/com/gitblit/tests/FederationTests.java
diff --git a/tests/com/gitblit/tests/FileUtilsTest.java b/src/test/java/com/gitblit/tests/FileUtilsTest.java
index 8e5cf8a6..8e5cf8a6 100644
--- a/tests/com/gitblit/tests/FileUtilsTest.java
+++ b/src/test/java/com/gitblit/tests/FileUtilsTest.java
diff --git a/tests/com/gitblit/tests/GitBlitSuite.java b/src/test/java/com/gitblit/tests/GitBlitSuite.java
index b0179c37..b0179c37 100644
--- a/tests/com/gitblit/tests/GitBlitSuite.java
+++ b/src/test/java/com/gitblit/tests/GitBlitSuite.java
diff --git a/tests/com/gitblit/tests/GitBlitTest.java b/src/test/java/com/gitblit/tests/GitBlitTest.java
index 786614f8..786614f8 100644
--- a/tests/com/gitblit/tests/GitBlitTest.java
+++ b/src/test/java/com/gitblit/tests/GitBlitTest.java
diff --git a/tests/com/gitblit/tests/GitServletTest.java b/src/test/java/com/gitblit/tests/GitServletTest.java
index a05b3650..a05b3650 100644
--- a/tests/com/gitblit/tests/GitServletTest.java
+++ b/src/test/java/com/gitblit/tests/GitServletTest.java
diff --git a/tests/com/gitblit/tests/GroovyScriptTest.java b/src/test/java/com/gitblit/tests/GroovyScriptTest.java
index 2954fa1d..2954fa1d 100644
--- a/tests/com/gitblit/tests/GroovyScriptTest.java
+++ b/src/test/java/com/gitblit/tests/GroovyScriptTest.java
diff --git a/tests/com/gitblit/tests/IssuesTest.java b/src/test/java/com/gitblit/tests/IssuesTest.java
index 54cac335..54cac335 100644
--- a/tests/com/gitblit/tests/IssuesTest.java
+++ b/src/test/java/com/gitblit/tests/IssuesTest.java
diff --git a/tests/com/gitblit/tests/JGitUtilsTest.java b/src/test/java/com/gitblit/tests/JGitUtilsTest.java
index ce72a46f..ce72a46f 100644
--- a/tests/com/gitblit/tests/JGitUtilsTest.java
+++ b/src/test/java/com/gitblit/tests/JGitUtilsTest.java
diff --git a/tests/com/gitblit/tests/JsonUtilsTest.java b/src/test/java/com/gitblit/tests/JsonUtilsTest.java
index cf058441..cf058441 100644
--- a/tests/com/gitblit/tests/JsonUtilsTest.java
+++ b/src/test/java/com/gitblit/tests/JsonUtilsTest.java
diff --git a/tests/com/gitblit/tests/LdapUserServiceTest.java b/src/test/java/com/gitblit/tests/LdapUserServiceTest.java
index a928f4a5..a928f4a5 100644
--- a/tests/com/gitblit/tests/LdapUserServiceTest.java
+++ b/src/test/java/com/gitblit/tests/LdapUserServiceTest.java
diff --git a/tests/com/gitblit/tests/LuceneExecutorTest.java b/src/test/java/com/gitblit/tests/LuceneExecutorTest.java
index 6b45b9fe..6b45b9fe 100644
--- a/tests/com/gitblit/tests/LuceneExecutorTest.java
+++ b/src/test/java/com/gitblit/tests/LuceneExecutorTest.java
diff --git a/tests/com/gitblit/tests/MailTest.java b/src/test/java/com/gitblit/tests/MailTest.java
index 05d55a24..05d55a24 100644
--- a/tests/com/gitblit/tests/MailTest.java
+++ b/src/test/java/com/gitblit/tests/MailTest.java
diff --git a/tests/com/gitblit/tests/MarkdownUtilsTest.java b/src/test/java/com/gitblit/tests/MarkdownUtilsTest.java
index cd7ca020..cd7ca020 100644
--- a/tests/com/gitblit/tests/MarkdownUtilsTest.java
+++ b/src/test/java/com/gitblit/tests/MarkdownUtilsTest.java
diff --git a/tests/com/gitblit/tests/MetricUtilsTest.java b/src/test/java/com/gitblit/tests/MetricUtilsTest.java
index bb8261af..bb8261af 100644
--- a/tests/com/gitblit/tests/MetricUtilsTest.java
+++ b/src/test/java/com/gitblit/tests/MetricUtilsTest.java
diff --git a/tests/com/gitblit/tests/ObjectCacheTest.java b/src/test/java/com/gitblit/tests/ObjectCacheTest.java
index 8d07fe65..8d07fe65 100644
--- a/tests/com/gitblit/tests/ObjectCacheTest.java
+++ b/src/test/java/com/gitblit/tests/ObjectCacheTest.java
diff --git a/tests/com/gitblit/tests/PermissionsTest.java b/src/test/java/com/gitblit/tests/PermissionsTest.java
index 5a951042..5a951042 100644
--- a/tests/com/gitblit/tests/PermissionsTest.java
+++ b/src/test/java/com/gitblit/tests/PermissionsTest.java
diff --git a/tests/com/gitblit/tests/PushLogTest.java b/src/test/java/com/gitblit/tests/PushLogTest.java
index aa4cf418..aa4cf418 100644
--- a/tests/com/gitblit/tests/PushLogTest.java
+++ b/src/test/java/com/gitblit/tests/PushLogTest.java
diff --git a/tests/com/gitblit/tests/RedmineUserServiceTest.java b/src/test/java/com/gitblit/tests/RedmineUserServiceTest.java
index 12fa73ff..12fa73ff 100644
--- a/tests/com/gitblit/tests/RedmineUserServiceTest.java
+++ b/src/test/java/com/gitblit/tests/RedmineUserServiceTest.java
diff --git a/tests/com/gitblit/tests/RepositoryModelTest.java b/src/test/java/com/gitblit/tests/RepositoryModelTest.java
index 1fe3fbd0..1fe3fbd0 100644
--- a/tests/com/gitblit/tests/RepositoryModelTest.java
+++ b/src/test/java/com/gitblit/tests/RepositoryModelTest.java
diff --git a/tests/com/gitblit/tests/RpcTests.java b/src/test/java/com/gitblit/tests/RpcTests.java
index 3241a8ab..3241a8ab 100644
--- a/tests/com/gitblit/tests/RpcTests.java
+++ b/src/test/java/com/gitblit/tests/RpcTests.java
diff --git a/tests/com/gitblit/tests/StringUtilsTest.java b/src/test/java/com/gitblit/tests/StringUtilsTest.java
index bcf3a99c..bcf3a99c 100644
--- a/tests/com/gitblit/tests/StringUtilsTest.java
+++ b/src/test/java/com/gitblit/tests/StringUtilsTest.java
diff --git a/tests/com/gitblit/tests/SyndicationUtilsTest.java b/src/test/java/com/gitblit/tests/SyndicationUtilsTest.java
index 75fbd7ca..75fbd7ca 100644
--- a/tests/com/gitblit/tests/SyndicationUtilsTest.java
+++ b/src/test/java/com/gitblit/tests/SyndicationUtilsTest.java
diff --git a/tests/com/gitblit/tests/TicgitUtilsTest.java b/src/test/java/com/gitblit/tests/TicgitUtilsTest.java
index 74f9e44e..74f9e44e 100644
--- a/tests/com/gitblit/tests/TicgitUtilsTest.java
+++ b/src/test/java/com/gitblit/tests/TicgitUtilsTest.java
diff --git a/tests/com/gitblit/tests/TimeUtilsTest.java b/src/test/java/com/gitblit/tests/TimeUtilsTest.java
index f9d5d834..f9d5d834 100644
--- a/tests/com/gitblit/tests/TimeUtilsTest.java
+++ b/src/test/java/com/gitblit/tests/TimeUtilsTest.java
diff --git a/tests/com/gitblit/tests/UserServiceTest.java b/src/test/java/com/gitblit/tests/UserServiceTest.java
index 710d1f35..710d1f35 100644
--- a/tests/com/gitblit/tests/UserServiceTest.java
+++ b/src/test/java/com/gitblit/tests/UserServiceTest.java
diff --git a/tests/com/gitblit/tests/X509UtilsTest.java b/src/test/java/com/gitblit/tests/X509UtilsTest.java
index 5d17e18d..5d17e18d 100644
--- a/tests/com/gitblit/tests/X509UtilsTest.java
+++ b/src/test/java/com/gitblit/tests/X509UtilsTest.java
diff --git a/tests/com/gitblit/tests/mock/MemorySettings.java b/src/test/java/com/gitblit/tests/mock/MemorySettings.java
index 1b3e2382..1b3e2382 100644
--- a/tests/com/gitblit/tests/mock/MemorySettings.java
+++ b/src/test/java/com/gitblit/tests/mock/MemorySettings.java
diff --git a/tests/com/gitblit/tests/resources/ldapUserServiceSampleData.ldif b/src/test/java/com/gitblit/tests/resources/ldapUserServiceSampleData.ldif
index df79333e..df79333e 100644
--- a/tests/com/gitblit/tests/resources/ldapUserServiceSampleData.ldif
+++ b/src/test/java/com/gitblit/tests/resources/ldapUserServiceSampleData.ldif
diff --git a/tests/de/akquinet/devops/GitBlit4UITests.java b/src/test/java/de/akquinet/devops/GitBlit4UITests.java
index 130f2c96..130f2c96 100644
--- a/tests/de/akquinet/devops/GitBlit4UITests.java
+++ b/src/test/java/de/akquinet/devops/GitBlit4UITests.java
diff --git a/tests/de/akquinet/devops/GitBlitServer4UITests.java b/src/test/java/de/akquinet/devops/GitBlitServer4UITests.java
index 2d54be2a..2d54be2a 100644
--- a/tests/de/akquinet/devops/GitBlitServer4UITests.java
+++ b/src/test/java/de/akquinet/devops/GitBlitServer4UITests.java
diff --git a/tests/de/akquinet/devops/GitblitRunnable.java b/src/test/java/de/akquinet/devops/GitblitRunnable.java
index 66a31e3c..66a31e3c 100644
--- a/tests/de/akquinet/devops/GitblitRunnable.java
+++ b/src/test/java/de/akquinet/devops/GitblitRunnable.java
diff --git a/tests/de/akquinet/devops/LaunchWithUITestConfig.java b/src/test/java/de/akquinet/devops/LaunchWithUITestConfig.java
index 594d7fc7..aebde9a2 100644
--- a/tests/de/akquinet/devops/LaunchWithUITestConfig.java
+++ b/src/test/java/de/akquinet/devops/LaunchWithUITestConfig.java
@@ -44,7 +44,8 @@ public class LaunchWithUITestConfig {
 		// different ports than in testParallelLaunchOfSeveralInstances to
 		// ensure that both test cases do not affect each others test results
 		int httpPort = 9191, httpsPort = 9292, shutdownPort = 9393;
-		String gitblitPropertiesPath = "test-ui-gitblit.properties", usersPropertiesPath = "test-ui-users.conf";
+		String gitblitPropertiesPath = "src/test/config/test-ui-gitblit.properties",
+				usersPropertiesPath = "src/test/config/test-ui-users.conf";
 
 		GitblitRunnable gitblitRunnable = new GitblitRunnable(httpPort,
 				httpsPort, shutdownPort, gitblitPropertiesPath,
@@ -74,7 +75,8 @@ public class LaunchWithUITestConfig {
 		// ensure that both test cases do not affect each others test results
 		int httpPort = 9797, httpsPort = 9898, shutdownPort = 9999;
 		int httpPort2 = 9494, httpsPort2 = 9595, shutdownPort2 = 9696;
-		String gitblitPropertiesPath = "test-ui-gitblit.properties", usersPropertiesPath = "test-ui-users.conf";
+		String gitblitPropertiesPath = "src/test/config/test-ui-gitblit.properties",
+				usersPropertiesPath = "src/test/config/test-ui-users.conf";
 
 		GitblitRunnable gitblitRunnable = new GitblitRunnable(httpPort,
 				httpsPort, shutdownPort, gitblitPropertiesPath,
diff --git a/tests/de/akquinet/devops/ManualUITestLaunch.java b/src/test/java/de/akquinet/devops/ManualUITestLaunch.java
index 2eff4918..809360aa 100644
--- a/tests/de/akquinet/devops/ManualUITestLaunch.java
+++ b/src/test/java/de/akquinet/devops/ManualUITestLaunch.java
@@ -3,7 +3,8 @@ package de.akquinet.devops;
 public class ManualUITestLaunch {
 public static void main(String[] args) {
 	int httpPort = 8080, httpsPort = 8443, shutdownPort = 8081;
-	String gitblitPropertiesPath = "test-ui-gitblit.properties", usersPropertiesPath = "test-ui-users.conf";
+	String gitblitPropertiesPath = "src/test/config/test-ui-gitblit.properties",
+			usersPropertiesPath = "src/test/config/test-ui-users.conf";
 
 	GitblitRunnable gitblitRunnable = new GitblitRunnable(httpPort,
 			httpsPort, shutdownPort, gitblitPropertiesPath,
diff --git a/tests/de/akquinet/devops/test/ui/TestUISuite.java b/src/test/java/de/akquinet/devops/test/ui/TestUISuite.java
index 08d7a00b..08d7a00b 100644
--- a/tests/de/akquinet/devops/test/ui/TestUISuite.java
+++ b/src/test/java/de/akquinet/devops/test/ui/TestUISuite.java
diff --git a/tests/de/akquinet/devops/test/ui/cases/UI_MultiAdminSupportTest.java b/src/test/java/de/akquinet/devops/test/ui/cases/UI_MultiAdminSupportTest.java
index a3925719..a3925719 100644
--- a/tests/de/akquinet/devops/test/ui/cases/UI_MultiAdminSupportTest.java
+++ b/src/test/java/de/akquinet/devops/test/ui/cases/UI_MultiAdminSupportTest.java
diff --git a/tests/de/akquinet/devops/test/ui/generic/AbstractUITest.java b/src/test/java/de/akquinet/devops/test/ui/generic/AbstractUITest.java
index bb7b3da2..bb7b3da2 100644
--- a/tests/de/akquinet/devops/test/ui/generic/AbstractUITest.java
+++ b/src/test/java/de/akquinet/devops/test/ui/generic/AbstractUITest.java
diff --git a/tests/de/akquinet/devops/test/ui/view/Exp.java b/src/test/java/de/akquinet/devops/test/ui/view/Exp.java
index 3433bbb6..3433bbb6 100644
--- a/tests/de/akquinet/devops/test/ui/view/Exp.java
+++ b/src/test/java/de/akquinet/devops/test/ui/view/Exp.java
diff --git a/tests/de/akquinet/devops/test/ui/view/GitblitDashboardView.java b/src/test/java/de/akquinet/devops/test/ui/view/GitblitDashboardView.java
index 0908d7c9..0908d7c9 100644
--- a/tests/de/akquinet/devops/test/ui/view/GitblitDashboardView.java
+++ b/src/test/java/de/akquinet/devops/test/ui/view/GitblitDashboardView.java
diff --git a/tests/de/akquinet/devops/test/ui/view/GitblitPageView.java b/src/test/java/de/akquinet/devops/test/ui/view/GitblitPageView.java
index 43716434..43716434 100644
--- a/tests/de/akquinet/devops/test/ui/view/GitblitPageView.java
+++ b/src/test/java/de/akquinet/devops/test/ui/view/GitblitPageView.java
diff --git a/tests/de/akquinet/devops/test/ui/view/RepoEditView.java b/src/test/java/de/akquinet/devops/test/ui/view/RepoEditView.java
index a3365d1c..a3365d1c 100644
--- a/tests/de/akquinet/devops/test/ui/view/RepoEditView.java
+++ b/src/test/java/de/akquinet/devops/test/ui/view/RepoEditView.java
diff --git a/tests/de/akquinet/devops/test/ui/view/RepoListView.java b/src/test/java/de/akquinet/devops/test/ui/view/RepoListView.java
index 6ec6203f..6ec6203f 100644
--- a/tests/de/akquinet/devops/test/ui/view/RepoListView.java
+++ b/src/test/java/de/akquinet/devops/test/ui/view/RepoListView.java
diff --git a/tmplt.pom.xml b/tmplt.pom.xml
deleted file mode 100644
index 4abe4be2..00000000
--- a/tmplt.pom.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-		xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-		<modelVersion>4.0.0</modelVersion>
-		<groupId>com.gitblit</groupId>
-		<artifactId>gitblit</artifactId>
-		<version>@gb.version@</version>
-</project>
diff --git a/tools/GenJar.jar b/tools/GenJar.jar
deleted file mode 100644
index 6f225cb4..00000000
--- a/tools/GenJar.jar
+++ /dev/null
diff --git a/tools/ant-googlecode-0.0.3.jar b/tools/ant-googlecode-0.0.3.jar
deleted file mode 100644
index 452fa84f..00000000
--- a/tools/ant-googlecode-0.0.3.jar
+++ /dev/null