Merge branch 'autotagpush' of https://github.com/akquinet/gitblit into pushtags
diff --git a/.classpath b/.classpath
index 365b6d4..3cee788 100644
--- a/.classpath
+++ b/.classpath
@@ -1,55 +1,59 @@
<?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/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/.gitignore b/.gitignore
index 65b74ab..057f6d7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,34 +2,17 @@
/lib
/ext
/build
-/keystore
-/*.zip
-/gitblit.properties
-/users.properties
/site
/git
-/target
/build.properties
-/war
-/*.war
-/proposals
-/*.jar
/federation.properties
/mailtest.properties
-/.settings/*.prefs
-/src/WEB-INF/reference.properties
-/bin/
/.settings/
-/javadoc
-/express
+/src/main/java/WEB-INF/reference.properties
+/bin/
/build-demo.xml
-/users.conf
*.directory
/.gradle
-/projects.conf
/pom.xml
-/deploy
-/*.jks
/x509test
-/certs
/data
diff --git a/build.moxie b/build.moxie
new file mode 100644
index 0000000..fe938a3
--- /dev/null
+++ b/build.moxie
@@ -0,0 +1,158 @@
+#
+# 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
+- 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 ed91f29..e1333bd 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 = "" to="" />
- <replacestring from="";" 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 = "" to="" />
- <replacestring from="";" 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 = "" to="" />
- <replacestring from="";" 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" />
- </target>
-
-
- <!--
- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- Compile
- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- -->
- <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}" />
+ <!-- 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" />
- <!-- cleanup old builds -->
+ <!-- Download links -->
+ <property name="gc.url" value="http://code.google.com/p/gitblit/downloads/detail?name=" />
+ </target>
+
+
+ <!--
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ Cleanup all build artifacts and directories
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ -->
+ <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 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" />
- <!-- 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>
-
- <!-- 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,178 @@
<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>
+
+ <!--
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ Compile
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ -->
+ <target name="compile" depends="setup" description="compiles Gitblit from source">
+
+ <!-- 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}" />
+
+ <!-- Compile project incrementally -->
+ <mx:javac scope="compile" clean="false" />
+
+ </target>
+
+
+ <!--
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ Report the compile dependencies on the console
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ -->
+ <target name="report" depends="prepare" description="generate dependency report">
+
+ <!-- Report compile dependencies to the console -->
+ <mx:report scope="compile" destfile="${project.targetDirectory}/dependencies.txt" />
+
+ </target>
+
+
+ <!--
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ Test
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ -->
+ <target name="test" depends="compile" description="compiles Gitblit from source and runs unit tests">
+
+ <!-- Compile unit tests -->
+ <mx:javac scope="test" />
+
+ <!-- Run unit tests -->
+ <mx:test failonerror="true" />
+
+ </target>
+
+
+ <!--
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ Run Gitblit GO
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ -->
+ <target name="run" depends="compile" description="Run Gitblit GO">
+
+ <!-- run the mainclass in a separate JVM -->
+ <mx:run fork="true" />
+
+ </target>
+
<!--
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Build Gitblit GO
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-->
- <target name="buildGO" depends="compile,buildAuthority" description="Build Gitblit GO distribution">
+ <target name="buildGO" depends="compile" description="Build Gitblit GO distribution">
- <echo>Building Gitblit GO ${gb.version}</echo>
+ <echo>Building Gitblit GO ${project.version}</echo>
- <!-- Delete the deploy folder -->
- <delete dir="${project.deploy.dir}" />
+ <local name="go.dir" />
+ <property name="go.dir" value="${project.outputDirectory}/go" />
+ <delete dir="${go.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}">
+ <prepareDataDirectory toDir="${go.dir}/data" />
+
+ <!-- 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>
-
- <!-- 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>
+ <!-- Windows distrib files -->
+ <zipfileset dir="${project.distrib.dir}/win" />
+ <!-- Gitblit Authority data -->
+ <zipfileset dir="${project.distrib.dir}/data/certs" prefix="data/certs" />
+ <!-- include all dependencies -->
+ <dependencies prefix="ext" />
+ </mx:zip>
- <!-- 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" />
+ <!-- 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>
-
- <!-- Build the docs for the deploy -->
- <antcall target="buildDocs" inheritall="true" inheritrefs="true">
- <param name="docs.output.dir" value="${project.deploy.dir}/docs" />
- </antcall>
-
- <!-- Create Zip deployment -->
- <zip destfile="${project.target.dir}/${distribution.zipfile}">
- <fileset dir="${project.deploy.dir}">
- <include name="**/*" />
- </fileset>
- </zip>
+ <!-- Linux/OSX distrib files -->
+ <tarfileset dir="${project.distrib.dir}/linux" filemode="755" />
+ <!-- Gitblit Authority data -->
+ <zipfileset dir="${project.distrib.dir}/data/certs" prefix="data/certs" />
+ <!-- include all dependencies -->
+ <dependencies prefix="ext" />
+ </mx:tar>
</target>
<!--
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- Build Gitblit Docs which are bundled with GO and WAR downloads
- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- -->
- <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=""%BEGINCODE%=<pre class='prettyprint lang-java'>"" />
-
- <arg value="--substitute" />
- <arg value="%ENDCODE%=</pre>" />
-
- <arg value="--regex" />
- <arg value=""\b(issue)(\s*[#]?|-){0,1}(\d+)\b!!!<a href='http://code.google.com/p/gitblit/issues/detail?id=$3'>issue $3</a>"" />
-
- </java>
- </target>
-
-
- <!--
- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Build Gitblit WAR
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-->
<target name="buildWAR" depends="compile" description="Build Gitblit WAR">
- <echo>Building Gitblit WAR ${gb.version}</echo>
-
- <delete dir="${project.war.dir}" />
+ <echo>Building Gitblit WAR ${project.version}</echo>
- <!-- 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>
+ <local name="war.dir" />
+ <property name="war.dir" value="${project.outputDirectory}/war" />
+ <delete dir="${war.dir}" />
- <!-- 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>
+ <local name="webinf" />
+ <property name="webinf" value="${war.dir}/WEB-INF" />
- <!-- 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>
+ <!-- Generate the docs for the WAR build -->
+ <generateDocs toDir="${webinf}/docs" />
- <!-- 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>
+ <!-- Prepare the data directory -->
+ <prepareDataDirectory toDir="${webinf}/data" />
- <!-- 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" />
-
- </java>
-
- <!-- Set Version into web.xml -->
- <replace file="${project.war.dir}/WEB-INF/web.xml" token="@gb.version@" value="${gb.version}" summary="yes"/>
-
- <!-- Gitblit resources -->
- <copy todir="${project.war.dir}">
- <fileset dir="${project.resources.dir}">
- <exclude name="thumbs.db" />
- </fileset>
- </copy>
-
- <!-- 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" />
- </fileset>
- </copy>
-
- <!-- 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/**" />
- </fileset>
- </copy>
+ <!-- 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 -->
- <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)
- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- -->
- <target name="buildJAR" depends="compile" description="Build Gitblit JAR">
-
- <echo>Building Gitblit JAR ${gb.version}</echo>
-
- <delete dir="${project.jar.dir}" />
-
- <!-- 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">
+ <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" />
+ <!-- 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>
+ <zipfileset prefix="WEB-INF" file="${project.compileOutputDirectory}/WEB-INF/weblogic.xml" />
+ <!-- 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>
- <!--
- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- 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}" />
- </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,159 +299,108 @@
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-->
<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"/>
+ <local name="webinf" />
+ <property name="webinf" value="${deployments.root}/WEB-INF" />
- <!-- Copy LICENSE and NOTICE to WEB-INF -->
- <copy todir="${deployments.root}/WEB-INF">
+ <!-- Prepare the data directory -->
+ <prepareDataDirectory toDir="${webinf}/data" />
+
+ <!-- Build the Express web.xml from the prototype web.xml and gitblit.properties -->
+ <!-- THIS FILE IS NOT OVERRIDDEN ONCE IT IS BUILT!!! -->
+ <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 -->
+ <mx:genjar destfile="${webinf}/lib/gitblit.jar" excludeclasspathjars="true">
+ <!-- Specify all web.xml servlets and filters -->
+ <class name="com.gitblit.GitBlit" />
+ <class name="com.gitblit.DownloadZipFilter" />
+ <class name="com.gitblit.DownloadZipServlet" />
+ <class name="com.gitblit.EnforceAuthenticationFilter" />
+ <class name="com.gitblit.FederationServlet" />
+ <class name="com.gitblit.GitFilter" />
+ <class name="com.gitblit.GitServlet" />
+ <class name="com.gitblit.PagesFilter" />
+ <class name="com.gitblit.PagesServlet" />
+ <class name="com.gitblit.RobotsTxtServlet" />
+ <class name="com.gitblit.RpcFilter" />
+ <class name="com.gitblit.RpcServlet" />
+ <class name="com.gitblit.SyndicationFilter" />
+ <class name="com.gitblit.SyndicationServlet" />
+ <class name="com.gitblit.wicket.GitBlitWebApp" />
+ </mx:genjar>
+
+ <!-- Build Express Zip file -->
+ <mx:zip basedir="${express.dir}" destfile="${project.targetDirectory}/${express.zipfile}">
<fileset dir="${basedir}">
<include name="LICENSE" />
<include name="NOTICE" />
</fileset>
- </copy>
-
- <!-- 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>
-
- <!-- 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 -->
- <!-- 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}">
+ <!-- README -->
+ <zipfileset fullpath="README.gitblit" file="${project.siteSourceDirectory}/openshift.mkd" />
+ <!-- resources -->
+ <zipfileset prefix="deployments/ROOT.war" 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>
-
- <!-- Gitblit classes -->
- <jar destfile="${deployments.root}/WEB-INF/lib/gitblit-${gb.version}.jar">
- <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/GitBlitServer*.class" />
- <exclude name="com/gitblit/Launcher*.class" />
- <exclude name="com/gitblit/authority/**" />
- </fileset>
- </jar>
-
- <!-- Build Express Zip file -->
- <zip destfile="${project.target.dir}/${express.zipfile}">
- <fileset dir="${project.express.dir}" />
- </zip>
+ <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 +411,64 @@
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-->
<target name="buildManager" depends="compile" description="Builds the stand-alone Gitblit Manager">
- <echo>Building Gitblit Manager ${gb.version}</echo>
+ <echo>Building Gitblit Manager ${project.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" />
+ <!-- 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>
- <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" />
+ <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 +478,66 @@
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-->
<target name="buildAuthority" depends="compile" description="Builds the stand-alone Gitblit Authority">
- <echo>Building Gitblit Authority ${gb.version}</echo>
+ <echo>Building Gitblit Authority ${project.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" />
+ <!-- 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>
- <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" />
+ <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">
- <include name="authority.conf" />
- <include name="mail.tmpl" />
- <include name="instructions.tmpl" />
+ <zipfileset dir="${project.distrib.dir}/data" prefix="data">
+ <include name="users.conf" />
+ <include name="gitblit.properties" />
</zipfileset>
- </zip>
+ <!-- Gitblit Authority data -->
+ <zipfileset dir="${project.distrib.dir}/data/certs" prefix="data/certs" />
+ <!-- include "authority" tagged dependencies -->
+ <dependencies prefix="ext" tag="authority" />
+ </mx:zip>
+
+ <!-- Cleanup -->
+ <delete file="${project.targetDirectory}/authority.jar" />
</target>
<!--
@@ -941,29 +546,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 +575,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 +584,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 dir="${project.targetDirectory}">
+ <include name="gbapi-${project.version}.jar" />
+ <include name="gbapi-${project.version}-sources.jar" />
+ <include name="gbapi-${project.version}-javadoc.jar" />
</fileset>
- <fileset dir="${basedir}/ext">
- <exclude name="src/**" />
- <include name="gson*.jar" />
- <include name="rome*.jar" />
- <include name="jdom*.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 +622,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>
+
+ <property name="releaselog" value="${basedir}/releases.moxie" />
<!-- 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>
-
- <!-- Copy Doc images -->
- <fileset dir="${basedir}/docs">
- <include name="*.png" />
- <include name="*.gif" />
- <include name="*.js" />
- </fileset>
- </copy>
+ <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="<a href='http://code.google.com/p/gitblit/issues/detail?id=$3'>issue $3</a>" />
+
+ <!-- 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=""%BEGINCODE%=<pre class='prettyprint lang-java'>"" />
-
- <arg value="--substitute" />
- <arg value="%ENDCODE%=</pre>" />
-
- <arg value="--regex" />
- <arg value=""\b(issue)(\s*[#]?|-){0,1}(\d+)\b!!!<a href='http://code.google.com/p/gitblit/issues/detail?id=$3'>issue $3</a>"" />
-
- </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 +747,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 +756,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 ${gb.version} binaries</echo>
+ <echo>Uploading Gitblit ${project.version} binaries</echo>
- <!-- 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 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 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 +811,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 +821,7 @@
remotedir="${ftp.dir}"
passive="true"
verbose="yes">
- <fileset dir="${project.site.dir}" />
+ <fileset dir="${project.siteTargetDirectory}" />
</ftp>
</target>
@@ -1300,10 +831,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="<a href='http://code.google.com/p/gitblit/issues/detail?id=$3'>issue $3</a>" />
+
+ <!-- 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/authority.cmd b/distrib/authority.cmd
deleted file mode 100644
index 805815e..0000000
--- 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 6c74d54..0000000
--- 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/install-service-centos.sh b/distrib/install-service-centos.sh
deleted file mode 100644
index 5e2e592..0000000
--- 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 75d7fcc..0000000
--- 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/docs/doc_footer.html b/docs/doc_footer.html
deleted file mode 100644
index 577380e..0000000
--- 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 c5ba366..0000000
--- 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 577380e..0000000
--- 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 ecfa67d..0000000
--- 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 232f00d..0fe7fe9 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,206 @@
</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="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 0000000..15c7da9
--- /dev/null
+++ b/releases.moxie
@@ -0,0 +1,729 @@
+#
+# ${project.version}
+#
+r17: {
+ title: Gitblit ${project.version} Released
+ id: ${project.version}
+ date: ${project.buildDate}
+ security:
+ - Raw servlet was insecure. If someone knew the exact repository name and path to a file, the raw blob could be retrieved bypassing security constraints. (issue 198)
+ fixes:
+ - Could not reset settings with $ or { characters through Gitblit Manager because they are not properly escaped
+ - Added more error checking to blob page and blame page
+ - Disable SNI extensions for client SSL connections
+ - Fix NPE when getting user's fork without repository list caching (issue 182)
+ - Fix internal error on folder history links (issue 192)
+ - Fixed incorrect icon file name for .doc files (issue 200)
+ - Do not queue emails with no recipients (issue 201)
+ - Disable view and blame links for deleted blobs (issue 216)
+ - Fixed 1.2.x regression with individually symlinked repositories (issue 217)
+ - Fixed UTF-8 encoding errors in email notifications (issue 218)
+ - Fixed NPE in 1.2.1 Federation Client (issue 219)
+ - Fixed extracting Groovy scripts on Express installs (issue 220)
+ - Ensure Redmine url is properly formatted (issue 223)
+ - Use standard ServletRequestWrapper instead of custom wrapper (issue 224)
+
+ additions:
+ - Support --baseFolder parameter in Federation Client
+ - 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
+ - Added weblogic.xml to WAR for deployment on WebLogic (issue 199)
+ - Support username substitution in web.otherUrls (issue 213)
+ - Option to force client-side basic authentication instead of form-based authentication if web.authenticateViewPages=true (issue 222)
+
+ contributors:
+ - Bandarupalli Satyanarayana
+ - Christian Aistleitner
+ - Egbert Teeselink
+ - Hige Maniya
+ - Ikslawek
+ - Jay Meyer
+ - John Crygier
+ - Laurens Vrijnsen
+ - Lee Grofit
+ - Martijn Laan
+ - Michael Schaefers
+ - Philip Boutros
+ - Rafael Cavazin
+ - Ryan Schneider
+ - Sarah Haselbauer
+ - Slawomir Bochenski
+ - Stardrad Yin
+ - Thomas Pummer
+ - Yukihiko Sawanobori
+ - github/akquinet
+ - github/dapengme
+
+ dependencyChanges:
+ - JGit 2.3.1.201302201838-r
+}
+
+#
+# 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 80f5a3d..0000000
--- 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/ServletRequestWrapper.java b/src/com/gitblit/ServletRequestWrapper.java
deleted file mode 100644
index d74a9ec..0000000
--- a/src/com/gitblit/ServletRequestWrapper.java
+++ /dev/null
@@ -1,400 +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.BufferedReader;
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-import java.security.Principal;
-import java.util.Collection;
-import java.util.Enumeration;
-import java.util.Locale;
-import java.util.Map;
-
-import javax.servlet.AsyncContext;
-import javax.servlet.DispatcherType;
-import javax.servlet.RequestDispatcher;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletException;
-import javax.servlet.ServletInputStream;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.http.Cookie;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
-import javax.servlet.http.Part;
-
-/**
- * ServletRequestWrapper is a pass-through/delegate wrapper class for a servlet
- * request. This class is used in conjunction with ServletFilters, such as the
- * AccessRestrictionFilter.
- *
- * The original request is wrapped by instances of this class and this class is
- * set as the servlet request in the filter. This allows for specialized
- * implementations of request methods, like getUserPrincipal() with delegation
- * to the original request for any method not overridden.
- *
- * This class, by itself, is not altogether interesting. Subclasses of this
- * class, however, are of interest.
- *
- * @author James Moger
- *
- */
-public abstract class ServletRequestWrapper implements HttpServletRequest {
-
- protected final HttpServletRequest req;
-
- public ServletRequestWrapper(HttpServletRequest req) {
- this.req = req;
- }
-
- @Override
- public Object getAttribute(String name) {
- return req.getAttribute(name);
- }
-
- @Override
- public Enumeration getAttributeNames() {
- return req.getAttributeNames();
- }
-
- @Override
- public String getCharacterEncoding() {
- return req.getCharacterEncoding();
- }
-
- @Override
- public void setCharacterEncoding(String env) throws UnsupportedEncodingException {
- req.setCharacterEncoding(env);
- }
-
- @Override
- public int getContentLength() {
- return req.getContentLength();
- }
-
- @Override
- public String getContentType() {
- return req.getContentType();
- }
-
- @Override
- public ServletInputStream getInputStream() throws IOException {
- return req.getInputStream();
- }
-
- @Override
- public String getParameter(String name) {
- return req.getParameter(name);
- }
-
- @Override
- public Enumeration getParameterNames() {
- return req.getParameterNames();
- }
-
- @Override
- public String[] getParameterValues(String name) {
- return req.getParameterValues(name);
- }
-
- @Override
- public Map getParameterMap() {
- return req.getParameterMap();
- }
-
- @Override
- public String getProtocol() {
- return req.getProtocol();
- }
-
- @Override
- public String getScheme() {
- return req.getScheme();
- }
-
- @Override
- public String getServerName() {
- return req.getServerName();
- }
-
- @Override
- public int getServerPort() {
- return req.getServerPort();
- }
-
- @Override
- public BufferedReader getReader() throws IOException {
- return req.getReader();
- }
-
- @Override
- public String getRemoteAddr() {
- return req.getRemoteAddr();
- }
-
- @Override
- public String getRemoteHost() {
- return req.getRemoteHost();
- }
-
- @Override
- public void setAttribute(String name, Object o) {
- req.setAttribute(name, o);
- }
-
- @Override
- public void removeAttribute(String name) {
- req.removeAttribute(name);
- }
-
- @Override
- public Locale getLocale() {
- return req.getLocale();
- }
-
- @Override
- public Enumeration getLocales() {
- return req.getLocales();
- }
-
- @Override
- public boolean isSecure() {
- return req.isSecure();
- }
-
- @Override
- public RequestDispatcher getRequestDispatcher(String path) {
- return req.getRequestDispatcher(path);
- }
-
- @Override
- @Deprecated
- public String getRealPath(String path) {
- return req.getRealPath(path);
- }
-
- @Override
- public int getRemotePort() {
- return req.getRemotePort();
- }
-
- @Override
- public String getLocalName() {
- return req.getLocalName();
- }
-
- @Override
- public String getLocalAddr() {
- return req.getLocalAddr();
- }
-
- @Override
- public int getLocalPort() {
- return req.getLocalPort();
- }
-
- @Override
- public String getAuthType() {
- return req.getAuthType();
- }
-
- @Override
- public Cookie[] getCookies() {
- return req.getCookies();
- }
-
- @Override
- public long getDateHeader(String name) {
- return req.getDateHeader(name);
- }
-
- @Override
- public String getHeader(String name) {
- return req.getHeader(name);
- }
-
- @Override
- public Enumeration getHeaders(String name) {
- return req.getHeaders(name);
- }
-
- @Override
- public Enumeration getHeaderNames() {
- return req.getHeaderNames();
- }
-
- @Override
- public int getIntHeader(String name) {
- return req.getIntHeader(name);
- }
-
- @Override
- public String getMethod() {
- return req.getMethod();
- }
-
- @Override
- public String getPathInfo() {
- return req.getPathInfo();
- }
-
- @Override
- public String getPathTranslated() {
- return req.getPathTranslated();
- }
-
- @Override
- public String getContextPath() {
- return req.getContextPath();
- }
-
- @Override
- public String getQueryString() {
- return req.getQueryString();
- }
-
- @Override
- public String getRemoteUser() {
- return req.getRemoteUser();
- }
-
- @Override
- public boolean isUserInRole(String role) {
- return req.isUserInRole(role);
- }
-
- @Override
- public Principal getUserPrincipal() {
- return req.getUserPrincipal();
- }
-
- @Override
- public String getRequestedSessionId() {
- return req.getRequestedSessionId();
- }
-
- @Override
- public String getRequestURI() {
- return req.getRequestURI();
- }
-
- @Override
- public StringBuffer getRequestURL() {
- return req.getRequestURL();
- }
-
- @Override
- public String getServletPath() {
- return req.getServletPath();
- }
-
- @Override
- public HttpSession getSession(boolean create) {
- return req.getSession(create);
- }
-
- @Override
- public HttpSession getSession() {
- return req.getSession();
- }
-
- @Override
- public boolean isRequestedSessionIdValid() {
- return req.isRequestedSessionIdValid();
- }
-
- @Override
- public boolean isRequestedSessionIdFromCookie() {
- return req.isRequestedSessionIdFromCookie();
- }
-
- @Override
- public boolean isRequestedSessionIdFromURL() {
- return req.isRequestedSessionIdFromURL();
- }
-
- @Override
- @Deprecated
- public boolean isRequestedSessionIdFromUrl() {
- return req.isRequestedSessionIdFromUrl();
- }
-
- /*
- * Servlet 3.0 Methods
- */
-
- @Override
- public boolean authenticate(HttpServletResponse response) throws IOException, ServletException {
- return false;
- }
-
- @Override
- public void login(String username, String password) throws ServletException {
- }
-
- @Override
- public void logout() throws ServletException {
- }
-
-
- @Override
- public Part getPart(String arg0) throws IOException, ServletException {
- return req.getPart(arg0);
- }
-
- @Override
- public Collection<Part> getParts() throws IOException, ServletException {
- return req.getParts();
- }
-
- @Override
- public AsyncContext getAsyncContext() {
- return req.getAsyncContext();
- }
-
- @Override
- public DispatcherType getDispatcherType() {
- return req.getDispatcherType();
- }
-
- @Override
- public ServletContext getServletContext() {
- return req.getServletContext();
- }
-
- @Override
- public boolean isAsyncStarted() {
- return req.isAsyncStarted();
- }
-
- @Override
- public boolean isAsyncSupported() {
- return req.isAsyncStarted();
- }
-
- @Override
- public AsyncContext startAsync() throws IllegalStateException {
- return req.startAsync();
- }
-
- @Override
- public AsyncContext startAsync(ServletRequest arg0, ServletResponse arg1)
- throws IllegalStateException {
- return req.startAsync(arg0, arg1);
- }
-}
\ No newline at end of file
diff --git a/src/com/gitblit/authority/GitblitAuthorityLauncher.java b/src/com/gitblit/authority/GitblitAuthorityLauncher.java
deleted file mode 100644
index 584ac01..0000000
--- a/src/com/gitblit/authority/GitblitAuthorityLauncher.java
+++ /dev/null
@@ -1,113 +0,0 @@
-/*
- * Copyright 2012 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.authority;
-
-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;
-import com.gitblit.client.Translation;
-
-/**
- * Downloads dependencies and launches Gitblit Authority.
- *
- * @author James Moger
- *
- */
-public class GitblitAuthorityLauncher {
-
- 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());
-
- // 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 Authority...");
- GitblitAuthority.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/src/com/gitblit/build/Build.java b/src/com/gitblit/build/Build.java
deleted file mode 100644
index 3a9ed75..0000000
--- a/src/com/gitblit/build/Build.java
+++ /dev/null
@@ -1,967 +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.build;
-
-import java.io.BufferedInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileWriter;
-import java.io.FilenameFilter;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.RandomAccessFile;
-import java.net.URL;
-import java.text.MessageFormat;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.Properties;
-
-import com.gitblit.Constants;
-import com.gitblit.utils.StringUtils;
-
-/**
- * The Build class downloads runtime and compile-time jar files from the Apache
- * or Eclipse Maven repositories.
- *
- * It also generates the Keys class from the gitblit.properties file.
- *
- * Its important that this class have minimal compile dependencies since its
- * called very early in the build script.
- *
- * @author James Moger
- *
- */
-public class Build {
-
- private static final String osName = System.getProperty("os.name");
-
- public interface DownloadListener {
- public void downloading(String name);
- }
-
- /**
- * BuildType enumeration representing compile-time or runtime. This is used
- * to download dependencies either for Gitblit GO runtime or for setting up
- * a development environment.
- */
- public static enum BuildType {
- RUNTIME, COMPILETIME;
- }
-
- private static DownloadListener downloadListener;
-
- public static void main(String... args) {
- runtime();
- compiletime();
- buildSettingKeys();
- delete(
- "bcmail-jdk16-1.46.jar",
- "bcprov-jdk16-1.46.jar",
- "src/bcmail-jdk16-1.46-sources.jar",
- "src/bcprov-jdk16-1.46-sources.jar");
- }
-
- public static void runtime() {
- downloadFromApache(MavenObject.JCOMMANDER, BuildType.RUNTIME);
- downloadFromApache(MavenObject.JETTY, BuildType.RUNTIME);
- downloadFromApache(MavenObject.JETTY_AJP, BuildType.RUNTIME);
- downloadFromApache(MavenObject.SERVLET, BuildType.RUNTIME);
- downloadFromApache(MavenObject.SLF4JAPI, BuildType.RUNTIME);
- downloadFromApache(MavenObject.SLF4LOG4J, BuildType.RUNTIME);
- downloadFromApache(MavenObject.LOG4J, BuildType.RUNTIME);
- downloadFromApache(MavenObject.WICKET, BuildType.RUNTIME);
- downloadFromApache(MavenObject.WICKET_EXT, BuildType.RUNTIME);
- downloadFromApache(MavenObject.WICKET_AUTH_ROLES, BuildType.RUNTIME);
- downloadFromApache(MavenObject.WICKET_GOOGLE_CHARTS, BuildType.RUNTIME);
- downloadFromApache(MavenObject.MARKDOWNPAPERS, BuildType.RUNTIME);
- downloadFromApache(MavenObject.BOUNCYCASTLE, BuildType.RUNTIME);
- downloadFromApache(MavenObject.BOUNCYCASTLE_MAIL, BuildType.RUNTIME);
- downloadFromApache(MavenObject.BOUNCYCASTLE_PKIX, BuildType.RUNTIME);
- downloadFromApache(MavenObject.JSCH, BuildType.RUNTIME);
- downloadFromApache(MavenObject.ROME, BuildType.RUNTIME);
- downloadFromApache(MavenObject.JDOM, BuildType.RUNTIME);
- downloadFromApache(MavenObject.GSON, BuildType.RUNTIME);
- downloadFromApache(MavenObject.MAIL, BuildType.RUNTIME);
- downloadFromApache(MavenObject.GROOVY, BuildType.RUNTIME);
- downloadFromApache(MavenObject.LUCENE, BuildType.RUNTIME);
- downloadFromApache(MavenObject.LUCENE_HIGHLIGHTER, BuildType.RUNTIME);
- downloadFromApache(MavenObject.LUCENE_MEMORY, BuildType.RUNTIME);
- downloadFromApache(MavenObject.LUCENE_QUERIES, BuildType.RUNTIME);
- downloadFromApache(MavenObject.JAKARTA_REGEXP, BuildType.RUNTIME);
- downloadFromApache(MavenObject.UNBOUND_ID, BuildType.RUNTIME);
- downloadFromApache(MavenObject.IVY, BuildType.RUNTIME);
- downloadFromApache(MavenObject.JCALENDAR, BuildType.RUNTIME);
- downloadFromApache(MavenObject.COMMONS_COMPRESS, BuildType.RUNTIME);
- downloadFromApache(MavenObject.XZ, BuildType.RUNTIME);
-
- //needed for selenium ui tests
- downloadFromApacheToExtSelenium(MavenObject.SEL_API, BuildType.RUNTIME);
- downloadFromApacheToExtSelenium(MavenObject.SEL_FF, BuildType.RUNTIME);
- downloadFromApacheToExtSelenium(MavenObject.SEL_JAVA, BuildType.RUNTIME);
- downloadFromApacheToExtSelenium(MavenObject.SEL_REMOTE, BuildType.RUNTIME);
- downloadFromApacheToExtSelenium(MavenObject.SEL_SUPPORT, BuildType.RUNTIME);
- downloadFromApacheToExtSelenium(MavenObject.GUAVA, BuildType.RUNTIME);
- downloadFromApacheToExtSelenium(MavenObject.JSON, BuildType.RUNTIME);
- downloadFromApacheToExtSelenium(MavenObject.COMMONS_EXEC, BuildType.RUNTIME);
- downloadFromApacheToExtSelenium(MavenObject.HTTPCLIENT, BuildType.RUNTIME);
- downloadFromApacheToExtSelenium(MavenObject.HTTPCORE, BuildType.RUNTIME);
- downloadFromApacheToExtSelenium(MavenObject.HTTPMIME, BuildType.RUNTIME);
- downloadFromApacheToExtSelenium(MavenObject.COMMONS_LOGGING, BuildType.RUNTIME);
-
- downloadFromEclipse(MavenObject.JGIT, BuildType.RUNTIME);
- downloadFromEclipse(MavenObject.JGIT_HTTP, BuildType.RUNTIME);
- }
-
- public static void compiletime() {
- downloadFromApache(MavenObject.JUNIT, BuildType.RUNTIME);
- downloadFromApache(MavenObject.HAMCREST, BuildType.RUNTIME);
- downloadFromApache(MavenObject.JCOMMANDER, BuildType.COMPILETIME);
- downloadFromApache(MavenObject.JETTY, BuildType.COMPILETIME);
- downloadFromApache(MavenObject.JETTY_AJP, BuildType.COMPILETIME);
- downloadFromApache(MavenObject.SERVLET, BuildType.COMPILETIME);
- downloadFromApache(MavenObject.SLF4JAPI, BuildType.COMPILETIME);
- downloadFromApache(MavenObject.SLF4LOG4J, BuildType.COMPILETIME);
- downloadFromApache(MavenObject.LOG4J, BuildType.COMPILETIME);
- downloadFromApache(MavenObject.WICKET, BuildType.COMPILETIME);
- downloadFromApache(MavenObject.WICKET_EXT, BuildType.COMPILETIME);
- downloadFromApache(MavenObject.WICKET_AUTH_ROLES, BuildType.COMPILETIME);
- downloadFromApache(MavenObject.WICKET_GOOGLE_CHARTS, BuildType.COMPILETIME);
- downloadFromApache(MavenObject.MARKDOWNPAPERS, BuildType.COMPILETIME);
- downloadFromApache(MavenObject.BOUNCYCASTLE, BuildType.COMPILETIME);
- downloadFromApache(MavenObject.BOUNCYCASTLE_MAIL, BuildType.COMPILETIME);
- downloadFromApache(MavenObject.BOUNCYCASTLE_PKIX, BuildType.COMPILETIME);
- downloadFromApache(MavenObject.JSCH, BuildType.COMPILETIME);
- downloadFromApache(MavenObject.ROME, BuildType.COMPILETIME);
- downloadFromApache(MavenObject.JDOM, BuildType.COMPILETIME);
- downloadFromApache(MavenObject.GSON, BuildType.COMPILETIME);
- downloadFromApache(MavenObject.MAIL, BuildType.COMPILETIME);
- downloadFromApache(MavenObject.GROOVY, BuildType.COMPILETIME);
- downloadFromApache(MavenObject.LUCENE, BuildType.COMPILETIME);
- downloadFromApache(MavenObject.LUCENE_HIGHLIGHTER, BuildType.COMPILETIME);
- downloadFromApache(MavenObject.LUCENE_MEMORY, BuildType.COMPILETIME);
- downloadFromApache(MavenObject.LUCENE_QUERIES, BuildType.COMPILETIME);
- downloadFromApache(MavenObject.JAKARTA_REGEXP, BuildType.COMPILETIME);
- downloadFromApache(MavenObject.UNBOUND_ID, BuildType.COMPILETIME);
- downloadFromApache(MavenObject.IVY, BuildType.COMPILETIME);
- downloadFromApache(MavenObject.JCALENDAR, BuildType.COMPILETIME);
- downloadFromApache(MavenObject.COMMONS_COMPRESS, BuildType.COMPILETIME);
- downloadFromApache(MavenObject.XZ, BuildType.COMPILETIME);
-
- //needed for selenium ui tests
- downloadFromApacheToExtSelenium(MavenObject.SEL_API, BuildType.COMPILETIME);
- downloadFromApacheToExtSelenium(MavenObject.SEL_FF, BuildType.COMPILETIME);
- downloadFromApacheToExtSelenium(MavenObject.SEL_JAVA, BuildType.COMPILETIME);
- downloadFromApacheToExtSelenium(MavenObject.SEL_REMOTE, BuildType.COMPILETIME);
- downloadFromApacheToExtSelenium(MavenObject.SEL_SUPPORT, BuildType.COMPILETIME);
- downloadFromApacheToExtSelenium(MavenObject.GUAVA, BuildType.COMPILETIME);
- downloadFromApacheToExtSelenium(MavenObject.JSON, BuildType.COMPILETIME);
- downloadFromApacheToExtSelenium(MavenObject.COMMONS_EXEC, BuildType.COMPILETIME);
- downloadFromApacheToExtSelenium(MavenObject.HTTPCLIENT, BuildType.COMPILETIME);
- downloadFromApacheToExtSelenium(MavenObject.HTTPCORE, BuildType.COMPILETIME);
- downloadFromApacheToExtSelenium(MavenObject.HTTPMIME, BuildType.COMPILETIME);
- downloadFromApacheToExtSelenium(MavenObject.COMMONS_LOGGING, BuildType.COMPILETIME);
-
- downloadFromEclipse(MavenObject.JGIT, BuildType.COMPILETIME);
- downloadFromEclipse(MavenObject.JGIT_HTTP, BuildType.COMPILETIME);
-
- // needed for site publishing
- downloadFromApache(MavenObject.COMMONSNET, BuildType.RUNTIME);
- }
-
- private static void delete(String... files) {
- for (String name : files) {
- File file = new File("ext", name);
- if (file.exists()) {
- file.delete();
- }
- }
- }
-
- public static void federationClient() {
- downloadFromApache(MavenObject.JCOMMANDER, BuildType.RUNTIME);
- downloadFromApache(MavenObject.SERVLET, BuildType.RUNTIME);
- downloadFromApache(MavenObject.MAIL, BuildType.RUNTIME);
- downloadFromApache(MavenObject.SLF4JAPI, BuildType.RUNTIME);
- downloadFromApache(MavenObject.SLF4LOG4J, BuildType.RUNTIME);
- downloadFromApache(MavenObject.LOG4J, BuildType.RUNTIME);
- downloadFromApache(MavenObject.GSON, BuildType.RUNTIME);
- downloadFromApache(MavenObject.JSCH, BuildType.RUNTIME);
- downloadFromApache(MavenObject.LUCENE, BuildType.RUNTIME);
- downloadFromApache(MavenObject.LUCENE_HIGHLIGHTER, BuildType.RUNTIME);
- downloadFromApache(MavenObject.LUCENE_MEMORY, BuildType.RUNTIME);
- downloadFromApache(MavenObject.LUCENE_QUERIES, BuildType.RUNTIME);
- downloadFromApache(MavenObject.JAKARTA_REGEXP, BuildType.RUNTIME);
-
- downloadFromEclipse(MavenObject.JGIT, BuildType.RUNTIME);
- }
-
- public static void manager(DownloadListener listener) {
- downloadListener = listener;
- downloadFromApache(MavenObject.GSON, BuildType.RUNTIME);
- downloadFromApache(MavenObject.ROME, BuildType.RUNTIME);
- downloadFromApache(MavenObject.JDOM, BuildType.RUNTIME);
- downloadFromApache(MavenObject.JSCH, BuildType.RUNTIME);
-
- downloadFromEclipse(MavenObject.JGIT, BuildType.RUNTIME);
- }
-
- public static void authority(DownloadListener listener) {
- downloadListener = listener;
- downloadFromApache(MavenObject.JCOMMANDER, BuildType.RUNTIME);
- downloadFromApache(MavenObject.JSCH, BuildType.RUNTIME);
- downloadFromApache(MavenObject.SLF4JAPI, BuildType.RUNTIME);
- downloadFromApache(MavenObject.SLF4LOG4J, BuildType.RUNTIME);
- downloadFromApache(MavenObject.LOG4J, BuildType.RUNTIME);
- downloadFromApache(MavenObject.BOUNCYCASTLE, BuildType.RUNTIME);
- downloadFromApache(MavenObject.BOUNCYCASTLE_MAIL, BuildType.RUNTIME);
- downloadFromApache(MavenObject.BOUNCYCASTLE_PKIX, BuildType.RUNTIME);
- downloadFromApache(MavenObject.JCALENDAR, BuildType.RUNTIME);
- downloadFromApache(MavenObject.MAIL, BuildType.RUNTIME);
-
- downloadFromEclipse(MavenObject.JGIT, BuildType.RUNTIME);
- }
-
- /**
- * Builds the Keys class based on the gitblit.properties file and inserts
- * the class source into the project source folder.
- */
- public static void buildSettingKeys() {
- // Load all keys
- Properties properties = new Properties();
- FileInputStream is = null;
- try {
- is = new FileInputStream(new File("distrib", Constants.PROPERTIES_FILE));
- properties.load(is);
- } catch (Throwable t) {
- t.printStackTrace();
- } finally {
- if (is != null) {
- try {
- is.close();
- } catch (Throwable t) {
- // IGNORE
- }
- }
- }
- List<String> keys = new ArrayList<String>(properties.stringPropertyNames());
- Collections.sort(keys);
-
- KeyGroup root = new KeyGroup();
- for (String key : keys) {
- root.addKey(key);
- }
-
- // Save Keys class definition
- try {
- File file = new File("src/com/gitblit/Keys.java");
- FileWriter fw = new FileWriter(file, false);
- fw.write(root.generateClass("com.gitblit", "Keys"));
- fw.close();
- } catch (Throwable t) {
- t.printStackTrace();
- }
- }
-
- private static class KeyGroup {
- final KeyGroup parent;
- final String namespace;
-
- String name;
- List<KeyGroup> children;
- List<String> fields;
-
- KeyGroup() {
- this.parent = null;
- this.namespace = "";
- this.name = "";
- }
-
- KeyGroup(String namespace, KeyGroup parent) {
- this.parent = parent;
- this.namespace = namespace;
- if (parent.children == null) {
- parent.children = new ArrayList<KeyGroup>();
- }
- parent.children.add(this);
- }
-
- void addKey(String key) {
- String keyspace = "";
- String field = key;
- if (key.indexOf('.') > -1) {
- keyspace = key.substring(0, key.lastIndexOf('.'));
- field = key.substring(key.lastIndexOf('.') + 1);
- KeyGroup group = addKeyGroup(keyspace);
- group.addKey(field);
- } else {
- if (fields == null) {
- fields = new ArrayList<String>();
- }
- fields.add(key);
- }
- }
-
- KeyGroup addKeyGroup(String keyspace) {
- KeyGroup parent = this;
- KeyGroup node = null;
- String [] space = keyspace.split("\\.");
- for (int i = 0; i < space.length; i++) {
- StringBuilder namespace = new StringBuilder();
- for (int j = 0; j <= i; j++) {
- namespace.append(space[j]);
- if (j < i) {
- namespace.append('.');
- }
- }
- if (parent.children != null) {
- for (KeyGroup child : parent.children) {
- if (child.name.equals(space[i])) {
- node = child;
- }
- }
- }
- if (node == null) {
- node = new KeyGroup(namespace.toString(), parent);
- node.name = space[i];
- }
- parent = node;
- node = null;
- }
- return parent;
- }
-
- String fullKey(String field) {
- if (namespace.equals("")) {
- return field;
- }
- return namespace + "." + field;
- }
-
- String generateClass(String packageName, String className) {
- StringBuilder sb = new StringBuilder();
- sb.append("package ").append(packageName).append(";\n");
- sb.append('\n');
- sb.append("/*\n");
- sb.append(" * This class is auto-generated from the properties file.\n");
- sb.append(" * Do not version control!\n");
- sb.append(" */\n");
- sb.append(MessageFormat.format("public final class {0} '{'\n\n", className));
- sb.append(generateClass(this, 0));
- sb.append("}\n");
- return sb.toString();
- }
-
- String generateClass(KeyGroup group, int level) {
- String classIndent = StringUtils.leftPad("", level, '\t');
- String fieldIndent = StringUtils.leftPad("", level + 1, '\t');
-
- // begin class
- StringBuilder sb = new StringBuilder();
- if (!group.namespace.equals("")) {
- sb.append(classIndent).append(MessageFormat.format("public static final class {0} '{'\n\n", group.name));
- sb.append(fieldIndent).append(MessageFormat.format("public static final String _ROOT = \"{0}\";\n\n", group.namespace));
- }
-
- if (group.fields != null) {
- // fields
- for (String field : group.fields) {
- sb.append(fieldIndent).append(MessageFormat.format("public static final String {0} = \"{1}\";\n\n", field, group.fullKey(field)));
- }
- }
- if (group.children != null) {
- // inner classes
- for (KeyGroup child : group.children) {
- sb.append(generateClass(child, level + 1));
- }
- }
- // end class
- if (!group.namespace.equals("")) {
- sb.append(classIndent).append("}\n\n");
- }
- return sb.toString();
- }
- }
-
- /**
- * Download a file from the official Apache Maven repository.
- *
- * @param mo
- * the maven object to download.
- * @return
- */
- private static List<File> downloadFromApache(MavenObject mo, BuildType type) {
- return downloadFromMaven("http://repo1.maven.org/maven2/", mo, type);
- }
-
- /**
- * Download a file from the official Eclipse Maven repository.
- *
- * @param mo
- * the maven object to download.
- * @return
- */
- private static List<File> downloadFromEclipse(MavenObject mo, BuildType type) {
- return downloadFromMaven("http://download.eclipse.org/jgit/maven/", mo, type);
- }
-
- /**
- * Download a file from a Maven repository.
- *
- * @param mo
- * the maven object to download.
- * @return
- */
- private static List<File> downloadFromMaven(String mavenRoot, MavenObject mo, BuildType type, String targetFolder) {
- List<File> downloads = new ArrayList<File>();
- String[] jars = { "" };
- if (BuildType.RUNTIME.equals(type)) {
- jars = new String[] { "" };
- } else if (BuildType.COMPILETIME.equals(type)) {
- jars = new String[] { "-sources" };
- }
- for (String jar : jars) {
- File targetFile = mo.getLocalFile(targetFolder, jar);
- if ("-sources".equals(jar)) {
- File relocated = new File(targetFolder+"/src", targetFile.getName());
- if (targetFile.exists()) {
- // move -sources jar to ext/src folder
- targetFile.renameTo(relocated);
- }
- // -sources jars are located in ext/src
- targetFile = relocated;
- }
-
- if (targetFile.exists()) {
- downloads.add(targetFile);
- removeObsoleteArtifacts(mo, type, targetFile.getParentFile());
- continue;
- }
- String expectedSHA1 = mo.getSHA1(jar);
- if (expectedSHA1 == null) {
- // skip this jar
- continue;
- }
- float approximateLength = mo.getApproximateLength(jar);
- String mavenURL = mavenRoot + mo.getRepositoryPath(jar);
- if (!targetFile.getAbsoluteFile().getParentFile().exists()) {
- boolean success = targetFile.getAbsoluteFile().getParentFile().mkdirs();
- if (!success) {
- throw new RuntimeException("Failed to create destination folder structure!");
- }
- }
- if (downloadListener != null) {
- downloadListener.downloading(mo.name + "...");
- }
- ByteArrayOutputStream buff = new ByteArrayOutputStream();
- try {
- URL url = new URL(mavenURL);
- InputStream in = new BufferedInputStream(url.openStream());
- byte[] buffer = new byte[4096];
- int downloadedLen = 0;
- float lastProgress = 0f;
-
- updateDownload(0, targetFile);
- while (true) {
- int len = in.read(buffer);
- if (len < 0) {
- break;
- }
- downloadedLen += len;
- buff.write(buffer, 0, len);
- float progress = downloadedLen / approximateLength;
- if (progress - lastProgress >= 0.1f) {
- lastProgress = progress;
- updateDownload(progress, targetFile);
- if (downloadListener != null) {
- int percent = Math.min(100, Math.round(100 * progress));
- downloadListener.downloading(mo.name + " (" + percent + "%)");
- }
- }
- }
- in.close();
- updateDownload(1f, targetFile);
- if (downloadListener != null) {
- downloadListener.downloading(mo.name + " (100%)");
- }
-
- } catch (IOException e) {
- throw new RuntimeException("Error downloading " + mavenURL + " to " + targetFile, e);
- }
- byte[] data = buff.toByteArray();
- String calculatedSHA1 = StringUtils.getSHA1(data);
-
- System.out.println();
-
- if (expectedSHA1.length() == 0) {
- updateProgress(0, "sha: " + calculatedSHA1);
- System.out.println();
- } else {
- if (!calculatedSHA1.equals(expectedSHA1)) {
- throw new RuntimeException("SHA1 checksum mismatch; got: " + calculatedSHA1);
- }
- }
- try {
- RandomAccessFile ra = new RandomAccessFile(targetFile, "rw");
- ra.write(data);
- ra.setLength(data.length);
- ra.close();
- } catch (IOException e) {
- throw new RuntimeException("Error writing to file " + targetFile, e);
- }
- downloads.add(targetFile);
-
- removeObsoleteArtifacts(mo, type, targetFile.getParentFile());
- }
- return downloads;
- }
-
- /**
- * Download a file from the official Apache Maven repository.
- *
- * @param mo
- * the maven object to download.
- * @return
- */
- private static List<File> downloadFromApacheToExtSelenium(MavenObject mo,
- BuildType type) {
- return downloadFromMaven("http://repo1.maven.org/maven2/", mo, type,
- "ext/seleniumhq");
- }
-
- /**
- * Download a file from the official Apache Maven repository.
- *
- * @param mo
- * the maven object to download.
- * @return
- */
- private static List<File> downloadFromMaven(String mavenRoot,
- MavenObject mo, BuildType type) {
- return downloadFromMaven(mavenRoot, mo, type, "ext");
- }
-
- private static void removeObsoleteArtifacts(final MavenObject mo, final BuildType type, File folder) {
- File [] removals = folder.listFiles(new FilenameFilter() {
- @Override
- public boolean accept(File dir, String name) {
- String n = name.toLowerCase();
- String dep = mo.artifact.toLowerCase();
- if (n.startsWith(dep)) {
- String suffix = "-" + mo.version;
- if (type.equals(BuildType.COMPILETIME)) {
- suffix += "-sources.jar";
- } else {
- suffix += ".jar";
- }
- if (!n.endsWith(suffix)) {
- return true;
- }
- }
- return false;
- }
- });
-
- // delete any matches
- if (removals != null) {
- for (File file : removals) {
- System.out.println("deleting " + file);
- file.delete();
- }
- }
- }
-
- private static void updateDownload(float progress, File file) {
- updateProgress(progress, "d/l: " + file.getName());
- }
-
- private static void updateProgress(float progress, String url) {
- boolean isWindows = osName.contains("Windows");
- String anim = "==========";
- int width = Math.round(anim.length() * progress);
- if (isWindows) System.out.print("\r");
- System.out.print("[");
- System.out.print(anim.substring(0, Math.min(width, anim.length())));
- for (int i = 0; i < anim.length() - width; i++) {
- System.out.print(' ');
- }
- System.out.print("] " + url);
- if (!isWindows) System.out.println();
- }
-
- /**
- * MavenObject represents a complete maven artifact (binary, sources, and
- * javadoc). MavenObjects can be downloaded and checksummed to confirm
- * authenticity.
- */
- private static class MavenObject {
-
- public static final MavenObject JCOMMANDER = new MavenObject(
- "jCommander", "com/beust", "jcommander", "1.17",
- 34000, 32000, 141000,
- "219a3540f3b27d7cc3b1d91d6ea046cd8723290e",
- "0bb50eec177acf0e94d58e0cf07262fe5164331d",
- "c7adc475ca40c288c93054e0f4fe58f3a98c0cb5");
-
- public static final MavenObject JETTY = new MavenObject(
- "Jetty", "org/eclipse/jetty/aggregate", "jetty-webapp", "7.6.8.v20121106",
- 1000000, 680000, 2720000,
- "6333969b4d509c4b681e05302ca7ebccb9c3efb5",
- "354f2752ed6544296bc0fc92e533d68a5b03045b",
- "");
-
- public static final MavenObject JETTY_AJP = new MavenObject(
- "Jetty-AJP", "org/eclipse/jetty", "jetty-ajp", "7.6.8.v20121106",
- 32000, 22000, 97000,
- "95bd1c89bb2afd4eeaabc6f4b0183a9f26a522d7",
- "e1fc2539202ebb240a87a080bc44a24c93d7318b",
- "");
-
- public static final MavenObject SERVLET = new MavenObject(
- "Servlet 3.0", "javax/servlet", "javax.servlet-api", "3.0.1",
- 84000, 211000, 0,
- "6bf0ebb7efd993e222fc1112377b5e92a13b38dd",
- "01952f91d84016a39e31346c9d18bd8c9c4a128a",
- null);
-
- public static final MavenObject SLF4JAPI = new MavenObject(
- "SLF4J API", "org/slf4j", "slf4j-api", "1.6.6",
- 25500, 45000, 182000,
- "ce53b0a0e2cfbb27e8a59d38f79a18a5c6a8d2b0",
- "bcd0e21b1572960cefd449f8a16efab5b6b8e644",
- "4253b52aabf1c5a5f20c191a261e6ada0fcf621d");
-
- public static final MavenObject SLF4LOG4J = new MavenObject(
- "SLF4J LOG4J", "org/slf4j", "slf4j-log4j12", "1.6.6",
- 9800, 9500, 52400,
- "5cd9b4fbc3ff6a97beaade3206137d76f65df805",
- "497bfac9a678118e7ff75d1f3b8c3bcc06dc9c8c",
- "69855e2a85d9249bb577df3c5076bc2cb34975d7");
-
- public static final MavenObject LOG4J = new MavenObject(
- "Apache LOG4J", "log4j", "log4j", "1.2.17",
- 481000, 471000, 1455000,
- "5af35056b4d257e4b64b9e8069c0746e8b08629f",
- "677abe279b68c5e7490d6d50c6951376238d7d3e",
- "c10c20168206896442f3192d5417815df7fcbf9a");
-
- public static final MavenObject WICKET = new MavenObject(
- "Apache Wicket", "org/apache/wicket", "wicket", "1.4.21",
- 1960000, 1906000, 6818000,
- "cce9dfd3088e18a3cdcf9be33b5b76caa48dc4c6",
- "e8c2bfe2c96a2da7a0eca947a2f60dc3242e7229",
- "");
-
- public static final MavenObject WICKET_EXT = new MavenObject(
- "Apache Wicket Extensions", "org/apache/wicket", "wicket-extensions", "1.4.21",
- 1180000, 1118000, 1458000,
- "fac510c7ee4399a29b927405ec3de40b67d105d8",
- "ee3409ce9ed64ad8cc8d69abbd7d63f07e10851a",
- "");
-
- public static final MavenObject WICKET_AUTH_ROLES = new MavenObject(
- "Apache Wicket Auth Roles", "org/apache/wicket", "wicket-auth-roles", "1.4.21",
- 44000, 45000, 166000,
- "e78df70ca942e2e15287c393f236b32fbe6f9a30",
- "47c301212cce43a70caa72f41a9a1aefcf26a533",
- "");
-
- public static final MavenObject WICKET_GOOGLE_CHARTS = new MavenObject(
- "Apache Wicket Google Charts Add-On", "org/wicketstuff", "googlecharts", "1.4.21",
- 34000, 18750, 161000,
- "73d7540267afc3a0e91ca6148d3073e050dba180",
- "627b125cc6029d4d5c59c3a910c1bef347384d97",
- "");
-
- public static final MavenObject JUNIT = new MavenObject(
- "JUnit", "junit", "junit", "4.10",
- 253000, 141000, 0, "e4f1766ce7404a08f45d859fb9c226fc9e41a861",
- "6c98d6766e72d5575f96c9479d1c1d3b865c6e25", "");
-
- public static final MavenObject HAMCREST = new MavenObject(
- "Hamcrest Core", "org/hamcrest", "hamcrest-core", "1.1",
- 77000, 0, 0,
- "860340562250678d1a344907ac75754e259cdb14",
- null,
- "");
-
- public static final MavenObject MARKDOWNPAPERS = new MavenObject(
- "MarkdownPapers", "org/tautua/markdownpapers", "markdownpapers-core", "1.3.2",
- 92000, 60000, 268000,
- "da22db6660e90b9a677bbdfc2c511c619ea5c249",
- "6a7228280a229144afe6c01351a8f44675d8524d",
- "");
-
- public static final MavenObject BOUNCYCASTLE = new MavenObject(
- "BouncyCastle", "org/bouncycastle", "bcprov-jdk15on", "1.47",
- 1900000, 1400000, 4670000,
- "b6f5d9926b0afbde9f4dbe3db88c5247be7794bb",
- "85e6e1ad449d5a3f09624bf4038fc8d2b02de81c",
- "");
-
- public static final MavenObject BOUNCYCASTLE_MAIL = new MavenObject(
- "BouncyCastle Mail", "org/bouncycastle", "bcmail-jdk15on", "1.47",
- 502000, 420000, 482000,
- "a35ccec640177d0de5815568529021af5546d6a7",
- "f742330cfe1e7365dbdf773c24b92382172164a7",
- "");
-
- public static final MavenObject BOUNCYCASTLE_PKIX = new MavenObject(
- "BouncyCastle PKIX", "org/bouncycastle", "bcpkix-jdk15on", "1.47",
- 502000, 420000, 482000,
- "cd204e6f26d2bbf65ff3a30de8831d3a1344e851",
- "80e774a73d0e6a6b40ddf35fff613f9f30fe2a98",
- "");
-
- public static final MavenObject JGIT = new MavenObject(
- "JGit", "org/eclipse/jgit", "org.eclipse.jgit", "2.2.0.201212191850-r",
- 1600000, 1565000, 3460000,
- "97d0761b9dd618d1f9f6c16c35c3ddf045ba536c",
- "08dcf9546f4d61e1b8a50df5da5513006023b64b",
- "");
-
- public static final MavenObject JGIT_HTTP = new MavenObject(
- "JGit", "org/eclipse/jgit", "org.eclipse.jgit.http.server", "2.2.0.201212191850-r",
- 68000, 62000, 110000,
- "8ad4fc4fb9529d645249bb46ad7e54d98436cb65",
- "3385cf294957d1d34c1270b468853aea347b36ca",
- "");
-
- public static final MavenObject JSCH = new MavenObject(
- "JSch", "com/jcraft", "jsch", "0.1.44-1",
- 214000, 211000, 413000,
- "2e9ae08de5a71bd0e0d3ba2558598181bfa71d4e",
- "e528f593b19b04d500992606f58b87fcfded8883",
- "d0ffadd0a4ab909d94a577b5aad43c13b617ddcb");
-
- public static final MavenObject COMMONSNET = new MavenObject(
- "commons-net", "commons-net", "commons-net", "1.4.0",
- 181000, 0, 0,
- "eb47e8cad2dd7f92fd7e77df1d1529cae87361f7",
- "",
- "");
-
- public static final MavenObject ROME = new MavenObject(
- "rome", "rome", "rome", "0.9",
- 208000, 196000, 407000,
- "dee2705dd01e79a5a96a17225f5a1ae30470bb18",
- "226f851dc44fd94fe70b9c471881b71f88949cbf",
- "8d7d867b97eeb3a9196c3926da550ad042941c1b");
-
- public static final MavenObject JDOM = new MavenObject(
- "jdom", "jdom", "jdom", "1.0",
- 153000, 235000, 445000,
- "a2ac1cd690ab4c80defe7f9bce14d35934c35cec",
- "662abe0196cf554d4d7374f5d6382034171b652c",
- "");
-
- public static final MavenObject GSON = new MavenObject(
- "gson", "com/google/code/gson", "gson", "1.7.2",
- 174000, 142000, 247000,
- "112366d8158749e25532ebce162232c6e0fb20a5",
- "a6fe3006df46174a9c1c56b3c51357b9bfde5874",
- "537f729ac63b6132a795a3c1f2e13b327e872333");
-
- public static final MavenObject MAIL = new MavenObject(
- "javax.mail", "javax/mail", "mail", "1.4.3",
- 462000, 642000, 0,
- "8154bf8d666e6db154c548dc31a8d512c273f5ee",
- "5875e2729de83a4e46391f8f979ec8bd03810c10", null);
-
- public static final MavenObject GROOVY = new MavenObject(
- "groovy", "org/codehaus/groovy", "groovy-all", "1.8.8",
- 6143000, 2290000, 4608000,
- "98a489343d3c30da817d36cbea5de11ed07bef31",
- "5f847ed18009f8a034bad3906e39f771c01728c1", "");
-
- public static final MavenObject LUCENE = new MavenObject(
- "lucene", "org/apache/lucene", "lucene-core", "3.6.1",
- 1540000, 1431000, 3608000,
- "6ae2c83c77a1ffa5840b9151a271ab3f451f6e0c",
- "6925deb6b78e63bbcac382004f00b98133327057", "");
-
- public static final MavenObject LUCENE_HIGHLIGHTER = new MavenObject(
- "lucene highlighter", "org/apache/lucene", "lucene-highlighter", "3.6.1",
- 89200, 85000, 0,
- "2bd49695e9891697c5f290aa94c3412dfb95b096",
- "20ae81816ce9c27186ef0f2e92a57812c9ee3b6c", "");
-
- public static final MavenObject LUCENE_MEMORY = new MavenObject(
- "lucene memory", "org/apache/lucene", "lucene-memory", "3.6.1",
- 30000, 23000, 0,
- "8c7ca5572edea50973dc0d26cf75c27047eebe7e",
- "2e291e96d25132e002b1c8240e361d1272d113e1", "");
-
- public static final MavenObject LUCENE_QUERIES = new MavenObject(
- "lucene queries", "org/apache/lucene", "lucene-queries", "3.6.1",
- 47400, 48600, 0,
- "4ed6022dd4aa80b932a1546e7e39e3b8bbe7acb7",
- "dc425c75d988e4975d314772035a46b6a17dcc8d", "");
-
- public static final MavenObject JAKARTA_REGEXP = new MavenObject(
- "jakarta regexp", "jakarta-regexp", "jakarta-regexp", "1.4",
- 28500, 0, 0,
- "0ea514a179ac1dd7e81c7e6594468b9b9910d298",
- null, "");
-
- public static final MavenObject UNBOUND_ID = new MavenObject(
- "unbound id", "com/unboundid", "unboundid-ldapsdk", "2.3.0",
- 1383417, 1439721, 0,
- "6fde8d9fb4ee3e7e3d7e764e3ea57195971e2eb2",
- "5276d3d29630693dba99ab9f7ea54f4c471d3af1",
- "");
-
- public static final MavenObject IVY = new MavenObject(
- "ivy", "org/apache/ivy", "ivy", "2.2.0",
- 948000, 744000, 0,
- "f9d1e83e82fc085093510f7d2e77d81d52bc2081",
- "0312527950ad0e8fbab37228fbed3bf41a6fe0a1", "");
-
- public static final MavenObject JCALENDAR = new MavenObject(
- "jcalendar", "com/toedter", "jcalendar", "1.3.2",
- 127000, 0, 0,
- "323a672aeacb5f5f4461be3b7f7d9d3e4bda80d4",
- null, "");
-
- public static final MavenObject COMMONS_COMPRESS = new MavenObject(
- "commons-compress", "org/apache/commons", "commons-compress", "1.4.1",
- 242000, 265000, 0,
- "b02e84a993d88568417536240e970c4b809126fd",
- "277d39267403965a7a192474794a29bac6760a25", "");
-
- public static final MavenObject XZ = new MavenObject(
- "xz", "org/tukaani", "xz", "1.0",
- 95000, 120000, 0,
- "ecff5cb8b1189514c9d1d8d68eb77ac372e000c9",
- "f95e32a5d2dd8da643c4419814415b9704312993", "");
-
- public static final MavenObject SEL_JAVA = new MavenObject(
- "selenium-java", "org/seleniumhq/selenium", "selenium-java",
- "2.28.0", 984098, 0, 0,
- "7606286989ac9cb942cc206d975ffe187c18d605", "4ede08d293dc153989a337cd0d31d26421433af5", "");
-
- public static final MavenObject SEL_API = new MavenObject(
- "selenium-api", "org/seleniumhq/selenium", "selenium-api",
- "2.28.0", 984098, 0, 0,
- "c4044c40fff65cd25135a5f443638a2b1ccaeac5", "35fc6ec0804ae32b16a56627e69bdcb69995c515", "");
-
- public static final MavenObject SEL_REMOTE = new MavenObject(
- "selenium-remote-driver", "org/seleniumhq/selenium",
- "selenium-remote-driver", "2.28.0", 984098, 0, 0,
- "c67f97cd94e02afec92b0ac881844febb4fc90be", "51a9c30de3c8c203cb7a474a10842443005a5fb4", "");
- public static final MavenObject SEL_SUPPORT = new MavenObject(
- "selenium-support", "org/seleniumhq/selenium",
- "selenium-support", "2.28.0", 984098, 0, 0,
- "caf68d6310425f583bc592c08e43066b35eb94f6", "ce3831a601f5f50fda2f4604decde409b6c735a7", "");
- public static final MavenObject SEL_FF = new MavenObject(
- "selenium-firefox-driver", "org/seleniumhq/selenium",
- "selenium-firefox-driver", "2.28.0", 984098, 0, 0,
- "a7c34e45dba39e65467b900aa67611aaa039692d", "aa8cd5fb49ca75a53d5b143406ea3d81ab3eddfd", "");
-
- public static final MavenObject GUAVA = new MavenObject("guava",
- "com/google/guava", "guava", "12.0", 984098, 0, 0,
- "5bc66dd95b79db1e437eb08adba124a3e4088dc0", "f8b98e61865bed3c39b978ee3bf5c7fb990c4032", "");
-
- public static final MavenObject JSON = new MavenObject("json",
- "org/json", "json", "20080701", 984098, 0, 0,
- "d652f102185530c93b66158b1859f35d45687258", "71bd54221e701df9d112bf9ba2918e13b0671f3a", "");
-
- public static final MavenObject COMMONS_EXEC = new MavenObject(
- "commons-exec", "org/apache/commons", "commons-exec", "1.1",
- 984098, 0, 0, "07dfdf16fade726000564386825ed6d911a44ba1", "f60bea898e18b308099862e8634d589b06a8b0be",
- "");
-
- public static final MavenObject HTTPCORE = new MavenObject("httpcore",
- "org/apache/httpcomponents", "httpcore", "4.2.1", 984098, 0, 0,
- "2d503272bf0a8b5f92d64db78b4ba9abbaccc6fd", "3f6caf5334fa83607b82e2f32dd128a9d8a0ea5e", "");
-
- public static final MavenObject HTTPMIME = new MavenObject("httpmime",
- "org/apache/httpcomponents", "httpmime", "4.2.1", 984098, 0, 0,
- "7c772bace9aa31a728c39a88c6ff66a7cd177e89", "", "4e453843ae47f1c2d70e2eb2c13c037de4b614c4");
-
- public static final MavenObject HTTPCLIENT = new MavenObject(
- "httpclient", "org/apache/httpcomponents", "httpclient",
- "4.2.1", 984098, 0, 0,
- "b69bd03af60bf487b3ae1209a644ecac587bf6fc", "6b27312b9c28b59aaeb6c21f3490045690c703d3", "");
- public static final MavenObject COMMONS_LOGGING = new MavenObject(
- "commons-logging", "commons-logging", "commons-logging",
- "1.1.1", 984098, 0, 0,
- "5043bfebc3db072ed80fbd362e7caf00e885d8ae", "f3f156cbff0e0fb0d64bfce31a352cce4a33bc19", "");
-
- public final String name;
- public final String group;
- public final String artifact;
- public final String version;
- public final int approxLibraryLen;
- public final int approxSourcesLen;
- public final int approxJavadocLen;
- public final String librarySHA1;
- public final String sourcesSHA1;
- public final String javadocSHA1;
-
- private MavenObject(String name, String group, String artifact, String version,
- int approxLibraryLen, int approxSourcesLen, int approxJavadocLen,
- String librarySHA1, String sourcesSHA1, String javadocSHA1) {
- this.name = name;
- this.group = group;
- this.artifact = artifact;
- this.version = version;
- this.approxLibraryLen = approxLibraryLen;
- this.approxSourcesLen = approxSourcesLen;
- this.approxJavadocLen = approxJavadocLen;
- this.librarySHA1 = librarySHA1;
- this.sourcesSHA1 = sourcesSHA1;
- this.javadocSHA1 = javadocSHA1;
- }
-
- private String getRepositoryPath(String jar) {
- return group + "/" + artifact + "/" + version + "/" + artifact + "-" + version + jar
- + ".jar";
- }
-
- private File getLocalFile(String basePath, String jar) {
- return new File(basePath, artifact + "-" + version + jar + ".jar");
- }
-
- private String getSHA1(String jar) {
- if (jar.equals("")) {
- return librarySHA1;
- } else if (jar.equals("-sources")) {
- return sourcesSHA1;
- } else if (jar.equals("-javadoc")) {
- return javadocSHA1;
- }
- return librarySHA1;
- }
-
- private int getApproximateLength(String jar) {
- if (jar.equals("")) {
- return approxLibraryLen;
- } else if (jar.equals("-sources")) {
- return approxSourcesLen;
- } else if (jar.equals("-javadoc")) {
- return approxJavadocLen;
- }
- return approxLibraryLen;
- }
-
- @Override
- public String toString() {
- return name;
- }
- }
-}
diff --git a/src/com/gitblit/build/BuildGhPages.java b/src/com/gitblit/build/BuildGhPages.java
deleted file mode 100644
index 5982ac3..0000000
--- a/src/com/gitblit/build/BuildGhPages.java
+++ /dev/null
@@ -1,259 +0,0 @@
-/*
- * Copyright 2012 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.build;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.text.MessageFormat;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Set;
-import java.util.TreeSet;
-
-import org.eclipse.jgit.api.errors.ConcurrentRefUpdateException;
-import org.eclipse.jgit.api.errors.JGitInternalException;
-import org.eclipse.jgit.dircache.DirCache;
-import org.eclipse.jgit.dircache.DirCacheBuilder;
-import org.eclipse.jgit.dircache.DirCacheEntry;
-import org.eclipse.jgit.internal.JGitText;
-import org.eclipse.jgit.lib.CommitBuilder;
-import org.eclipse.jgit.lib.Constants;
-import org.eclipse.jgit.lib.FileMode;
-import org.eclipse.jgit.lib.ObjectId;
-import org.eclipse.jgit.lib.ObjectInserter;
-import org.eclipse.jgit.lib.PersonIdent;
-import org.eclipse.jgit.lib.RefUpdate;
-import org.eclipse.jgit.lib.RefUpdate.Result;
-import org.eclipse.jgit.lib.Repository;
-import org.eclipse.jgit.lib.RepositoryCache.FileKey;
-import org.eclipse.jgit.revwalk.RevCommit;
-import org.eclipse.jgit.revwalk.RevWalk;
-import org.eclipse.jgit.storage.file.FileRepository;
-import org.eclipse.jgit.treewalk.CanonicalTreeParser;
-import org.eclipse.jgit.treewalk.TreeWalk;
-import org.eclipse.jgit.util.FS;
-
-import com.beust.jcommander.JCommander;
-import com.beust.jcommander.Parameter;
-import com.beust.jcommander.ParameterException;
-import com.beust.jcommander.Parameters;
-import com.gitblit.models.RefModel;
-import com.gitblit.utils.JGitUtils;
-import com.gitblit.utils.StringUtils;
-
-/**
- * Creates or updates a gh-pages branch with the specified content.
- *
- * @author James Moger
- *
- */
-public class BuildGhPages {
-
- public static void main(String[] args) {
- Params params = new Params();
- JCommander jc = new JCommander(params);
- try {
- jc.parse(args);
- } catch (ParameterException t) {
- System.err.println(t.getMessage());
- jc.usage();
- }
-
- File source = new File(params.sourceFolder);
- String ghpages = "refs/heads/gh-pages";
- try {
- File gitDir = FileKey.resolve(new File(params.repositoryFolder), FS.DETECTED);
- Repository repository = new FileRepository(gitDir);
-
- RefModel issuesBranch = JGitUtils.getPagesBranch(repository);
- if (issuesBranch == null) {
- JGitUtils.createOrphanBranch(repository, "gh-pages", null);
- }
-
- System.out.println("Updating gh-pages branch...");
- ObjectId headId = repository.resolve(ghpages + "^{commit}");
- ObjectInserter odi = repository.newObjectInserter();
- try {
- // Create the in-memory index of the new/updated issue.
- DirCache index = createIndex(repository, headId, source, params.obliterate);
- ObjectId indexTreeId = index.writeTree(odi);
-
- // Create a commit object
- PersonIdent author = new PersonIdent("Gitblit", "gitblit@localhost");
- CommitBuilder commit = new CommitBuilder();
- commit.setAuthor(author);
- commit.setCommitter(author);
- commit.setEncoding(Constants.CHARACTER_ENCODING);
- commit.setMessage("updated pages");
- commit.setParentId(headId);
- commit.setTreeId(indexTreeId);
-
- // Insert the commit into the repository
- ObjectId commitId = odi.insert(commit);
- odi.flush();
-
- RevWalk revWalk = new RevWalk(repository);
- try {
- RevCommit revCommit = revWalk.parseCommit(commitId);
- RefUpdate ru = repository.updateRef(ghpages);
- ru.setNewObjectId(commitId);
- ru.setExpectedOldObjectId(headId);
- ru.setRefLogMessage("commit: " + revCommit.getShortMessage(), false);
- Result rc = ru.forceUpdate();
- switch (rc) {
- case NEW:
- case FORCED:
- case FAST_FORWARD:
- break;
- case REJECTED:
- case LOCK_FAILURE:
- throw new ConcurrentRefUpdateException(JGitText.get().couldNotLockHEAD,
- ru.getRef(), rc);
- default:
- throw new JGitInternalException(MessageFormat.format(
- JGitText.get().updatingRefFailed, ghpages, commitId.toString(), rc));
- }
- } finally {
- revWalk.release();
- }
- } finally {
- odi.release();
- }
- System.out.println("gh-pages updated.");
- } catch (Throwable t) {
- t.printStackTrace();
- }
- }
-
- /**
- * Creates an in-memory index of the issue change.
- *
- * @param repo
- * @param headId
- * @param sourceFolder
- * @param obliterate
- * if true the source folder tree is used as the new tree for
- * gh-pages and non-existent files are considered deleted
- * @return an in-memory index
- * @throws IOException
- */
- private static DirCache createIndex(Repository repo, ObjectId headId, File sourceFolder,
- boolean obliterate) throws IOException {
-
- DirCache inCoreIndex = DirCache.newInCore();
- DirCacheBuilder dcBuilder = inCoreIndex.builder();
- ObjectInserter inserter = repo.newObjectInserter();
-
- try {
- // Add all files to the temporary index
- Set<String> ignorePaths = new TreeSet<String>();
- List<File> files = listFiles(sourceFolder);
- for (File file : files) {
- // create an index entry for the file
- final DirCacheEntry dcEntry = new DirCacheEntry(StringUtils.getRelativePath(
- sourceFolder.getPath(), file.getPath()));
- dcEntry.setLength(file.length());
- dcEntry.setLastModified(file.lastModified());
- dcEntry.setFileMode(FileMode.REGULAR_FILE);
-
- // add this entry to the ignore paths set
- ignorePaths.add(dcEntry.getPathString());
-
- // insert object
- InputStream inputStream = new FileInputStream(file);
- try {
- dcEntry.setObjectId(inserter.insert(Constants.OBJ_BLOB, file.length(),
- inputStream));
- } finally {
- inputStream.close();
- }
-
- // add to temporary in-core index
- dcBuilder.add(dcEntry);
- }
-
- if (!obliterate) {
- // Traverse HEAD to add all other paths
- TreeWalk treeWalk = new TreeWalk(repo);
- int hIdx = -1;
- if (headId != null)
- hIdx = treeWalk.addTree(new RevWalk(repo).parseTree(headId));
- treeWalk.setRecursive(true);
-
- while (treeWalk.next()) {
- String path = treeWalk.getPathString();
- CanonicalTreeParser hTree = null;
- if (hIdx != -1)
- hTree = treeWalk.getTree(hIdx, CanonicalTreeParser.class);
- if (!ignorePaths.contains(path)) {
- // add entries from HEAD for all other paths
- if (hTree != null) {
- // create a new DirCacheEntry with data retrieved
- // from
- // HEAD
- final DirCacheEntry dcEntry = new DirCacheEntry(path);
- dcEntry.setObjectId(hTree.getEntryObjectId());
- dcEntry.setFileMode(hTree.getEntryFileMode());
-
- // add to temporary in-core index
- dcBuilder.add(dcEntry);
- }
- }
- }
-
- // release the treewalk
- treeWalk.release();
- }
-
- // finish temporary in-core index used for this commit
- dcBuilder.finish();
- } finally {
- inserter.release();
- }
- return inCoreIndex;
- }
-
- private static List<File> listFiles(File folder) {
- List<File> files = new ArrayList<File>();
- for (File file : folder.listFiles()) {
- if (file.isDirectory()) {
- files.addAll(listFiles(file));
- } else {
- files.add(file);
- }
- }
- return files;
- }
-
- /**
- * JCommander Parameters class for BuildGhPages.
- */
- @Parameters(separators = " ")
- private static class Params {
-
- @Parameter(names = { "--sourceFolder" }, description = "Source folder for pages", required = true)
- public String sourceFolder;
-
- @Parameter(names = { "--repository" }, description = "Repository folder", required = true)
- public String repositoryFolder;
-
- @Parameter(names = { "--obliterate" }, description = "Replace gh-pages tree with only the content in your sourcefolder")
- public boolean obliterate;
-
- }
-}
diff --git a/src/com/gitblit/build/BuildSite.java b/src/com/gitblit/build/BuildSite.java
deleted file mode 100644
index efff5a3..0000000
--- a/src/com/gitblit/build/BuildSite.java
+++ /dev/null
@@ -1,385 +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.build;
-
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.FileReader;
-import java.io.FilenameFilter;
-import java.io.OutputStreamWriter;
-import java.nio.charset.Charset;
-import java.text.MessageFormat;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Vector;
-
-import com.beust.jcommander.JCommander;
-import com.beust.jcommander.Parameter;
-import com.beust.jcommander.ParameterException;
-import com.beust.jcommander.Parameters;
-import com.gitblit.Constants;
-import com.gitblit.utils.FileUtils;
-import com.gitblit.utils.MarkdownUtils;
-import com.gitblit.utils.StringUtils;
-
-/**
- * Builds the web site or deployment documentation from Markdown source files.
- *
- * All Markdown source files must have the .mkd extension.
- *
- * Natural string sort order of the Markdown source filenames is the order of
- * page links. "##_" prefixes are used to control the sort order.
- *
- * @author James Moger
- *
- */
-public class BuildSite {
-
- private static final String SPACE_DELIMITED = "SPACE-DELIMITED";
-
- private static final String CASE_SENSITIVE = "CASE-SENSITIVE";
-
- private static final String RESTART_REQUIRED = "RESTART REQUIRED";
-
- private static final String SINCE = "SINCE";
-
- public static void main(String... args) {
- Params params = new Params();
- JCommander jc = new JCommander(params);
- try {
- jc.parse(args);
- } catch (ParameterException t) {
- usage(jc, t);
- }
-
- File sourceFolder = new File(params.sourceFolder);
- File destinationFolder = new File(params.outputFolder);
- File[] markdownFiles = sourceFolder.listFiles(new FilenameFilter() {
-
- @Override
- public boolean accept(File dir, String name) {
- return name.toLowerCase().endsWith(".mkd");
- }
- });
- Arrays.sort(markdownFiles);
-
- Map<String, String> aliasMap = new HashMap<String, String>();
- for (String alias : params.aliases) {
- String[] values = alias.split("=");
- aliasMap.put(values[0], values[1]);
- }
-
- System.out.println(MessageFormat.format("Generating site from {0} Markdown Docs in {1} ",
- markdownFiles.length, sourceFolder.getAbsolutePath()));
-
- String htmlHeader = FileUtils.readContent(new File(params.pageHeader), "\n");
-
- String htmlAdSnippet = null;
- if (!StringUtils.isEmpty(params.adSnippet)) {
- File snippet = new File(params.adSnippet);
- if (snippet.exists()) {
- htmlAdSnippet = FileUtils.readContent(snippet, "\n");
- }
- }
- String htmlFooter = FileUtils.readContent(new File(params.pageFooter), "\n");
- final String date = new SimpleDateFormat("yyyy-MM-dd").format(new Date());
- final String footer = MessageFormat.format(htmlFooter, "generated " + date);
- for (File file : markdownFiles) {
- String documentName = getDocumentName(file);
- if (params.skips.contains(documentName)) {
- continue;
- }
- try {
- String links = createLinks(file, markdownFiles, aliasMap, params.skips);
- String header = MessageFormat.format(htmlHeader, Constants.FULL_NAME, links);
- if (!StringUtils.isEmpty(params.analyticsSnippet)) {
- File snippet = new File(params.analyticsSnippet);
- if (snippet.exists()) {
- String htmlSnippet = FileUtils.readContent(snippet, "\n");
- header = header.replace("<!-- ANALYTICS -->", htmlSnippet);
- }
- }
-
- String fileName = documentName + ".html";
- System.out.println(MessageFormat.format(" {0} => {1}", file.getName(), fileName));
- String rawContent = FileUtils.readContent(file, "\n");
- String markdownContent = rawContent;
-
- Map<String, List<String>> nomarkdownMap = new HashMap<String, List<String>>();
-
- // extract sections marked as no-markdown
- int nmd = 0;
- for (String token : params.nomarkdown) {
- StringBuilder strippedContent = new StringBuilder();
-
- String nomarkdownKey = "%NOMARKDOWN" + nmd + "%";
- String[] kv = token.split(":", 2);
- String beginToken = kv[0];
- String endToken = kv[1];
-
- // strip nomarkdown chunks from markdown and cache them
- List<String> chunks = new Vector<String>();
- int beginCode = 0;
- int endCode = 0;
- while ((beginCode = markdownContent.indexOf(beginToken, endCode)) > -1) {
- if (endCode == 0) {
- strippedContent.append(markdownContent.substring(0, beginCode));
- } else {
- strippedContent.append(markdownContent.substring(endCode, beginCode));
- }
- strippedContent.append(nomarkdownKey);
- endCode = markdownContent.indexOf(endToken, beginCode);
- chunks.add(markdownContent.substring(beginCode, endCode));
- nomarkdownMap.put(nomarkdownKey, chunks);
- }
-
- // get remainder of text
- if (endCode < markdownContent.length()) {
- strippedContent.append(markdownContent.substring(endCode,
- markdownContent.length()));
- }
- markdownContent = strippedContent.toString();
- nmd++;
- }
-
- // transform markdown to html
- String content = transformMarkdown(markdownContent.toString());
-
- // reinsert nomarkdown chunks
- for (Map.Entry<String, List<String>> nomarkdown : nomarkdownMap.entrySet()) {
- for (String chunk : nomarkdown.getValue()) {
- content = content.replaceFirst(nomarkdown.getKey(), chunk);
- }
- }
-
- for (String token : params.substitutions) {
- String[] kv = token.split("=", 2);
- content = content.replace(kv[0], kv[1]);
- }
- for (String token : params.regex) {
- String[] kv = token.split("!!!", 2);
- content = content.replaceAll(kv[0], kv[1]);
- }
- for (String alias : params.properties) {
- String[] kv = alias.split("=", 2);
- String loadedContent = generatePropertiesContent(new File(kv[1]));
- content = content.replace(kv[0], loadedContent);
- }
- for (String alias : params.loads) {
- String[] kv = alias.split("=", 2);
- String loadedContent = FileUtils.readContent(new File(kv[1]), "\n");
- loadedContent = StringUtils.escapeForHtml(loadedContent, false);
- loadedContent = StringUtils.breakLinesForHtml(loadedContent);
- content = content.replace(kv[0], loadedContent);
- }
- OutputStreamWriter writer = new OutputStreamWriter(new FileOutputStream(new File(
- destinationFolder, fileName)), Charset.forName("UTF-8"));
- writer.write(header);
- if (!StringUtils.isEmpty(htmlAdSnippet)) {
- writer.write(htmlAdSnippet);
- }
- writer.write(content);
- writer.write(footer);
- writer.close();
- } catch (Throwable t) {
- System.err.println("Failed to transform " + file.getName());
- t.printStackTrace();
- }
- }
- }
-
- private static String getDocumentName(File file) {
- String displayName = file.getName().substring(0, file.getName().lastIndexOf('.'))
- .toLowerCase();
- int underscore = displayName.indexOf('_') + 1;
- if (underscore > -1) {
- // trim leading ##_ which is to control display order
- return displayName.substring(underscore);
- }
- return displayName;
- }
-
- private static String createLinks(File currentFile, File[] markdownFiles,
- Map<String, String> aliasMap, List<String> skips) {
- String linkPattern = "<li><a href=''{0}''>{1}</a></li>";
- String currentLinkPattern = "<li class=''active''><a href=''{0}''>{1}</a></li>";
- StringBuilder sb = new StringBuilder();
- for (File file : markdownFiles) {
- String documentName = getDocumentName(file);
- if (!skips.contains(documentName)) {
- String displayName = documentName;
- if (aliasMap.containsKey(documentName)) {
- displayName = aliasMap.get(documentName);
- } else {
- displayName = displayName.replace('_', ' ');
- }
- String fileName = documentName + ".html";
- if (currentFile.getName().equals(file.getName())) {
- sb.append(MessageFormat.format(currentLinkPattern, fileName, displayName));
- } else {
- sb.append(MessageFormat.format(linkPattern, fileName, displayName));
- }
- }
- }
- sb.setLength(sb.length() - 3);
- sb.trimToSize();
- return sb.toString();
- }
-
- private static String generatePropertiesContent(File propertiesFile) throws Exception {
- // Read the current Gitblit properties
- BufferedReader propertiesReader = new BufferedReader(new FileReader(propertiesFile));
-
- Vector<Setting> settings = new Vector<Setting>();
- List<String> comments = new ArrayList<String>();
- String line = null;
- while ((line = propertiesReader.readLine()) != null) {
- if (line.length() == 0) {
- Setting s = new Setting("", "", comments);
- settings.add(s);
- comments.clear();
- } else {
- if (line.charAt(0) == '#') {
- comments.add(line.substring(1).trim());
- } else {
- String[] kvp = line.split("=", 2);
- String key = kvp[0].trim();
- Setting s = new Setting(key, kvp[1].trim(), comments);
- settings.add(s);
- comments.clear();
- }
- }
- }
- propertiesReader.close();
-
- StringBuilder sb = new StringBuilder();
- for (Setting setting : settings) {
- for (String comment : setting.comments) {
- if (comment.contains(SINCE) || comment.contains(RESTART_REQUIRED)
- || comment.contains(CASE_SENSITIVE) || comment.contains(SPACE_DELIMITED)) {
- sb.append(MessageFormat.format(
- "<span style=\"color:#004000;\"># <i>{0}</i></span>",
- transformMarkdown(comment)));
- } else {
- sb.append(MessageFormat.format("<span style=\"color:#004000;\"># {0}</span>",
- transformMarkdown(comment)));
- }
- sb.append("<br/>\n");
- }
- if (!StringUtils.isEmpty(setting.name)) {
- sb.append(MessageFormat
- .format("<span style=\"color:#000080;\">{0}</span> = <span style=\"color:#800000;\">{1}</span>",
- setting.name, StringUtils.escapeForHtml(setting.value, false)));
- }
- sb.append("<br/>\n");
- }
-
- return sb.toString();
- }
-
- private static String transformMarkdown(String comment) throws ParseException {
- String md = MarkdownUtils.transformMarkdown(comment);
- if (md.startsWith("<p>")) {
- md = md.substring(3);
- }
- if (md.endsWith("</p>")) {
- md = md.substring(0, md.length() - 4);
- }
- return md;
- }
-
- private static void usage(JCommander jc, ParameterException t) {
- System.out.println(Constants.getGitBlitVersion());
- System.out.println();
- if (t != null) {
- System.out.println(t.getMessage());
- System.out.println();
- }
- if (jc != null) {
- jc.usage();
- }
- System.exit(0);
- }
-
- /**
- * Setting represents a setting with its comments from the properties file.
- */
- private static class Setting {
- final String name;
- final String value;
- final List<String> comments;
-
- Setting(String name, String value, List<String> comments) {
- this.name = name;
- this.value = value;
- this.comments = new ArrayList<String>(comments);
- }
- }
-
- /**
- * JCommander Parameters class for BuildSite.
- */
- @Parameters(separators = " ")
- private static class Params {
-
- @Parameter(names = { "--sourceFolder" }, description = "Markdown Source Folder", required = true)
- public String sourceFolder;
-
- @Parameter(names = { "--outputFolder" }, description = "HTML Ouptut Folder", required = true)
- public String outputFolder;
-
- @Parameter(names = { "--pageHeader" }, description = "Page Header HTML Snippet", required = true)
- public String pageHeader;
-
- @Parameter(names = { "--pageFooter" }, description = "Page Footer HTML Snippet", required = true)
- public String pageFooter;
-
- @Parameter(names = { "--adSnippet" }, description = "Ad HTML Snippet", required = false)
- public String adSnippet;
-
- @Parameter(names = { "--analyticsSnippet" }, description = "Analytics HTML Snippet", required = false)
- public String analyticsSnippet;
-
- @Parameter(names = { "--skip" }, description = "Filename to skip", required = false)
- public List<String> skips = new ArrayList<String>();
-
- @Parameter(names = { "--alias" }, description = "Filename=Linkname aliases", required = false)
- public List<String> aliases = new ArrayList<String>();
-
- @Parameter(names = { "--substitute" }, description = "%TOKEN%=value", required = false)
- public List<String> substitutions = new ArrayList<String>();
-
- @Parameter(names = { "--load" }, description = "%TOKEN%=filename", required = false)
- public List<String> loads = new ArrayList<String>();
-
- @Parameter(names = { "--properties" }, description = "%TOKEN%=filename", required = false)
- public List<String> properties = new ArrayList<String>();
-
- @Parameter(names = { "--nomarkdown" }, description = "%STARTTOKEN%:%ENDTOKEN%", required = false)
- public List<String> nomarkdown = new ArrayList<String>();
-
- @Parameter(names = { "--regex" }, description = "searchPattern!!!replacePattern", required = false)
- public List<String> regex = new ArrayList<String>();
-
- }
-}
diff --git a/src/com/gitblit/build/BuildThumbnails.java b/src/com/gitblit/build/BuildThumbnails.java
deleted file mode 100644
index fe06c6c..0000000
--- a/src/com/gitblit/build/BuildThumbnails.java
+++ /dev/null
@@ -1,162 +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.build;
-
-import java.awt.Dimension;
-import java.awt.Image;
-import java.awt.image.BufferedImage;
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.FilenameFilter;
-import java.io.IOException;
-import java.text.MessageFormat;
-import java.util.Iterator;
-
-import javax.imageio.ImageIO;
-import javax.imageio.ImageReader;
-import javax.imageio.stream.ImageInputStream;
-
-import com.beust.jcommander.JCommander;
-import com.beust.jcommander.Parameter;
-import com.beust.jcommander.ParameterException;
-import com.beust.jcommander.Parameters;
-
-/**
- * Generates PNG thumbnails of the PNG images from the specified source folder.
- *
- * @author James Moger
- *
- */
-public class BuildThumbnails {
-
- public static void main(String[] args) {
- Params params = new Params();
- JCommander jc = new JCommander(params);
- try {
- jc.parse(args);
- } catch (ParameterException t) {
- System.err.println(t.getMessage());
- jc.usage();
- }
- createImageThumbnail(params.sourceFolder, params.destinationFolder, params.maximumDimension);
- }
-
- /**
- * Generates thumbnails from all PNG images in the source folder and saves
- * them to the destination folder.
- *
- * @param sourceFolder
- * @param destinationFolder
- * @param maxDimension
- * the maximum height or width of the image.
- */
- public static void createImageThumbnail(String sourceFolder, String destinationFolder,
- int maxDimension) {
- if (maxDimension <= 0) {
- return;
- }
- File source = new File(sourceFolder);
- File destination = new File(destinationFolder);
- destination.mkdirs();
- File[] sourceFiles = source.listFiles(new FilenameFilter() {
- @Override
- public boolean accept(File dir, String name) {
- return name.toLowerCase().endsWith(".png");
- }
- });
-
- for (File sourceFile : sourceFiles) {
- File destinationFile = new File(destination, sourceFile.getName());
- try {
- Dimension sz = getImageDimensions(sourceFile);
- int w = 0;
- int h = 0;
- if (sz.width > maxDimension) {
- // Scale to Width
- w = maxDimension;
- float f = maxDimension;
- // normalize height
- h = (int) ((f / sz.width) * sz.height);
- } else if (sz.height > maxDimension) {
- // Scale to Height
- h = maxDimension;
- float f = maxDimension;
- // normalize width
- w = (int) ((f / sz.height) * sz.width);
- }
- System.out.println(MessageFormat.format(
- "Generating thumbnail for {0} as ({1,number,#}, {2,number,#})",
- sourceFile.getName(), w, h));
- BufferedImage image = ImageIO.read(sourceFile);
- Image scaledImage = image.getScaledInstance(w, h, BufferedImage.SCALE_SMOOTH);
- BufferedImage destImage = new BufferedImage(w, h, BufferedImage.TYPE_INT_RGB);
- destImage.createGraphics().drawImage(scaledImage, 0, 0, null);
- FileOutputStream fos = new FileOutputStream(destinationFile);
- ImageIO.write(destImage, "png", fos);
- fos.flush();
- fos.getFD().sync();
- fos.close();
- } catch (Throwable t) {
- t.printStackTrace();
- }
- }
- }
-
- /**
- * Return the dimensions of the specified image file.
- *
- * @param file
- * @return dimensions of the image
- * @throws IOException
- */
- public static Dimension getImageDimensions(File file) throws IOException {
- ImageInputStream in = ImageIO.createImageInputStream(file);
- try {
- final Iterator<ImageReader> readers = ImageIO.getImageReaders(in);
- if (readers.hasNext()) {
- ImageReader reader = readers.next();
- try {
- reader.setInput(in);
- return new Dimension(reader.getWidth(0), reader.getHeight(0));
- } finally {
- reader.dispose();
- }
- }
- } finally {
- if (in != null) {
- in.close();
- }
- }
- return null;
- }
-
- /**
- * JCommander Parameters class for BuildThumbnails.
- */
- @Parameters(separators = " ")
- private static class Params {
-
- @Parameter(names = { "--sourceFolder" }, description = "Source folder for raw images", required = true)
- public String sourceFolder;
-
- @Parameter(names = { "--destinationFolder" }, description = "Destination folder for thumbnails", required = true)
- public String destinationFolder;
-
- @Parameter(names = { "--maximumDimension" }, description = "Maximum width or height for thumbnail", required = true)
- public int maximumDimension;
-
- }
-}
diff --git a/src/com/gitblit/build/BuildWebXml.java b/src/com/gitblit/build/BuildWebXml.java
deleted file mode 100644
index 49a12ab..0000000
--- a/src/com/gitblit/build/BuildWebXml.java
+++ /dev/null
@@ -1,160 +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.build;
-
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.FileReader;
-import java.text.MessageFormat;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Vector;
-
-import com.beust.jcommander.JCommander;
-import com.beust.jcommander.Parameter;
-import com.beust.jcommander.ParameterException;
-import com.beust.jcommander.Parameters;
-import com.gitblit.Keys;
-import com.gitblit.utils.StringUtils;
-
-/**
- * Builds the Gitblit WAR web.xml file by merging the Gitblit GO web.xml file
- * with the gitblit.properties comments, settings, and values.
- *
- * @author James Moger
- *
- */
-public class BuildWebXml {
- private static final String PARAMS = "<!-- PARAMS -->";
-
- private static final String[] STRIP_TOKENS = { "<!-- STRIP", "STRIP -->" };
-
- private static final String COMMENT_PATTERN = "\n\t<!-- {0} -->";
-
- private static final String PARAM_PATTERN = "\n\t<context-param>\n\t\t<param-name>{0}</param-name>\n\t\t<param-value>{1}</param-value>\n\t</context-param>\n";
-
- public static void main(String[] args) throws Exception {
- Params params = new Params();
- JCommander jc = new JCommander(params);
- try {
- jc.parse(args);
- } catch (ParameterException t) {
- System.err.println(t.getMessage());
- jc.usage();
- }
- generateWebXml(params);
- }
-
- private static void generateWebXml(Params params) throws Exception {
- StringBuilder parameters = new StringBuilder();
- // Read the current Gitblit properties
- if (params.propertiesFile != null) {
- BufferedReader propertiesReader = new BufferedReader(new FileReader(new File(
- params.propertiesFile)));
-
- Vector<Setting> settings = new Vector<Setting>();
- List<String> comments = new ArrayList<String>();
- String line = null;
- while ((line = propertiesReader.readLine()) != null) {
- if (line.length() == 0) {
- comments.clear();
- } else {
- if (line.charAt(0) == '#') {
- if (line.length() > 1) {
- comments.add(line.substring(1).trim());
- }
- } else {
- String[] kvp = line.split("=", 2);
- String key = kvp[0].trim();
- if (!skipKey(key)) {
- Setting s = new Setting(key, kvp[1].trim(), comments);
- settings.add(s);
- }
- comments.clear();
- }
- }
- }
- propertiesReader.close();
-
- for (Setting setting : settings) {
- for (String comment : setting.comments) {
- parameters.append(MessageFormat.format(COMMENT_PATTERN, comment));
- }
- parameters.append(MessageFormat.format(PARAM_PATTERN, setting.name,
- StringUtils.escapeForHtml(setting.value, false)));
- }
- }
- // Read the prototype web.xml file
- File webxml = new File(params.sourceFile);
- char[] buffer = new char[(int) webxml.length()];
- FileReader webxmlReader = new FileReader(webxml);
- webxmlReader.read(buffer);
- webxmlReader.close();
- String webXmlContent = new String(buffer);
-
- // Insert the Gitblit properties into the prototype web.xml
- for (String stripToken : STRIP_TOKENS) {
- webXmlContent = webXmlContent.replace(stripToken, "");
- }
- int idx = webXmlContent.indexOf(PARAMS);
- StringBuilder sb = new StringBuilder();
- sb.append(webXmlContent.substring(0, idx));
- sb.append(parameters.toString());
- sb.append(webXmlContent.substring(idx + PARAMS.length()));
-
- // Save the merged web.xml to the war build folder
- FileOutputStream os = new FileOutputStream(new File(params.destinationFile), false);
- os.write(sb.toString().getBytes());
- os.close();
- }
-
- private static boolean skipKey(String key) {
- return key.startsWith(Keys.server._ROOT);
- }
-
- /**
- * Setting represents a setting and its comments from the properties file.
- */
- private static class Setting {
- final String name;
- final String value;
- final List<String> comments;
-
- Setting(String name, String value, List<String> comments) {
- this.name = name;
- this.value = value;
- this.comments = new ArrayList<String>(comments);
- }
- }
-
- /**
- * JCommander Parameters class for BuildWebXml.
- */
- @Parameters(separators = " ")
- private static class Params {
-
- @Parameter(names = { "--sourceFile" }, description = "Source web.xml file", required = true)
- public String sourceFile;
-
- @Parameter(names = { "--propertiesFile" }, description = "Properties settings file")
- public String propertiesFile;
-
- @Parameter(names = { "--destinationFile" }, description = "Destination web.xml file", required = true)
- public String destinationFile;
-
- }
-}
diff --git a/src/com/gitblit/client/GitblitManagerLauncher.java b/src/com/gitblit/client/GitblitManagerLauncher.java
deleted file mode 100644
index 9b6ee96..0000000
--- 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/src/com/gitblit/wicket/pages/LogoutPage.java b/src/com/gitblit/wicket/pages/LogoutPage.java
deleted file mode 100644
index 4690ad1..0000000
--- a/src/com/gitblit/wicket/pages/LogoutPage.java
+++ /dev/null
@@ -1,36 +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.wicket.pages;
-
-import org.apache.wicket.markup.html.WebPage;
-import org.apache.wicket.protocol.http.WebResponse;
-
-import com.gitblit.GitBlit;
-import com.gitblit.models.UserModel;
-import com.gitblit.wicket.GitBlitWebSession;
-
-public class LogoutPage extends WebPage {
-
- public LogoutPage() {
- GitBlitWebSession session = GitBlitWebSession.get();
- UserModel user = session.getUser();
- GitBlit.self().setCookie((WebResponse) getResponse(), null);
- GitBlit.self().logout(user);
- session.invalidate();
- setRedirect(true);
- setResponsePage(getApplication().getHomePage());
- }
-}
\ No newline at end of file
diff --git a/checkstyle.xml b/src/main/config/checkstyle.xml
similarity index 100%
rename from checkstyle.xml
rename to src/main/config/checkstyle.xml
diff --git a/distrib/authority.conf b/src/main/distrib/data/certs/authority.conf
similarity index 100%
rename from distrib/authority.conf
rename to src/main/distrib/data/certs/authority.conf
diff --git a/distrib/instructions.tmpl b/src/main/distrib/data/certs/instructions.tmpl
similarity index 100%
rename from distrib/instructions.tmpl
rename to src/main/distrib/data/certs/instructions.tmpl
diff --git a/distrib/mail.tmpl b/src/main/distrib/data/certs/mail.tmpl
similarity index 100%
rename from distrib/mail.tmpl
rename to src/main/distrib/data/certs/mail.tmpl
diff --git a/distrib/gitblit.properties b/src/main/distrib/data/gitblit.properties
similarity index 98%
rename from distrib/gitblit.properties
rename to src/main/distrib/data/gitblit.properties
index 80790d3..8c90258 100644
--- a/distrib/gitblit.properties
+++ b/src/main/distrib/data/gitblit.properties
@@ -440,6 +440,12 @@
# 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
@@ -717,9 +723,16 @@
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.
+# Use spaces to separate urls.
+#
+# {0} is the token for the repository name
+# {1} is the token for the username
+#
+# The username is only practical if you have setup your other git serving
+# solutions accounts to have the same username as the Gitblit account.
+#
# e.g.
-# web.otherUrls = ssh://localhost/git/{0} git://localhost/git/{0}
+# web.otherUrls = ssh://localhost/git/{0} git://localhost/git/{0} https://{1}@localhost/r/{0}
#
# SPACE-DELIMITED
# SINCE 0.5.0
@@ -803,7 +816,7 @@
#
# 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
+web.prettyPrintExtensions = c cpp cs css frm groovy htm html java js moxie php pl prefs properties py rb scala sh sql xml vb yaml yml
# Registered extensions for markdown transformation
#
diff --git a/distrib/groovy/.gitignore b/src/main/distrib/data/groovy/.gitignore
similarity index 100%
rename from distrib/groovy/.gitignore
rename to src/main/distrib/data/groovy/.gitignore
diff --git a/distrib/groovy/blockpush.groovy b/src/main/distrib/data/groovy/blockpush.groovy
similarity index 100%
rename from distrib/groovy/blockpush.groovy
rename to src/main/distrib/data/groovy/blockpush.groovy
diff --git a/distrib/groovy/fogbugz.groovy b/src/main/distrib/data/groovy/fogbugz.groovy
similarity index 100%
rename from distrib/groovy/fogbugz.groovy
rename to src/main/distrib/data/groovy/fogbugz.groovy
diff --git a/distrib/groovy/jenkins.groovy b/src/main/distrib/data/groovy/jenkins.groovy
similarity index 100%
rename from distrib/groovy/jenkins.groovy
rename to src/main/distrib/data/groovy/jenkins.groovy
diff --git a/distrib/groovy/localclone.groovy b/src/main/distrib/data/groovy/localclone.groovy
similarity index 100%
rename from distrib/groovy/localclone.groovy
rename to src/main/distrib/data/groovy/localclone.groovy
diff --git a/distrib/groovy/protect-refs.groovy b/src/main/distrib/data/groovy/protect-refs.groovy
similarity index 100%
rename from distrib/groovy/protect-refs.groovy
rename to 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
similarity index 100%
rename from distrib/groovy/sendmail-html.groovy
rename to src/main/distrib/data/groovy/sendmail-html.groovy
diff --git a/distrib/groovy/sendmail.groovy b/src/main/distrib/data/groovy/sendmail.groovy
similarity index 100%
rename from distrib/groovy/sendmail.groovy
rename to src/main/distrib/data/groovy/sendmail.groovy
diff --git a/distrib/groovy/thebuggenie.groovy b/src/main/distrib/data/groovy/thebuggenie.groovy
similarity index 100%
rename from distrib/groovy/thebuggenie.groovy
rename to src/main/distrib/data/groovy/thebuggenie.groovy
diff --git a/distrib/projects.conf b/src/main/distrib/data/projects.conf
similarity index 100%
rename from distrib/projects.conf
rename to src/main/distrib/data/projects.conf
diff --git a/distrib/users.conf b/src/main/distrib/data/users.conf
similarity index 100%
rename from distrib/users.conf
rename to src/main/distrib/data/users.conf
diff --git a/distrib/federation.properties b/src/main/distrib/federation.properties
similarity index 98%
rename from distrib/federation.properties
rename to src/main/distrib/federation.properties
index c762b45..72058f0 100644
--- a/distrib/federation.properties
+++ b/src/main/distrib/federation.properties
@@ -8,7 +8,7 @@
#
# SINCE 0.5.0
# RESTART REQUIRED
-git.repositoriesFolder = git
+git.repositoriesFolder = ${baseFolder}/git
# Search the repositories folder subfolders for other repositories.
# Repositories MAY NOT be nested (i.e. one repository within another)
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 0000000..d31f43e
--- /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 0000000..ce5c237
--- /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 0000000..2fef203
--- /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 0000000..7d631e7
--- /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 0000000..19d28c7
--- /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 0000000..72c4e6c
--- /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
similarity index 100%
rename from distrib/java-proxy-config.sh
rename to src/main/distrib/linux/java-proxy-config.sh
diff --git a/distrib/gitblit-centos b/src/main/distrib/linux/service-centos.sh
similarity index 100%
rename from distrib/gitblit-centos
rename to src/main/distrib/linux/service-centos.sh
diff --git a/distrib/gitblit-ubuntu b/src/main/distrib/linux/service-ubuntu.sh
similarity index 100%
rename from distrib/gitblit-ubuntu
rename to src/main/distrib/linux/service-ubuntu.sh
diff --git a/distrib/add-indexed-branch.cmd b/src/main/distrib/win/add-indexed-branch.cmd
similarity index 100%
rename from distrib/add-indexed-branch.cmd
rename to src/main/distrib/win/add-indexed-branch.cmd
diff --git a/distrib/amd64/gitblit.exe b/src/main/distrib/win/amd64/gitblit.exe
similarity index 100%
rename from distrib/amd64/gitblit.exe
rename to src/main/distrib/win/amd64/gitblit.exe
Binary files differ
diff --git a/src/main/distrib/win/authority.cmd b/src/main/distrib/win/authority.cmd
new file mode 100644
index 0000000..f9a1864
--- /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
similarity index 100%
rename from distrib/gitblit-stop.cmd
rename to src/main/distrib/win/gitblit-stop.cmd
diff --git a/distrib/gitblit.cmd b/src/main/distrib/win/gitblit.cmd
similarity index 100%
rename from distrib/gitblit.cmd
rename to src/main/distrib/win/gitblit.cmd
diff --git a/distrib/gitblitw.exe b/src/main/distrib/win/gitblitw.exe
similarity index 100%
rename from distrib/gitblitw.exe
rename to src/main/distrib/win/gitblitw.exe
Binary files differ
diff --git a/distrib/ia64/gitblit.exe b/src/main/distrib/win/ia64/gitblit.exe
similarity index 100%
rename from distrib/ia64/gitblit.exe
rename to src/main/distrib/win/ia64/gitblit.exe
Binary files differ
diff --git a/distrib/installService.cmd b/src/main/distrib/win/installService.cmd
similarity index 93%
rename from distrib/installService.cmd
rename to src/main/distrib/win/installService.cmd
index d254d67..a684ab2 100644
--- a/distrib/installService.cmd
+++ b/src/main/distrib/win/installService.cmd
@@ -23,12 +23,12 @@
--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
similarity index 100%
rename from distrib/uninstallService.cmd
rename to src/main/distrib/win/uninstallService.cmd
diff --git a/distrib/x86/gitblit.exe b/src/main/distrib/win/x86/gitblit.exe
similarity index 100%
rename from distrib/x86/gitblit.exe
rename to src/main/distrib/win/x86/gitblit.exe
Binary files differ
diff --git a/src/WEB-INF/web.xml b/src/main/java/WEB-INF/web.xml
similarity index 96%
rename from src/WEB-INF/web.xml
rename to src/main/java/WEB-INF/web.xml
index bdc882a..a943688 100644
--- a/src/WEB-INF/web.xml
+++ b/src/main/java/WEB-INF/web.xml
@@ -214,6 +214,15 @@
<filter-name>PagesFilter</filter-name>
<url-pattern>/pages/*</url-pattern>
</filter-mapping>
+
+ <filter>
+ <filter-name>EnforceAuthenticationFilter</filter-name>
+ <filter-class>com.gitblit.EnforceAuthenticationFilter</filter-class>
+ </filter>
+ <filter-mapping>
+ <filter-name>EnforceAuthenticationFilter</filter-name>
+ <url-pattern>/*</url-pattern>
+ </filter-mapping>
<!-- Wicket Filter -->
diff --git a/src/main/java/WEB-INF/weblogic.xml b/src/main/java/WEB-INF/weblogic.xml
new file mode 100644
index 0000000..cd08111
--- /dev/null
+++ b/src/main/java/WEB-INF/weblogic.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<wls:weblogic-web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:wls="http://www.bea.com/ns/weblogic/90" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd http://www.bea.com/ns/weblogic/90 http://www.bea.com/ns/weblogic/90/weblogic-web-app.xsd">
+ <wls:weblogic-version>12.1.1</wls:weblogic-version>
+ <wls:context-root>gitblit</wls:context-root>
+ <wls:container-descriptor>
+ <wls:show-archived-real-path-enabled>true</wls:show-archived-real-path-enabled>
+ <wls:prefer-web-inf-classes>true</wls:prefer-web-inf-classes>
+ </wls:container-descriptor>
+</wls:weblogic-web-app>
\ No newline at end of file
diff --git a/src/com/gitblit/.gitignore b/src/main/java/com/gitblit/.gitignore
similarity index 100%
rename from src/com/gitblit/.gitignore
rename to src/main/java/com/gitblit/.gitignore
diff --git a/src/com/gitblit/AccessRestrictionFilter.java b/src/main/java/com/gitblit/AccessRestrictionFilter.java
similarity index 100%
rename from src/com/gitblit/AccessRestrictionFilter.java
rename to src/main/java/com/gitblit/AccessRestrictionFilter.java
diff --git a/src/com/gitblit/AddIndexedBranch.java b/src/main/java/com/gitblit/AddIndexedBranch.java
similarity index 100%
rename from src/com/gitblit/AddIndexedBranch.java
rename to src/main/java/com/gitblit/AddIndexedBranch.java
diff --git a/src/com/gitblit/AuthenticationFilter.java b/src/main/java/com/gitblit/AuthenticationFilter.java
similarity index 97%
rename from src/com/gitblit/AuthenticationFilter.java
rename to src/main/java/com/gitblit/AuthenticationFilter.java
index eb6e95b..5319bf3 100644
--- a/src/com/gitblit/AuthenticationFilter.java
+++ b/src/main/java/com/gitblit/AuthenticationFilter.java
@@ -28,6 +28,7 @@
import javax.servlet.ServletRequest;
import javax.servlet.ServletResponse;
import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletRequestWrapper;
import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession;
@@ -105,7 +106,6 @@
/**
* Taken from Jetty's LoginAuthenticator.renewSessionOnAuthentication()
*/
- @SuppressWarnings("unchecked")
protected void newSession(HttpServletRequest request, HttpServletResponse response) {
HttpSession oldSession = request.getSession(false);
if (oldSession != null && oldSession.getAttribute(SESSION_SECURED) == null) {
@@ -145,7 +145,7 @@
/**
* Wraps a standard HttpServletRequest and overrides user principal methods.
*/
- public static class AuthenticatedRequest extends ServletRequestWrapper {
+ public static class AuthenticatedRequest extends HttpServletRequestWrapper {
private UserModel user;
diff --git a/src/com/gitblit/ConfigUserService.java b/src/main/java/com/gitblit/ConfigUserService.java
similarity index 100%
rename from src/com/gitblit/ConfigUserService.java
rename to src/main/java/com/gitblit/ConfigUserService.java
diff --git a/src/com/gitblit/Constants.java b/src/main/java/com/gitblit/Constants.java
similarity index 90%
rename from src/com/gitblit/Constants.java
rename to src/main/java/com/gitblit/Constants.java
index bcca8c7..7663f8b 100644
--- a/src/com/gitblit/Constants.java
+++ b/src/main/java/com/gitblit/Constants.java
@@ -18,7 +18,9 @@
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 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 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
similarity index 100%
rename from src/com/gitblit/DownloadZipFilter.java
rename to src/main/java/com/gitblit/DownloadZipFilter.java
diff --git a/src/com/gitblit/DownloadZipServlet.java b/src/main/java/com/gitblit/DownloadZipServlet.java
similarity index 94%
rename from src/com/gitblit/DownloadZipServlet.java
rename to src/main/java/com/gitblit/DownloadZipServlet.java
index 0feee87..8a4a710 100644
--- a/src/com/gitblit/DownloadZipServlet.java
+++ b/src/main/java/com/gitblit/DownloadZipServlet.java
@@ -16,6 +16,7 @@
package com.gitblit;
import java.io.IOException;
+import java.net.SocketException;
import java.text.MessageFormat;
import java.text.ParseException;
import java.util.Date;
@@ -176,6 +177,13 @@
}
response.flushBuffer();
+ } catch (SocketException t) {
+ String message = t.getMessage() == null ? "" : t.getMessage().toLowerCase();
+ if (message.contains("reset") || message.contains("broken pipe")) {
+ logger.error("Client aborted zip download: " + message);
+ } else {
+ logger.error("Failed to write attachment to client", t);
+ }
} catch (Throwable t) {
logger.error("Failed to write attachment to client", t);
}
diff --git a/src/main/java/com/gitblit/EnforceAuthenticationFilter.java b/src/main/java/com/gitblit/EnforceAuthenticationFilter.java
new file mode 100644
index 0000000..2a17996
--- /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
similarity index 83%
rename from src/com/gitblit/FederationClient.java
rename to src/main/java/com/gitblit/FederationClient.java
index f666139..d34aadb 100644
--- a/src/com/gitblit/FederationClient.java
+++ b/src/main/java/com/gitblit/FederationClient.java
@@ -44,7 +44,16 @@
usage(jc, t);
}
- IStoredSettings settings = new FileSettings(params.registrationsFile);
+ System.out.println("Gitblit Federation Client v" + Constants.getVersion() + " (" + Constants.getBuildDate() + ")");
+
+ // command-line specified base folder
+ File baseFolder = new File(System.getProperty("user.dir"));
+ if (!StringUtils.isEmpty(params.baseFolder)) {
+ baseFolder = new File(params.baseFolder);
+ }
+
+ File regFile = com.gitblit.utils.FileUtils.resolveParameter(Constants.baseFolder$, baseFolder, params.registrationsFile);
+ IStoredSettings settings = new FileSettings(regFile.getAbsolutePath());
List<FederationModel> registrations = new ArrayList<FederationModel>();
if (StringUtils.isEmpty(params.url)) {
registrations.addAll(FederationUtils.getFederationRegistrations(settings));
@@ -67,8 +76,6 @@
System.exit(0);
}
- System.out.println("Gitblit Federation Client v" + Constants.VERSION + " (" + Constants.VERSION_DATE + ")");
-
// command-line specified repositories folder
if (!StringUtils.isEmpty(params.repositoriesFolder)) {
settings.overrideSetting(Keys.git.repositoriesFolder, new File(
@@ -76,7 +83,7 @@
}
// configure the Gitblit singleton for minimal, non-server operation
- GitBlit.self().configureContext(settings, null, false);
+ GitBlit.self().configureContext(settings, baseFolder, false);
FederationPullExecutor executor = new FederationPullExecutor(registrations, params.isDaemon);
executor.run();
if (!params.isDaemon) {
@@ -106,7 +113,7 @@
private static class Params {
@Parameter(names = { "--registrations" }, description = "Gitblit Federation Registrations File", required = false)
- public String registrationsFile = "federation.properties";
+ public String registrationsFile = "${baseFolder}/federation.properties";
@Parameter(names = { "--daemon" }, description = "Runs in daemon mode to schedule and pull repositories", required = false)
public boolean isDaemon;
@@ -126,6 +133,9 @@
@Parameter(names = { "--frequency" }, description = "Period to wait between pull attempts (requires --daemon)", required = false)
public String frequency = "60 mins";
+ @Parameter(names = { "--baseFolder" }, description = "Base folder for received data", required = false)
+ public String baseFolder;
+
@Parameter(names = { "--repositoriesFolder" }, description = "Destination folder for cloned repositories", required = false)
public String repositoriesFolder;
diff --git a/src/com/gitblit/FederationPullExecutor.java b/src/main/java/com/gitblit/FederationPullExecutor.java
similarity index 99%
rename from src/com/gitblit/FederationPullExecutor.java
rename to src/main/java/com/gitblit/FederationPullExecutor.java
index ad1022c..25cd32a 100644
--- a/src/com/gitblit/FederationPullExecutor.java
+++ b/src/main/java/com/gitblit/FederationPullExecutor.java
@@ -153,7 +153,7 @@
c, registrationFolder, registration.name));
return;
}
- File repositoriesFolder = new File(GitBlit.getString(Keys.git.repositoriesFolder, "git"));
+ File repositoriesFolder = GitBlit.getRepositoriesFolder();
File registrationFolderFile = new File(repositoriesFolder, registrationFolder);
registrationFolderFile.mkdirs();
diff --git a/src/com/gitblit/FederationServlet.java b/src/main/java/com/gitblit/FederationServlet.java
similarity index 100%
rename from src/com/gitblit/FederationServlet.java
rename to src/main/java/com/gitblit/FederationServlet.java
diff --git a/src/com/gitblit/FileSettings.java b/src/main/java/com/gitblit/FileSettings.java
similarity index 100%
rename from src/com/gitblit/FileSettings.java
rename to src/main/java/com/gitblit/FileSettings.java
diff --git a/src/com/gitblit/FileUserService.java b/src/main/java/com/gitblit/FileUserService.java
similarity index 100%
rename from src/com/gitblit/FileUserService.java
rename to src/main/java/com/gitblit/FileUserService.java
diff --git a/src/com/gitblit/GCExecutor.java b/src/main/java/com/gitblit/GCExecutor.java
similarity index 100%
rename from src/com/gitblit/GCExecutor.java
rename to src/main/java/com/gitblit/GCExecutor.java
diff --git a/src/com/gitblit/GitBlit.java b/src/main/java/com/gitblit/GitBlit.java
similarity index 97%
rename from src/com/gitblit/GitBlit.java
rename to src/main/java/com/gitblit/GitBlit.java
index 3ac8d17..6d44f46 100644
--- a/src/com/gitblit/GitBlit.java
+++ b/src/main/java/com/gitblit/GitBlit.java
@@ -54,6 +54,8 @@
import javax.mail.Message;
import javax.mail.MessagingException;
+import javax.mail.internet.MimeBodyPart;
+import javax.mail.internet.MimeMultipart;
import javax.servlet.ServletContext;
import javax.servlet.ServletContextEvent;
import javax.servlet.ServletContextListener;
@@ -452,12 +454,13 @@
* advertise alternative urls for Git client repository access.
*
* @param repositoryName
+ * @param userName
* @return list of non-gitblit clone urls
*/
- public List<String> getOtherCloneUrls(String repositoryName) {
+ public List<String> getOtherCloneUrls(String repositoryName, String username) {
List<String> cloneUrls = new ArrayList<String>();
for (String url : settings.getStrings(Keys.web.otherUrls)) {
- cloneUrls.add(MessageFormat.format(url, repositoryName));
+ cloneUrls.add(MessageFormat.format(url, repositoryName, username));
}
return cloneUrls;
}
@@ -613,7 +616,7 @@
X509Metadata metadata = HttpUtils.getCertificateMetadata(httpRequest);
if (user != null) {
flagWicketSession(AuthenticationType.CERTIFICATE);
- logger.info(MessageFormat.format("{0} authenticated by client certificate {1} from {2}",
+ logger.debug(MessageFormat.format("{0} authenticated by client certificate {1} from {2}",
user.username, metadata.serialNumber, httpRequest.getRemoteAddr()));
return user;
} else {
@@ -633,7 +636,7 @@
UserModel user = getUserModel(principal.getName());
if (user != null) {
flagWicketSession(AuthenticationType.CONTAINER);
- logger.info(MessageFormat.format("{0} authenticated by servlet container principal from {1}",
+ logger.debug(MessageFormat.format("{0} authenticated by servlet container principal from {1}",
user.username, httpRequest.getRemoteAddr()));
return user;
} else {
@@ -647,7 +650,7 @@
UserModel user = authenticate(httpRequest.getCookies());
if (user != null) {
flagWicketSession(AuthenticationType.COOKIE);
- logger.info(MessageFormat.format("{0} authenticated by cookie from {1}",
+ logger.debug(MessageFormat.format("{0} authenticated by cookie from {1}",
user.username, httpRequest.getRemoteAddr()));
return user;
}
@@ -669,7 +672,7 @@
UserModel user = authenticate(username, password);
if (user != null) {
flagWicketSession(AuthenticationType.CREDENTIALS);
- logger.info(MessageFormat.format("{0} authenticated by BASIC request header from {1}",
+ logger.debug(MessageFormat.format("{0} authenticated by BASIC request header from {1}",
user.username, httpRequest.getRemoteAddr()));
return user;
} else {
@@ -1656,6 +1659,11 @@
} else {
model.name = com.gitblit.utils.FileUtils.getRelativePath(basePath, r.getDirectory().getParentFile());
}
+ if (StringUtils.isEmpty(model.name)) {
+ // Repository is NOT located relative to the base folder because it
+ // is symlinked. Use the provided repository name.
+ model.name = repositoryName;
+ }
model.hasCommits = JGitUtils.hasCommits(r);
model.lastChange = JGitUtils.getLastChange(r);
model.projectPath = StringUtils.getFirstPathElement(repositoryName);
@@ -1828,6 +1836,9 @@
} else {
// not caching
ProjectModel project = getProjectModel(userProject);
+ if (project == null) {
+ return null;
+ }
for (String repository : project.repositories) {
if (repository.startsWith(userProject)) {
RepositoryModel model = getRepositoryModel(repository);
@@ -2574,17 +2585,8 @@
}
// send an email, if possible
- try {
- Message message = mailExecutor.createMessageForAdministrators();
- if (message != null) {
- message.setSubject("Federation proposal from " + proposal.url);
- message.setText("Please review the proposal @ " + gitblitUrl + "/proposal/"
- + proposal.token);
- mailExecutor.queue(message);
- }
- } catch (Throwable t) {
- logger.error("Failed to notify administrators of proposal", t);
- }
+ sendMailToAdministrators("Federation proposal from " + proposal.url,
+ "Please review the proposal @ " + gitblitUrl + "/proposal/" + proposal.token);
return true;
}
@@ -2871,16 +2873,8 @@
* @param message
*/
public void sendMailToAdministrators(String subject, String message) {
- try {
- Message mail = mailExecutor.createMessageForAdministrators();
- if (mail != null) {
- mail.setSubject(subject);
- mail.setText(message);
- mailExecutor.queue(mail);
- }
- } catch (MessagingException e) {
- logger.error("Messaging error", e);
- }
+ List<String> toAddresses = settings.getStrings(Keys.mail.adminAddresses);
+ sendMail(subject, message, toAddresses);
}
/**
@@ -2902,11 +2896,24 @@
* @param toAddresses
*/
public void sendMail(String subject, String message, String... toAddresses) {
+ if (toAddresses == null || toAddresses.length == 0) {
+ logger.debug(MessageFormat.format("Dropping message {0} because there are no recipients", subject));
+ return;
+ }
try {
Message mail = mailExecutor.createMessage(toAddresses);
if (mail != null) {
mail.setSubject(subject);
- mail.setText(message);
+
+ MimeBodyPart messagePart = new MimeBodyPart();
+ messagePart.setText(message, "utf-8");
+ messagePart.setHeader("Content-Type", "text/plain; charset=\"utf-8\"");
+ messagePart.setHeader("Content-Transfer-Encoding", "quoted-printable");
+
+ MimeMultipart multiPart = new MimeMultipart();
+ multiPart.addBodyPart(messagePart);
+ mail.setContent(multiPart);
+
mailExecutor.queue(mail);
}
} catch (MessagingException e) {
@@ -2933,11 +2940,24 @@
* @param toAddresses
*/
public void sendHtmlMail(String subject, String message, String... toAddresses) {
+ if (toAddresses == null || toAddresses.length == 0) {
+ logger.debug(MessageFormat.format("Dropping message {0} because there are no recipients", subject));
+ return;
+ }
try {
Message mail = mailExecutor.createMessage(toAddresses);
if (mail != null) {
mail.setSubject(subject);
- mail.setContent(message, "text/html");
+
+ MimeBodyPart messagePart = new MimeBodyPart();
+ messagePart.setText(message, "utf-8");
+ messagePart.setHeader("Content-Type", "text/html; charset=\"utf-8\"");
+ messagePart.setHeader("Content-Transfer-Encoding", "quoted-printable");
+
+ MimeMultipart multiPart = new MimeMultipart();
+ multiPart.addBodyPart(messagePart);
+ mail.setContent(multiPart);
+
mailExecutor.queue(mail);
}
} catch (MessagingException e) {
@@ -3227,13 +3247,15 @@
if (!StringUtils.isEmpty(openShift)) {
// Gitblit is running in OpenShift/JBoss
File base = new File(openShift);
+ logger.info("EXPRESS contextFolder is " + contextFolder.getAbsolutePath());
// gitblit.properties setting overrides
File overrideFile = new File(base, "gitblit.properties");
webxmlSettings.applyOverrides(overrideFile);
// Copy the included scripts to the configured groovy folder
- File localScripts = new File(base, webxmlSettings.getString(Keys.groovy.scriptsFolder, "groovy"));
+ String path = webxmlSettings.getString(Keys.groovy.scriptsFolder, "groovy");
+ File localScripts = com.gitblit.utils.FileUtils.resolveParameter(Constants.baseFolder$, base, path);
if (!localScripts.exists()) {
File warScripts = new File(contextFolder, "/WEB-INF/data/groovy");
if (!warScripts.equals(localScripts)) {
diff --git a/src/com/gitblit/GitBlitException.java b/src/main/java/com/gitblit/GitBlitException.java
similarity index 100%
rename from src/com/gitblit/GitBlitException.java
rename to src/main/java/com/gitblit/GitBlitException.java
diff --git a/src/com/gitblit/GitBlitServer.java b/src/main/java/com/gitblit/GitBlitServer.java
similarity index 100%
rename from src/com/gitblit/GitBlitServer.java
rename to src/main/java/com/gitblit/GitBlitServer.java
diff --git a/src/com/gitblit/GitFilter.java b/src/main/java/com/gitblit/GitFilter.java
similarity index 100%
rename from src/com/gitblit/GitFilter.java
rename to src/main/java/com/gitblit/GitFilter.java
diff --git a/src/com/gitblit/GitServlet.java b/src/main/java/com/gitblit/GitServlet.java
similarity index 100%
rename from src/com/gitblit/GitServlet.java
rename to src/main/java/com/gitblit/GitServlet.java
diff --git a/src/com/gitblit/GitblitSslContextFactory.java b/src/main/java/com/gitblit/GitblitSslContextFactory.java
similarity index 100%
rename from src/com/gitblit/GitblitSslContextFactory.java
rename to src/main/java/com/gitblit/GitblitSslContextFactory.java
diff --git a/src/com/gitblit/GitblitTrustManager.java b/src/main/java/com/gitblit/GitblitTrustManager.java
similarity index 100%
rename from src/com/gitblit/GitblitTrustManager.java
rename to src/main/java/com/gitblit/GitblitTrustManager.java
diff --git a/src/com/gitblit/GitblitUserService.java b/src/main/java/com/gitblit/GitblitUserService.java
similarity index 100%
rename from src/com/gitblit/GitblitUserService.java
rename to src/main/java/com/gitblit/GitblitUserService.java
diff --git a/src/com/gitblit/IStoredSettings.java b/src/main/java/com/gitblit/IStoredSettings.java
similarity index 100%
rename from src/com/gitblit/IStoredSettings.java
rename to src/main/java/com/gitblit/IStoredSettings.java
diff --git a/src/com/gitblit/IUserService.java b/src/main/java/com/gitblit/IUserService.java
similarity index 100%
rename from src/com/gitblit/IUserService.java
rename to src/main/java/com/gitblit/IUserService.java
diff --git a/src/com/gitblit/JsonServlet.java b/src/main/java/com/gitblit/JsonServlet.java
similarity index 100%
rename from src/com/gitblit/JsonServlet.java
rename to src/main/java/com/gitblit/JsonServlet.java
diff --git a/src/com/gitblit/LdapUserService.java b/src/main/java/com/gitblit/LdapUserService.java
similarity index 100%
rename from src/com/gitblit/LdapUserService.java
rename to src/main/java/com/gitblit/LdapUserService.java
diff --git a/src/com/gitblit/LuceneExecutor.java b/src/main/java/com/gitblit/LuceneExecutor.java
similarity index 100%
rename from src/com/gitblit/LuceneExecutor.java
rename to src/main/java/com/gitblit/LuceneExecutor.java
diff --git a/src/com/gitblit/MailExecutor.java b/src/main/java/com/gitblit/MailExecutor.java
similarity index 93%
rename from src/com/gitblit/MailExecutor.java
rename to src/main/java/com/gitblit/MailExecutor.java
index 9001e83..54ff8b8 100644
--- a/src/com/gitblit/MailExecutor.java
+++ b/src/main/java/com/gitblit/MailExecutor.java
@@ -110,19 +110,6 @@
return session != null;
}
- /**
- * Creates a message for the administrators.
- *
- * @returna message
- */
- public Message createMessageForAdministrators() {
- List<String> toAddresses = settings.getStrings(Keys.mail.adminAddresses);
- if (toAddresses.size() == 0) {
- logger.warn("Can not notify administrators because no email addresses are defined!");
- return null;
- }
- return createMessage(toAddresses);
- }
/**
* Create a message.
diff --git a/src/com/gitblit/PagesFilter.java b/src/main/java/com/gitblit/PagesFilter.java
similarity index 100%
rename from src/com/gitblit/PagesFilter.java
rename to src/main/java/com/gitblit/PagesFilter.java
diff --git a/src/com/gitblit/PagesServlet.java b/src/main/java/com/gitblit/PagesServlet.java
similarity index 100%
rename from src/com/gitblit/PagesServlet.java
rename to src/main/java/com/gitblit/PagesServlet.java
diff --git a/src/com/gitblit/RedmineUserService.java b/src/main/java/com/gitblit/RedmineUserService.java
similarity index 99%
rename from src/com/gitblit/RedmineUserService.java
rename to src/main/java/com/gitblit/RedmineUserService.java
index 9d571e3..2728e00 100644
--- a/src/com/gitblit/RedmineUserService.java
+++ b/src/main/java/com/gitblit/RedmineUserService.java
@@ -158,7 +158,7 @@
String url = this.settings.getString(Keys.realm.redmine.url, "");
if (!url.endsWith("/")) {
- url.concat("/");
+ url = url.concat("/");
}
HttpURLConnection http;
if (username == null) {
diff --git a/src/com/gitblit/RobotsTxtServlet.java b/src/main/java/com/gitblit/RobotsTxtServlet.java
similarity index 100%
rename from src/com/gitblit/RobotsTxtServlet.java
rename to src/main/java/com/gitblit/RobotsTxtServlet.java
diff --git a/src/com/gitblit/RpcFilter.java b/src/main/java/com/gitblit/RpcFilter.java
similarity index 100%
rename from src/com/gitblit/RpcFilter.java
rename to src/main/java/com/gitblit/RpcFilter.java
diff --git a/src/com/gitblit/RpcServlet.java b/src/main/java/com/gitblit/RpcServlet.java
similarity index 100%
rename from src/com/gitblit/RpcServlet.java
rename to src/main/java/com/gitblit/RpcServlet.java
diff --git a/src/com/gitblit/SyndicationFilter.java b/src/main/java/com/gitblit/SyndicationFilter.java
similarity index 100%
rename from src/com/gitblit/SyndicationFilter.java
rename to src/main/java/com/gitblit/SyndicationFilter.java
diff --git a/src/com/gitblit/SyndicationServlet.java b/src/main/java/com/gitblit/SyndicationServlet.java
similarity index 100%
rename from src/com/gitblit/SyndicationServlet.java
rename to src/main/java/com/gitblit/SyndicationServlet.java
diff --git a/src/com/gitblit/WebXmlSettings.java b/src/main/java/com/gitblit/WebXmlSettings.java
similarity index 100%
rename from src/com/gitblit/WebXmlSettings.java
rename to 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
similarity index 100%
rename from src/com/gitblit/authority/AuthorityWorker.java
rename to 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
similarity index 100%
rename from src/com/gitblit/authority/CertificateStatus.java
rename to 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
similarity index 100%
rename from src/com/gitblit/authority/CertificateStatusRenderer.java
rename to 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
similarity index 100%
rename from src/com/gitblit/authority/CertificatesTableModel.java
rename to 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
similarity index 100%
rename from src/com/gitblit/authority/DefaultOidsPanel.java
rename to 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
similarity index 99%
rename from src/com/gitblit/authority/GitblitAuthority.java
rename to src/main/java/com/gitblit/authority/GitblitAuthority.java
index c3d8184..1a1f96d 100644
--- a/src/com/gitblit/authority/GitblitAuthority.java
+++ b/src/main/java/com/gitblit/authority/GitblitAuthority.java
@@ -175,7 +175,7 @@
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/Launcher.java b/src/main/java/com/gitblit/authority/Launcher.java
similarity index 60%
copy from src/com/gitblit/Launcher.java
copy to src/main/java/com/gitblit/authority/Launcher.java
index a43331b..1da9714 100644
--- a/src/com/gitblit/Launcher.java
+++ b/src/main/java/com/gitblit/authority/Launcher.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2011 gitblit.com.
+ * Copyright 2012 gitblit.com.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -13,30 +13,30 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.gitblit;
+package com.gitblit.authority;
+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;
+import com.gitblit.client.Translation;
/**
- * 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 Authority.
*
* @author James Moger
*
@@ -50,59 +50,69 @@
*/
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 Authority...");
+ GitblitAuthority.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()) {
diff --git a/src/com/gitblit/authority/NewCertificateConfig.java b/src/main/java/com/gitblit/authority/NewCertificateConfig.java
similarity index 100%
rename from src/com/gitblit/authority/NewCertificateConfig.java
rename to 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
similarity index 100%
rename from src/com/gitblit/authority/NewClientCertificateDialog.java
rename to 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
similarity index 100%
rename from src/com/gitblit/authority/NewSSLCertificateDialog.java
rename to 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
similarity index 100%
rename from src/com/gitblit/authority/RequestFocusListener.java
rename to 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
similarity index 100%
rename from src/com/gitblit/authority/UserCertificateConfig.java
rename to 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
similarity index 100%
rename from src/com/gitblit/authority/UserCertificateModel.java
rename to 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
similarity index 100%
rename from src/com/gitblit/authority/UserCertificatePanel.java
rename to 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
similarity index 100%
rename from src/com/gitblit/authority/UserCertificateTableModel.java
rename to 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
similarity index 100%
rename from src/com/gitblit/authority/UserOidsPanel.java
rename to 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
similarity index 100%
rename from src/com/gitblit/authority/Utils.java
rename to 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
similarity index 100%
rename from src/com/gitblit/authority/X509CertificateViewer.java
rename to src/main/java/com/gitblit/authority/X509CertificateViewer.java
diff --git a/src/com/gitblit/client/BooleanCellRenderer.java b/src/main/java/com/gitblit/client/BooleanCellRenderer.java
similarity index 100%
rename from src/com/gitblit/client/BooleanCellRenderer.java
rename to 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
similarity index 100%
rename from src/com/gitblit/client/BranchRenderer.java
rename to 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
similarity index 100%
rename from src/com/gitblit/client/ClosableTabComponent.java
rename to 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
similarity index 100%
rename from src/com/gitblit/client/DateCellRenderer.java
rename to 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
similarity index 100%
rename from src/com/gitblit/client/EditRegistrationDialog.java
rename to 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
similarity index 100%
rename from src/com/gitblit/client/EditRepositoryDialog.java
rename to 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
similarity index 100%
rename from src/com/gitblit/client/EditTeamDialog.java
rename to 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
similarity index 100%
rename from src/com/gitblit/client/EditUserDialog.java
rename to 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
similarity index 100%
rename from src/com/gitblit/client/FeedEntryTableModel.java
rename to 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
similarity index 100%
rename from src/com/gitblit/client/FeedsPanel.java
rename to 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
similarity index 100%
rename from src/com/gitblit/client/FeedsTableModel.java
rename to 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
similarity index 100%
rename from src/com/gitblit/client/GitblitClient.java
rename to 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
similarity index 98%
rename from src/com/gitblit/client/GitblitManager.java
rename to src/main/java/com/gitblit/client/GitblitManager.java
index dd0315f..d2fd7f7 100644
--- a/src/com/gitblit/client/GitblitManager.java
+++ b/src/main/java/com/gitblit/client/GitblitManager.java
@@ -96,7 +96,7 @@
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
similarity index 61%
rename from src/com/gitblit/Launcher.java
rename to src/main/java/com/gitblit/client/GitblitManagerLauncher.java
index a43331b..d0cc839 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 @@
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 @@
"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
similarity index 100%
rename from src/com/gitblit/client/GitblitPanel.java
rename to 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
similarity index 100%
rename from src/com/gitblit/client/GitblitRegistration.java
rename to 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
similarity index 100%
rename from src/com/gitblit/client/GitblitWorker.java
rename to 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
similarity index 100%
rename from src/com/gitblit/client/HeaderPanel.java
rename to 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
similarity index 100%
rename from src/com/gitblit/client/IndicatorsRenderer.java
rename to 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
similarity index 100%
rename from src/com/gitblit/client/JPalette.java
rename to 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
similarity index 100%
rename from src/com/gitblit/client/MessageRenderer.java
rename to 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
similarity index 100%
rename from src/com/gitblit/client/NameRenderer.java
rename to 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
similarity index 100%
rename from src/com/gitblit/client/PropertiesTableModel.java
rename to 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
similarity index 100%
rename from src/com/gitblit/client/RegistrantPermissionsPanel.java
rename to 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
similarity index 100%
rename from src/com/gitblit/client/RegistrantPermissionsTableModel.java
rename to 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
similarity index 100%
rename from src/com/gitblit/client/RegistrationsDialog.java
rename to 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
similarity index 100%
rename from src/com/gitblit/client/RegistrationsTableModel.java
rename to 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
similarity index 100%
rename from src/com/gitblit/client/RepositoriesPanel.java
rename to 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
similarity index 100%
rename from src/com/gitblit/client/RepositoriesTableModel.java
rename to 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
similarity index 100%
rename from src/com/gitblit/client/SearchDialog.java
rename to 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
similarity index 100%
rename from src/com/gitblit/client/SettingCellRenderer.java
rename to 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
similarity index 100%
rename from src/com/gitblit/client/SettingPanel.java
rename to 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
similarity index 100%
rename from src/com/gitblit/client/SettingsPanel.java
rename to 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
similarity index 100%
rename from src/com/gitblit/client/SettingsTableModel.java
rename to 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
similarity index 100%
rename from src/com/gitblit/client/StatusPanel.java
rename to 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
similarity index 100%
rename from src/com/gitblit/client/SubscribedRepositoryRenderer.java
rename to 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
similarity index 100%
rename from src/com/gitblit/client/SubscriptionsDialog.java
rename to 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
similarity index 100%
rename from src/com/gitblit/client/TeamsPanel.java
rename to 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
similarity index 100%
rename from src/com/gitblit/client/TeamsTableModel.java
rename to 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
similarity index 100%
rename from src/com/gitblit/client/Translation.java
rename to 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
similarity index 100%
rename from src/com/gitblit/client/UsersPanel.java
rename to 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
similarity index 100%
rename from src/com/gitblit/client/UsersTableModel.java
rename to 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
similarity index 100%
rename from src/com/gitblit/client/Utils.java
rename to 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
similarity index 100%
rename from src/com/gitblit/client/splash.png
rename to src/main/java/com/gitblit/client/splash.png
Binary files differ
diff --git a/src/com/gitblit/fanout/FanoutClient.java b/src/main/java/com/gitblit/fanout/FanoutClient.java
similarity index 100%
rename from src/com/gitblit/fanout/FanoutClient.java
rename to 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
similarity index 100%
rename from src/com/gitblit/fanout/FanoutConstants.java
rename to 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
similarity index 100%
rename from src/com/gitblit/fanout/FanoutNioService.java
rename to 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
similarity index 100%
rename from src/com/gitblit/fanout/FanoutService.java
rename to 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
similarity index 100%
rename from src/com/gitblit/fanout/FanoutServiceConnection.java
rename to 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
similarity index 100%
rename from src/com/gitblit/fanout/FanoutSocketService.java
rename to 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
similarity index 100%
rename from src/com/gitblit/fanout/FanoutStats.java
rename to 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
similarity index 100%
rename from src/com/gitblit/models/Activity.java
rename to 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
similarity index 100%
rename from src/com/gitblit/models/AnnotatedLine.java
rename to 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
similarity index 100%
rename from src/com/gitblit/models/FederationModel.java
rename to 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
similarity index 100%
rename from src/com/gitblit/models/FederationProposal.java
rename to 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
similarity index 100%
rename from src/com/gitblit/models/FederationSet.java
rename to 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
similarity index 100%
rename from src/com/gitblit/models/FeedEntryModel.java
rename to 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
similarity index 100%
rename from src/com/gitblit/models/FeedModel.java
rename to 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
similarity index 100%
rename from src/com/gitblit/models/ForkModel.java
rename to 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
similarity index 100%
rename from src/com/gitblit/models/GitNote.java
rename to 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
similarity index 100%
rename from src/com/gitblit/models/GravatarProfile.java
rename to 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
similarity index 100%
rename from src/com/gitblit/models/IssueModel.java
rename to 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
similarity index 100%
rename from src/com/gitblit/models/Metric.java
rename to 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
similarity index 100%
rename from src/com/gitblit/models/PathModel.java
rename to 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
similarity index 100%
rename from src/com/gitblit/models/ProjectModel.java
rename to 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
similarity index 100%
rename from src/com/gitblit/models/PushLogEntry.java
rename to 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
similarity index 100%
rename from src/com/gitblit/models/RefModel.java
rename to 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
similarity index 100%
rename from src/com/gitblit/models/RegistrantAccessPermission.java
rename to 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
similarity index 100%
rename from src/com/gitblit/models/RepositoryCommit.java
rename to 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
similarity index 100%
rename from src/com/gitblit/models/RepositoryModel.java
rename to 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
similarity index 100%
rename from src/com/gitblit/models/SearchResult.java
rename to 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
similarity index 100%
rename from src/com/gitblit/models/ServerSettings.java
rename to 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
similarity index 95%
rename from src/com/gitblit/models/ServerStatus.java
rename to src/main/java/com/gitblit/models/ServerStatus.java
index f1650c8..3a1e030 100644
--- a/src/com/gitblit/models/ServerStatus.java
+++ b/src/main/java/com/gitblit/models/ServerStatus.java
@@ -53,8 +53,8 @@
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
similarity index 100%
rename from src/com/gitblit/models/SettingModel.java
rename to 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
similarity index 100%
rename from src/com/gitblit/models/SubmoduleModel.java
rename to 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
similarity index 100%
rename from src/com/gitblit/models/TeamModel.java
rename to 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
similarity index 100%
rename from src/com/gitblit/models/TicketModel.java
rename to 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
similarity index 100%
rename from src/com/gitblit/models/UserModel.java
rename to 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
similarity index 100%
rename from src/com/gitblit/utils/ActivityUtils.java
rename to 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
similarity index 100%
rename from src/com/gitblit/utils/ArrayUtils.java
rename to 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
similarity index 100%
rename from src/com/gitblit/utils/Base64.java
rename to 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
similarity index 100%
rename from src/com/gitblit/utils/ByteFormat.java
rename to 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
similarity index 100%
rename from src/com/gitblit/utils/ClientLogger.java
rename to 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
similarity index 100%
rename from src/com/gitblit/utils/CompressionUtils.java
rename to 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
similarity index 96%
rename from src/com/gitblit/utils/ConnectionUtils.java
rename to src/main/java/com/gitblit/utils/ConnectionUtils.java
index f0b4111..feeedd2 100644
--- a/src/com/gitblit/utils/ConnectionUtils.java
+++ b/src/main/java/com/gitblit/utils/ConnectionUtils.java
@@ -61,6 +61,10 @@
SSL_CONTEXT = context;
HOSTNAME_VERIFIER = new DummyHostnameVerifier();
CHARSET = "UTF-8";
+
+ // Disable Java 7 SNI checks
+ // http://stackoverflow.com/questions/7615645/ssl-handshake-alert-unrecognized-name-error-since-upgrade-to-java-1-7-0
+ System.setProperty("jsse.enableSNIExtension", "false");
}
public static void setAuthorization(URLConnection conn, String username, char[] password) {
diff --git a/src/com/gitblit/utils/ContainerUtils.java b/src/main/java/com/gitblit/utils/ContainerUtils.java
old mode 100755
new mode 100644
similarity index 100%
rename from src/com/gitblit/utils/ContainerUtils.java
rename to 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
similarity index 100%
rename from src/com/gitblit/utils/DeepCopier.java
rename to 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
similarity index 100%
rename from src/com/gitblit/utils/DiffUtils.java
rename to 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
similarity index 100%
rename from src/com/gitblit/utils/FederationUtils.java
rename to 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
similarity index 100%
rename from src/com/gitblit/utils/FileUtils.java
rename to 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
similarity index 100%
rename from src/com/gitblit/utils/GitBlitDiffFormatter.java
rename to 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
similarity index 100%
rename from src/com/gitblit/utils/GitWebDiffFormatter.java
rename to 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
similarity index 100%
rename from src/com/gitblit/utils/HttpUtils.java
rename to 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
similarity index 100%
rename from src/com/gitblit/utils/IssueUtils.java
rename to 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
similarity index 100%
rename from src/com/gitblit/utils/JGitUtils.java
rename to 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
similarity index 100%
rename from src/com/gitblit/utils/JsonUtils.java
rename to 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
similarity index 100%
rename from src/com/gitblit/utils/MarkdownUtils.java
rename to 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
similarity index 100%
rename from src/com/gitblit/utils/MetricUtils.java
rename to 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
similarity index 100%
rename from src/com/gitblit/utils/ObjectCache.java
rename to 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
similarity index 100%
rename from src/com/gitblit/utils/PatchFormatter.java
rename to 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
similarity index 100%
rename from src/com/gitblit/utils/PushLogUtils.java
rename to 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
similarity index 100%
rename from src/com/gitblit/utils/RpcUtils.java
rename to 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
similarity index 100%
rename from src/com/gitblit/utils/StringUtils.java
rename to 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
similarity index 100%
rename from src/com/gitblit/utils/SyndicationUtils.java
rename to 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
similarity index 100%
rename from src/com/gitblit/utils/TicgitUtils.java
rename to 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
similarity index 100%
rename from src/com/gitblit/utils/TimeUtils.java
rename to 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
similarity index 100%
rename from src/com/gitblit/utils/X509Utils.java
rename to 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
similarity index 99%
rename from src/com/gitblit/wicket/AuthorizationStrategy.java
rename to src/main/java/com/gitblit/wicket/AuthorizationStrategy.java
index 21bd1b7..765d860 100644
--- a/src/com/gitblit/wicket/AuthorizationStrategy.java
+++ b/src/main/java/com/gitblit/wicket/AuthorizationStrategy.java
@@ -78,6 +78,7 @@
@Override
public void onUnauthorizedInstantiation(Component component) {
+
if (component instanceof BasePage) {
throw new RestartResponseException(RepositoriesPage.class);
}
diff --git a/src/com/gitblit/wicket/ExternalImage.java b/src/main/java/com/gitblit/wicket/ExternalImage.java
similarity index 100%
rename from src/com/gitblit/wicket/ExternalImage.java
rename to 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
similarity index 98%
rename from src/com/gitblit/wicket/GitBlitWebApp.java
rename to src/main/java/com/gitblit/wicket/GitBlitWebApp.java
index 4e32daa..2300d0f 100644
--- a/src/com/gitblit/wicket/GitBlitWebApp.java
+++ b/src/main/java/com/gitblit/wicket/GitBlitWebApp.java
@@ -40,6 +40,7 @@
import com.gitblit.wicket.pages.GravatarProfilePage;
import com.gitblit.wicket.pages.HistoryPage;
import com.gitblit.wicket.pages.LogPage;
+import com.gitblit.wicket.pages.LogoutPage;
import com.gitblit.wicket.pages.LuceneSearchPage;
import com.gitblit.wicket.pages.MarkdownPage;
import com.gitblit.wicket.pages.MetricsPage;
@@ -101,6 +102,7 @@
mount("/metrics", MetricsPage.class, "r");
mount("/blame", BlamePage.class, "r", "h", "f");
mount("/users", UsersPage.class);
+ mount("/logout", LogoutPage.class);
// setup ticket urls
mount("/tickets", TicketsPage.class, "r");
diff --git a/src/com/gitblit/wicket/GitBlitWebApp.properties b/src/main/java/com/gitblit/wicket/GitBlitWebApp.properties
similarity index 98%
rename from src/com/gitblit/wicket/GitBlitWebApp.properties
rename to src/main/java/com/gitblit/wicket/GitBlitWebApp.properties
index b6b59ac..81eecb2 100644
--- a/src/com/gitblit/wicket/GitBlitWebApp.properties
+++ b/src/main/java/com/gitblit/wicket/GitBlitWebApp.properties
@@ -444,4 +444,7 @@
gb.siteNameDescription = short, descriptive name of your server
gb.excludeFromActivity = exclude from activity page
gb.isSparkleshared = repository is Sparkleshared
-gb.owners = owners
\ No newline at end of file
+gb.owners = owners
+gb.sessionEnded = Session has been closed
+gb.closeBrowser = Please close the browser to properly end the session.
+gb.doesNotExistInTree = {0} does not exist in tree {1}
diff --git a/src/com/gitblit/wicket/GitBlitWebApp_es.properties b/src/main/java/com/gitblit/wicket/GitBlitWebApp_es.properties
similarity index 99%
rename from src/com/gitblit/wicket/GitBlitWebApp_es.properties
rename to src/main/java/com/gitblit/wicket/GitBlitWebApp_es.properties
index 64c9ca1..210a75f 100644
--- a/src/com/gitblit/wicket/GitBlitWebApp_es.properties
+++ b/src/main/java/com/gitblit/wicket/GitBlitWebApp_es.properties
@@ -440,4 +440,6 @@
gb.validity = Vigencia
gb.siteName = Nombre del sitio
gb.siteNameDescription = Nombre corto y descriptivo de tu servidor
-gb.excludeFromActivity = Excluir de la p\u00E1gina de actividad
\ No newline at end of file
+gb.excludeFromActivity = Excluir de la p\u00E1gina de actividad
+gb.sessionEnded = La sesi\u00F3n ha sido cerrada
+gb.closeBrowser = Porfavor cierre el navegador para terminar correctamente la sesi\u00F3n.
\ No newline at end of file
diff --git a/src/com/gitblit/wicket/GitBlitWebApp_ja.properties b/src/main/java/com/gitblit/wicket/GitBlitWebApp_ja.properties
old mode 100755
new mode 100644
similarity index 99%
rename from src/com/gitblit/wicket/GitBlitWebApp_ja.properties
rename to src/main/java/com/gitblit/wicket/GitBlitWebApp_ja.properties
index 086df7b..d0234f8
--- a/src/com/gitblit/wicket/GitBlitWebApp_ja.properties
+++ b/src/main/java/com/gitblit/wicket/GitBlitWebApp_ja.properties
@@ -314,3 +314,5 @@
gb.allowAuthenticatedDescription = \u5168\u3066\u306e\u8a8d\u8a3c\u6e08\u307f\u30e6\u30fc\u30b6\u30fc\u3078\u30a2\u30af\u30bb\u30b9\u3092\u8a31\u53ef\u3059\u308b
gb.allowNamedDescription = \u6307\u5b9a\u3057\u305f\u540d\u524d\u306e\u30e6\u30fc\u30b6\u30fc/\u30c1\u30fc\u30e0\u3078\u30a2\u30af\u30bb\u30b9\u3092\u8a31\u53ef\u3059\u308b
gb.markdownFailure = Markdown \u306e\u30d1\u30fc\u30b9\u306b\u5931\u6557\u3057\u307e\u3057\u305f!
+gb.sessionEnded = Session has been closed
+gb.closeBrowser = Please close the browser to properly end the session.
diff --git a/src/com/gitblit/wicket/GitBlitWebApp_ko.properties b/src/main/java/com/gitblit/wicket/GitBlitWebApp_ko.properties
similarity index 99%
rename from src/com/gitblit/wicket/GitBlitWebApp_ko.properties
rename to src/main/java/com/gitblit/wicket/GitBlitWebApp_ko.properties
index 18eda26..42915df 100644
--- a/src/com/gitblit/wicket/GitBlitWebApp_ko.properties
+++ b/src/main/java/com/gitblit/wicket/GitBlitWebApp_ko.properties
@@ -440,4 +440,6 @@
gb.validity = \uC720\uD6A8\uC131
gb.siteName = \uC0AC\uC774\uD2B8 \uC774\uB984
gb.siteNameDescription = \uC11C\uBC84\uC758 \uC9E6\uC740 \uC124\uBA85\uC774 \uD3EC\uD568\uB41C \uC774\uB984
-gb.excludeFromActivity = \uC561\uD2F0\uBE44\uD2F0 \uD398\uC774\uC9C0\uC5D0\uC11C \uC81C\uC678
\ No newline at end of file
+gb.excludeFromActivity = \uC561\uD2F0\uBE44\uD2F0 \uD398\uC774\uC9C0\uC5D0\uC11C \uC81C\uC678
+gb.sessionEnded = Session has been closed
+gb.closeBrowser = Please close the browser to properly end the session.
diff --git a/src/com/gitblit/wicket/GitBlitWebApp_nl.properties b/src/main/java/com/gitblit/wicket/GitBlitWebApp_nl.properties
similarity index 99%
rename from src/com/gitblit/wicket/GitBlitWebApp_nl.properties
rename to src/main/java/com/gitblit/wicket/GitBlitWebApp_nl.properties
index 5471ad8..f1281e1 100644
--- a/src/com/gitblit/wicket/GitBlitWebApp_nl.properties
+++ b/src/main/java/com/gitblit/wicket/GitBlitWebApp_nl.properties
@@ -441,3 +441,5 @@
gb.siteName = site naam
gb.siteNameDescription = korte, verduidelijkende naam van deze server
gb.excludeFromActivity = sluit uit van activiteitspagina
+gb.sessionEnded = Sessie is afgesloten
+gb.closeBrowser = Sluit de browser af om de sessie helemaal te beeindigen.
\ No newline at end of file
diff --git a/src/com/gitblit/wicket/GitBlitWebApp_pl.properties b/src/main/java/com/gitblit/wicket/GitBlitWebApp_pl.properties
similarity index 98%
rename from src/com/gitblit/wicket/GitBlitWebApp_pl.properties
rename to src/main/java/com/gitblit/wicket/GitBlitWebApp_pl.properties
index 82ffa63..b75e8f8 100644
--- a/src/com/gitblit/wicket/GitBlitWebApp_pl.properties
+++ b/src/main/java/com/gitblit/wicket/GitBlitWebApp_pl.properties
@@ -318,4 +318,6 @@
gb.projects = Projekty
gb.project = Projekt
gb.allProjects = Wszystkie projekty
-gb.copyToClipboard = Kopiuj do schowka
\ No newline at end of file
+gb.copyToClipboard = Kopiuj do schowka
+gb.sessionEnded = Session has been closed
+gb.closeBrowser = Please close the browser to properly end the session.
\ No newline at end of file
diff --git a/src/com/gitblit/wicket/GitBlitWebApp_pt_BR.properties b/src/main/java/com/gitblit/wicket/GitBlitWebApp_pt_BR.properties
similarity index 99%
rename from src/com/gitblit/wicket/GitBlitWebApp_pt_BR.properties
rename to src/main/java/com/gitblit/wicket/GitBlitWebApp_pt_BR.properties
index efe286c..a02d2ff 100644
--- a/src/com/gitblit/wicket/GitBlitWebApp_pt_BR.properties
+++ b/src/main/java/com/gitblit/wicket/GitBlitWebApp_pt_BR.properties
@@ -442,4 +442,6 @@
gb.siteNameDescription = breve, mas ainda assim um nome descritivo para seu servidor
gb.excludeFromActivity = excluir da página de atividades
gb.isSparkleshared = repositório é Sparkleshared
-gb.owners = proprietários
\ No newline at end of file
+gb.owners = proprietários
+gb.sessionEnded = Session has been closed
+gb.closeBrowser = Please close the browser to properly end the session.
\ No newline at end of file
diff --git a/src/com/gitblit/wicket/GitBlitWebApp_zh_CN.properties b/src/main/java/com/gitblit/wicket/GitBlitWebApp_zh_CN.properties
similarity index 99%
rename from src/com/gitblit/wicket/GitBlitWebApp_zh_CN.properties
rename to src/main/java/com/gitblit/wicket/GitBlitWebApp_zh_CN.properties
index b571585..96e2067 100644
--- a/src/com/gitblit/wicket/GitBlitWebApp_zh_CN.properties
+++ b/src/main/java/com/gitblit/wicket/GitBlitWebApp_zh_CN.properties
@@ -441,4 +441,6 @@
gb.siteName = \u7f51\u7ad9\u540d\u79f0
gb.siteNameDescription = \u60a8\u7684\u670d\u52a1\u5668\u7684\u7b80\u8981\u63cf\u8ff0
gb.excludeFromActivity = \u4ece\u6d3b\u52a8\u9875\u9762\u6392\u9664
-gb.isSparkleshared = repository is Sparkleshared
\ No newline at end of file
+gb.isSparkleshared = repository is Sparkleshared
+gb.sessionEnded = Session has been closed
+gb.closeBrowser = Please close the browser to properly end the session.
\ No newline at end of file
diff --git a/src/com/gitblit/wicket/GitBlitWebSession.java b/src/main/java/com/gitblit/wicket/GitBlitWebSession.java
similarity index 100%
rename from src/com/gitblit/wicket/GitBlitWebSession.java
rename to 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
similarity index 100%
rename from src/com/gitblit/wicket/GitblitParamUrlCodingStrategy.java
rename to 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
similarity index 100%
rename from src/com/gitblit/wicket/GitblitRedirectException.java
rename to 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
similarity index 100%
rename from src/com/gitblit/wicket/PageRegistration.java
rename to 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
similarity index 100%
rename from src/com/gitblit/wicket/RequiresAdminRole.java
rename to 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
similarity index 100%
rename from src/com/gitblit/wicket/SessionlessForm.java
rename to 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
similarity index 100%
rename from src/com/gitblit/wicket/StringChoiceRenderer.java
rename to 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
similarity index 99%
rename from src/com/gitblit/wicket/WicketUtils.java
rename to src/main/java/com/gitblit/wicket/WicketUtils.java
index e4eb29f..6e03032 100644
--- a/src/com/gitblit/wicket/WicketUtils.java
+++ b/src/main/java/com/gitblit/wicket/WicketUtils.java
@@ -165,7 +165,7 @@
|| filename.endsWith(".xlsx")) {
return newImage(wicketId, "file_excel_16x16.png");
} else if (filename.endsWith(".doc") || filename.endsWith(".docx")) {
- return newImage(wicketId, "file_word_16x16.png");
+ return newImage(wicketId, "file_doc_16x16.png");
} else if (filename.endsWith(".ppt")) {
return newImage(wicketId, "file_ppt_16x16.png");
} else if (filename.endsWith(".zip")) {
diff --git a/src/com/gitblit/wicket/charting/GoogleChart.java b/src/main/java/com/gitblit/wicket/charting/GoogleChart.java
similarity index 100%
rename from src/com/gitblit/wicket/charting/GoogleChart.java
rename to 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
similarity index 100%
rename from src/com/gitblit/wicket/charting/GoogleCharts.java
rename to 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
similarity index 100%
rename from src/com/gitblit/wicket/charting/GoogleLineChart.java
rename to 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
similarity index 100%
rename from src/com/gitblit/wicket/charting/GooglePieChart.java
rename to 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
similarity index 100%
rename from src/com/gitblit/wicket/pages/ActivityPage.html
rename to 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
similarity index 100%
rename from src/com/gitblit/wicket/pages/ActivityPage.java
rename to 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
similarity index 100%
rename from src/com/gitblit/wicket/pages/BasePage.html
rename to 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
similarity index 91%
rename from src/com/gitblit/wicket/pages/BasePage.java
rename to src/main/java/com/gitblit/wicket/pages/BasePage.java
index c733c99..bb7d8c9 100644
--- a/src/com/gitblit/wicket/pages/BasePage.java
+++ b/src/main/java/com/gitblit/wicket/pages/BasePage.java
@@ -38,15 +38,12 @@
import org.apache.wicket.RequestCycle;
import org.apache.wicket.RestartResponseException;
import org.apache.wicket.markup.html.CSSPackageResource;
-import org.apache.wicket.markup.html.WebPage;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.link.BookmarkablePageLink;
import org.apache.wicket.markup.html.link.ExternalLink;
import org.apache.wicket.markup.html.panel.FeedbackPanel;
import org.apache.wicket.markup.html.panel.Fragment;
import org.apache.wicket.protocol.http.RequestUtils;
-import org.apache.wicket.protocol.http.WebRequest;
-import org.apache.wicket.protocol.http.WebResponse;
import org.apache.wicket.protocol.http.servlet.ServletWebRequest;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -68,7 +65,7 @@
import com.gitblit.wicket.WicketUtils;
import com.gitblit.wicket.panels.LinkPanel;
-public abstract class BasePage extends WebPage {
+public abstract class BasePage extends SessionPage {
private final Logger logger;
@@ -78,14 +75,12 @@
super();
logger = LoggerFactory.getLogger(getClass());
customizeHeader();
- login();
}
public BasePage(PageParameters params) {
super(params);
logger = LoggerFactory.getLogger(getClass());
customizeHeader();
- login();
}
private void customizeHeader() {
@@ -133,34 +128,6 @@
super.onAfterRender();
}
- private void login() {
- GitBlitWebSession session = GitBlitWebSession.get();
- if (session.isLoggedIn() && !session.isSessionInvalidated()) {
- // already have a session, refresh usermodel to pick up
- // any changes to permissions or roles (issue-186)
- UserModel user = GitBlit.self().getUserModel(session.getUser().username);
- session.setUser(user);
- return;
- }
-
- // try to authenticate by servlet request
- HttpServletRequest httpRequest = ((WebRequest) getRequestCycle().getRequest()).getHttpServletRequest();
- UserModel user = GitBlit.self().authenticate(httpRequest);
-
- // Login the user
- if (user != null) {
- // issue 62: fix session fixation vulnerability
- session.replaceSession();
- session.setUser(user);
-
- // Set Cookie
- WebResponse response = (WebResponse) getRequestCycle().getResponse();
- GitBlit.self().setCookie(response, user);
-
- session.continueRequest();
- }
- }
-
protected void setupPage(String repositoryName, String pageName) {
if (repositoryName != null && repositoryName.trim().length() > 0) {
add(new Label("title", getServerName() + " - " + repositoryName));
@@ -184,7 +151,7 @@
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
similarity index 96%
rename from src/com/gitblit/wicket/pages/BlamePage.html
rename to src/main/java/com/gitblit/wicket/pages/BlamePage.html
index 9391eaf..722cf3d 100644
--- a/src/com/gitblit/wicket/pages/BlamePage.html
+++ b/src/main/java/com/gitblit/wicket/pages/BlamePage.html
@@ -17,6 +17,8 @@
<!-- breadcrumbs -->
<div wicket:id="breadcrumbs">[breadcrumbs]</div>
+
+ <div wicket:id="missingBlob">[missing blob]</div>
<!-- blame content -->
<table class="annotated" style="margin-bottom:5px;">
diff --git a/src/com/gitblit/wicket/pages/BlamePage.java b/src/main/java/com/gitblit/wicket/pages/BlamePage.java
similarity index 82%
rename from src/com/gitblit/wicket/pages/BlamePage.java
rename to src/main/java/com/gitblit/wicket/pages/BlamePage.java
index d76181d..9b4c15c 100644
--- a/src/com/gitblit/wicket/pages/BlamePage.java
+++ b/src/main/java/com/gitblit/wicket/pages/BlamePage.java
@@ -32,7 +32,9 @@
import com.gitblit.GitBlit;
import com.gitblit.Keys;
import com.gitblit.models.AnnotatedLine;
+import com.gitblit.models.PathModel;
import com.gitblit.utils.DiffUtils;
+import com.gitblit.utils.JGitUtils;
import com.gitblit.utils.StringUtils;
import com.gitblit.wicket.WicketUtils;
import com.gitblit.wicket.panels.CommitHeaderPanel;
@@ -69,6 +71,24 @@
"EEEE, MMMM d, yyyy HH:mm Z");
final DateFormat df = new SimpleDateFormat(format);
df.setTimeZone(getTimeZone());
+
+ PathModel pathModel = null;
+ List<PathModel> paths = JGitUtils.getFilesInPath(getRepository(), StringUtils.getRootPath(blobPath), commit);
+ for (PathModel path : paths) {
+ if (path.path.equals(blobPath)) {
+ pathModel = path;
+ break;
+ }
+ }
+
+ if (pathModel == null) {
+ add(new Label("annotation").setVisible(false));
+ add(new Label("missingBlob", missingBlob(blobPath, commit)).setEscapeModelStrings(false));
+ return;
+ }
+
+ add(new Label("missingBlob").setVisible(false));
+
List<AnnotatedLine> lines = DiffUtils.blame(getRepository(), blobPath, objectId);
ListDataProvider<AnnotatedLine> blameDp = new ListDataProvider<AnnotatedLine>(lines);
DataView<AnnotatedLine> blameView = new DataView<AnnotatedLine>("annotation", blameDp) {
@@ -126,4 +146,13 @@
protected String getPageName() {
return getString("gb.blame");
}
+
+ protected String missingBlob(String blobPath, RevCommit commit) {
+ StringBuilder sb = new StringBuilder();
+ sb.append("<div class=\"alert alert-error\">");
+ String pattern = getString("gb.doesNotExistInTree").replace("{0}", "<b>{0}</b>").replace("{1}", "<b>{1}</b>");
+ sb.append(MessageFormat.format(pattern, blobPath, commit.getTree().getId().getName()));
+ sb.append("</div>");
+ return sb.toString();
+ }
}
diff --git a/src/com/gitblit/wicket/pages/BlobDiffPage.html b/src/main/java/com/gitblit/wicket/pages/BlobDiffPage.html
similarity index 100%
rename from src/com/gitblit/wicket/pages/BlobDiffPage.html
rename to 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
similarity index 100%
rename from src/com/gitblit/wicket/pages/BlobDiffPage.java
rename to 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
similarity index 100%
rename from src/com/gitblit/wicket/pages/BlobPage.html
rename to 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
similarity index 90%
rename from src/com/gitblit/wicket/pages/BlobPage.java
rename to src/main/java/com/gitblit/wicket/pages/BlobPage.java
index e2b8546..ab0f0f1 100644
--- a/src/com/gitblit/wicket/pages/BlobPage.java
+++ b/src/main/java/com/gitblit/wicket/pages/BlobPage.java
@@ -124,20 +124,39 @@
default:
// plain text
String source = JGitUtils.getStringContent(r, commit.getTree(), blobPath, encodings);
- String table = generateSourceView(source, type == 1);
+ String table;
+ if (source == null) {
+ table = missingBlob(blobPath, commit);
+ } else {
+ table = generateSourceView(source, type == 1);
+ }
add(new Label("blobText", table).setEscapeModelStrings(false));
add(new Image("blobImage").setVisible(false));
}
} else {
// plain text
String source = JGitUtils.getStringContent(r, commit.getTree(), blobPath, encodings);
- String table = generateSourceView(source, false);
+ String table;
+ if (source == null) {
+ table = missingBlob(blobPath, commit);
+ } else {
+ table = generateSourceView(source, false);
+ }
add(new Label("blobText", table).setEscapeModelStrings(false));
add(new Image("blobImage").setVisible(false));
}
}
}
+ protected String missingBlob(String blobPath, RevCommit commit) {
+ StringBuilder sb = new StringBuilder();
+ sb.append("<div class=\"alert alert-error\">");
+ String pattern = getString("gb.doesNotExistInTree").replace("{0}", "<b>{0}</b>").replace("{1}", "<b>{1}</b>");
+ sb.append(MessageFormat.format(pattern, blobPath, commit.getTree().getId().getName()));
+ sb.append("</div>");
+ return sb.toString();
+ }
+
protected String generateSourceView(String source, boolean prettyPrint) {
String [] lines = source.split("\n");
diff --git a/src/com/gitblit/wicket/pages/BranchesPage.html b/src/main/java/com/gitblit/wicket/pages/BranchesPage.html
similarity index 100%
rename from src/com/gitblit/wicket/pages/BranchesPage.html
rename to 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
similarity index 100%
rename from src/com/gitblit/wicket/pages/BranchesPage.java
rename to 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
similarity index 100%
rename from src/com/gitblit/wicket/pages/ChangePasswordPage.html
rename to 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
similarity index 100%
rename from src/com/gitblit/wicket/pages/ChangePasswordPage.java
rename to 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
similarity index 100%
rename from src/com/gitblit/wicket/pages/CommitDiffPage.html
rename to 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
similarity index 100%
rename from src/com/gitblit/wicket/pages/CommitDiffPage.java
rename to 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
similarity index 100%
rename from src/com/gitblit/wicket/pages/CommitPage.html
rename to 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
similarity index 97%
rename from src/com/gitblit/wicket/pages/CommitPage.java
rename to src/main/java/com/gitblit/wicket/pages/CommitPage.java
index c5a24c8..540d2a2 100644
--- a/src/com/gitblit/wicket/pages/CommitPage.java
+++ b/src/main/java/com/gitblit/wicket/pages/CommitPage.java
@@ -200,10 +200,12 @@
.setEnabled(!entry.changeType.equals(ChangeType.ADD)
&& !entry.changeType.equals(ChangeType.DELETE)));
item.add(new BookmarkablePageLink<Void>("view", BlobPage.class, WicketUtils
- .newPathParameter(repositoryName, entry.commitId, entry.path)));
+ .newPathParameter(repositoryName, entry.commitId, entry.path))
+ .setEnabled(!entry.changeType.equals(ChangeType.DELETE)));
item.add(new BookmarkablePageLink<Void>("blame", BlamePage.class, WicketUtils
.newPathParameter(repositoryName, entry.commitId, entry.path))
- .setEnabled(!entry.changeType.equals(ChangeType.ADD)));
+ .setEnabled(!entry.changeType.equals(ChangeType.ADD)
+ && !entry.changeType.equals(ChangeType.DELETE)));
item.add(new BookmarkablePageLink<Void>("history", HistoryPage.class, WicketUtils
.newPathParameter(repositoryName, entry.commitId, entry.path))
.setEnabled(!entry.changeType.equals(ChangeType.ADD)));
diff --git a/src/com/gitblit/wicket/pages/DocsPage.html b/src/main/java/com/gitblit/wicket/pages/DocsPage.html
similarity index 100%
rename from src/com/gitblit/wicket/pages/DocsPage.html
rename to 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
similarity index 100%
rename from src/com/gitblit/wicket/pages/DocsPage.java
rename to 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
similarity index 100%
rename from src/com/gitblit/wicket/pages/EditRepositoryPage.html
rename to 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
similarity index 100%
rename from src/com/gitblit/wicket/pages/EditRepositoryPage.java
rename to 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
similarity index 100%
rename from src/com/gitblit/wicket/pages/EditTeamPage.html
rename to 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
similarity index 100%
rename from src/com/gitblit/wicket/pages/EditTeamPage.java
rename to 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
similarity index 100%
rename from src/com/gitblit/wicket/pages/EditUserPage.html
rename to 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
similarity index 100%
rename from src/com/gitblit/wicket/pages/EditUserPage.java
rename to 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
similarity index 100%
rename from src/com/gitblit/wicket/pages/EmptyRepositoryPage.html
rename to 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
similarity index 92%
rename from src/com/gitblit/wicket/pages/EmptyRepositoryPage.java
rename to src/main/java/com/gitblit/wicket/pages/EmptyRepositoryPage.java
index be0dad9..cccf8a6 100644
--- a/src/com/gitblit/wicket/pages/EmptyRepositoryPage.java
+++ b/src/main/java/com/gitblit/wicket/pages/EmptyRepositoryPage.java
@@ -25,7 +25,9 @@
import com.gitblit.GitBlit;
import com.gitblit.Keys;
import com.gitblit.models.RepositoryModel;
+import com.gitblit.models.UserModel;
import com.gitblit.utils.ArrayUtils;
+import com.gitblit.wicket.GitBlitWebSession;
import com.gitblit.wicket.GitblitRedirectException;
import com.gitblit.wicket.WicketUtils;
import com.gitblit.wicket.panels.RepositoryUrlPanel;
@@ -56,7 +58,8 @@
// add the Gitblit repository url
repositoryUrls.add(getRepositoryUrl(repository));
}
- repositoryUrls.addAll(GitBlit.self().getOtherCloneUrls(repositoryName));
+ UserModel user = GitBlitWebSession.get().getUser();
+ repositoryUrls.addAll(GitBlit.self().getOtherCloneUrls(repositoryName, user == null ? "" : user.username));
String primaryUrl = ArrayUtils.isEmpty(repositoryUrls) ? "" : repositoryUrls.get(0);
add(new Label("repository", repositoryName));
diff --git a/src/com/gitblit/wicket/pages/EmptyRepositoryPage_es.html b/src/main/java/com/gitblit/wicket/pages/EmptyRepositoryPage_es.html
similarity index 100%
rename from src/com/gitblit/wicket/pages/EmptyRepositoryPage_es.html
rename to 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
similarity index 100%
rename from src/com/gitblit/wicket/pages/EmptyRepositoryPage_ko.html
rename to 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
similarity index 100%
rename from src/com/gitblit/wicket/pages/EmptyRepositoryPage_nl.html
rename to 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
similarity index 100%
rename from src/com/gitblit/wicket/pages/EmptyRepositoryPage_pl.html
rename to 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
similarity index 100%
rename from src/com/gitblit/wicket/pages/EmptyRepositoryPage_pt_BR.html
rename to 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
similarity index 100%
rename from src/com/gitblit/wicket/pages/EmptyRepositoryPage_zh_CN.html
rename to 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
similarity index 100%
rename from src/com/gitblit/wicket/pages/FederationPage.html
rename to 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
similarity index 100%
rename from src/com/gitblit/wicket/pages/FederationPage.java
rename to 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
similarity index 100%
rename from src/com/gitblit/wicket/pages/FederationRegistrationPage.html
rename to 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
similarity index 100%
rename from src/com/gitblit/wicket/pages/FederationRegistrationPage.java
rename to 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
similarity index 100%
rename from src/com/gitblit/wicket/pages/ForkPage.html
rename to 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
similarity index 100%
rename from src/com/gitblit/wicket/pages/ForkPage.java
rename to 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
similarity index 100%
rename from src/com/gitblit/wicket/pages/ForksPage.html
rename to 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
similarity index 100%
rename from src/com/gitblit/wicket/pages/ForksPage.java
rename to 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
similarity index 100%
rename from src/com/gitblit/wicket/pages/GitSearchPage.html
rename to 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
similarity index 100%
rename from src/com/gitblit/wicket/pages/GitSearchPage.java
rename to 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
similarity index 100%
rename from src/com/gitblit/wicket/pages/GravatarProfilePage.html
rename to 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
similarity index 100%
rename from src/com/gitblit/wicket/pages/GravatarProfilePage.java
rename to 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
similarity index 100%
rename from src/com/gitblit/wicket/pages/HistoryPage.html
rename to 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
similarity index 100%
rename from src/com/gitblit/wicket/pages/HistoryPage.java
rename to 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
similarity index 100%
rename from src/com/gitblit/wicket/pages/LogPage.html
rename to 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
similarity index 100%
rename from src/com/gitblit/wicket/pages/LogPage.java
rename to 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 0000000..d407783
--- /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/main/java/com/gitblit/wicket/pages/LogoutPage.java b/src/main/java/com/gitblit/wicket/pages/LogoutPage.java
new file mode 100644
index 0000000..982de0e
--- /dev/null
+++ b/src/main/java/com/gitblit/wicket/pages/LogoutPage.java
@@ -0,0 +1,51 @@
+/*
+ * 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.wicket.pages;
+
+import org.apache.wicket.markup.html.WebPage;
+import org.apache.wicket.protocol.http.WebRequest;
+import org.apache.wicket.protocol.http.WebResponse;
+
+import com.gitblit.GitBlit;
+import com.gitblit.models.UserModel;
+import com.gitblit.wicket.GitBlitWebSession;
+
+public class LogoutPage extends BasePage {
+
+ public LogoutPage() {
+ super();
+ GitBlitWebSession session = GitBlitWebSession.get();
+ UserModel user = session.getUser();
+ GitBlit.self().setCookie((WebResponse) getResponse(), null);
+ GitBlit.self().logout(user);
+ session.invalidate();
+
+ /*
+ * Now check whether the authentication was realized via the Authorization in the header.
+ * If so, it is likely to be cached by the browser, and cannot be undone. Effectively, this means
+ * that you cannot log out...
+ */
+ if ( ((WebRequest)getRequest()).getHttpServletRequest().getHeader("Authorization") != null ) {
+ // authentication will be done via this route anyway, show a page to close the browser:
+ // this will be done by Wicket.
+ setupPage(null, getString("gb.logout"));
+
+ } else {
+ setRedirect(true);
+ setResponsePage(getApplication().getHomePage());
+ } // not via WWW-Auth
+ } // LogoutPage
+}
\ No newline at end of file
diff --git a/src/com/gitblit/wicket/pages/LuceneSearchPage.html b/src/main/java/com/gitblit/wicket/pages/LuceneSearchPage.html
similarity index 100%
rename from src/com/gitblit/wicket/pages/LuceneSearchPage.html
rename to 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
similarity index 100%
rename from src/com/gitblit/wicket/pages/LuceneSearchPage.java
rename to 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
similarity index 100%
rename from src/com/gitblit/wicket/pages/MarkdownPage.html
rename to 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
similarity index 100%
rename from src/com/gitblit/wicket/pages/MarkdownPage.java
rename to 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
similarity index 100%
rename from src/com/gitblit/wicket/pages/MetricsPage.html
rename to 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
similarity index 100%
rename from src/com/gitblit/wicket/pages/MetricsPage.java
rename to 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
similarity index 100%
rename from src/com/gitblit/wicket/pages/PatchPage.html
rename to 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
similarity index 100%
rename from src/com/gitblit/wicket/pages/PatchPage.java
rename to 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
similarity index 100%
rename from src/com/gitblit/wicket/pages/ProjectPage.html
rename to 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
similarity index 100%
rename from src/com/gitblit/wicket/pages/ProjectPage.java
rename to 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
similarity index 100%
rename from src/com/gitblit/wicket/pages/ProjectsPage.html
rename to 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
similarity index 100%
rename from src/com/gitblit/wicket/pages/ProjectsPage.java
rename to 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
similarity index 89%
rename from src/com/gitblit/wicket/pages/RawPage.java
rename to src/main/java/com/gitblit/wicket/pages/RawPage.java
index 28e8bae..27a01f9 100644
--- a/src/com/gitblit/wicket/pages/RawPage.java
+++ b/src/main/java/com/gitblit/wicket/pages/RawPage.java
@@ -22,7 +22,6 @@
import org.apache.wicket.IRequestTarget;
import org.apache.wicket.PageParameters;
import org.apache.wicket.RequestCycle;
-import org.apache.wicket.markup.html.WebPage;
import org.apache.wicket.protocol.http.WebResponse;
import org.eclipse.jgit.lib.Repository;
import org.eclipse.jgit.revwalk.RevCommit;
@@ -31,17 +30,20 @@
import com.gitblit.GitBlit;
import com.gitblit.Keys;
+import com.gitblit.models.RepositoryModel;
+import com.gitblit.models.UserModel;
import com.gitblit.utils.JGitUtils;
import com.gitblit.utils.StringUtils;
+import com.gitblit.wicket.GitBlitWebSession;
import com.gitblit.wicket.WicketUtils;
-public class RawPage extends WebPage {
+public class RawPage extends SessionPage {
private final Logger logger = LoggerFactory.getLogger(getClass().getSimpleName());
public RawPage(final PageParameters params) {
super(params);
-
+
if (!params.containsKey("r")) {
error(getString("gb.repositoryNotSpecified"));
redirectToInterceptPage(new RepositoriesPage());
@@ -60,7 +62,17 @@
final String objectId = WicketUtils.getObject(params);
final String blobPath = WicketUtils.getPath(params);
String[] encodings = GitBlit.getEncodings();
-
+ GitBlitWebSession session = GitBlitWebSession.get();
+ UserModel user = session.getUser();
+
+ RepositoryModel model = GitBlit.self().getRepositoryModel(user, repositoryName);
+ if (model == null) {
+ // user does not have permission
+ error(getString("gb.canNotLoadRepository") + " " + repositoryName);
+ redirectToInterceptPage(new RepositoriesPage());
+ return;
+ }
+
Repository r = GitBlit.self().getRepository(repositoryName);
if (r == null) {
error(getString("gb.canNotLoadRepository") + " " + repositoryName);
diff --git a/src/com/gitblit/wicket/pages/RepositoriesPage.html b/src/main/java/com/gitblit/wicket/pages/RepositoriesPage.html
similarity index 100%
rename from src/com/gitblit/wicket/pages/RepositoriesPage.html
rename to 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
similarity index 100%
rename from src/com/gitblit/wicket/pages/RepositoriesPage.java
rename to 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
similarity index 100%
rename from src/com/gitblit/wicket/pages/RepositoryPage.html
rename to 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
similarity index 100%
rename from src/com/gitblit/wicket/pages/RepositoryPage.java
rename to 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
similarity index 100%
rename from src/com/gitblit/wicket/pages/ReviewProposalPage.html
rename to 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
similarity index 100%
rename from src/com/gitblit/wicket/pages/ReviewProposalPage.java
rename to 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
similarity index 100%
rename from src/com/gitblit/wicket/pages/RootPage.html
rename to 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
similarity index 100%
rename from src/com/gitblit/wicket/pages/RootPage.java
rename to 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
similarity index 100%
rename from src/com/gitblit/wicket/pages/RootSubPage.html
rename to 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
similarity index 100%
rename from src/com/gitblit/wicket/pages/RootSubPage.java
rename to 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
similarity index 100%
rename from src/com/gitblit/wicket/pages/SendProposalPage.html
rename to 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
similarity index 100%
rename from src/com/gitblit/wicket/pages/SendProposalPage.java
rename to src/main/java/com/gitblit/wicket/pages/SendProposalPage.java
diff --git a/src/main/java/com/gitblit/wicket/pages/SessionPage.java b/src/main/java/com/gitblit/wicket/pages/SessionPage.java
new file mode 100644
index 0000000..5a255ec
--- /dev/null
+++ b/src/main/java/com/gitblit/wicket/pages/SessionPage.java
@@ -0,0 +1,69 @@
+/*
+ * 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.wicket.pages;
+
+import javax.servlet.http.HttpServletRequest;
+
+import org.apache.wicket.PageParameters;
+import org.apache.wicket.markup.html.WebPage;
+import org.apache.wicket.protocol.http.WebRequest;
+import org.apache.wicket.protocol.http.WebResponse;
+
+import com.gitblit.GitBlit;
+import com.gitblit.models.UserModel;
+import com.gitblit.wicket.GitBlitWebSession;
+
+public abstract class SessionPage extends WebPage {
+
+ public SessionPage() {
+ super();
+ login();
+ }
+
+ public SessionPage(final PageParameters params) {
+ super(params);
+ login();
+ }
+
+ private void login() {
+ GitBlitWebSession session = GitBlitWebSession.get();
+ if (session.isLoggedIn() && !session.isSessionInvalidated()) {
+ // already have a session, refresh usermodel to pick up
+ // any changes to permissions or roles (issue-186)
+ UserModel user = GitBlit.self().getUserModel(session.getUser().username);
+ session.setUser(user);
+ return;
+ }
+
+ // try to authenticate by servlet request
+ HttpServletRequest httpRequest = ((WebRequest) getRequestCycle().getRequest())
+ .getHttpServletRequest();
+ UserModel user = GitBlit.self().authenticate(httpRequest);
+
+ // Login the user
+ if (user != null) {
+ // issue 62: fix session fixation vulnerability
+ session.replaceSession();
+ session.setUser(user);
+
+ // Set Cookie
+ WebResponse response = (WebResponse) getRequestCycle().getResponse();
+ GitBlit.self().setCookie(response, user);
+
+ session.continueRequest();
+ }
+ }
+}
diff --git a/src/com/gitblit/wicket/pages/SummaryPage.html b/src/main/java/com/gitblit/wicket/pages/SummaryPage.html
similarity index 100%
rename from src/com/gitblit/wicket/pages/SummaryPage.html
rename to 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
similarity index 98%
rename from src/com/gitblit/wicket/pages/SummaryPage.java
rename to src/main/java/com/gitblit/wicket/pages/SummaryPage.java
index bd40a1b..d68add0 100644
--- a/src/com/gitblit/wicket/pages/SummaryPage.java
+++ b/src/main/java/com/gitblit/wicket/pages/SummaryPage.java
@@ -53,6 +53,7 @@
import com.gitblit.utils.JGitUtils;
import com.gitblit.utils.MarkdownUtils;
import com.gitblit.utils.StringUtils;
+import com.gitblit.wicket.GitBlitWebSession;
import com.gitblit.wicket.WicketUtils;
import com.gitblit.wicket.panels.BranchesPanel;
import com.gitblit.wicket.panels.LinkPanel;
@@ -73,6 +74,7 @@
Repository r = getRepository();
RepositoryModel model = getRepositoryModel();
+ UserModel user = GitBlitWebSession.get().getUser();
List<Metric> metrics = null;
Metric metricsTotal = null;
@@ -148,7 +150,7 @@
} else {
add(WicketUtils.newClearPixel("accessRestrictionIcon").setVisible(false));
}
- repositoryUrls.addAll(GitBlit.self().getOtherCloneUrls(repositoryName));
+ repositoryUrls.addAll(GitBlit.self().getOtherCloneUrls(repositoryName, user == null ? "" : user.username));
String primaryUrl = ArrayUtils.isEmpty(repositoryUrls) ? "" : repositoryUrls.remove(0);
add(new RepositoryUrlPanel("repositoryCloneUrl", primaryUrl));
diff --git a/src/com/gitblit/wicket/pages/TagPage.html b/src/main/java/com/gitblit/wicket/pages/TagPage.html
similarity index 100%
rename from src/com/gitblit/wicket/pages/TagPage.html
rename to 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
similarity index 100%
rename from src/com/gitblit/wicket/pages/TagPage.java
rename to 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
similarity index 100%
rename from src/com/gitblit/wicket/pages/TagsPage.html
rename to 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
similarity index 100%
rename from src/com/gitblit/wicket/pages/TagsPage.java
rename to 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
similarity index 100%
rename from src/com/gitblit/wicket/pages/TicketPage.html
rename to 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
similarity index 100%
rename from src/com/gitblit/wicket/pages/TicketPage.java
rename to 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
similarity index 100%
rename from src/com/gitblit/wicket/pages/TicketsPage.html
rename to 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
similarity index 100%
rename from src/com/gitblit/wicket/pages/TicketsPage.java
rename to 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
similarity index 100%
rename from src/com/gitblit/wicket/pages/TreePage.html
rename to 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
similarity index 100%
rename from src/com/gitblit/wicket/pages/TreePage.java
rename to 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
similarity index 100%
rename from src/com/gitblit/wicket/pages/UserPage.html
rename to 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
similarity index 100%
rename from src/com/gitblit/wicket/pages/UserPage.java
rename to 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
similarity index 100%
rename from src/com/gitblit/wicket/pages/UsersPage.html
rename to 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
similarity index 100%
rename from src/com/gitblit/wicket/pages/UsersPage.java
rename to 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
similarity index 100%
rename from src/com/gitblit/wicket/pages/prettify/lang-apollo.js
rename to 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
similarity index 100%
rename from src/com/gitblit/wicket/pages/prettify/lang-css.js
rename to 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
similarity index 100%
rename from src/com/gitblit/wicket/pages/prettify/lang-hs.js
rename to 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
similarity index 100%
rename from src/com/gitblit/wicket/pages/prettify/lang-lisp.js
rename to 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
similarity index 100%
rename from src/com/gitblit/wicket/pages/prettify/lang-lua.js
rename to 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
similarity index 100%
rename from src/com/gitblit/wicket/pages/prettify/lang-ml.js
rename to 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
similarity index 100%
rename from src/com/gitblit/wicket/pages/prettify/lang-proto.js
rename to 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
similarity index 100%
rename from src/com/gitblit/wicket/pages/prettify/lang-scala.js
rename to 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
similarity index 100%
rename from src/com/gitblit/wicket/pages/prettify/lang-sql.js
rename to 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
similarity index 100%
rename from src/com/gitblit/wicket/pages/prettify/lang-vb.js
rename to 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
similarity index 100%
rename from src/com/gitblit/wicket/pages/prettify/lang-vhdl.js
rename to 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
similarity index 100%
rename from src/com/gitblit/wicket/pages/prettify/lang-wiki.js
rename to 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
similarity index 100%
rename from src/com/gitblit/wicket/pages/prettify/lang-yaml.js
rename to 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
similarity index 100%
rename from src/com/gitblit/wicket/pages/prettify/prettify.css
rename to 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
similarity index 100%
rename from src/com/gitblit/wicket/pages/prettify/prettify.js
rename to 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
similarity index 100%
rename from src/com/gitblit/wicket/panels/ActivityPanel.html
rename to 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
similarity index 100%
rename from src/com/gitblit/wicket/panels/ActivityPanel.java
rename to 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
similarity index 100%
rename from src/com/gitblit/wicket/panels/BasePanel.java
rename to 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
similarity index 100%
rename from src/com/gitblit/wicket/panels/BranchesPanel.html
rename to 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
similarity index 100%
rename from src/com/gitblit/wicket/panels/BranchesPanel.java
rename to 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
similarity index 100%
rename from src/com/gitblit/wicket/panels/BulletListPanel.html
rename to 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
similarity index 100%
rename from src/com/gitblit/wicket/panels/BulletListPanel.java
rename to 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
similarity index 100%
rename from src/com/gitblit/wicket/panels/CommitHeaderPanel.html
rename to 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
similarity index 97%
rename from src/com/gitblit/wicket/panels/CommitHeaderPanel.java
rename to src/main/java/com/gitblit/wicket/panels/CommitHeaderPanel.java
index bb960cc..eb75750 100644
--- a/src/com/gitblit/wicket/panels/CommitHeaderPanel.java
+++ b/src/main/java/com/gitblit/wicket/panels/CommitHeaderPanel.java
@@ -33,6 +33,7 @@
add(new Label("commitid"));
add(new Label("author"));
add(new Label("date"));
+ add(new Label("authorAvatar"));
}
public CommitHeaderPanel(String id, String repositoryName, RevCommit c) {
diff --git a/src/com/gitblit/wicket/panels/CommitLegendPanel.html b/src/main/java/com/gitblit/wicket/panels/CommitLegendPanel.html
similarity index 100%
rename from src/com/gitblit/wicket/panels/CommitLegendPanel.html
rename to 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
similarity index 100%
rename from src/com/gitblit/wicket/panels/CommitLegendPanel.java
rename to 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
similarity index 100%
rename from src/com/gitblit/wicket/panels/CompressedDownloadsPanel.html
rename to 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
similarity index 100%
rename from src/com/gitblit/wicket/panels/CompressedDownloadsPanel.java
rename to 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
similarity index 100%
rename from src/com/gitblit/wicket/panels/DropDownMenu.html
rename to 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
similarity index 100%
rename from src/com/gitblit/wicket/panels/DropDownMenu.java
rename to 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
similarity index 100%
rename from src/com/gitblit/wicket/panels/FederationProposalsPanel.html
rename to 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
similarity index 100%
rename from src/com/gitblit/wicket/panels/FederationProposalsPanel.java
rename to 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
similarity index 100%
rename from src/com/gitblit/wicket/panels/FederationRegistrationsPanel.html
rename to 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
similarity index 100%
rename from src/com/gitblit/wicket/panels/FederationRegistrationsPanel.java
rename to 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
similarity index 100%
rename from src/com/gitblit/wicket/panels/FederationTokensPanel.html
rename to 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
similarity index 100%
rename from src/com/gitblit/wicket/panels/FederationTokensPanel.java
rename to 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
similarity index 100%
rename from src/com/gitblit/wicket/panels/GravatarImage.html
rename to 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
similarity index 100%
rename from src/com/gitblit/wicket/panels/GravatarImage.java
rename to 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
similarity index 100%
rename from src/com/gitblit/wicket/panels/HistoryPanel.html
rename to 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
similarity index 97%
rename from src/com/gitblit/wicket/panels/HistoryPanel.java
rename to src/main/java/com/gitblit/wicket/panels/HistoryPanel.java
index e587863..4d27589 100644
--- a/src/com/gitblit/wicket/panels/HistoryPanel.java
+++ b/src/main/java/com/gitblit/wicket/panels/HistoryPanel.java
@@ -109,13 +109,13 @@
}
final boolean isTree = matchingPath == null ? true : matchingPath.isTree();
- final boolean isSubmodule = matchingPath == null ? true : matchingPath.isSubmodule();
+ final boolean isSubmodule = matchingPath == null ? false : matchingPath.isSubmodule();
// submodule
- SubmoduleModel submodule = getSubmodule(submodules, repositoryName, matchingPath.path);
final String submodulePath;
final boolean hasSubmodule;
- if (submodule != null) {
+ if (isSubmodule) {
+ SubmoduleModel submodule = getSubmodule(submodules, repositoryName, matchingPath == null ? null : matchingPath.path);
submodulePath = submodule.gitblitPath;
hasSubmodule = submodule.hasSubmodule;
} else {
diff --git a/src/com/gitblit/wicket/panels/LinkPanel.html b/src/main/java/com/gitblit/wicket/panels/LinkPanel.html
similarity index 100%
rename from src/com/gitblit/wicket/panels/LinkPanel.html
rename to 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
similarity index 100%
rename from src/com/gitblit/wicket/panels/LinkPanel.java
rename to 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
similarity index 100%
rename from src/com/gitblit/wicket/panels/LogPanel.html
rename to 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
similarity index 100%
rename from src/com/gitblit/wicket/panels/LogPanel.java
rename to 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
similarity index 100%
rename from src/com/gitblit/wicket/panels/NavigationPanel.html
rename to 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
similarity index 100%
rename from src/com/gitblit/wicket/panels/NavigationPanel.java
rename to 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
similarity index 100%
rename from src/com/gitblit/wicket/panels/ObjectContainer.java
rename to 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
similarity index 100%
rename from src/com/gitblit/wicket/panels/PagerPanel.html
rename to 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
similarity index 100%
rename from src/com/gitblit/wicket/panels/PagerPanel.java
rename to 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
similarity index 100%
rename from src/com/gitblit/wicket/panels/PathBreadcrumbsPanel.html
rename to 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
similarity index 100%
rename from src/com/gitblit/wicket/panels/PathBreadcrumbsPanel.java
rename to 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
similarity index 100%
rename from src/com/gitblit/wicket/panels/ProjectRepositoryPanel.html
rename to 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
similarity index 99%
rename from src/com/gitblit/wicket/panels/ProjectRepositoryPanel.java
rename to src/main/java/com/gitblit/wicket/panels/ProjectRepositoryPanel.java
index 7b4ee9f..f2b56e1 100644
--- a/src/com/gitblit/wicket/panels/ProjectRepositoryPanel.java
+++ b/src/main/java/com/gitblit/wicket/panels/ProjectRepositoryPanel.java
@@ -221,7 +221,7 @@
// add the Gitblit repository url
repositoryUrls.add(BasePage.getRepositoryUrl(entry));
}
- repositoryUrls.addAll(GitBlit.self().getOtherCloneUrls(entry.name));
+ repositoryUrls.addAll(GitBlit.self().getOtherCloneUrls(entry.name, user == null ? "" : user.username));
String primaryUrl = ArrayUtils.isEmpty(repositoryUrls) ? "" : repositoryUrls.remove(0);
add(new RepositoryUrlPanel("repositoryCloneUrl", primaryUrl));
diff --git a/src/com/gitblit/wicket/panels/RefsPanel.html b/src/main/java/com/gitblit/wicket/panels/RefsPanel.html
similarity index 100%
rename from src/com/gitblit/wicket/panels/RefsPanel.html
rename to 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
similarity index 100%
rename from src/com/gitblit/wicket/panels/RefsPanel.java
rename to 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
similarity index 100%
rename from src/com/gitblit/wicket/panels/RegistrantPermissionsPanel.html
rename to 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
similarity index 100%
rename from src/com/gitblit/wicket/panels/RegistrantPermissionsPanel.java
rename to 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
similarity index 100%
rename from src/com/gitblit/wicket/panels/RepositoriesPanel.html
rename to 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
similarity index 100%
rename from src/com/gitblit/wicket/panels/RepositoriesPanel.java
rename to 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
similarity index 100%
rename from src/com/gitblit/wicket/panels/RepositoryUrlPanel.html
rename to 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
similarity index 100%
rename from src/com/gitblit/wicket/panels/RepositoryUrlPanel.java
rename to 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
similarity index 100%
rename from src/com/gitblit/wicket/panels/SearchPanel.html
rename to 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
similarity index 100%
rename from src/com/gitblit/wicket/panels/SearchPanel.java
rename to 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
similarity index 100%
rename from src/com/gitblit/wicket/panels/ShockWaveComponent.java
rename to 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
similarity index 100%
rename from src/com/gitblit/wicket/panels/TagsPanel.html
rename to 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
similarity index 100%
rename from src/com/gitblit/wicket/panels/TagsPanel.java
rename to 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
similarity index 100%
rename from src/com/gitblit/wicket/panels/TeamsPanel.html
rename to 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
similarity index 100%
rename from src/com/gitblit/wicket/panels/TeamsPanel.java
rename to 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
similarity index 100%
rename from src/com/gitblit/wicket/panels/UsersPanel.html
rename to 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
similarity index 100%
rename from src/com/gitblit/wicket/panels/UsersPanel.java
rename to src/main/java/com/gitblit/wicket/panels/UsersPanel.java
diff --git a/src/log4j.properties b/src/main/java/log4j.properties
similarity index 100%
rename from src/log4j.properties
rename to src/main/java/log4j.properties
diff --git a/resources/add_16x16.png b/src/main/resources/add_16x16.png
similarity index 100%
rename from resources/add_16x16.png
rename to src/main/resources/add_16x16.png
Binary files differ
diff --git a/resources/arrow_down.png b/src/main/resources/arrow_down.png
similarity index 100%
rename from resources/arrow_down.png
rename to src/main/resources/arrow_down.png
Binary files differ
diff --git a/resources/arrow_left.png b/src/main/resources/arrow_left.png
similarity index 100%
rename from resources/arrow_left.png
rename to src/main/resources/arrow_left.png
Binary files differ
diff --git a/resources/arrow_off.png b/src/main/resources/arrow_off.png
similarity index 100%
rename from resources/arrow_off.png
rename to src/main/resources/arrow_off.png
Binary files differ
diff --git a/resources/arrow_page.png b/src/main/resources/arrow_page.png
similarity index 100%
rename from resources/arrow_page.png
rename to src/main/resources/arrow_page.png
Binary files differ
diff --git a/resources/arrow_up.png b/src/main/resources/arrow_up.png
similarity index 100%
rename from resources/arrow_up.png
rename to src/main/resources/arrow_up.png
Binary files differ
diff --git a/resources/background.png b/src/main/resources/background.png
similarity index 100%
rename from resources/background.png
rename to src/main/resources/background.png
Binary files differ
diff --git a/resources/blank.png b/src/main/resources/blank.png
similarity index 100%
rename from resources/blank.png
rename to src/main/resources/blank.png
Binary files differ
diff --git a/resources/book_16x16.png b/src/main/resources/book_16x16.png
similarity index 100%
rename from resources/book_16x16.png
rename to src/main/resources/book_16x16.png
Binary files differ
diff --git a/resources/bootstrap/css/bootstrap-responsive.css b/src/main/resources/bootstrap/css/bootstrap-responsive.css
similarity index 100%
rename from resources/bootstrap/css/bootstrap-responsive.css
rename to src/main/resources/bootstrap/css/bootstrap-responsive.css
diff --git a/resources/bootstrap/css/bootstrap.css b/src/main/resources/bootstrap/css/bootstrap.css
similarity index 100%
rename from resources/bootstrap/css/bootstrap.css
rename to 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
similarity index 100%
rename from resources/bootstrap/img/glyphicons-halflings-white.png
rename to src/main/resources/bootstrap/img/glyphicons-halflings-white.png
Binary files differ
diff --git a/resources/bootstrap/img/glyphicons-halflings.png b/src/main/resources/bootstrap/img/glyphicons-halflings.png
similarity index 100%
rename from resources/bootstrap/img/glyphicons-halflings.png
rename to src/main/resources/bootstrap/img/glyphicons-halflings.png
Binary files differ
diff --git a/resources/bootstrap/js/bootstrap.js b/src/main/resources/bootstrap/js/bootstrap.js
similarity index 100%
rename from resources/bootstrap/js/bootstrap.js
rename to src/main/resources/bootstrap/js/bootstrap.js
diff --git a/resources/bootstrap/js/jquery.js b/src/main/resources/bootstrap/js/jquery.js
similarity index 100%
rename from resources/bootstrap/js/jquery.js
rename to src/main/resources/bootstrap/js/jquery.js
diff --git a/resources/bug_16x16.png b/src/main/resources/bug_16x16.png
similarity index 100%
rename from resources/bug_16x16.png
rename to src/main/resources/bug_16x16.png
Binary files differ
diff --git a/resources/bullet_black.png b/src/main/resources/bullet_black.png
similarity index 100%
rename from resources/bullet_black.png
rename to src/main/resources/bullet_black.png
Binary files differ
diff --git a/resources/bullet_blue.png b/src/main/resources/bullet_blue.png
similarity index 100%
rename from resources/bullet_blue.png
rename to src/main/resources/bullet_blue.png
Binary files differ
diff --git a/resources/bullet_delete.png b/src/main/resources/bullet_delete.png
similarity index 100%
rename from resources/bullet_delete.png
rename to src/main/resources/bullet_delete.png
Binary files differ
diff --git a/resources/bullet_error.png b/src/main/resources/bullet_error.png
similarity index 100%
rename from resources/bullet_error.png
rename to src/main/resources/bullet_error.png
Binary files differ
diff --git a/resources/bullet_feed.png b/src/main/resources/bullet_feed.png
similarity index 100%
rename from resources/bullet_feed.png
rename to src/main/resources/bullet_feed.png
Binary files differ
diff --git a/resources/bullet_green.png b/src/main/resources/bullet_green.png
similarity index 100%
rename from resources/bullet_green.png
rename to src/main/resources/bullet_green.png
Binary files differ
diff --git a/resources/bullet_key.png b/src/main/resources/bullet_key.png
similarity index 100%
rename from resources/bullet_key.png
rename to src/main/resources/bullet_key.png
Binary files differ
diff --git a/resources/bullet_orange.png b/src/main/resources/bullet_orange.png
similarity index 100%
rename from resources/bullet_orange.png
rename to src/main/resources/bullet_orange.png
Binary files differ
diff --git a/resources/bullet_red.png b/src/main/resources/bullet_red.png
similarity index 100%
rename from resources/bullet_red.png
rename to src/main/resources/bullet_red.png
Binary files differ
diff --git a/resources/bullet_white.png b/src/main/resources/bullet_white.png
similarity index 100%
rename from resources/bullet_white.png
rename to src/main/resources/bullet_white.png
Binary files differ
diff --git a/resources/bullet_yellow.png b/src/main/resources/bullet_yellow.png
similarity index 100%
rename from resources/bullet_yellow.png
rename to src/main/resources/bullet_yellow.png
Binary files differ
diff --git a/resources/clipboard_13x13.png b/src/main/resources/clipboard_13x13.png
similarity index 100%
rename from resources/clipboard_13x13.png
rename to src/main/resources/clipboard_13x13.png
Binary files differ
diff --git a/resources/clipboard_16x16.png b/src/main/resources/clipboard_16x16.png
similarity index 100%
rename from resources/clipboard_16x16.png
rename to src/main/resources/clipboard_16x16.png
Binary files differ
diff --git a/resources/clippy.png b/src/main/resources/clippy.png
similarity index 100%
rename from resources/clippy.png
rename to src/main/resources/clippy.png
Binary files differ
diff --git a/resources/clippy.swf b/src/main/resources/clippy.swf
similarity index 100%
rename from resources/clippy.swf
rename to src/main/resources/clippy.swf
Binary files differ
diff --git a/resources/cold_16x16.png b/src/main/resources/cold_16x16.png
similarity index 100%
rename from resources/cold_16x16.png
rename to src/main/resources/cold_16x16.png
Binary files differ
diff --git a/resources/commit_branch_16x16.png b/src/main/resources/commit_branch_16x16.png
similarity index 100%
rename from resources/commit_branch_16x16.png
rename to src/main/resources/commit_branch_16x16.png
Binary files differ
diff --git a/resources/commit_changes_16x16.png b/src/main/resources/commit_changes_16x16.png
similarity index 100%
rename from resources/commit_changes_16x16.png
rename to src/main/resources/commit_changes_16x16.png
Binary files differ
diff --git a/resources/commit_divide_16x16.png b/src/main/resources/commit_divide_16x16.png
similarity index 100%
rename from resources/commit_divide_16x16.png
rename to src/main/resources/commit_divide_16x16.png
Binary files differ
diff --git a/resources/commit_join_16x16.png b/src/main/resources/commit_join_16x16.png
similarity index 100%
rename from resources/commit_join_16x16.png
rename to src/main/resources/commit_join_16x16.png
Binary files differ
diff --git a/resources/commit_merge_16x16.png b/src/main/resources/commit_merge_16x16.png
similarity index 100%
rename from resources/commit_merge_16x16.png
rename to src/main/resources/commit_merge_16x16.png
Binary files differ
diff --git a/resources/commit_up_16x16.png b/src/main/resources/commit_up_16x16.png
similarity index 100%
rename from resources/commit_up_16x16.png
rename to src/main/resources/commit_up_16x16.png
Binary files differ
diff --git a/resources/federated_16x16.png b/src/main/resources/federated_16x16.png
similarity index 100%
rename from resources/federated_16x16.png
rename to src/main/resources/federated_16x16.png
Binary files differ
diff --git a/resources/feed_16x16.png b/src/main/resources/feed_16x16.png
similarity index 100%
rename from resources/feed_16x16.png
rename to src/main/resources/feed_16x16.png
Binary files differ
diff --git a/resources/file_16x16.png b/src/main/resources/file_16x16.png
similarity index 100%
rename from resources/file_16x16.png
rename to src/main/resources/file_16x16.png
Binary files differ
diff --git a/resources/file_acrobat_16x16.png b/src/main/resources/file_acrobat_16x16.png
similarity index 100%
rename from resources/file_acrobat_16x16.png
rename to src/main/resources/file_acrobat_16x16.png
Binary files differ
diff --git a/resources/file_c_16x16.png b/src/main/resources/file_c_16x16.png
similarity index 100%
rename from resources/file_c_16x16.png
rename to src/main/resources/file_c_16x16.png
Binary files differ
diff --git a/resources/file_code_16x16.png b/src/main/resources/file_code_16x16.png
similarity index 100%
rename from resources/file_code_16x16.png
rename to src/main/resources/file_code_16x16.png
Binary files differ
diff --git a/resources/file_cpp_16x16.png b/src/main/resources/file_cpp_16x16.png
similarity index 100%
rename from resources/file_cpp_16x16.png
rename to src/main/resources/file_cpp_16x16.png
Binary files differ
diff --git a/resources/file_cs_16x16.png b/src/main/resources/file_cs_16x16.png
similarity index 100%
rename from resources/file_cs_16x16.png
rename to src/main/resources/file_cs_16x16.png
Binary files differ
diff --git a/resources/file_doc_16x16.png b/src/main/resources/file_doc_16x16.png
similarity index 100%
rename from resources/file_doc_16x16.png
rename to src/main/resources/file_doc_16x16.png
Binary files differ
diff --git a/resources/file_excel_16x16.png b/src/main/resources/file_excel_16x16.png
similarity index 100%
rename from resources/file_excel_16x16.png
rename to src/main/resources/file_excel_16x16.png
Binary files differ
diff --git a/resources/file_h_16x16.png b/src/main/resources/file_h_16x16.png
similarity index 100%
rename from resources/file_h_16x16.png
rename to src/main/resources/file_h_16x16.png
Binary files differ
diff --git a/resources/file_java_16x16.png b/src/main/resources/file_java_16x16.png
similarity index 100%
rename from resources/file_java_16x16.png
rename to src/main/resources/file_java_16x16.png
Binary files differ
diff --git a/resources/file_php_16x16.png b/src/main/resources/file_php_16x16.png
similarity index 100%
rename from resources/file_php_16x16.png
rename to src/main/resources/file_php_16x16.png
Binary files differ
diff --git a/resources/file_ppt_16x16.png b/src/main/resources/file_ppt_16x16.png
similarity index 100%
rename from resources/file_ppt_16x16.png
rename to src/main/resources/file_ppt_16x16.png
Binary files differ
diff --git a/resources/file_ruby_16x16.png b/src/main/resources/file_ruby_16x16.png
similarity index 100%
rename from resources/file_ruby_16x16.png
rename to src/main/resources/file_ruby_16x16.png
Binary files differ
diff --git a/resources/file_settings_16x16.png b/src/main/resources/file_settings_16x16.png
similarity index 100%
rename from resources/file_settings_16x16.png
rename to src/main/resources/file_settings_16x16.png
Binary files differ
diff --git a/resources/file_vs_16x16.png b/src/main/resources/file_vs_16x16.png
similarity index 100%
rename from resources/file_vs_16x16.png
rename to src/main/resources/file_vs_16x16.png
Binary files differ
diff --git a/resources/file_world_16x16.png b/src/main/resources/file_world_16x16.png
similarity index 100%
rename from resources/file_world_16x16.png
rename to src/main/resources/file_world_16x16.png
Binary files differ
diff --git a/resources/file_zip_16x16.png b/src/main/resources/file_zip_16x16.png
similarity index 100%
rename from resources/file_zip_16x16.png
rename to src/main/resources/file_zip_16x16.png
Binary files differ
diff --git a/resources/folder_16x16.png b/src/main/resources/folder_16x16.png
similarity index 100%
rename from resources/folder_16x16.png
rename to src/main/resources/folder_16x16.png
Binary files differ
diff --git a/resources/folder_star_16x16.png b/src/main/resources/folder_star_16x16.png
similarity index 100%
rename from resources/folder_star_16x16.png
rename to src/main/resources/folder_star_16x16.png
Binary files differ
diff --git a/resources/folder_star_32x32.png b/src/main/resources/folder_star_32x32.png
similarity index 100%
rename from resources/folder_star_32x32.png
rename to src/main/resources/folder_star_32x32.png
Binary files differ
diff --git a/resources/fork_16x16.png b/src/main/resources/fork_16x16.png
similarity index 100%
rename from resources/fork_16x16.png
rename to src/main/resources/fork_16x16.png
Binary files differ
diff --git a/resources/git-black-16x16.png b/src/main/resources/git-black-16x16.png
similarity index 100%
rename from resources/git-black-16x16.png
rename to src/main/resources/git-black-16x16.png
Binary files differ
diff --git a/resources/git-black.png b/src/main/resources/git-black.png
similarity index 100%
rename from resources/git-black.png
rename to src/main/resources/git-black.png
Binary files differ
diff --git a/resources/git-black_210x210.png b/src/main/resources/git-black_210x210.png
similarity index 100%
rename from resources/git-black_210x210.png
rename to src/main/resources/git-black_210x210.png
Binary files differ
diff --git a/resources/git-orange-16x16.png b/src/main/resources/git-orange-16x16.png
similarity index 100%
rename from resources/git-orange-16x16.png
rename to src/main/resources/git-orange-16x16.png
Binary files differ
diff --git a/resources/gitblit.css b/src/main/resources/gitblit.css
similarity index 100%
rename from resources/gitblit.css
rename to src/main/resources/gitblit.css
diff --git a/resources/gitblt-favicon.png b/src/main/resources/gitblt-favicon.png
similarity index 100%
rename from resources/gitblt-favicon.png
rename to src/main/resources/gitblt-favicon.png
Binary files differ
diff --git a/resources/gitblt-logo.png b/src/main/resources/gitblt-logo.png
similarity index 100%
rename from resources/gitblt-logo.png
rename to src/main/resources/gitblt-logo.png
Binary files differ
diff --git a/resources/gitblt2.png b/src/main/resources/gitblt2.png
similarity index 100%
rename from resources/gitblt2.png
rename to src/main/resources/gitblt2.png
Binary files differ
diff --git a/resources/gitblt2_white.png b/src/main/resources/gitblt2_white.png
similarity index 100%
rename from resources/gitblt2_white.png
rename to src/main/resources/gitblt2_white.png
Binary files differ
diff --git a/resources/gitblt_25.png b/src/main/resources/gitblt_25.png
similarity index 100%
rename from resources/gitblt_25.png
rename to src/main/resources/gitblt_25.png
Binary files differ
diff --git a/resources/gitblt_25_white.png b/src/main/resources/gitblt_25_white.png
similarity index 100%
rename from resources/gitblt_25_white.png
rename to src/main/resources/gitblt_25_white.png
Binary files differ
diff --git a/resources/gitweb-favicon.png b/src/main/resources/gitweb-favicon.png
similarity index 100%
rename from resources/gitweb-favicon.png
rename to src/main/resources/gitweb-favicon.png
Binary files differ
diff --git a/resources/health_16x16.png b/src/main/resources/health_16x16.png
similarity index 100%
rename from resources/health_16x16.png
rename to src/main/resources/health_16x16.png
Binary files differ
diff --git a/resources/heart_16x16.png b/src/main/resources/heart_16x16.png
similarity index 100%
rename from resources/heart_16x16.png
rename to src/main/resources/heart_16x16.png
Binary files differ
diff --git a/resources/information_16x16.png b/src/main/resources/information_16x16.png
similarity index 100%
rename from resources/information_16x16.png
rename to src/main/resources/information_16x16.png
Binary files differ
diff --git a/resources/lock_16x16.png b/src/main/resources/lock_16x16.png
similarity index 100%
rename from resources/lock_16x16.png
rename to src/main/resources/lock_16x16.png
Binary files differ
diff --git a/resources/lock_go_16x16.png b/src/main/resources/lock_go_16x16.png
similarity index 100%
rename from resources/lock_go_16x16.png
rename to src/main/resources/lock_go_16x16.png
Binary files differ
diff --git a/resources/lock_pull_16x16.png b/src/main/resources/lock_pull_16x16.png
similarity index 100%
rename from resources/lock_pull_16x16.png
rename to src/main/resources/lock_pull_16x16.png
Binary files differ
diff --git a/resources/login.mkd b/src/main/resources/login.mkd
similarity index 100%
rename from resources/login.mkd
rename to src/main/resources/login.mkd
diff --git a/resources/login_es.mkd b/src/main/resources/login_es.mkd
similarity index 100%
rename from resources/login_es.mkd
rename to src/main/resources/login_es.mkd
diff --git a/resources/login_ko.mkd b/src/main/resources/login_ko.mkd
similarity index 100%
rename from resources/login_ko.mkd
rename to src/main/resources/login_ko.mkd
diff --git a/resources/login_nl.mkd b/src/main/resources/login_nl.mkd
similarity index 100%
rename from resources/login_nl.mkd
rename to src/main/resources/login_nl.mkd
diff --git a/resources/login_pl.mkd b/src/main/resources/login_pl.mkd
similarity index 100%
rename from resources/login_pl.mkd
rename to src/main/resources/login_pl.mkd
diff --git a/resources/login_pt_br.mkd b/src/main/resources/login_pt_br.mkd
similarity index 100%
rename from resources/login_pt_br.mkd
rename to src/main/resources/login_pt_br.mkd
diff --git a/resources/login_zh_CN.mkd b/src/main/resources/login_zh_CN.mkd
similarity index 100%
rename from resources/login_zh_CN.mkd
rename to src/main/resources/login_zh_CN.mkd
diff --git a/resources/mail_16x16.png b/src/main/resources/mail_16x16.png
similarity index 100%
rename from resources/mail_16x16.png
rename to src/main/resources/mail_16x16.png
Binary files differ
diff --git a/resources/pixel.png b/src/main/resources/pixel.png
similarity index 100%
rename from resources/pixel.png
rename to src/main/resources/pixel.png
Binary files differ
diff --git a/resources/rosette_16x16.png b/src/main/resources/rosette_16x16.png
similarity index 100%
rename from resources/rosette_16x16.png
rename to src/main/resources/rosette_16x16.png
Binary files differ
diff --git a/resources/rosette_32x32.png b/src/main/resources/rosette_32x32.png
similarity index 100%
rename from resources/rosette_32x32.png
rename to src/main/resources/rosette_32x32.png
Binary files differ
diff --git a/resources/script_16x16.png b/src/main/resources/script_16x16.png
similarity index 100%
rename from resources/script_16x16.png
rename to src/main/resources/script_16x16.png
Binary files differ
diff --git a/resources/search-icon.png b/src/main/resources/search-icon.png
similarity index 100%
rename from resources/search-icon.png
rename to src/main/resources/search-icon.png
Binary files differ
diff --git a/resources/settings_16x16.png b/src/main/resources/settings_16x16.png
similarity index 100%
rename from resources/settings_16x16.png
rename to src/main/resources/settings_16x16.png
Binary files differ
diff --git a/resources/settings_32x32.png b/src/main/resources/settings_32x32.png
similarity index 100%
rename from resources/settings_32x32.png
rename to src/main/resources/settings_32x32.png
Binary files differ
diff --git a/resources/shield_16x16.png b/src/main/resources/shield_16x16.png
similarity index 100%
rename from resources/shield_16x16.png
rename to src/main/resources/shield_16x16.png
Binary files differ
diff --git a/resources/star_16x16.png b/src/main/resources/star_16x16.png
similarity index 100%
rename from resources/star_16x16.png
rename to src/main/resources/star_16x16.png
Binary files differ
diff --git a/resources/star_32x32.png b/src/main/resources/star_32x32.png
similarity index 100%
rename from resources/star_32x32.png
rename to src/main/resources/star_32x32.png
Binary files differ
diff --git a/resources/tag_16x16.png b/src/main/resources/tag_16x16.png
similarity index 100%
rename from resources/tag_16x16.png
rename to src/main/resources/tag_16x16.png
Binary files differ
diff --git a/resources/user_16x16.png b/src/main/resources/user_16x16.png
similarity index 100%
rename from resources/user_16x16.png
rename to src/main/resources/user_16x16.png
Binary files differ
diff --git a/resources/users_16x16.png b/src/main/resources/users_16x16.png
similarity index 100%
rename from resources/users_16x16.png
rename to src/main/resources/users_16x16.png
Binary files differ
diff --git a/resources/vcard_16x16.png b/src/main/resources/vcard_16x16.png
similarity index 100%
rename from resources/vcard_16x16.png
rename to src/main/resources/vcard_16x16.png
Binary files differ
diff --git a/resources/welcome.mkd b/src/main/resources/welcome.mkd
similarity index 100%
rename from resources/welcome.mkd
rename to src/main/resources/welcome.mkd
diff --git a/resources/welcome_es.mkd b/src/main/resources/welcome_es.mkd
similarity index 100%
rename from resources/welcome_es.mkd
rename to src/main/resources/welcome_es.mkd
diff --git a/resources/welcome_ko.mkd b/src/main/resources/welcome_ko.mkd
similarity index 100%
rename from resources/welcome_ko.mkd
rename to src/main/resources/welcome_ko.mkd
diff --git a/resources/welcome_nl.mkd b/src/main/resources/welcome_nl.mkd
similarity index 100%
rename from resources/welcome_nl.mkd
rename to src/main/resources/welcome_nl.mkd
diff --git a/resources/welcome_pl.mkd b/src/main/resources/welcome_pl.mkd
similarity index 100%
rename from resources/welcome_pl.mkd
rename to src/main/resources/welcome_pl.mkd
diff --git a/resources/welcome_pt_br.mkd b/src/main/resources/welcome_pt_br.mkd
similarity index 100%
rename from resources/welcome_pt_br.mkd
rename to src/main/resources/welcome_pt_br.mkd
diff --git a/resources/welcome_zh_CN.mkd b/src/main/resources/welcome_zh_CN.mkd
similarity index 100%
rename from resources/welcome_zh_CN.mkd
rename to src/main/resources/welcome_zh_CN.mkd
diff --git a/docs/.gitignore b/src/site/.gitignore
similarity index 100%
rename from docs/.gitignore
rename to src/site/.gitignore
diff --git a/docs/architecture.odg b/src/site/architecture.odg
similarity index 100%
rename from docs/architecture.odg
rename to src/site/architecture.odg
Binary files differ
diff --git a/src/site/custom.less b/src/site/custom.less
new file mode 100644
index 0000000..c05058b
--- /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
similarity index 97%
rename from docs/04_design.mkd
rename to src/site/design.mkd
index 622e4a2..5ca8355 100644
--- a/docs/04_design.mkd
+++ b/src/site/design.mkd
@@ -51,7 +51,7 @@
- [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 @@
## 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
similarity index 100%
rename from docs/fancybox/blank.gif
rename to src/site/fancybox/blank.gif
Binary files differ
diff --git a/docs/fancybox/fancy_close.png b/src/site/fancybox/fancy_close.png
similarity index 100%
rename from docs/fancybox/fancy_close.png
rename to src/site/fancybox/fancy_close.png
Binary files differ
diff --git a/docs/fancybox/fancy_loading.png b/src/site/fancybox/fancy_loading.png
similarity index 100%
rename from docs/fancybox/fancy_loading.png
rename to src/site/fancybox/fancy_loading.png
Binary files differ
diff --git a/docs/fancybox/fancy_nav_left.png b/src/site/fancybox/fancy_nav_left.png
similarity index 100%
rename from docs/fancybox/fancy_nav_left.png
rename to src/site/fancybox/fancy_nav_left.png
Binary files differ
diff --git a/docs/fancybox/fancy_nav_right.png b/src/site/fancybox/fancy_nav_right.png
similarity index 100%
rename from docs/fancybox/fancy_nav_right.png
rename to src/site/fancybox/fancy_nav_right.png
Binary files differ
diff --git a/docs/fancybox/fancy_shadow_e.png b/src/site/fancybox/fancy_shadow_e.png
similarity index 100%
rename from docs/fancybox/fancy_shadow_e.png
rename to src/site/fancybox/fancy_shadow_e.png
Binary files differ
diff --git a/docs/fancybox/fancy_shadow_n.png b/src/site/fancybox/fancy_shadow_n.png
similarity index 100%
rename from docs/fancybox/fancy_shadow_n.png
rename to src/site/fancybox/fancy_shadow_n.png
Binary files differ
diff --git a/docs/fancybox/fancy_shadow_ne.png b/src/site/fancybox/fancy_shadow_ne.png
similarity index 100%
rename from docs/fancybox/fancy_shadow_ne.png
rename to src/site/fancybox/fancy_shadow_ne.png
Binary files differ
diff --git a/docs/fancybox/fancy_shadow_nw.png b/src/site/fancybox/fancy_shadow_nw.png
similarity index 100%
rename from docs/fancybox/fancy_shadow_nw.png
rename to src/site/fancybox/fancy_shadow_nw.png
Binary files differ
diff --git a/docs/fancybox/fancy_shadow_s.png b/src/site/fancybox/fancy_shadow_s.png
similarity index 100%
rename from docs/fancybox/fancy_shadow_s.png
rename to src/site/fancybox/fancy_shadow_s.png
Binary files differ
diff --git a/docs/fancybox/fancy_shadow_se.png b/src/site/fancybox/fancy_shadow_se.png
similarity index 100%
rename from docs/fancybox/fancy_shadow_se.png
rename to src/site/fancybox/fancy_shadow_se.png
Binary files differ
diff --git a/docs/fancybox/fancy_shadow_sw.png b/src/site/fancybox/fancy_shadow_sw.png
similarity index 100%
rename from docs/fancybox/fancy_shadow_sw.png
rename to src/site/fancybox/fancy_shadow_sw.png
Binary files differ
diff --git a/docs/fancybox/fancy_shadow_w.png b/src/site/fancybox/fancy_shadow_w.png
similarity index 100%
rename from docs/fancybox/fancy_shadow_w.png
rename to src/site/fancybox/fancy_shadow_w.png
Binary files differ
diff --git a/docs/fancybox/fancy_title_left.png b/src/site/fancybox/fancy_title_left.png
similarity index 100%
rename from docs/fancybox/fancy_title_left.png
rename to src/site/fancybox/fancy_title_left.png
Binary files differ
diff --git a/docs/fancybox/fancy_title_main.png b/src/site/fancybox/fancy_title_main.png
similarity index 100%
rename from docs/fancybox/fancy_title_main.png
rename to src/site/fancybox/fancy_title_main.png
Binary files differ
diff --git a/docs/fancybox/fancy_title_over.png b/src/site/fancybox/fancy_title_over.png
similarity index 100%
rename from docs/fancybox/fancy_title_over.png
rename to src/site/fancybox/fancy_title_over.png
Binary files differ
diff --git a/docs/fancybox/fancy_title_right.png b/src/site/fancybox/fancy_title_right.png
similarity index 100%
rename from docs/fancybox/fancy_title_right.png
rename to src/site/fancybox/fancy_title_right.png
Binary files differ
diff --git a/docs/fancybox/fancybox-x.png b/src/site/fancybox/fancybox-x.png
similarity index 100%
rename from docs/fancybox/fancybox-x.png
rename to src/site/fancybox/fancybox-x.png
Binary files differ
diff --git a/docs/fancybox/fancybox-y.png b/src/site/fancybox/fancybox-y.png
similarity index 100%
rename from docs/fancybox/fancybox-y.png
rename to src/site/fancybox/fancybox-y.png
Binary files differ
diff --git a/docs/fancybox/fancybox.png b/src/site/fancybox/fancybox.png
similarity index 100%
rename from docs/fancybox/fancybox.png
rename to src/site/fancybox/fancybox.png
Binary files differ
diff --git a/docs/fancybox/jquery-1.4.3.min.js b/src/site/fancybox/jquery-1.4.3.min.js
similarity index 100%
rename from docs/fancybox/jquery-1.4.3.min.js
rename to 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
similarity index 100%
rename from docs/fancybox/jquery.easing-1.3.pack.js
rename to 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
similarity index 100%
rename from docs/fancybox/jquery.fancybox-1.3.4.css
rename to 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
similarity index 100%
rename from docs/fancybox/jquery.fancybox-1.3.4.js
rename to 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
similarity index 100%
rename from docs/fancybox/jquery.fancybox-1.3.4.pack.js
rename to 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
similarity index 100%
rename from docs/fancybox/jquery.mousewheel-3.0.4.pack.js
rename to src/site/fancybox/jquery.mousewheel-3.0.4.pack.js
diff --git a/docs/03_faq.mkd b/src/site/faq.mkd
similarity index 93%
rename from docs/03_faq.mkd
rename to src/site/faq.mkd
index cdf3d59..fb1b599 100644
--- a/docs/03_faq.mkd
+++ b/src/site/faq.mkd
@@ -3,18 +3,19 @@
### Eclipse/Egit/JGit complains that it "can't open upload pack"?
There are a few ways this can occur:
-1. You are using https with a self-signed certificate and you **did not** configure *http.sslVerify=false*
+1. Are you running Java 7?<br />Java 7 introduced SNI support for SSL connections and it is enabled by default.<br />[Java 7 Security Enhancements](http://docs.oracle.com/javase/7/docs/technotes/guides/security/enhancements-7.html)<br />To disable SNI alerts, add this line to your eclipse.ini file and restart Eclipse.<br /><pre>-Djsse.enableSNIExtension=false</pre>
+2. You are using https with a self-signed certificate and you **did not** configure *http.sslVerify=false*
1. Window->Preferences->Team->Git->Configuration
2. Click the *New Entry* button
3. <pre>Key = <em>http.sslVerify</em>
Value = <em>false</em></pre>
-2. Gitblit GO's default self-signed certificate is bound to *localhost* and you are trying to clone/push between machines.
+3. Gitblit GO's default self-signed certificate is bound to *localhost* and you are trying to clone/push between machines.
1. Review the contents of `makekeystore.cmd`
2. Set *your hostname* in the *HOSTNAME* variable.
3. Execute the script.<br/>This will generate a new certificate and keystore for *your hostname* protected by *server.storePassword*.
-3. The repository is clone-restricted and you don't have access.
-4. The repository is clone-restricted and your password changed.
-5. A regression in Gitblit. :(
+4. The repository is clone-restricted and you don't have access.
+5. The repository is clone-restricted and your password changed.
+6. A regression in Gitblit. :(
### Why can't I access Gitblit GO from another machine?
1. Please check *server.httpBindInterface* and *server.httpsBindInterface* in `gitblit.properties`, you may be only be serving on *localhost*.
diff --git a/docs/01_features.mkd b/src/site/features.mkd
similarity index 100%
rename from docs/01_features.mkd
rename to src/site/features.mkd
diff --git a/docs/02_federation.mkd b/src/site/federation.mkd
similarity index 99%
rename from docs/02_federation.mkd
rename to src/site/federation.mkd
index d83a9e3..756d3fc 100644
--- a/docs/02_federation.mkd
+++ b/src/site/federation.mkd
@@ -48,11 +48,11 @@
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
similarity index 100%
rename from docs/federation.odg
rename to src/site/federation.odg
Binary files differ
diff --git a/docs/gitblit_logo_white.xcf b/src/site/gitblit_logo_white.xcf
similarity index 100%
rename from docs/gitblit_logo_white.xcf
rename to src/site/gitblit_logo_white.xcf
Binary files differ
diff --git a/distrib/openshift.mkd b/src/site/openshift.mkd
similarity index 100%
rename from distrib/openshift.mkd
rename to src/site/openshift.mkd
diff --git a/docs/permissions_matrix.ods b/src/site/permissions_matrix.ods
similarity index 100%
rename from docs/permissions_matrix.ods
rename to src/site/permissions_matrix.ods
Binary files differ
diff --git a/docs/03_properties.mkd b/src/site/properties.mkd
similarity index 100%
rename from docs/03_properties.mkd
rename to src/site/properties.mkd
diff --git a/src/site/releasecurrent.mkd b/src/site/releasecurrent.mkd
new file mode 100644
index 0000000..613f1bf
--- /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) *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/docs/04_releases.mkd b/src/site/releasehistory.mkd
similarity index 88%
copy from docs/04_releases.mkd
copy to src/site/releasehistory.mkd
index efce794..7ea7676 100644
--- a/docs/04_releases.mkd
+++ b/src/site/releasehistory.mkd
@@ -1,65 +1,4 @@
-## Release History
-
-### Current Release
-
-**%VERSION%** ([go](http://code.google.com/p/gitblit/downloads/detail?name=%GO%) | [war](http://code.google.com/p/gitblit/downloads/detail?name=%WAR%) | [express](http://code.google.com/p/gitblit/downloads/detail?name=%EXPRESS%) | [fedclient](http://code.google.com/p/gitblit/downloads/detail?name=%FEDCLIENT%) | [manager](http://code.google.com/p/gitblit/downloads/detail?name=%MANAGER%) | [api](http://code.google.com/p/gitblit/downloads/detail?name=%API%)) based on [%JGIT%][jgit] *released %BUILDDATE%*
-
-#### fixes
-
-- Can't set reset settings with $ or { characters through Gitblit Manager because they are not properly escaped
-
-#### additions
-
- - Optional periodic LDAP user and team pre-fetching & synchronization (github/mschaefers)
- - Display name and version in Tomcat Manager (github/thefake)
- - FogBugz post-receive hook script (github/djschny)
- - Implemented multiple repository owners (github/akquinet)
- - Chinese translation (github/dapengme, github/yin8086)
-
-### Older Releases
-
-<div class="alert alert-info">
-<h4>Update Note 1.2.1</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>
-
-#### 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)
+## Older Releases
<div class="alert alert-info">
<h4>Update Note 1.2.0</h4>
diff --git a/docs/04_releases.mkd b/src/site/releases.mkd
similarity index 99%
rename from docs/04_releases.mkd
rename to src/site/releases.mkd
index efce794..7dd6b17 100644
--- a/docs/04_releases.mkd
+++ b/src/site/releases.mkd
@@ -10,6 +10,7 @@
#### additions
+ - Option to force client-side basic authentication instead of form-based authentication if web.authenticateViewPages=true (github/furinzen)
- Optional periodic LDAP user and team pre-fetching & synchronization (github/mschaefers)
- Display name and version in Tomcat Manager (github/thefake)
- FogBugz post-receive hook script (github/djschny)
diff --git a/docs/architecture.png b/src/site/resources/architecture.png
similarity index 100%
rename from docs/architecture.png
rename to src/site/resources/architecture.png
Binary files differ
diff --git a/docs/fed_aggregation.png b/src/site/resources/fed_aggregation.png
similarity index 100%
rename from docs/fed_aggregation.png
rename to src/site/resources/fed_aggregation.png
Binary files differ
diff --git a/docs/fed_mirror.png b/src/site/resources/fed_mirror.png
similarity index 100%
rename from docs/fed_mirror.png
rename to src/site/resources/fed_mirror.png
Binary files differ
diff --git a/docs/ldapSample.png b/src/site/resources/ldapSample.png
similarity index 100%
rename from docs/ldapSample.png
rename to src/site/resources/ldapSample.png
Binary files differ
diff --git a/docs/permissions_matrix.png b/src/site/resources/permissions_matrix.png
similarity index 100%
rename from docs/permissions_matrix.png
rename to src/site/resources/permissions_matrix.png
Binary files differ
diff --git a/docs/screenshots.js b/src/site/resources/screenshots.js
similarity index 100%
rename from docs/screenshots.js
rename to src/site/resources/screenshots.js
diff --git a/docs/stjude_150x150.gif b/src/site/resources/stjude_150x150.gif
similarity index 100%
rename from docs/stjude_150x150.gif
rename to src/site/resources/stjude_150x150.gif
Binary files differ
diff --git a/docs/05_roadmap.mkd b/src/site/roadmap.mkd
similarity index 100%
rename from docs/05_roadmap.mkd
rename to src/site/roadmap.mkd
diff --git a/docs/02_rpc.mkd b/src/site/rpc.mkd
similarity index 100%
rename from docs/02_rpc.mkd
rename to src/site/rpc.mkd
diff --git a/docs/01_screenshots.mkd b/src/site/screenshots.mkd
similarity index 94%
rename from docs/01_screenshots.mkd
rename to src/site/screenshots.mkd
index 74f6742..b18408a 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
similarity index 100%
rename from docs/screenshots/00.png
rename to src/site/screenshots/00.png
Binary files differ
diff --git a/docs/screenshots/00b.png b/src/site/screenshots/00b.png
similarity index 100%
rename from docs/screenshots/00b.png
rename to src/site/screenshots/00b.png
Binary files differ
diff --git a/docs/screenshots/00c.png b/src/site/screenshots/00c.png
similarity index 100%
rename from docs/screenshots/00c.png
rename to src/site/screenshots/00c.png
Binary files differ
diff --git a/docs/screenshots/00d.png b/src/site/screenshots/00d.png
similarity index 100%
rename from docs/screenshots/00d.png
rename to src/site/screenshots/00d.png
Binary files differ
diff --git a/docs/screenshots/01.png b/src/site/screenshots/01.png
similarity index 100%
rename from docs/screenshots/01.png
rename to src/site/screenshots/01.png
Binary files differ
diff --git a/docs/screenshots/01b.png b/src/site/screenshots/01b.png
similarity index 100%
rename from docs/screenshots/01b.png
rename to src/site/screenshots/01b.png
Binary files differ
diff --git a/docs/screenshots/01c.png b/src/site/screenshots/01c.png
similarity index 100%
rename from docs/screenshots/01c.png
rename to src/site/screenshots/01c.png
Binary files differ
diff --git a/docs/screenshots/02.png b/src/site/screenshots/02.png
similarity index 100%
rename from docs/screenshots/02.png
rename to src/site/screenshots/02.png
Binary files differ
diff --git a/docs/screenshots/03.png b/src/site/screenshots/03.png
similarity index 100%
rename from docs/screenshots/03.png
rename to src/site/screenshots/03.png
Binary files differ
diff --git a/docs/screenshots/04.png b/src/site/screenshots/04.png
similarity index 100%
rename from docs/screenshots/04.png
rename to src/site/screenshots/04.png
Binary files differ
diff --git a/docs/screenshots/05.png b/src/site/screenshots/05.png
similarity index 100%
rename from docs/screenshots/05.png
rename to src/site/screenshots/05.png
Binary files differ
diff --git a/docs/screenshots/06.png b/src/site/screenshots/06.png
similarity index 100%
rename from docs/screenshots/06.png
rename to src/site/screenshots/06.png
Binary files differ
diff --git a/docs/screenshots/07.png b/src/site/screenshots/07.png
similarity index 100%
rename from docs/screenshots/07.png
rename to src/site/screenshots/07.png
Binary files differ
diff --git a/docs/screenshots/08.png b/src/site/screenshots/08.png
similarity index 100%
rename from docs/screenshots/08.png
rename to src/site/screenshots/08.png
Binary files differ
diff --git a/docs/screenshots/09.png b/src/site/screenshots/09.png
similarity index 100%
rename from docs/screenshots/09.png
rename to src/site/screenshots/09.png
Binary files differ
diff --git a/docs/screenshots/10.png b/src/site/screenshots/10.png
similarity index 100%
rename from docs/screenshots/10.png
rename to src/site/screenshots/10.png
Binary files differ
diff --git a/docs/screenshots/11.png b/src/site/screenshots/11.png
similarity index 100%
rename from docs/screenshots/11.png
rename to src/site/screenshots/11.png
Binary files differ
diff --git a/docs/screenshots/12.png b/src/site/screenshots/12.png
similarity index 100%
rename from docs/screenshots/12.png
rename to src/site/screenshots/12.png
Binary files differ
diff --git a/docs/screenshots/13.png b/src/site/screenshots/13.png
similarity index 100%
rename from docs/screenshots/13.png
rename to src/site/screenshots/13.png
Binary files differ
diff --git a/docs/screenshots/14.png b/src/site/screenshots/14.png
similarity index 100%
rename from docs/screenshots/14.png
rename to src/site/screenshots/14.png
Binary files differ
diff --git a/docs/screenshots/15.png b/src/site/screenshots/15.png
similarity index 100%
rename from docs/screenshots/15.png
rename to src/site/screenshots/15.png
Binary files differ
diff --git a/docs/screenshots/image_processing.txt b/src/site/screenshots/image_processing.txt
similarity index 100%
rename from docs/screenshots/image_processing.txt
rename to src/site/screenshots/image_processing.txt
diff --git a/docs/screenshots/m00.png b/src/site/screenshots/m00.png
similarity index 100%
rename from docs/screenshots/m00.png
rename to src/site/screenshots/m00.png
Binary files differ
diff --git a/docs/screenshots/m01.png b/src/site/screenshots/m01.png
similarity index 100%
rename from docs/screenshots/m01.png
rename to src/site/screenshots/m01.png
Binary files differ
diff --git a/docs/screenshots/m02.png b/src/site/screenshots/m02.png
similarity index 100%
rename from docs/screenshots/m02.png
rename to src/site/screenshots/m02.png
Binary files differ
diff --git a/docs/screenshots/m03.png b/src/site/screenshots/m03.png
similarity index 100%
rename from docs/screenshots/m03.png
rename to src/site/screenshots/m03.png
Binary files differ
diff --git a/docs/screenshots/m04.png b/src/site/screenshots/m04.png
similarity index 100%
rename from docs/screenshots/m04.png
rename to src/site/screenshots/m04.png
Binary files differ
diff --git a/docs/screenshots/m05.png b/src/site/screenshots/m05.png
similarity index 100%
rename from docs/screenshots/m05.png
rename to src/site/screenshots/m05.png
Binary files differ
diff --git a/docs/screenshots/m06.png b/src/site/screenshots/m06.png
similarity index 100%
rename from docs/screenshots/m06.png
rename to src/site/screenshots/m06.png
Binary files differ
diff --git a/docs/screenshots/m07.png b/src/site/screenshots/m07.png
similarity index 100%
rename from docs/screenshots/m07.png
rename to src/site/screenshots/m07.png
Binary files differ
diff --git a/docs/screenshots/m08.png b/src/site/screenshots/m08.png
similarity index 100%
rename from docs/screenshots/m08.png
rename to src/site/screenshots/m08.png
Binary files differ
diff --git a/docs/screenshots/m09.png b/src/site/screenshots/m09.png
similarity index 100%
rename from docs/screenshots/m09.png
rename to src/site/screenshots/m09.png
Binary files differ
diff --git a/docs/screenshots/m10.png b/src/site/screenshots/m10.png
similarity index 100%
rename from docs/screenshots/m10.png
rename to src/site/screenshots/m10.png
Binary files differ
diff --git a/docs/01_setup.mkd b/src/site/setup.mkd
similarity index 96%
rename from docs/01_setup.mkd
rename to src/site/setup.mkd
index a7f7526..525be85 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 @@
## 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 @@
**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.
@@ -109,7 +109,7 @@
### Running as a Windows Service
Gitblit uses [Apache Commons Daemon](http://commons.apache.org/daemon) to install and configure its Windows service.
-1. Review the contents of the `installService.cmd`
+1. **Review the contents** of the `installService.cmd` where you may have to change the <u>default keystore password</u>.
2. Set the *ARCH* value as appropriate for your installed Java Virtual Machine.
3. Add any necessary *--StartParams* as enumerated below in **Command-Line Parameters**.
4. Execute the script.
@@ -165,16 +165,16 @@
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 @@
ProxyPreserveHost On
# Set the permissions for the proxy
-<Proxy *>
+<Proxy>
AddDefaultCharset off
Order deny,allow
Allow from all
-</Proxy>
+</Proxy>
# The proxy context path must match the Gitblit context path.
# For Gitblit GO, see server.contextPath in gitblit.properties.
@@ -214,7 +214,7 @@
#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 @@
<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 @@
ints.add(0, 42)
assert ints.size() == 1
assert ints.get(0) == 42
-%ENDCODE%
+---JAVA---
### Custom Fields
@@ -741,7 +741,7 @@
**NOTE:**
The default self-signed certificate generated by Gitlbit GO is bound to *localhost*.
If you are using Eclipse/EGit/JGit clients, you will have to generate your own certificate that specifies the exact hostname used in your clone/push url.
-You must do this because Eclipse/EGit/JGit (<= 2.1.0) always verifies certificate hostnames, regardless of the *http.sslVerify=false* client-side setting.
+You must do this because Eclipse/EGit/JGit (<= 2.3.1) always verifies certificate hostnames, regardless of the *http.sslVerify=false* client-side setting.
- **Eclipse/EGit/JGit**
1. Window->Preferences->Team->Git->Configuration
@@ -757,6 +757,25 @@
This can be adjusted on your client by changing the default post buffer size:
<pre>git config --global http.postBuffer 524288000</pre>
+### Disabling SNI
+
+You may run into SNI alerts (Server Name Indication). These will manifest as failures to clone or push to your Gitblit instance.
+
+#### Java-based Clients
+
+When using Java 7-based clients, SNI is enabled by default. You can disable SNI by specifying the JVM system parameter `-Djsse.enableSNIExtension=false` when your Java-based client launches.
+
+For Eclipse, you can append `-Djsse.enableSNIExtension=false` to your *eclipse.ini* file.
+
+#### Native Clients
+
+Native clients may display an error when attempting to clone or push that looks like this:
+---FIXED---
+C:\projects\git\gitblit>git push rhcloud master
+error: error:14077458:SSL routines:SSL23_GET_SERVER_HELLO:reason(1112) while accessing https://demo-gitblit.rhcloud.com/git/gitblit.git/info/refs?service=git-receive-pack
+fatal: HTTP request failed
+---FIXED---
+
### Cloning an Access Restricted Repository
- **Eclipse/EGit/JGit**
Nothing special to configure, EGit figures out everything.
diff --git a/docs/00_index.mkd b/src/site/siteindex.mkd
similarity index 71%
rename from docs/00_index.mkd
rename to src/site/siteindex.mkd
index 0812c3e..de5c099 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> & <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> & <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 0000000..06d28da
--- /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 0000000..e7c275b
--- /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 0000000..3bfd709
--- /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 →</a></li>
+ </ul>
+</div>
diff --git a/src/site/templates/releasehistory.ftl b/src/site/templates/releasehistory.ftl
new file mode 100644
index 0000000..eaaaad2
--- /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 0000000..90e86eb
--- /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
similarity index 100%
rename from test-gitblit.properties
rename to src/test/config/test-gitblit.properties
diff --git a/test-ui-gitblit.properties b/src/test/config/test-ui-gitblit.properties
similarity index 100%
rename from test-ui-gitblit.properties
rename to src/test/config/test-ui-gitblit.properties
diff --git a/test-ui-users.conf b/src/test/config/test-ui-users.conf
similarity index 100%
rename from test-ui-users.conf
rename to src/test/config/test-ui-users.conf
diff --git a/test-users.conf b/src/test/config/test-users.conf
similarity index 100%
rename from test-users.conf
rename to src/test/config/test-users.conf
diff --git a/tests/com/gitblit/tests/ActivityTest.java b/src/test/java/com/gitblit/tests/ActivityTest.java
similarity index 100%
rename from tests/com/gitblit/tests/ActivityTest.java
rename to 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
similarity index 100%
rename from tests/com/gitblit/tests/ArrayUtilsTest.java
rename to 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
similarity index 100%
rename from tests/com/gitblit/tests/Base64Test.java
rename to 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
similarity index 100%
rename from tests/com/gitblit/tests/ByteFormatTest.java
rename to 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
similarity index 100%
rename from tests/com/gitblit/tests/DiffUtilsTest.java
rename to 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
similarity index 100%
rename from tests/com/gitblit/tests/FanoutServiceTest.java
rename to 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
similarity index 100%
rename from tests/com/gitblit/tests/FederationTests.java
rename to 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
similarity index 100%
rename from tests/com/gitblit/tests/FileUtilsTest.java
rename to 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
similarity index 100%
rename from tests/com/gitblit/tests/GitBlitSuite.java
rename to 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
similarity index 100%
rename from tests/com/gitblit/tests/GitBlitTest.java
rename to 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
similarity index 100%
rename from tests/com/gitblit/tests/GitServletTest.java
rename to 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
similarity index 100%
rename from tests/com/gitblit/tests/GroovyScriptTest.java
rename to 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
similarity index 100%
rename from tests/com/gitblit/tests/IssuesTest.java
rename to 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
similarity index 100%
rename from tests/com/gitblit/tests/JGitUtilsTest.java
rename to 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
similarity index 100%
rename from tests/com/gitblit/tests/JsonUtilsTest.java
rename to 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
similarity index 100%
rename from tests/com/gitblit/tests/LdapUserServiceTest.java
rename to 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
similarity index 100%
rename from tests/com/gitblit/tests/LuceneExecutorTest.java
rename to 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
similarity index 85%
rename from tests/com/gitblit/tests/MailTest.java
rename to src/test/java/com/gitblit/tests/MailTest.java
index 05d55a2..4feedb0 100644
--- a/tests/com/gitblit/tests/MailTest.java
+++ b/src/test/java/com/gitblit/tests/MailTest.java
@@ -22,6 +22,7 @@
import org.junit.Test;
import com.gitblit.FileSettings;
+import com.gitblit.Keys;
import com.gitblit.MailExecutor;
public class MailTest {
@@ -30,9 +31,9 @@
public void testSendMail() throws Exception {
FileSettings settings = new FileSettings("mailtest.properties");
MailExecutor mail = new MailExecutor(settings);
- Message message = mail.createMessageForAdministrators();
+ Message message = mail.createMessage(settings.getStrings(Keys.mail.adminAddresses));
message.setSubject("Test");
- message.setText("this is a test");
+ message.setText("Lägger till andra stycket i ny fil. UTF-8 encoded");
mail.queue(message);
mail.run();
diff --git a/tests/com/gitblit/tests/MarkdownUtilsTest.java b/src/test/java/com/gitblit/tests/MarkdownUtilsTest.java
similarity index 100%
rename from tests/com/gitblit/tests/MarkdownUtilsTest.java
rename to 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
similarity index 100%
rename from tests/com/gitblit/tests/MetricUtilsTest.java
rename to 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
similarity index 100%
rename from tests/com/gitblit/tests/ObjectCacheTest.java
rename to 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
similarity index 100%
rename from tests/com/gitblit/tests/PermissionsTest.java
rename to 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
similarity index 100%
rename from tests/com/gitblit/tests/PushLogTest.java
rename to 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
similarity index 100%
rename from tests/com/gitblit/tests/RedmineUserServiceTest.java
rename to 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
similarity index 100%
rename from tests/com/gitblit/tests/RepositoryModelTest.java
rename to 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
similarity index 100%
rename from tests/com/gitblit/tests/RpcTests.java
rename to 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
similarity index 100%
rename from tests/com/gitblit/tests/StringUtilsTest.java
rename to 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
similarity index 100%
rename from tests/com/gitblit/tests/SyndicationUtilsTest.java
rename to 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
similarity index 100%
rename from tests/com/gitblit/tests/TicgitUtilsTest.java
rename to 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
similarity index 100%
rename from tests/com/gitblit/tests/TimeUtilsTest.java
rename to 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
similarity index 100%
rename from tests/com/gitblit/tests/UserServiceTest.java
rename to 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
similarity index 100%
rename from tests/com/gitblit/tests/X509UtilsTest.java
rename to 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
similarity index 100%
rename from tests/com/gitblit/tests/mock/MemorySettings.java
rename to 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
similarity index 100%
rename from tests/com/gitblit/tests/resources/ldapUserServiceSampleData.ldif
rename to 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
similarity index 100%
rename from tests/de/akquinet/devops/GitBlit4UITests.java
rename to 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
similarity index 100%
rename from tests/de/akquinet/devops/GitBlitServer4UITests.java
rename to 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
similarity index 100%
rename from tests/de/akquinet/devops/GitblitRunnable.java
rename to 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
similarity index 93%
rename from tests/de/akquinet/devops/LaunchWithUITestConfig.java
rename to src/test/java/de/akquinet/devops/LaunchWithUITestConfig.java
index 594d7fc..aebde9a 100644
--- a/tests/de/akquinet/devops/LaunchWithUITestConfig.java
+++ b/src/test/java/de/akquinet/devops/LaunchWithUITestConfig.java
@@ -44,7 +44,8 @@
// 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 @@
// 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
similarity index 73%
rename from tests/de/akquinet/devops/ManualUITestLaunch.java
rename to src/test/java/de/akquinet/devops/ManualUITestLaunch.java
index 2eff491..809360a 100644
--- a/tests/de/akquinet/devops/ManualUITestLaunch.java
+++ b/src/test/java/de/akquinet/devops/ManualUITestLaunch.java
@@ -3,7 +3,8 @@
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
similarity index 100%
rename from tests/de/akquinet/devops/test/ui/TestUISuite.java
rename to 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
similarity index 100%
rename from tests/de/akquinet/devops/test/ui/cases/UI_MultiAdminSupportTest.java
rename to 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
similarity index 100%
rename from tests/de/akquinet/devops/test/ui/generic/AbstractUITest.java
rename to 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
similarity index 100%
rename from tests/de/akquinet/devops/test/ui/view/Exp.java
rename to 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
similarity index 100%
rename from tests/de/akquinet/devops/test/ui/view/GitblitDashboardView.java
rename to 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
similarity index 100%
rename from tests/de/akquinet/devops/test/ui/view/GitblitPageView.java
rename to 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
similarity index 100%
rename from tests/de/akquinet/devops/test/ui/view/RepoEditView.java
rename to 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
similarity index 100%
rename from tests/de/akquinet/devops/test/ui/view/RepoListView.java
rename to 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 4abe4be..0000000
--- 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 6f225cb..0000000
--- a/tools/GenJar.jar
+++ /dev/null
Binary files differ
diff --git a/tools/ant-googlecode-0.0.3.jar b/tools/ant-googlecode-0.0.3.jar
deleted file mode 100644
index 452fa84..0000000
--- a/tools/ant-googlecode-0.0.3.jar
+++ /dev/null
Binary files differ
