.classpath
@@ -1,55 +1,61 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> <classpathentry kind="src" path="src" /> <classpathentry kind="src" path="resources" /> <classpathentry kind="src" path="tests" output="bin/test-classes" /> <classpathentry kind="lib" path="ext/jcommander-1.17.jar" sourcepath="ext/src/jcommander-1.17-sources.jar" /> <classpathentry kind="lib" path="ext/log4j-1.2.17.jar" sourcepath="ext/src/log4j-1.2.17-sources.jar" /> <classpathentry kind="lib" path="ext/slf4j-api-1.6.6.jar" sourcepath="ext/src/slf4j-api-1.6.6-sources.jar" /> <classpathentry kind="lib" path="ext/slf4j-log4j12-1.6.6.jar" sourcepath="ext/src/slf4j-log4j12-1.6.6-sources.jar" /> <classpathentry kind="lib" path="ext/mail-1.4.3.jar" sourcepath="ext/src/mail-1.4.3-sources.jar" /> <classpathentry kind="lib" path="ext/javax.servlet-api-3.0.1.jar" sourcepath="ext/src/javax.servlet-api-3.0.1-sources.jar" /> <classpathentry kind="lib" path="ext/jetty-webapp-7.6.8.v20121106.jar" sourcepath="ext/src/jetty-webapp-7.6.8.v20121106-sources.jar" /> <classpathentry kind="lib" path="ext/jetty-ajp-7.6.8.v20121106.jar" sourcepath="ext/src/jetty-ajp-7.6.8.v20121106-sources.jar" /> <classpathentry kind="lib" path="ext/wicket-1.4.21.jar" sourcepath="ext/src/wicket-1.4.21-sources.jar" /> <classpathentry kind="lib" path="ext/wicket-auth-roles-1.4.21.jar" sourcepath="ext/src/wicket-auth-roles-1.4.21-sources.jar" /> <classpathentry kind="lib" path="ext/wicket-extensions-1.4.21.jar" sourcepath="ext/src/wicket-extensions-1.4.21-sources.jar" /> <classpathentry kind="lib" path="ext/googlecharts-1.4.21.jar" sourcepath="ext/src/googlecharts-1.4.21-sources.jar" /> <classpathentry kind="lib" path="ext/lucene-core-3.6.1.jar" sourcepath="ext/src/lucene-core-3.6.1-sources.jar" /> <classpathentry kind="lib" path="ext/lucene-highlighter-3.6.1.jar" sourcepath="ext/src/lucene-highlighter-3.6.1-sources.jar" /> <classpathentry kind="lib" path="ext/lucene-memory-3.6.1.jar" sourcepath="ext/src/lucene-memory-3.6.1-sources.jar" /> <classpathentry kind="lib" path="ext/lucene-queries-3.6.1.jar" sourcepath="ext/src/lucene-queries-3.6.1-sources.jar" /> <classpathentry kind="src" path="src/main/java" /> <classpathentry kind="src" path="src/test/java" output="bin/test-classes" /> <classpathentry kind="src" path="src/main/resources" /> <classpathentry kind="lib" path="ext/jcommander-1.17.jar" sourcepath="ext/src/jcommander-1.17.jar" /> <classpathentry kind="lib" path="ext/log4j-1.2.17.jar" sourcepath="ext/src/log4j-1.2.17.jar" /> <classpathentry kind="lib" path="ext/slf4j-api-1.6.6.jar" sourcepath="ext/src/slf4j-api-1.6.6.jar" /> <classpathentry kind="lib" path="ext/slf4j-log4j12-1.6.6.jar" sourcepath="ext/src/slf4j-log4j12-1.6.6.jar" /> <classpathentry kind="lib" path="ext/mail-1.4.3.jar" sourcepath="ext/src/mail-1.4.3.jar" /> <classpathentry kind="lib" path="ext/javax.servlet-api-3.0.1.jar" sourcepath="ext/src/javax.servlet-api-3.0.1.jar" /> <classpathentry kind="lib" path="ext/jetty-webapp-7.6.8.v20121106.jar" sourcepath="ext/src/jetty-webapp-7.6.8.v20121106.jar" /> <classpathentry kind="lib" path="ext/jetty-ajp-7.6.8.v20121106.jar" sourcepath="ext/src/jetty-ajp-7.6.8.v20121106.jar" /> <classpathentry kind="lib" path="ext/wicket-1.4.21.jar" sourcepath="ext/src/wicket-1.4.21.jar" /> <classpathentry kind="lib" path="ext/wicket-auth-roles-1.4.21.jar" sourcepath="ext/src/wicket-auth-roles-1.4.21.jar" /> <classpathentry kind="lib" path="ext/wicket-extensions-1.4.21.jar" sourcepath="ext/src/wicket-extensions-1.4.21.jar" /> <classpathentry kind="lib" path="ext/googlecharts-1.4.21.jar" sourcepath="ext/src/googlecharts-1.4.21.jar" /> <classpathentry kind="lib" path="ext/lucene-core-3.6.1.jar" sourcepath="ext/src/lucene-core-3.6.1.jar" /> <classpathentry kind="lib" path="ext/lucene-highlighter-3.6.1.jar" sourcepath="ext/src/lucene-highlighter-3.6.1.jar" /> <classpathentry kind="lib" path="ext/lucene-memory-3.6.1.jar" sourcepath="ext/src/lucene-memory-3.6.1.jar" /> <classpathentry kind="lib" path="ext/lucene-queries-3.6.1.jar" sourcepath="ext/src/lucene-queries-3.6.1.jar" /> <classpathentry kind="lib" path="ext/jakarta-regexp-1.4.jar" /> <classpathentry kind="lib" path="ext/markdownpapers-core-1.3.2.jar" sourcepath="ext/src/markdownpapers-core-1.3.2-sources.jar" /> <classpathentry kind="lib" path="ext/org.eclipse.jgit-2.2.0.201212191850-r.jar" sourcepath="ext/src/org.eclipse.jgit-2.2.0.201212191850-r-sources.jar" /> <classpathentry kind="lib" path="ext/jsch-0.1.44-1.jar" sourcepath="ext/src/jsch-0.1.44-1-sources.jar" /> <classpathentry kind="lib" path="ext/org.eclipse.jgit.http.server-2.2.0.201212191850-r.jar" sourcepath="ext/src/org.eclipse.jgit.http.server-2.2.0.201212191850-r-sources.jar" /> <classpathentry kind="lib" path="ext/bcprov-jdk15on-1.47.jar" sourcepath="ext/src/bcprov-jdk15on-1.47-sources.jar" /> <classpathentry kind="lib" path="ext/bcmail-jdk15on-1.47.jar" sourcepath="ext/src/bcmail-jdk15on-1.47-sources.jar" /> <classpathentry kind="lib" path="ext/bcpkix-jdk15on-1.47.jar" sourcepath="ext/src/bcpkix-jdk15on-1.47-sources.jar" /> <classpathentry kind="lib" path="ext/rome-0.9.jar" sourcepath="ext/src/rome-0.9-sources.jar" /> <classpathentry kind="lib" path="ext/jdom-1.0.jar" sourcepath="ext/src/jdom-1.0-sources.jar" /> <classpathentry kind="lib" path="ext/gson-1.7.2.jar" sourcepath="ext/src/gson-1.7.2-sources.jar" /> <classpathentry kind="lib" path="ext/groovy-all-1.8.8.jar" sourcepath="ext/src/groovy-all-1.8.8-sources.jar" /> <classpathentry kind="lib" path="ext/unboundid-ldapsdk-2.3.0.jar" sourcepath="ext/src/unboundid-ldapsdk-2.3.0-sources.jar" /> <classpathentry kind="lib" path="ext/ivy-2.2.0.jar" sourcepath="ext/src/ivy-2.2.0-sources.jar" /> <classpathentry kind="lib" path="ext/markdownpapers-core-1.3.2.jar" sourcepath="ext/src/markdownpapers-core-1.3.2.jar" /> <classpathentry kind="lib" path="ext/org.eclipse.jgit-2.3.1.201302201838-r.jar" sourcepath="ext/src/org.eclipse.jgit-2.3.1.201302201838-r.jar" /> <classpathentry kind="lib" path="ext/jsch-0.1.46.jar" sourcepath="ext/src/jsch-0.1.46.jar" /> <classpathentry kind="lib" path="ext/org.eclipse.jgit.http.server-2.3.1.201302201838-r.jar" sourcepath="ext/src/org.eclipse.jgit.http.server-2.3.1.201302201838-r.jar" /> <classpathentry kind="lib" path="ext/bcprov-jdk15on-1.47.jar" sourcepath="ext/src/bcprov-jdk15on-1.47.jar" /> <classpathentry kind="lib" path="ext/bcmail-jdk15on-1.47.jar" sourcepath="ext/src/bcmail-jdk15on-1.47.jar" /> <classpathentry kind="lib" path="ext/bcpkix-jdk15on-1.47.jar" sourcepath="ext/src/bcpkix-jdk15on-1.47.jar" /> <classpathentry kind="lib" path="ext/rome-0.9.jar" sourcepath="ext/src/rome-0.9.jar" /> <classpathentry kind="lib" path="ext/jdom-1.0.jar" sourcepath="ext/src/jdom-1.0.jar" /> <classpathentry kind="lib" path="ext/gson-1.7.2.jar" sourcepath="ext/src/gson-1.7.2.jar" /> <classpathentry kind="lib" path="ext/groovy-all-1.8.8.jar" sourcepath="ext/src/groovy-all-1.8.8.jar" /> <classpathentry kind="lib" path="ext/unboundid-ldapsdk-2.3.0.jar" sourcepath="ext/src/unboundid-ldapsdk-2.3.0.jar" /> <classpathentry kind="lib" path="ext/ivy-2.2.0.jar" sourcepath="ext/src/ivy-2.2.0.jar" /> <classpathentry kind="lib" path="ext/jcalendar-1.3.2.jar" /> <classpathentry kind="lib" path="ext/commons-compress-1.4.1.jar" sourcepath="ext/src/commons-compress-1.4.1-sources.jar" /> <classpathentry kind="lib" path="ext/xz-1.0.jar" sourcepath="ext/src/xz-1.0-sources.jar" /> <classpathentry kind="lib" path="ext/junit-4.10.jar" sourcepath="ext/src/junit-4.10-sources.jar" /> <classpathentry kind="lib" path="ext/hamcrest-core-1.1.jar" /> <classpathentry kind="lib" path="ext/seleniumhq/selenium-java-2.28.0.jar"/> <classpathentry kind="lib" path="ext/seleniumhq/selenium-api-2.28.0.jar"/> <classpathentry kind="lib" path="ext/seleniumhq/selenium-remote-driver-2.28.0.jar"/> <classpathentry kind="lib" path="ext/seleniumhq/selenium-support-2.28.0.jar"/> <classpathentry kind="lib" path="ext/seleniumhq/guava-12.0.jar"/> <classpathentry kind="lib" path="ext/seleniumhq/json-20080701.jar"/> <classpathentry kind="lib" path="ext/seleniumhq/commons-exec-1.1.jar"/> <classpathentry kind="lib" path="ext/seleniumhq/httpcore-4.2.1.jar"/> <classpathentry kind="lib" path="ext/seleniumhq/httpmime-4.2.1.jar"/> <classpathentry kind="lib" path="ext/seleniumhq/httpclient-4.2.1.jar"/> <classpathentry kind="lib" path="ext/seleniumhq/commons-logging-1.1.1.jar"/> <classpathentry kind="lib" path="ext/seleniumhq/selenium-firefox-driver-2.28.0.jar"/> <classpathentry kind="lib" path="ext/commons-compress-1.4.1.jar" sourcepath="ext/src/commons-compress-1.4.1.jar" /> <classpathentry kind="lib" path="ext/xz-1.0.jar" sourcepath="ext/src/xz-1.0.jar" /> <classpathentry kind="lib" path="ext/commons-daemon-1.0.14.jar" sourcepath="ext/src/commons-daemon-1.0.14.jar" /> <classpathentry kind="lib" path="ext/commons-daemon-1.0.14-bin-windows.zip" /> <classpathentry kind="lib" path="ext/junit-4.11.jar" sourcepath="ext/src/junit-4.11.jar" /> <classpathentry kind="lib" path="ext/hamcrest-core-1.3.jar" sourcepath="ext/src/hamcrest-core-1.3.jar" /> <classpathentry kind="lib" path="ext/selenium-java-2.28.0.jar" sourcepath="ext/src/selenium-java-2.28.0.jar" /> <classpathentry kind="lib" path="ext/selenium-support-2.28.0.jar" sourcepath="ext/src/selenium-support-2.28.0.jar" /> <classpathentry kind="lib" path="ext/selenium-firefox-driver-2.28.0.jar" sourcepath="ext/src/selenium-firefox-driver-2.28.0.jar" /> <classpathentry kind="lib" path="ext/selenium-remote-driver-2.28.0.jar" sourcepath="ext/src/selenium-remote-driver-2.28.0.jar" /> <classpathentry kind="lib" path="ext/cglib-nodep-2.1_3.jar" sourcepath="ext/src/cglib-nodep-2.1_3.jar" /> <classpathentry kind="lib" path="ext/json-20080701.jar" sourcepath="ext/src/json-20080701.jar" /> <classpathentry kind="lib" path="ext/selenium-api-2.28.0.jar" sourcepath="ext/src/selenium-api-2.28.0.jar" /> <classpathentry kind="lib" path="ext/guava-13.0.1.jar" sourcepath="ext/src/guava-13.0.1.jar" /> <classpathentry kind="lib" path="ext/httpclient-4.2.1.jar" sourcepath="ext/src/httpclient-4.2.1.jar" /> <classpathentry kind="lib" path="ext/httpcore-4.2.1.jar" sourcepath="ext/src/httpcore-4.2.1.jar" /> <classpathentry kind="lib" path="ext/commons-logging-1.1.1.jar" sourcepath="ext/src/commons-logging-1.1.1.jar" /> <classpathentry kind="lib" path="ext/commons-codec-1.6.jar" sourcepath="ext/src/commons-codec-1.6.jar" /> <classpathentry kind="lib" path="ext/commons-exec-1.1.jar" sourcepath="ext/src/commons-exec-1.1.jar" /> <classpathentry kind="lib" path="ext/jna-3.4.0.jar" sourcepath="ext/src/jna-3.4.0.jar" /> <classpathentry kind="lib" path="ext/platform-3.4.0.jar" sourcepath="ext/src/platform-3.4.0.jar" /> <classpathentry kind="lib" path="ext/commons-io-2.2.jar" sourcepath="ext/src/commons-io-2.2.jar" /> <classpathentry kind="output" path="bin/classes" /> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER" /> </classpath> build.moxie
New file @@ -0,0 +1,161 @@ # # Gitblit project descriptor # # Specify minimum Moxie version required to build requires: 0.7.1 # Project Metadata name: Gitblit description: pure Java Git solution groupId: com.gitblit artifactId: gitblit version: 1.3.0-SNAPSHOT inceptionYear: 2011 # Current stable release releaseVersion: 1.2.1 releaseDate: '2013-01-15' # Project urls url: 'http://gitblit.com' issuesUrl: 'http://code.google.com/p/gitblit/issues/list' socialNetworkUrl: 'https://plus.google.com/114464678392593421684' forumUrl: 'http://groups.google.com/group/gitblit' # Licenses section included for POM generation licenses: - { name: Apache ASL v2.0 url: 'http://www.apache.org/licenses/LICENSE-2.0.html' } # Developers section included for POM generation developers: - { id: james name: James Moger url: 'https://plus.google.com/u/0/116428776452027956920' organization: VAS organizationUrl: 'http://www.vas.com' roles: developer } # SCM section included for POM generation scm: { connection: 'scm:git:git://github.com/gitblit/gitblit.git' developerConnection: 'scm:git:https://github.com/gitblit/gitblit.git' url: 'https://github.com/gitblit/gitblit' tag: HEAD } # Mainclass is used for setting jar manifests and using the mx:run target mainclass: com.gitblit.GitBlitServer # Moxie supports multiple source directories and allows you to assign # a scope to each directory. sourceDirectories: - compile 'src/main/java' - test 'src/test/java' # Moxie supports one site-scoped directory for mx:doc - site 'src/site' resourceDirectories: - compile 'src/main/resources' - site 'src/site/resources' # compile for Java 6 class format tasks: { 'mx:javac' : { source: 1.6 target: 1.6 compiler: javac1.6 encoding: UTF-8 # stop complaints about bootstrap classpath when compiling with Java 7 compilerArgs: '-Xlint:-options' } } # Generate Eclipse project files. # Generate IntelliJ IDEA module files. # Generate a distribution Maven POM (not suitable for building with Maven). apply: eclipse, intellij, pom # Copy all retrieved dependencies to the "ext" directory. # Generated IDE settings (.classpath, etc) will use the artifacts # from this project-relative directory. This allows the IDE settings # to be version-controlled and shared. dependencyDirectory: ext # Register the Eclipse JGit Maven repositories registeredRepositories: - { id: jgit, url: 'http://download.eclipse.org/jgit/maven' } - { id: jgit-snapshots, url: 'https://repo.eclipse.org/content/groups/snapshots' } # Source all dependencies from the following repositories in the specified order repositories: central, jgit-snapshots, jgit # Convenience properties for dependencies properties: { jetty.version : 7.6.8.v20121106 wicket.version : 1.4.21 lucene.version : 3.6.1 jgit.version : 2.3.1.201302201838-r groovy.version : 1.8.8 bouncycastle.version : 1.47 selenium.version : 2.28.0 } # Dependencies # # May be tagged with ":label" notation to group dependencies. # # "@extension" fetches the artifact with the specified extension # and ignores all transitive dependencies. # # "!groupId" or "!groupId:artifactId" excludes all matching transitive # dependencies in that dependency's dependency graph. # dependencies: # Standard dependencies - compile 'com.beust:jcommander:1.17' :fedclient :authority - compile 'log4j:log4j:1.2.17' :war :fedclient :authority - compile 'org.slf4j:slf4j-api:1.6.6' :war fedclient :authority - compile 'org.slf4j:slf4j-log4j12:1.6.6' :war :fedclient :authority - compile 'javax.mail:mail:1.4.3' :war :fedclient :authority - compile 'javax.servlet:javax.servlet-api:3.0.1' :fedclient - compile 'org.eclipse.jetty.aggregate:jetty-webapp:${jetty.version}' @jar - compile 'org.eclipse.jetty:jetty-ajp:${jetty.version}' @jar - compile 'org.apache.wicket:wicket:${wicket.version}' :war !org.mockito - compile 'org.apache.wicket:wicket-auth-roles:${wicket.version}' :war !org.mockito - compile 'org.apache.wicket:wicket-extensions:${wicket.version}' :war !org.mockito - compile 'org.wicketstuff:googlecharts:${wicket.version}' :war - compile 'org.apache.lucene:lucene-core:${lucene.version}' :war :fedclient - compile 'org.apache.lucene:lucene-highlighter:${lucene.version}' :war :fedclient - compile 'org.apache.lucene:lucene-memory:${lucene.version}' :war :fedclient - compile 'org.tautua.markdownpapers:markdownpapers-core:1.3.2' :war - compile 'org.eclipse.jgit:org.eclipse.jgit:${jgit.version}' :war :fedclient :manager :authority - compile 'org.eclipse.jgit:org.eclipse.jgit.http.server:${jgit.version}' :war :fedclient :manager :authority - compile 'org.bouncycastle:bcprov-jdk15on:${bouncycastle.version}' :war :authority - compile 'org.bouncycastle:bcmail-jdk15on:${bouncycastle.version}' :war :authority - compile 'org.bouncycastle:bcpkix-jdk15on:${bouncycastle.version}' :war :authority - compile 'rome:rome:0.9' :war :manager :api - compile 'com.google.code.gson:gson:1.7.2' :war :fedclient :manager :api - compile 'org.codehaus.groovy:groovy-all:${groovy.version}' :war - compile 'com.unboundid:unboundid-ldapsdk:2.3.0' :war - compile 'org.apache.ivy:ivy:2.2.0' :war - compile 'com.toedter:jcalendar:1.3.2' :authority - compile 'org.apache.commons:commons-compress:1.4.1' :war # Commons Daemon is for launching services - provided 'commons-daemon:commons-daemon:1.0.14' - provided 'commons-daemon:commons-daemon:1.0.14:bin-windows:zip' - test 'junit' # Dependencies for Selenium web page testing - test 'org.seleniumhq.selenium:selenium-java:${selenium.version}' @jar - test 'org.seleniumhq.selenium:selenium-support:${selenium.version}' @jar - test 'org.seleniumhq.selenium:selenium-firefox-driver:${selenium.version}' # Dependencies with the "build" scope are retrieved # and injected into the Ant runtime classpath - build 'jacoco'
@@ -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,280 +120,122 @@ <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> <!-- Distrib files --> <zipfileset dir="${project.distrib.dir}/win" /> <!-- 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> <!-- Distrib files --> <tarfileset dir="${project.distrib.dir}/linux" filemode="755" /> <!-- 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 @@ -445,186 +243,50 @@ --> <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> <!-- 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,145 +294,72 @@ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ --> <target name="buildFederationClient" depends="compile" description="Builds the stand-alone Gitblit federation client"> <echo>Building Gitblit Federation Client ${gb.version}</echo> <echo>Building Gitblit Federation Client ${project.version}</echo> <genjar jarfile="${project.target.dir}/fedclient.jar"> <class name="com.gitblit.FederationClientLauncher" /> <resource file="${project.build.dir}/log4j.properties" /> <classfilter> <exclude name="org.apache." /> <exclude name="org.bouncycastle." /> <exclude name="org.eclipse." /> <exclude name="org.slf4j." /> <exclude name="com.beust." /> <exclude name="com.google." /> <exclude name="com.unboundid." /> </classfilter> <classpath refid="master-classpath" /> <manifest> <attribute name="Main-Class" value="com.gitblit.FederationClientLauncher" /> <attribute name="Specification-Version" value="${gb.version}" /> <attribute name="Release-Date" value="${gb.versionDate}" /> </manifest> </genjar> <!-- generate jar by traversing the class hierarchy of the specified classes, exclude any classes in classpath jars --> <mx:genjar tag="" excludeClasspathJars="true" destfile="${project.targetDirectory}/fedclient.jar"> <mainclass name="com.gitblit.FederationClient" /> <launcher paths="ext" /> <resource file="${project.compileOutputDirectory}/log4j.properties" /> </mx:genjar> <!-- Build the federation client zip file --> <zip destfile="${project.target.dir}/${fedclient.zipfile}"> <mx:zip destfile="${project.targetDirectory}/${fedclient.zipfile}"> <fileset dir="${basedir}"> <include name="LICENSE" /> <include name="NOTICE" /> </fileset> <fileset dir="${project.target.dir}"> <fileset dir="${project.targetDirectory}"> <include name="fedclient.jar" /> </fileset> <fileset dir="${basedir}/distrib"> <fileset dir="${project.distrib.dir}"> <include name="federation.properties" /> </fileset> </zip> <!-- include "fedclient" tagged dependencies --> <dependencies prefix="ext" tag="fedclient" /> </mx:zip> <!-- Cleanup --> <delete file="${project.target.dir}/fedclient.jar" /> <delete file="${project.targetDirectory}/fedclient.jar" /> </target> <!-- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Build a Gitblit filesystem for deployment to RedHat OpenShif Expresst Build a Gitblit filesystem for deployment to RedHat OpenShift Express ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ --> <target name="buildExpress" depends="compile" description="Build exploded WAR file suitable for deployment to OpenShift Express"> <echo>Building Gitblit Express for RedHat OpenShift ${gb.version}</echo> <echo>Building Gitblit Express for RedHat OpenShift ${project.version}</echo> <delete dir="${project.express.dir}" /> <local name="express.dir" /> <property name="express.dir" value="${project.outputDirectory}/express" /> <delete dir="${express.dir}" /> <!-- Create the OpenShift filesystem --> <property name="deployments.root" value="${project.express.dir}/deployments/ROOT.war"/> <local name="deployments.root" /> <property name="deployments.root" value="${express.dir}/deployments/ROOT.war"/> <mkdir dir="${deployments.root}" /> <touch file="${project.express.dir}/deployments/ROOT.war.dodeploy" /> <touch file="${express.dir}/deployments/ROOT.war.dodeploy" /> <!-- Copy the Gitblit OpenShift readme file --> <copy tofile="${project.express.dir}/README.gitblit" file="${basedir}/distrib/openshift.mkd"/> <local name="webinf" /> <property name="webinf" value="${deployments.root}/WEB-INF" /> <!-- Copy LICENSE and NOTICE to WEB-INF --> <copy todir="${deployments.root}/WEB-INF"> <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> <!-- Prepare the data directory --> <prepareDataDirectory toDir="${webinf}/data" /> <!-- Copy the supported Groovy hook scripts --> <mkdir dir="${deployments.root}/WEB-INF/data/groovy" /> <copy todir="${deployments.root}/WEB-INF/data/groovy"> <fileset dir="${basedir}/distrib/groovy"> <include name="sendmail.groovy" /> <include name="sendmail-html.groovy" /> <include name="jenkins.groovy" /> <include name="protect-refs.groovy" /> <include name="fogbugz.groovy" /> <include name="thebuggenie.groovy" /> </fileset> </copy> <!-- Build the WAR web.xml from the prototype web.xml and gitblit.properties --> <!-- Build the Express web.xml from the prototype web.xml and gitblit.properties --> <!-- THIS FILE IS NOT OVERRIDDEN ONCE IT IS BUILT!!! --> <java classpath="${project.build.dir}" classname="com.gitblit.build.BuildWebXml"> <classpath refid="master-classpath" /> <arg value="--sourceFile" /> <arg value="${basedir}/src/WEB-INF/web.xml" /> <arg value="--destinationFile" /> <arg value="${deployments.root}/WEB-INF/web.xml" /> <arg value="--propertiesFile" /> <arg value="${basedir}/distrib/gitblit.properties" /> </java> <!-- Set Version into web.xml --> <replace file="${deployments.root}/WEB-INF/web.xml" token="@gb.version@" value="${gb.version}" summary="yes"/> <!-- Gitblit resources --> <copy todir="${deployments.root}"> <fileset dir="${project.resources.dir}"> <exclude name="thumbs.db" /> </fileset> </copy> <!-- Gitblit library dependencies --> <mkdir dir="${deployments.root}/WEB-INF/lib"/> <copy todir="${deployments.root}/WEB-INF/lib"> <fileset dir="${basedir}/ext"> <exclude name="src/**" /> <exclude name="jcommander*.jar" /> <exclude name="jetty*.jar" /> <exclude name="junit*.jar" /> <exclude name="hamcrest*.jar" /> <exclude name="servlet*.jar" /> <exclude name="javax.servlet*.jar" /> <exclude name="jsslutils*.jar" /> <exclude name="jcalendar*.jar" /> </fileset> </copy> <mx:webxml sourcefile="${project.src.dir}/WEB-INF/web.xml" destfile="${webinf}/web.xml" propertiesFile="${project.distrib.dir}/data/gitblit.properties" skip="server.*" /> <!-- Gitblit classes --> <jar destfile="${deployments.root}/WEB-INF/lib/gitblit-${gb.version}.jar"> <fileset dir="${project.build.dir}"> <jar destfile="${webinf}/lib/gitblit.jar"> <fileset dir="${project.compileOutputDirectory}"> <exclude name="WEB-INF/" /> <exclude name="com/gitblit/tests/" /> <exclude name="com/gitblit/build/**" /> @@ -782,9 +371,24 @@ </jar> <!-- Build Express Zip file --> <zip destfile="${project.target.dir}/${express.zipfile}"> <fileset dir="${project.express.dir}" /> </zip> <mx:zip basedir="${express.dir}" destfile="${project.targetDirectory}/${express.zipfile}"> <fileset dir="${basedir}"> <include name="LICENSE" /> <include name="NOTICE" /> </fileset> <!-- README --> <zipfileset fullpath="README.gitblit" file="${project.siteSourceDirectory}/openshift.mkd" /> <!-- resources --> <zipfileset prefix="deployments/ROOT.war" dir="${project.resources.dir}"> <exclude name="thumbs.db" /> <exclude name="*.mkd" /> </zipfileset> <!-- reference.properties --> <zipfileset fullpath="deployments/ROOT.war/WEB-INF/reference.properties" file="${project.distrib.dir}/data/gitblit.properties" /> <!-- include "war" tagged dependencies --> <dependencies prefix="deployments/ROOT.war/WEB-INF/lib" tag="war" /> </mx:zip> </target> @@ -795,72 +399,64 @@ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ --> <target name="buildManager" depends="compile" description="Builds the stand-alone Gitblit Manager"> <echo>Building Gitblit Manager ${gb.version}</echo> <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 +466,69 @@ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ --> <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"> <zipfileset dir="${project.distrib.dir}/data" prefix="data"> <include name="users.conf" /> <include name="gitblit.properties" /> </zipfileset> <zipfileset dir="${project.distrib.dir}/data/certs" prefix="data/certs"> <include name="authority.conf" /> <include name="mail.tmpl" /> <include name="instructions.tmpl" /> </zipfileset> </zip> <!-- include "authority" tagged dependencies --> <dependencies prefix="ext" tag="authority" /> </mx:zip> <!-- Cleanup --> <delete file="${project.targetDirectory}/authority.jar" /> </target> <!-- @@ -941,29 +537,25 @@ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ --> <target name="buildApiLibrary" depends="compile" description="Builds the Gitblit RPC client library"> <echo>Building Gitblit API Library ${gb.version}</echo> <echo>Building Gitblit API Library ${project.version}</echo> <local name="javadoc.dir" /> <property name="javadoc.dir" value="${project.outputDirectory}/javadoc" /> <delete dir="${javadoc.dir}" /> <!-- Build API Library jar --> <genjar jarfile="${project.target.dir}/gbapi-${gb.version}.jar"> <mx:genjar tag="" excludeClasspathJars="true" destfile="${project.targetDirectory}/gbapi-${project.version}.jar"> <class name="com.gitblit.Keys" /> <class name="com.gitblit.client.GitblitClient" /> <class name="com.gitblit.models.FederationModel" /> <class name="com.gitblit.models.FederationProposal" /> <class name="com.gitblit.models.FederationSet" /> <classpath refid="master-classpath" /> <classfilter> <exclude name="com.google.gson." /> <exclude name="com.sun.syndication." /> </classfilter> <manifest> <attribute name="Specification-Version" value="${gb.version}" /> <attribute name="Release-Date" value="${gb.versionDate}" /> </manifest> </genjar> </mx:genjar> <!-- Build API sources jar --> <zip destfile="${project.target.dir}/gbapi-${gb.version}-sources.jar"> <fileset dir="${basedir}/src" defaultexcludes="yes"> <zip destfile="${project.targetDirectory}/gbapi-${project.version}-sources.jar"> <fileset dir="${project.src.dir}" defaultexcludes="yes"> <include name="com/gitblit/Constants.java"/> <include name="com/gitblit/GitBlitException.java"/> <include name="com/gitblit/Keys.java"/> @@ -974,8 +566,8 @@ </zip> <!-- Build API JavaDoc jar --> <javadoc destdir="${project.target.dir}/javadoc"> <fileset dir="${basedir}/src" defaultexcludes="yes"> <mx:javadoc destdir="${javadoc.dir}" redirect="true"> <fileset dir="${project.src.dir}" defaultexcludes="yes"> <include name="com/gitblit/Constants.java"/> <include name="com/gitblit/GitBlitException.java"/> <include name="com/gitblit/Keys.java"/> @@ -983,37 +575,34 @@ <include name="com/gitblit/models/**/*.java"/> <include name="com/gitblit/utils/**/*.java"/> </fileset> </javadoc> <zip destfile="${project.target.dir}/gbapi-${gb.version}-javadoc.jar"> <fileset dir="${project.target.dir}/javadoc" /> </mx:javadoc> <zip destfile="${project.targetDirectory}/gbapi-${project.version}-javadoc.jar"> <fileset dir="${javadoc.dir}" /> </zip> <!-- Build the API library zip file --> <zip destfile="${project.target.dir}/${gbapi.zipfile}"> <mx:zip destfile="${project.targetDirectory}/${gbapi.zipfile}"> <fileset dir="${basedir}"> <include name="LICENSE" /> <include name="NOTICE" /> </fileset> <fileset dir="${project.target.dir}"> <include name="gbapi-${gb.version}.jar" /> <include name="gbapi-${gb.version}-sources.jar" /> <include name="gbapi-${gb.version}-javadoc.jar" /> <fileset 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 +613,122 @@ Build the Gitblit Website ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ --> <target name="buildSite" depends="compile" description="Build the Gitblit website"> <target name="buildSite" depends="prepare" description="Build the Gitblit website"> <echo>Building Gitblit Website ${gb.version}</echo> <echo>Building Gitblit Website ${project.version}</echo> <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 +738,7 @@ --> <target name="updateGhPages" depends="buildSite"> <!-- Build gh-pages branch --> <java classpath="${project.build.dir}" classname="com.gitblit.build.BuildGhPages"> <classpath refid="master-classpath" /> <arg value="--sourceFolder" /> <arg value="${basedir}/target/site" /> <arg value="--repository" /> <arg value="${basedir}" /> <arg value="--obliterate" /> </java> <mx:ghpages repositorydir="${basedir}" obliterate="true" /> </target> @@ -1207,69 +747,51 @@ Publish binaries to Google Code ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ --> <target name="publishBinaries" depends="buildGO,buildWAR,buildExpress,buildFederationClient,buildManager,buildApiLibrary" description="Publish the Gitblit binaries to Google Code"> <target name="publishBinaries" depends="clean,buildGO,buildWAR,buildExpress,buildFederationClient,buildManager,buildApiLibrary" description="Publish the Gitblit binaries to Google Code"> <echo>Uploading Gitblit ${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 +802,9 @@ You must add ext/commons-net-1.4.0.jar to your ANT classpath. ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ --> <target name="publishSite" depends="buildSite,updateGhPages" description="Publish the Gitblit site to a webserver (requires ext/commons-net-1.4.0.jar)" > <target name="publishSite" depends="clean,buildSite,updateGhPages" description="Publish the Gitblit site to a webserver (requires ext/commons-net-1.4.0.jar)" > <echo>Uploading Gitblit ${gb.version} website</echo> <echo>Uploading Gitblit ${project.version} website</echo> <ftp server="${ftp.server}" userid="${ftp.user}" @@ -1290,7 +812,7 @@ remotedir="${ftp.dir}" passive="true" verbose="yes"> <fileset dir="${project.site.dir}" /> <fileset dir="${project.siteTargetDirectory}" /> </ftp> </target> @@ -1300,10 +822,189 @@ Compile from source, publish binaries, and build & deploy site ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ --> <target name="publishAll" depends="publishBinaries,publishSite"> <!-- Cleanup --> <delete dir="${project.build.dir}" /> <delete dir="${project.war.dir}" /> <delete dir="${project.deploy.dir}" /> <target name="publishAll" depends="publishBinaries,publishSite" /> <!-- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Tag a new version and prepare for the next development cycle. ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ --> <target name="tagRelease" depends="prepare"> <!-- release --> <property name="dryrun" value="false" /> <mx:version stage="release" dryrun="${dryrun}" /> <!-- commit build.moxie & releases.moxie (automatic) --> <mx:commit showtitle="no"> <message>Prepare ${project.version} release</message> <tag name="v${project.version}"> <message>${project.name} ${project.version} release</message> </tag> </mx:commit> <!-- next cycle --> <mx:version stage="snapshot" incrementNumber="incremental" dryrun="${dryrun}" /> <mx:commit showtitle="no"> <message>Reset build identifiers for next development cycle</message> </mx:commit> </target> <!-- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Build Gitblit Docs ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ --> <macrodef name="generateDocs"> <attribute name="toDir"/> <sequential> <mx:doc toDir="@{toDir}" minify="true" customless="custom.less"> <structure> <menu name="about"> <page name="overview" src="siteindex.mkd" out="index.html" headerLinks="false" /> <page name="features" src="features.mkd" /> </menu> <menu name="documentation"> <page name="setup" src="setup.mkd" /> <page name="federation" src="federation.mkd" /> <divider /> <page name="faq" src="faq.mkd" /> <page name="settings" src="properties.mkd" /> <divider /> <page name="design" src="design.mkd" /> <page name="rpc" src="rpc.mkd" /> </menu> <menu name="changelog"> <page name="current release" src="releasecurrent.mkd" /> <page name="older releases" src="releasehistory.mkd" /> </menu> <menu name="links"> <link name="Demo" src="https://demo-gitblit.rhcloud.com" /> <divider /> <link name="Github" src="${project.scmUrl}" /> <link name="Issues" src="${project.issuesUrl}" /> <link name="Discussion" src="${project.forumUrl}" /> <link name="Google+" src="${project.socialNetworkUrl}" /> <link name="Ohloh" src="http://www.ohloh.net/p/gitblit" /> </menu> </structure> <properties token="%PROPERTIES%" file="${project.distrib.dir}/data/gitblit.properties" /> <regex searchPattern="\b(issue)(\s*[#]?|-){0,1}(\d+)\b" replacePattern="<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> distrib/amd64/gitblit.exeBinary files differ
distrib/authority.cmd
File was deleted distrib/gitblit
File was deleted distrib/gitblitw.exeBinary files differ
distrib/ia64/gitblit.exeBinary files differ
distrib/install-service-centos.sh
File was deleted distrib/install-service.sh
File was deleted distrib/x86/gitblit.exeBinary files differ
docs/doc_footer.html
File was deleted docs/doc_header.html
File was deleted docs/site_footer.html
File was deleted docs/site_header.html
File was deleted gitblit.iml
@@ -5,9 +5,9 @@ <output-test url="file://$MODULE_DIR$/bin/test-classes" /> <exclude-output /> <content url="file://$MODULE_DIR$"> <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" /> <sourceFolder url="file://$MODULE_DIR$/resources" isTestSource="false" /> <sourceFolder url="file://$MODULE_DIR$/tests" isTestSource="true" /> <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" /> <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" /> <sourceFolder url="file://$MODULE_DIR$/src/main/resources" isTestSource="false" /> </content> <orderEntry type="sourceFolder" forTests="false" /> <orderEntry type="module-library"> @@ -17,7 +17,7 @@ </CLASSES> <JAVADOC /> <SOURCES> <root url="jar://$MODULE_DIR$/ext/src/jcommander-1.17-sources.jar!/" /> <root url="jar://$MODULE_DIR$/ext/src/jcommander-1.17.jar!/" /> </SOURCES> </library> </orderEntry> @@ -28,7 +28,7 @@ </CLASSES> <JAVADOC /> <SOURCES> <root url="jar://$MODULE_DIR$/ext/src/log4j-1.2.17-sources.jar!/" /> <root url="jar://$MODULE_DIR$/ext/src/log4j-1.2.17.jar!/" /> </SOURCES> </library> </orderEntry> @@ -39,7 +39,7 @@ </CLASSES> <JAVADOC /> <SOURCES> <root url="jar://$MODULE_DIR$/ext/src/slf4j-api-1.6.6-sources.jar!/" /> <root url="jar://$MODULE_DIR$/ext/src/slf4j-api-1.6.6.jar!/" /> </SOURCES> </library> </orderEntry> @@ -50,7 +50,7 @@ </CLASSES> <JAVADOC /> <SOURCES> <root url="jar://$MODULE_DIR$/ext/src/slf4j-log4j12-1.6.6-sources.jar!/" /> <root url="jar://$MODULE_DIR$/ext/src/slf4j-log4j12-1.6.6.jar!/" /> </SOURCES> </library> </orderEntry> @@ -61,7 +61,7 @@ </CLASSES> <JAVADOC /> <SOURCES> <root url="jar://$MODULE_DIR$/ext/src/mail-1.4.3-sources.jar!/" /> <root url="jar://$MODULE_DIR$/ext/src/mail-1.4.3.jar!/" /> </SOURCES> </library> </orderEntry> @@ -72,7 +72,7 @@ </CLASSES> <JAVADOC /> <SOURCES> <root url="jar://$MODULE_DIR$/ext/src/javax.servlet-api-3.0.1-sources.jar!/" /> <root url="jar://$MODULE_DIR$/ext/src/javax.servlet-api-3.0.1.jar!/" /> </SOURCES> </library> </orderEntry> @@ -83,7 +83,7 @@ </CLASSES> <JAVADOC /> <SOURCES> <root url="jar://$MODULE_DIR$/ext/src/jetty-webapp-7.6.8.v20121106-sources.jar!/" /> <root url="jar://$MODULE_DIR$/ext/src/jetty-webapp-7.6.8.v20121106.jar!/" /> </SOURCES> </library> </orderEntry> @@ -94,7 +94,7 @@ </CLASSES> <JAVADOC /> <SOURCES> <root url="jar://$MODULE_DIR$/ext/src/jetty-ajp-7.6.8.v20121106-sources.jar!/" /> <root url="jar://$MODULE_DIR$/ext/src/jetty-ajp-7.6.8.v20121106.jar!/" /> </SOURCES> </library> </orderEntry> @@ -105,7 +105,7 @@ </CLASSES> <JAVADOC /> <SOURCES> <root url="jar://$MODULE_DIR$/ext/src/wicket-1.4.21-sources.jar!/" /> <root url="jar://$MODULE_DIR$/ext/src/wicket-1.4.21.jar!/" /> </SOURCES> </library> </orderEntry> @@ -116,7 +116,7 @@ </CLASSES> <JAVADOC /> <SOURCES> <root url="jar://$MODULE_DIR$/ext/src/wicket-auth-roles-1.4.21-sources.jar!/" /> <root url="jar://$MODULE_DIR$/ext/src/wicket-auth-roles-1.4.21.jar!/" /> </SOURCES> </library> </orderEntry> @@ -127,7 +127,7 @@ </CLASSES> <JAVADOC /> <SOURCES> <root url="jar://$MODULE_DIR$/ext/src/wicket-extensions-1.4.21-sources.jar!/" /> <root url="jar://$MODULE_DIR$/ext/src/wicket-extensions-1.4.21.jar!/" /> </SOURCES> </library> </orderEntry> @@ -138,7 +138,7 @@ </CLASSES> <JAVADOC /> <SOURCES> <root url="jar://$MODULE_DIR$/ext/src/googlecharts-1.4.21-sources.jar!/" /> <root url="jar://$MODULE_DIR$/ext/src/googlecharts-1.4.21.jar!/" /> </SOURCES> </library> </orderEntry> @@ -149,7 +149,7 @@ </CLASSES> <JAVADOC /> <SOURCES> <root url="jar://$MODULE_DIR$/ext/src/lucene-core-3.6.1-sources.jar!/" /> <root url="jar://$MODULE_DIR$/ext/src/lucene-core-3.6.1.jar!/" /> </SOURCES> </library> </orderEntry> @@ -160,7 +160,7 @@ </CLASSES> <JAVADOC /> <SOURCES> <root url="jar://$MODULE_DIR$/ext/src/lucene-highlighter-3.6.1-sources.jar!/" /> <root url="jar://$MODULE_DIR$/ext/src/lucene-highlighter-3.6.1.jar!/" /> </SOURCES> </library> </orderEntry> @@ -171,7 +171,7 @@ </CLASSES> <JAVADOC /> <SOURCES> <root url="jar://$MODULE_DIR$/ext/src/lucene-memory-3.6.1-sources.jar!/" /> <root url="jar://$MODULE_DIR$/ext/src/lucene-memory-3.6.1.jar!/" /> </SOURCES> </library> </orderEntry> @@ -182,7 +182,7 @@ </CLASSES> <JAVADOC /> <SOURCES> <root url="jar://$MODULE_DIR$/ext/src/lucene-queries-3.6.1-sources.jar!/" /> <root url="jar://$MODULE_DIR$/ext/src/lucene-queries-3.6.1.jar!/" /> </SOURCES> </library> </orderEntry> @@ -202,40 +202,40 @@ </CLASSES> <JAVADOC /> <SOURCES> <root url="jar://$MODULE_DIR$/ext/src/markdownpapers-core-1.3.2-sources.jar!/" /> <root url="jar://$MODULE_DIR$/ext/src/markdownpapers-core-1.3.2.jar!/" /> </SOURCES> </library> </orderEntry> <orderEntry type="module-library"> <library name="org.eclipse.jgit-2.2.0.201212191850-r.jar"> <library name="org.eclipse.jgit-2.3.1.201302201838-r.jar"> <CLASSES> <root url="jar://$MODULE_DIR$/ext/org.eclipse.jgit-2.2.0.201212191850-r.jar!/" /> <root url="jar://$MODULE_DIR$/ext/org.eclipse.jgit-2.3.1.201302201838-r.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES> <root url="jar://$MODULE_DIR$/ext/src/org.eclipse.jgit-2.2.0.201212191850-r-sources.jar!/" /> <root url="jar://$MODULE_DIR$/ext/src/org.eclipse.jgit-2.3.1.201302201838-r.jar!/" /> </SOURCES> </library> </orderEntry> <orderEntry type="module-library"> <library name="jsch-0.1.44-1.jar"> <library name="jsch-0.1.46.jar"> <CLASSES> <root url="jar://$MODULE_DIR$/ext/jsch-0.1.44-1.jar!/" /> <root url="jar://$MODULE_DIR$/ext/jsch-0.1.46.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES> <root url="jar://$MODULE_DIR$/ext/src/jsch-0.1.44-1-sources.jar!/" /> <root url="jar://$MODULE_DIR$/ext/src/jsch-0.1.46.jar!/" /> </SOURCES> </library> </orderEntry> <orderEntry type="module-library"> <library name="org.eclipse.jgit.http.server-2.2.0.201212191850-r.jar"> <library name="org.eclipse.jgit.http.server-2.3.1.201302201838-r.jar"> <CLASSES> <root url="jar://$MODULE_DIR$/ext/org.eclipse.jgit.http.server-2.2.0.201212191850-r.jar!/" /> <root url="jar://$MODULE_DIR$/ext/org.eclipse.jgit.http.server-2.3.1.201302201838-r.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES> <root url="jar://$MODULE_DIR$/ext/src/org.eclipse.jgit.http.server-2.2.0.201212191850-r-sources.jar!/" /> <root url="jar://$MODULE_DIR$/ext/src/org.eclipse.jgit.http.server-2.3.1.201302201838-r.jar!/" /> </SOURCES> </library> </orderEntry> @@ -246,7 +246,7 @@ </CLASSES> <JAVADOC /> <SOURCES> <root url="jar://$MODULE_DIR$/ext/src/bcprov-jdk15on-1.47-sources.jar!/" /> <root url="jar://$MODULE_DIR$/ext/src/bcprov-jdk15on-1.47.jar!/" /> </SOURCES> </library> </orderEntry> @@ -257,7 +257,7 @@ </CLASSES> <JAVADOC /> <SOURCES> <root url="jar://$MODULE_DIR$/ext/src/bcmail-jdk15on-1.47-sources.jar!/" /> <root url="jar://$MODULE_DIR$/ext/src/bcmail-jdk15on-1.47.jar!/" /> </SOURCES> </library> </orderEntry> @@ -268,7 +268,7 @@ </CLASSES> <JAVADOC /> <SOURCES> <root url="jar://$MODULE_DIR$/ext/src/bcpkix-jdk15on-1.47-sources.jar!/" /> <root url="jar://$MODULE_DIR$/ext/src/bcpkix-jdk15on-1.47.jar!/" /> </SOURCES> </library> </orderEntry> @@ -279,7 +279,7 @@ </CLASSES> <JAVADOC /> <SOURCES> <root url="jar://$MODULE_DIR$/ext/src/rome-0.9-sources.jar!/" /> <root url="jar://$MODULE_DIR$/ext/src/rome-0.9.jar!/" /> </SOURCES> </library> </orderEntry> @@ -290,7 +290,7 @@ </CLASSES> <JAVADOC /> <SOURCES> <root url="jar://$MODULE_DIR$/ext/src/jdom-1.0-sources.jar!/" /> <root url="jar://$MODULE_DIR$/ext/src/jdom-1.0.jar!/" /> </SOURCES> </library> </orderEntry> @@ -301,7 +301,7 @@ </CLASSES> <JAVADOC /> <SOURCES> <root url="jar://$MODULE_DIR$/ext/src/gson-1.7.2-sources.jar!/" /> <root url="jar://$MODULE_DIR$/ext/src/gson-1.7.2.jar!/" /> </SOURCES> </library> </orderEntry> @@ -312,7 +312,7 @@ </CLASSES> <JAVADOC /> <SOURCES> <root url="jar://$MODULE_DIR$/ext/src/groovy-all-1.8.8-sources.jar!/" /> <root url="jar://$MODULE_DIR$/ext/src/groovy-all-1.8.8.jar!/" /> </SOURCES> </library> </orderEntry> @@ -323,7 +323,7 @@ </CLASSES> <JAVADOC /> <SOURCES> <root url="jar://$MODULE_DIR$/ext/src/unboundid-ldapsdk-2.3.0-sources.jar!/" /> <root url="jar://$MODULE_DIR$/ext/src/unboundid-ldapsdk-2.3.0.jar!/" /> </SOURCES> </library> </orderEntry> @@ -334,7 +334,7 @@ </CLASSES> <JAVADOC /> <SOURCES> <root url="jar://$MODULE_DIR$/ext/src/ivy-2.2.0-sources.jar!/" /> <root url="jar://$MODULE_DIR$/ext/src/ivy-2.2.0.jar!/" /> </SOURCES> </library> </orderEntry> @@ -354,7 +354,7 @@ </CLASSES> <JAVADOC /> <SOURCES> <root url="jar://$MODULE_DIR$/ext/src/commons-compress-1.4.1-sources.jar!/" /> <root url="jar://$MODULE_DIR$/ext/src/commons-compress-1.4.1.jar!/" /> </SOURCES> </library> </orderEntry> @@ -365,28 +365,226 @@ </CLASSES> <JAVADOC /> <SOURCES> <root url="jar://$MODULE_DIR$/ext/src/xz-1.0-sources.jar!/" /> <root url="jar://$MODULE_DIR$/ext/src/xz-1.0.jar!/" /> </SOURCES> </library> </orderEntry> <orderEntry type="module-library" scope="TEST"> <library name="junit-4.10.jar"> <orderEntry type="module-library" scope="PROVIDED"> <library name="commons-daemon-1.0.14.jar"> <CLASSES> <root url="jar://$MODULE_DIR$/ext/junit-4.10.jar!/" /> <root url="jar://$MODULE_DIR$/ext/commons-daemon-1.0.14.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES> <root url="jar://$MODULE_DIR$/ext/src/junit-4.10-sources.jar!/" /> <root url="jar://$MODULE_DIR$/ext/src/commons-daemon-1.0.14.jar!/" /> </SOURCES> </library> </orderEntry> <orderEntry type="module-library" scope="PROVIDED"> <library name="commons-daemon-1.0.14-bin-windows.zip"> <CLASSES> <root url="jar://$MODULE_DIR$/ext/commons-daemon-1.0.14-bin-windows.zip!/" /> </CLASSES> <JAVADOC /> <SOURCES /> </library> </orderEntry> <orderEntry type="module-library" scope="TEST"> <library name="junit-4.11.jar"> <CLASSES> <root url="jar://$MODULE_DIR$/ext/junit-4.11.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES> <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" /> releases.moxie
New file @@ -0,0 +1,694 @@ # # ${project.version} # r17: { title: Gitblit ${project.version} Released id: ${project.version} date: ${project.buildDate} fixes: - Could not reset settings with $ or { characters through Gitblit Manager because they are not properly escaped additions: - Option to force client-side basic authentication instead of form-based authentication if web.authenticateViewPages=true (issue 222) - Optional periodic LDAP user and team pre-fetching & synchronization - Display name and version in Tomcat Manager - FogBugz post-receive hook script - Implemented multiple repository owners - Chinese translation contributors: - github/furinzen - github/mschaefers - github/thefake - github/djschny - github/akquinet - github/dapengme - github/yin8086 } # # 1.2.1 # r16: { title: Gitblit 1.2.1 Released id: 1.2.1 date: 2013-01-15 note: '' Because there are now several types of files and folders that must be considered Gitblit data, the default location for data has changed. You will need to move a few files around when upgrading. Please see the Upgrading section of the <a href="setup.html">setup</a> page for details. <b>Express Users</b> make sure to update your web.xml file with the ${baseFolder} values! '' fixes: - Fixed nullpointer on recursively calculating folder sizes when there is a named pipe or symlink in the hierarchy - Added nullchecking when concurrently forking a repository and trying to display the fork network (issue-187) - Fixed bug where permission changes were not visible in the web ui to a logged-in user until the user logged-out and then logged back in again (issue-186) - Fixed nullpointer on creating a repository with mixed case (issue 185) - Include missing model classes in api library (issue-184) - Fixed nullpointer when using *web.allowForking = true* && *git.cacheRepositoryList = false* (issue 182) - Likely fix for commit and commitdiff page failures when a submodule reference changes (issue 178) - Build project models from the repository model cache, when possible, to reduce page load time (issue 172) - Fixed loading of Brazilian Portuguese translation from *nix server additions: - ''Fanout PubSub service for self-hosted [Sparkleshare](http://sparkleshare.org) notifications. This service is disabled by default.'' - ''Implemented a simple push log based on a hidden, orphan branch refs/gitblit/pushes (issue 177) The push log is not currently visible in the ui, but the data will be collected and it will be exposed to the ui in the next release.'' - Support for locally and remotely authenticated accounts in LdapUserService and RedmineUserService (issue 183) - Added Dutch translation changes: - ''Gitblit GO and Gitblit WAR are now both configured by `gitblit.properties`. WAR is no longer configured by `web.xml`. However, Express for OpenShift continues to be configured by `web.xml`.'' - Support for a *--baseFolder* command-line argument for Gitblit GO and Gitblit Certificate Authority - Support for specifying a *${baseFolder}* parameter in `gitblit.properties` and `web.xml` for several settings - Improve history display of a submodule link - Updated Korean translation - Updated checkstyle definition settings: - { name: fanout.bindInterface, defaultValue: localhost } - { name: fanout.port, defaultValue: 0 } - { name: fanout.useNio, defaultValue: 'true' } - { name: fanout.connectionLimit, defaultValue: 0 } contributors: - github/mystygage - github/ds5apn - github/kwoot - github/inaiat } # # 1.2.0 # r15: { title: Gitblit 1.2.0 Released id: 1.2.0 date: 2012-12-31 note: '' The permissions model has changed in the 1.2.0 release. If you are updating your server, you must also update any Gitblit Manager and Federation Client installs to 1.2.0 as well. The data model used by the RPC mechanism has changed slightly for the new permissions infrastructure. '' fixes: - Fixed regression in *isFrozen* (issue 181) - Author metrics can be broken by newlines in email addresses from converted repositories (issue 176) - Set subjectAlternativeName on generated SSL cert if CN is an ip address (issue 170) - Fixed incorrect links on history page for files not in the current/active commit (issue 166) - Empty repository page failed to handle missing repository (issue 160) - Fixed broken ticgit urls (issue 157) - Exclude submodules from zip downloads (issue 151) - Fixed bug where repository ownership was not updated on rename user - Fixed bug in create/rename repository if you explicitly specified the alias for the root group (e.g. main/myrepo) (issue 143) - Wrapped Markdown parser with improved exception handler (issue 142) - Fixed duplicate entries in repository cache (issue 140) - Fixed connection leak in LDAPUserService (issue 139) - Fixed bug in commit page where changes to a submodule threw a null pointer exception (issue 132) - Fixed bug in the diff view for filenames that have non-ASCII characters (issue 128) additions: - '' Implemented discrete repository permissions (issue 36) - V (view in web ui, RSS feeds, download zip) - R (clone) - RW (clone and push) - RWC (clone and push with ref creation) - RWD (clone and push with ref creation, deletion) - RW+ (clone and push with ref creation, deletion, rewind) While not as sophisticated as Gitolite, this does give finer access controls. These permissions fit in cleanly with the existing users.conf and users.properties files. In Gitblit <= 1.1.0, all your existing user accounts have RW+ access. If you are upgrading to 1.2.0, the RW+ access is *preserved* and you will have to lower/adjust accordingly. '' - ''Implemented *case-insensitive* regex repository permission matching (issue 36) This allows you to specify a permission like `RW:mygroup/.*` to grant push privileges to all repositories within the *mygroup* project/folder.'' - Added DELETE, CREATE, and NON-FAST-FORWARD ref change logging - ''Added support for personal repositories. Personal repositories can be created by accounts with the *create* permission and are stored in *git.repositoriesFolder/~username*. Each user with personal repositories will have a user page, something like the GitHub profile page. Personal repositories have all the same features as common repositories, except personal repositories can be renamed by their owner.'' - ''Added support for server-side forking of a repository to a personal repository (issue 137) In order to fork a repository, the user account must have the *fork* permission **and** the repository must *allow forks*. The clone inherits the access list of its origin. i.e. if Team A has clone access to the origin repository, then by default Team A also has clone access to the fork. This is to facilitate collaboration. The fork owner may change access to the fork and add/remove users/teams, etc as required <u>however</u> it should be noted that all personal forks will be enumerated in the fork network regardless of access view restrictions. If you really must have an invisible fork, the clone it locally, create a new repository for your invisible fork, and push it back to Gitblit.'' - Added optional *create-on-push* support - Added **experimental** JGit-based garbage collection service. This service is disabled by default. - ''Added support for X509 client certificate authentication. (issue 106) You can require all git servlet access be authenticated by a client certificate. You may also specify the OID fingerprint to use for mapping a certificate to a username. It should be noted that the user account MUST already exist in Gitblit for this authentication mechanism to work; this mechanism can not be used to automatically create user accounts from a certificate.'' - Revised clean install certificate generation to create a Gitblit GO Certificate Authority certificate; an SSL certificate signed by the CA certificate; and to create distinct server key and server trust stores. <u>The store files have been renamed!</u> - Added support for Gitblit GO to require usage of client certificates to access the entire server. - Added **Gitblit Certificate Authority**, an x509 PKI management tool for Gitblit GO to encourage use of x509 client certificate authentication. - Added web.shortCommitId setting to control length of shortened commit ids - Added alternate compressed download formats: tar.gz, tar.xz, tar.bzip2 (issue 174) - Added simple project pages. A project is a subfolder off the *git.repositoriesFolder*. - Added support for X-Forwarded-Context for Apache subdomain proxy configurations (issue 135) - Delete branch feature (issue 121) - Added line links to blob view (issue 130) - Added HTML sendmail hook script and Gitblit.sendHtmlMail method - Added RedmineUserService - Support for committer verification. Requires use of *--no-ff* when merging branches or pull requests. See setup page for details. - Added Brazilian Portuguese translation changes: - Added server setting to specify keystore alias for ssl certificate (issue 98) - Added optional global and per-repository activity page commit contribution throttle to help tame *really* active repositories (issue 173) - Added support for symlinks in tree page and commit page (issue 171) - All access restricted servlets (e.g. DownloadZip, RSS, etc) will try to authenticate using X509 certificates, container principals, cookies, and BASIC headers, in that order. - Added *groovy* and *scala* to *web.prettyPrintExtensions* - Added short commit id column to log and history tables (issue 168) - Teams can now specify the *admin*, *create*, and *fork* roles to simplify user administration - Use https Gravatar urls to avoid browser complaints - Added frm to default pretty print extensions (issue 156) - Expose ReceivePack to Groovy push hooks (issue 125) - Redirect to summary page when refreshing the empty repository page on a repository that is not empty (issue 129) - Emit a warning in the log file if running on a Tomcat-based servlet container which is unfriendly to %2F forward-slash url encoding AND Gitblit is configured to mount parameters with %2F forward-slash url encoding (issue 126) - ''LDAP admin attribute setting is now consistent with LDAP teams setting and admin teams list. If *realm.ldap.maintainTeams==true* **AND** *realm.ldap.admins* is not empty, then User.canAdmin() is controlled by LDAP administrative team membership. Otherwise, User.canAdmin() is controlled by Gitblit.'' - Support servlet container authentication for existing UserModels (issue 68) settings: - { name: web.allowForking, defaultValue: 'true' } - { name: git.allowCreateOnPush, defaultValue: 'true' } - { name: git.allowGarbageCollection, defaultValue: 'false' } - { name: git.garbageCollectionHour, defaultValue: 0 } - { name: git.defaultGarbageCollectionThreshold, defaultValue: 500k } - { name: git.defaultGarbageCollectionPeriod, defaultValue: 7 days } - { name: git.requireClientCertificates, defaultValue: 'false' } - { name: git.enforceCertificateValidity, defaultValue: 'true' } - { name: git.certificateUsernameOIDs, defaultValue: CN } - { name: web.shortCommitIdLength, defaultValue: 8 } - { name: web.compressedDownloads, defaultValue: zip gz } - { name: server.requireClientCertificates, defaultValue: 'false' } dependencyChanges: - Jetty 7.6.8 - JGit 2.2.0.201212191850-r - Groovy 1.8.8 - Wicket 1.4.21 - Lucene 3.6.1 - BouncyCastle 1.47 - MarkdownPapers 1.3.2 - JCalendar 1.3.2 - Commons-Compress 1.4.1 - XZ for Java 1.0 contributors: - github/rafaelcavazin - github/mallowlabs - github/sauthieg - github/ajermakovics - github/kevinanderson1 - github/jpyeron } # # 1.1.0 # r14: { title: Gitblit 1.1.0 Released id: 1.1.0 date: 2012-08-25 note: If you are updating from an earlier release AND you have indexed branches with the Lucene indexing feature, you need to be aware that this release will completely re-index your repositories. Please be sure to provide ample heap resources as appropriate for your installation. fixes: - Bypass Wicket's inability to handle direct url addressing of a view-restricted, grouped repository for new, unauthenticated sessions (e.g. click link from email or rss feed without having an active Wicket session) - Fixed MailExecutor's failure to cope with mail server connection troubles resulting in 100% CPU usage - Fixed generated urls in Groovy *sendmail* hook script for grouped repositories - Fixed generated urls in RSS feeds for grouped repositories - Fixed nullpointer exception in git servlet security filter (issue 123) - Eliminated an unnecessary repository enumeration call on the root page which should result in faster page loads (issue 103) - Gitblit could not delete a Lucene index in a working copy on index upgrade - Do not index submodule links (issue 119) - Restore original user or team object on failure to update (issue 118) - Fixes to relative path determination in repository search algorithm for symlinks (issue 116) - Fix to GitServlet to allow pushing to symlinked repositories (issue 116) - Repository URL now uses `X-Forwarded-Proto` and `X-Forwarded-Port`, if available, for reverse proxy configurations (issue 115) - Output real RAW content, not simulated RAW content (issue 114) - Fixed Lucene charset encoding bug when reindexing a repository (issue 112) - Fixed search box linking to Lucene page for grouped repository on Tomcat (issue 111) - Fixed null pointer in LdapUserSerivce if account has a null email address (issue 110) - Really fixed failure to update a GO setting from the manager (issue 85) additions: - Identified repository list is now cached by default to reduce disk io and to improve performance (issue 103) - Preliminary bare repository submodule support - '' *git.submoduleUrlPatterns* is a space-delimited list of regular expressions for extracting a repository name from a submodule url. For example, `git.submoduleUrlPatterns = .*?://github.com/(.*)` would extract *gitblit/gitblit.git* from *git://github.git/gitblit/gitblit.git* **Note:** You may not need this control to work with submodules, but it is there if you do. - If there are no matches from *git.submoduleUrlPatterns* then the repository name is assumed to be whatever comes after the last `/` character *(e.g. gitblit.git)* - Gitblit will try to locate this repository relative to the current repository *(e.g. myfolder/myrepo.git, myfolder/mysubmodule.git)* and then at the root level *(mysubmodule.git)* if that fails. - Submodule references in a working copy will be properly identified as gitlinks, but Gitblit will not traverse into the working copy submodule repository. '' - '' Added a repository setting to control authorization as AUTHENTICATED or NAMED. (issue 117) NAMED is the original behavior for authorizing against a list of permitted users or permitted teams. AUTHENTICATED allows restricted access for any authenticated user. This is a looser authorization control. '' - Added default authorization control setting (AUTHENTICATED or NAMED) - Added setting to control how deep Gitblit will recurse into *git.repositoriesFolder* looking for repositories (issue 103) - Added setting to specify regex exclusions for repositories (issue 103) - Blob page now supports displaying images (issue 6) - Non-image binary files can now be downloaded using the RAW link - Support StartTLS in LdapUserService (issue 122) - Added Korean translation changes: - Line breaks inserted for readability in raw Markdown content display in the event of a parsing/transformation error. An error message is now displayed prepended to the raw content. - Improve UTF-8 reading for Markdown files - Updated Polish translation - Updated Japanese translation - Updated Spanish translation settings: - { name: git.cacheRepositoryList, defaultValue: 'true' } - { name: git.submoduleUrlPatterns, defaultValue: * } - { name: git.searchExclusions, defaultValue: * } - { name: git.searchRecursionDepth, defaultValue: -1 } - { name: git.defaultAuthorizationControl, defaultValue: NAMED } contributors: - Steffen Gebert } # # 1.0.0 # r13: { title: Gitblit 1.0.0 Released id: 1.0.0 date: 2012-07-14 fixes: - Fixed bug in Lucene search where old/stale blobs were never properly deleted during incremental updates. This resulted in duplicate blob entries in the index. - Fixed intermittent bug in identifying line numbers in Lucene search (issue 105) - Adjust repository identification algorithm to handle the scenario where a repository name collides with a group/folder name (e.g. foo.git and foo/bar.git) (issue 104) - Fixed bug where a repository set as *authenticated push* did not have anonymous clone access (issue 96) - Fixed bug in Basic authentication if passwords had a colon - Fixed bug where the Gitblit Manager could not update a setting that was not referenced in reference.properties (issue 85) changes: - ''**Updated Lucene index version which will force a rebuild of ALL your Lucene indexes** Make sure to properly set *web.blobEncodings* before starting Gitblit if you are updating! (issue 97)'' - Changed default layout for web ui from Fixed-Width layout to Responsive layout (issue 101) - ''IUserService interface has changed to better accomodate custom authentication and/or custom authorization< The default `users.conf` now supports persisting display names and email addresses.'' - Updated Japanese translation additions: - Added setting to allow specification of a robots.txt file (issue 99) - ''Added setting to control Responsive layout or Fixed-Width layout (issue 101) Responsive layout is now the default. This layout gracefully scales the web ui from a desktop layout to a mobile layout by hiding page components. It is easy to try, just resize your browser or point your Android/iOS device to the url of your Gitblit install.'' - Added setting to control charsets for blob string decoding. Default encodings are UTF-8, ISO-8859-1, and the server default charset. (issue 97) - ''Exposed JGit internal configuration settings in gitblit.properties/web.xml (issue 93) Review your `gitblit.properties` or `web.xml` for detailed explanations of these settings.'' - Added default access restriction. Applies to new repositories and repositories that have not been configured with Gitblit. (issue 88) - Added Ivy 2.2.0 dependency which enables Groovy Grapes, a mechanism to resolve and retrieve library dependencies from a Maven 2 repository within a Groovy push hook script - ''Added setting to control Groovy Grape root folder (location where resolved dependencies are stored) [Grape](http://groovy.codehaus.org/Grape) allows you to add Maven dependencies to your pre-/post-receive hook script classpath.'' - Added LDAP User Service with many new *realm.ldap* keys - ''Added support for custom repository properties for Groovy hooks Custom repository properties complement hook scripts by providing text field prompts in the web ui and the Gitblit Manager for the defined properties. This allows your push hooks to be parameterized.'' - Added script to facilitate proxy environment setup on Linux - Added Polish translation - Added Spanish translation settings: - { name: groovy.grapeFolder, defaultValue: groovy/grape } - { name: web.robots.txt, defaultValue: } - { name: web.useResponsiveLayout, defaultValue: 'true' } - { name: web.blobEncodings, defaultValue: UTF-8 ISO-8859-1 } - { name: git.defaultAccessRestriction, defaultValue: NONE } - { name: git.packedGitWindowSize, defaultValue: 8k } - { name: git.packedGitLimit, defaultValue: 10m } - { name: git.deltaBaseCacheLimit, defaultValue: 10m } - { name: git.packedGitOpenFiles, defaultValue: 128 } - { name: git.streamFileThreshold, defaultValue: 50m } - { name: git.packedGitMmap, defaultValue: 'false' } dependencyChanges: - Bootstrap 2.0.4 - JGit 2.0.0.201206130900-r - Groovy 1.8.6 - Gson 1.7.2 - Log4J 1.2.17 - SLF4J 1.6.6 - Apache Commons Daemon 1.0.10 - Ivy 2.2.0 contributors: - Eduardo Guervos Narvaez - Lukasz Jader - github/mragab - github/jcrygier - github/zakki - github/peterloron } # # 0.9.3 # r12: { title: Gitblit 0.9.3 Released id: 0.9.3 date: 2012-04-11 fixes: - Fixed bug where you could not remove all selections from a RepositoryModel list (permitted users, permitted teams, hook scripts, federation sets, etc) (issue 81) - Automatically set *java.awt.headless=true* for Gitblit GO } # # 0.9.2 # r11: { title: Gitblit 0.9.2 Released id: 0.9.2 date: 2012-04-04 changes: - Added *clientLogger* bound variable to Groovy hook mechanism to allow custom info and error messages to be returned to the client fixes: - Fixed absolute path/canonical path discrepancy between Gitblit and JGit regarding use of symlinks (issue 78) - Fixed row layout on activity page (issue 79) - Fixed Centos service script - Fixed EditRepositoryPage for IE8; missing save button (issue 80) contributors: - github/jonnybbb - github/mohamedmansour - github/jcrygier } # # 0.9.1 # r10: { title: Gitblit 0.9.1 Released id: 0.9.1 date: 2012-03-27 fixes: - Lucene folder was stored in working copy instead of in .git folder } # # 0.9.0 # r9: { title: Gitblit 0.9.0 Released id: 0.9.0 date: 2012-03-27 security: - Fixed session fixation vulnerability where the session identifier was not reset during the login process (issue 62) changes: - Reject pushes to a repository with a working copy (i.e. non-bare repository) (issue-49) - Changed default web.datetimestampLongFormat from *EEEE, MMMM d, yyyy h:mm a z* to *EEEE, MMMM d, yyyy HH:mm Z* (issue 50) - Expanded commit age coloring from 2 days to 30 days (issue 57) additions: - ''Added optional Lucene branch indexing (issue 16) Repository branches may be optionally indexed by Lucene for improved searching. To use this feature you must specify which branches to index within the *Edit Repository* page; _no repositories are automatically indexed_. Gitblit will build or incrementally update enrolled repositories on a 2 minute cycle. (i.e you will have to wait 2-3 minutes after respecifying indexed branches or pushing new commits before Gitblit will build/update the repository Lucene index.) If a repository has Lucene-indexed branches the *search* form on the repository pages will redirect to the root-level Lucene search page and only the content of those branches can be searched.<br/> If the repository does not specify any indexed branches then repository commit-traversal search is used. **Note:** Initial indexing of an existing repository can be memory-exhaustive. Be sure to provide your Gitblit server adequate heap space to index your repositories (e.g. -Xmx1024M).<br/> See the [setup](setup.html) page for additional details.'' - Allow specifying timezone to use for Gitblit which is independent of both the JVM and the system timezone (issue 54) - Added a built-in AJP connector for integrating Gitblit GO into an Apache mod_proxy setup (issue 59) - ''On the Repositories page show a bang *!* character in the color swatch of a repository with a working copy (issue 49) Push requests to these repositories will be rejected.'' - On all non-bare Repository pages show *WORKING COPY* in the upper right corner (issue 49) - New setting to prevent display/serving non-bare repositories - Added *protect-refs.groovy* - Allow setting default branch (relinking HEAD) to a branch or a tag - Added Ubuntu service init script (issue 72) - Added partial Japanese translation fixes: - Ensure that Welcome message is parsed using UTF-8 encoding (issue 74) - Activity page chart layout broken by Google (issue 73) - Uppercase repositories not selectable in edit palettes (issue 71) - Not all git notes were properly displayed on the commit page (issue 70) - Activity page now displays all local branches (issue 65) - Fixed (harmless) nullpointer on pushing to an empty repository (issue 69) - Fixed possible nullpointer from the servlet container on startup (issue 67) - Fixed UTF-8 encoding bug on diff page (issue 66) - Fixed timezone bugs on the activity page (issue 54) - Prevent add/edit team with no selected repositories (issue 56) - Disallow browser autocomplete on add/edit user/team/repository pages - Fixed username case-sensitivity issues (issue 43) - Disregard searching a subfolder if Gitblit does not have filesystem permissions (issue 51) settings: - { name: web.allowLuceneIndexing, defaultValue: 'true' } - { name: web.luceneIgnoreExtensions, defaultValue: 7z arc arj bin bmp dll doc docx exe gif gz jar jpg lib lzh odg odf odt pdf ppt png so swf xcf xls xlsx zip } - { name: web.timezone, defaultValue: } - { name: server.ajpPort, defaultValue: 0 } - { name: server.ajpBindInterface, defaultValue: localhost } - { name: git.onlyAccessBareRepositories, defaultValue: 'false' } dependencyChanges: - Bootstrap 2.0.2 - MarkdownPapers 1.2.7 - JGit 1.3.0.201202151440-r - Wicket 1.4.20 contributors: - github/lemval - github/zakki - github/plm } # # 0.8.2 # r8: { title: Gitblit 0.8.2 Released id: 0.8.2 date: 2012-01-13 fixes: - Fixed bug when upgrading from users.properties to users.conf (issue 41) } # # 0.8.1 # r7: { title: Gitblit 0.8.1 Released id: 0.8.1 date: 2012-01-11 fixes: - Include missing icon resource for the manager (issue 40) - Fixed sendmail.groovy message content with incorrect tag/branch labels } # # 0.8.0 # r6: { title: Gitblit 0.8.0 Released id: 0.8.0 date: 2012-01-11 additions: - ''Platform-independent, Groovy push hook script mechanism. Hook scripts can be set per-repository, per-team, or globally for all repositories.'' - ''*sendmail.groovy* for optional email notifications on push. You must properly configure your SMTP server settings in `gitblit.properties` or `web.xml` to use *sendmail.groovy*.'' - New global key for mailing lists. This is used in conjunction with the *sendmail.groovy* hook script. All repositories that use the *sendmail.groovy* script will include these addresses in the notification process. Please see the Setup page for more details about configuring sendmail. - *com.gitblit.GitblitUserService*. This is a wrapper object for the built-in user service implementations. For those wanting to only implement custom authentication it is recommended to subclass GitblitUserService and override the appropriate methods. Going forward, this will help insulate custom authentication from new IUserService API and/or changes in model classes. - ''New default user service implementation: *com.gitblit.ConfigUserService* (`users.conf`) This user service implementation allows for serialization and deserialization of more sophisticated Gitblit User objects without requiring the encoding trickery now present in FileUserService (users.properties). This will open the door for more advanced Gitblit features. For those upgrading from an earlier Gitblit version, a `users.conf` file will automatically be created for you from your existing `users.properties` file on your first launch of Gitblit <u>however</u> you will have to manually set *realm.userService=users.conf* to switch to the new user service. The original `users.properties` file and the corresponding implementation are **deprecated**.'' - Teams for specifying user-repository access in bulk. Teams may also specify mailing lists addresses and pre- & post- receive hook scripts. - Gravatar integration - Activity page for aggregated repository activity. This is a timeline of commit activity over the last N days for one or more repositories. - *Filters* menu for the Repositories page and Activity page. You can filter by federation set, team, and simple custom regular expressions. Custom expressions can be stored in `gitblit.properties` or `web.xml` or directly defined in your url (issue 27) - Flash-based 1-step *copy to clipboard* of the primary repository url based on Clippy - JavaScript-based 3-step (click, ctrl+c, enter) *copy to clipboard* of the primary repository url in the event that you do not want to use Flash on your installation - Empty repositories now link to an *empty repository* page which gives some direction to the user for the next step in using Gitblit. This page displays the primary push/clone url of the repository and gives sample syntax for the git command-line client. (issue 31) - Repositories with a *gh-pages* branch will now have a *pages* link which will serve the content of this branch. All resource requests are against the repository, Gitblit does not checkout/export this branch to a temporary filesystem. Jekyll templating is not supported. - Gitblit Express bundle to get started running Gitblit on RedHat OpenShift cloud <span class="label label-warning">BETA</span> changes: - Dropped display of trailing .git from repository names - ''Gitblit GO is now monolithic like the WAR build. (issue 30) This change helps adoption of GO in environments without an internet connection or with a restricted connection.'' - Unit testing framework has been migrated to JUnit4 syntax and the test suite has been redesigned to run all unit tests, including rpc, federation, and git push/clone tests fixes: - Several a bugs in FileUserService related to cleaning up old repository permissions on a rename or delete - Renaming a repository into a new subfolder failed (issue 33) settings: - { name: groovy.scriptsFolder, defaultValue: groovy } - { name: groovy.preReceiveScripts, defaultValue: } - { name: groovy.postReceiveScripts, defaultValue: } - { name: mail.mailingLists, defaultValue: } - { name: realm.userService, defaultValue: users.conf } - { name: web.allowGravatar, defaultValue: 'true' } - { name: web.activityDuration, defaultValue: 14 } - { name: web.timeFormat, defaultValue: HH:mm } - { name: web.datestampLongFormat, defaultValue: "EEEE, MMMM d, yyyy" } - { name: web.customFilters, defaultValue: } - { name: web.allowFlashCopyToClipboard, defaultValue: 'true' } dependencyChanges: - JGit 1.2.0 - Groovy 1.8.5 - Clippy } # # 0.7.0 # r5: { title: Gitblit 0.7.0 Released id: 0.7.0 date: 2011-11-11 security: - fixed security hole when cloning clone-restricted repository with TortoiseGit (issue 28) fixes: - ''federation protocol timestamps. dates are now serialized to the [iso8601](http://en.wikipedia.org/wiki/ISO_8601) standard. **This breaks 0.6.0 federation clients/servers.**'' - collision on rename for repositories and users - Gitblit can now browse the Linux kernel repository (issue 25) - Gitblit now runs on Servlet 3.0 webservers (e.g. Tomcat 7, Jetty 8) (issue 23) - Set the RSS content type of syndication feeds for Firefox 4 (issue 22) - RSS feeds are now properly encoded to UTF-8 - RSS feeds now properly generate parameterized links if *web.mountParameters=false* - Null pointer exception if did not set federation strategy (issue 20) - Gitblit GO allows SSL renegotiation if running on Java 1.6.0_22 or later changes: - updated ui with Twitter Bootstrap CSS toolkit - repositories list performance by caching repository sizes (issue 27) - summary page performance by caching metric calculations (issue 25) additions: - authenticated JSON RPC mechanism - Gitblit API RSS/JSON RPC library - Gitblit Manager (Java/Swing Application) for remote administration of a Gitblit server. - per-repository setting to skip size calculation (faster repositories page loading) - per-repository setting to skip summary metrics calculation (faster summary page loading) - IUserService.setup(IStoredSettings) for custom user service implementations - setting to control Gitblit GO context path for proxy setups - *combined-md5* password storage option which stores the hash of username+password as the password - repository owners are automatically granted access for git, feeds, and zip downloads without explicitly selecting them - RSS feeds now include regex substitutions on commit messages for bug trackers, etc settings: - { name: web.loginMessage, defaultValue: gitblit } - { name: web.enableRpcServlet, defaultValue: 'true' } - { name: web.enableRpcManagement, defaultValue: 'false' } - { name: web.enableRpcAdministration, defaultValue: 'false' } - { name: server.contextPath, defaultValue: / } dependencyChanges: - MarkdownPapers 1.2.5 - Wicket 1.4.19 contributors: - github/dadalar - github/alyandon - github/trygvis } # # 0.6.0 # r4: { title: Gitblit 0.6.0 Released id: 0.6.0 date: 2011-09-27 fixes: - syndication urls for WAR deployments - authentication for zip downloads additions: - federation feature to allow gitblit instances (or gitblit federation clients) to pull repositories and, optionally, settings and accounts from other gitblit instances. This is something like [svn-sync](http://svnbook.red-bean.com/en/1.5/svn.ref.svnsync.html) for gitblit. - user role *#notfederated* to prevent a user account from being pulled by a federated Gitblit instance settings: - { name: federation.name, defaultValue: } - { name: federation.passphrase, defaultValue: } - { name: federation.allowProposals, defaultValue: 'false' } - { name: federation.proposalsFolder, defaultValue: proposals } - { name: federation.defaultFrequency, defaultValue: 60 mins } - { name: federation.sets, defaultValue: } - { name: "mail.*", defaultValue: } dependencyChanges: - MarkdownPapers 1.1.1 - Wicket 1.4.18 - JGit 1.1.0 - google-gson - javamail } # # 0.5.2 # r3: { title: Gitblit 0.5.2 Released id: 0.5.2 date: 2011-07-27 fixes: - active repositories with a HEAD that pointed to an empty branch caused internal errors (issue 14) - bare-cloned repositories were listed as (empty) and were not clickable (issue 13) - default port for Gitblit GO is now 8443 to be more linux/os x friendly (issue 12) - repositories can now be reliably deleted and renamed (issue 10) - users can now change their passwords (issue 1) - always show root repository group first, i.e. do not sort root group with other groups - tone-down repository group header color additions: - optionally display repository on-disk size on repositories page - forward-slashes ('/', %2F) can be encoded using a custom character to workaround some servlet container default security measures for proxy servers settings: - { name: web.showRepositorySizes, defaultValue: 'true' } - { name: web.forwardSlashCharacter, defaultValue: / } dependencyChanges: - MarkdownPapers 1.1.0 - Jetty 7.4.3 } # # 0.5.1 # r2: { title: Gitblit 0.5.1 Released id: 0.5.1 date: 2011-06-28 changes: - clarified SSL certificate generation and configuration for both server-side and client-side - added some more troubleshooting information to documentation - replaced JavaService with Apache Commons Daemon } # # 0.5.0 # r1: { title: Gitblit 0.5.0 Released id: 0.5.0 date: 2011-06-26 text: initial release } snapshot: &r17 release: &r16 releases: &r[1..16] src/com/gitblit/FederationClientLauncher.java
File was deleted src/com/gitblit/authority/GitblitAuthorityLauncher.java
File was deleted src/com/gitblit/client/GitblitManagerLauncher.java
File was deleted src/main/config/checkstyle.xml
src/main/distrib/data/certs/authority.conf
src/main/distrib/data/certs/instructions.tmpl
src/main/distrib/data/certs/mail.tmpl
src/main/distrib/data/gitblit.properties
File was renamed from distrib/gitblit.properties @@ -440,7 +440,7 @@ # RESTART REQUIRED web.authenticateViewPages = false # if web.authenticateViewPages=true you may optionally require a client-side # If web.authenticateViewPages=true you may optionally require a client-side # basic authentication prompt instead of the standard form-based login. # # SINCE 1.3.0 src/main/distrib/data/groovy/.gitignore
src/main/distrib/data/groovy/blockpush.groovy
src/main/distrib/data/groovy/jenkins.groovy
src/main/distrib/data/groovy/localclone.groovy
src/main/distrib/data/groovy/protect-refs.groovy
src/main/distrib/data/groovy/sendmail-html.groovy
src/main/distrib/data/groovy/sendmail.groovy
src/main/distrib/data/groovy/thebuggenie.groovy
src/main/distrib/data/projects.conf
src/main/distrib/data/users.conf
src/main/distrib/federation.properties
src/main/distrib/groovy/fogbugz.groovy
src/main/distrib/linux/add-indexed-branch.sh
New file @@ -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% src/main/distrib/linux/authority.sh
New file @@ -0,0 +1,2 @@ #!/bin/bash java -cp gitblit.jar com.gitblit.authority.Launcher --baseFolder data src/main/distrib/linux/gitblit-stop.sh
New file @@ -0,0 +1,2 @@ #!/bin/bash java -jar gitblit.jar --baseFolder data --stop src/main/distrib/linux/gitblit.sh
New file @@ -0,0 +1,2 @@ #!/bin/bash java -jar gitblit.jar --baseFolder data src/main/distrib/linux/install-service-centos.sh
New file @@ -0,0 +1,3 @@ #!/bin/bash sudo cp service-centos.sh /etc/init.d/gitblit sudo chkconfig --add gitblit src/main/distrib/linux/install-service-ubuntu.sh
New file @@ -0,0 +1,3 @@ #!/bin/bash sudo cp service-ubuntu.sh /etc/init.d/gitblit sudo update-rc.d gitblit defaults src/main/distrib/linux/java-proxy-config.sh
src/main/distrib/linux/service-centos.sh
src/main/distrib/linux/service-ubuntu.sh
src/main/distrib/win/add-indexed-branch.cmd
src/main/distrib/win/authority.cmd
New file @@ -0,0 +1 @@ @java -cp gitblit.jar com.gitblit.authority.Launcher --baseFolder data %* src/main/distrib/win/gitblit-stop.cmd
src/main/distrib/win/gitblit.cmd
src/main/distrib/win/installService.cmd
File was renamed from distrib/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 ^ src/main/distrib/win/uninstallService.cmd
src/main/java/WEB-INF/reference.propertiescopy from distrib/gitblit.properties copy to src/main/java/WEB-INF/reference.properties
File was copied from distrib/gitblit.properties @@ -440,7 +440,7 @@ # RESTART REQUIRED web.authenticateViewPages = false # if web.authenticateViewPages=true you may optionally require a client-side # If web.authenticateViewPages=true you may optionally require a client-side # basic authentication prompt instead of the standard form-based login. # # SINCE 1.3.0 src/main/java/WEB-INF/web.xml
src/main/java/com/gitblit/.gitignore
src/main/java/com/gitblit/AccessRestrictionFilter.java
src/main/java/com/gitblit/AddIndexedBranch.java
src/main/java/com/gitblit/AuthenticationFilter.java
src/main/java/com/gitblit/ConfigUserService.java
src/main/java/com/gitblit/Constants.java
File was renamed from src/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. @@ -31,18 +33,6 @@ public static final String NAME = "Gitblit"; 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"; @@ -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; } /** src/main/java/com/gitblit/DownloadZipFilter.java
src/main/java/com/gitblit/DownloadZipServlet.java
src/main/java/com/gitblit/EnforceAuthenticationFilter.java
New file @@ -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 } src/main/java/com/gitblit/FederationClient.java
File was renamed from src/com/gitblit/FederationClient.java @@ -67,7 +67,7 @@ System.exit(0); } System.out.println("Gitblit Federation Client v" + Constants.VERSION + " (" + Constants.VERSION_DATE + ")"); System.out.println("Gitblit Federation Client v" + Constants.getVersion() + " (" + Constants.getBuildDate() + ")"); // command-line specified repositories folder if (!StringUtils.isEmpty(params.repositoriesFolder)) { src/main/java/com/gitblit/FederationPullExecutor.java
src/main/java/com/gitblit/FederationServlet.java
src/main/java/com/gitblit/FileSettings.java
src/main/java/com/gitblit/FileUserService.java
src/main/java/com/gitblit/GCExecutor.java
src/main/java/com/gitblit/GitBlit.java
src/main/java/com/gitblit/GitBlitException.java
src/main/java/com/gitblit/GitBlitServer.java
src/main/java/com/gitblit/GitFilter.java
src/main/java/com/gitblit/GitServlet.java
src/main/java/com/gitblit/GitblitSslContextFactory.java
src/main/java/com/gitblit/GitblitTrustManager.java
src/main/java/com/gitblit/GitblitUserService.java
src/main/java/com/gitblit/IStoredSettings.java
src/main/java/com/gitblit/IUserService.java
src/main/java/com/gitblit/JsonServlet.java
src/main/java/com/gitblit/LdapUserService.java
src/main/java/com/gitblit/LuceneExecutor.java
src/main/java/com/gitblit/MailExecutor.java
src/main/java/com/gitblit/PagesFilter.java
src/main/java/com/gitblit/PagesServlet.java
src/main/java/com/gitblit/RedmineUserService.java
src/main/java/com/gitblit/RobotsTxtServlet.java
src/main/java/com/gitblit/RpcFilter.java
src/main/java/com/gitblit/RpcServlet.java
src/main/java/com/gitblit/ServletRequestWrapper.java
src/main/java/com/gitblit/SyndicationFilter.java
src/main/java/com/gitblit/SyndicationServlet.java
src/main/java/com/gitblit/WebXmlSettings.java
src/main/java/com/gitblit/authority/AuthorityWorker.java
src/main/java/com/gitblit/authority/CertificateStatus.java
src/main/java/com/gitblit/authority/CertificateStatusRenderer.java
src/main/java/com/gitblit/authority/CertificatesTableModel.java
src/main/java/com/gitblit/authority/DefaultOidsPanel.java
src/main/java/com/gitblit/authority/GitblitAuthority.java
File was renamed from src/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() { src/main/java/com/gitblit/authority/Launcher.javacopy from src/com/gitblit/Launcher.java copy to src/main/java/com/gitblit/authority/Launcher.java
File was copied from src/com/gitblit/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()) { src/main/java/com/gitblit/authority/NewCertificateConfig.java
src/main/java/com/gitblit/authority/NewClientCertificateDialog.java
src/main/java/com/gitblit/authority/NewSSLCertificateDialog.java
src/main/java/com/gitblit/authority/RequestFocusListener.java
src/main/java/com/gitblit/authority/UserCertificateConfig.java
src/main/java/com/gitblit/authority/UserCertificateModel.java
src/main/java/com/gitblit/authority/UserCertificatePanel.java
src/main/java/com/gitblit/authority/UserCertificateTableModel.java
src/main/java/com/gitblit/authority/UserOidsPanel.java
src/main/java/com/gitblit/authority/Utils.java
src/main/java/com/gitblit/authority/X509CertificateViewer.java
src/main/java/com/gitblit/build/Build.java
src/main/java/com/gitblit/build/BuildGhPages.java
src/main/java/com/gitblit/build/BuildSite.java
src/main/java/com/gitblit/build/BuildThumbnails.java
src/main/java/com/gitblit/build/BuildWebXml.java
src/main/java/com/gitblit/client/BooleanCellRenderer.java
src/main/java/com/gitblit/client/BranchRenderer.java
src/main/java/com/gitblit/client/ClosableTabComponent.java
src/main/java/com/gitblit/client/DateCellRenderer.java
src/main/java/com/gitblit/client/EditRegistrationDialog.java
src/main/java/com/gitblit/client/EditRepositoryDialog.java
src/main/java/com/gitblit/client/EditTeamDialog.java
src/main/java/com/gitblit/client/EditUserDialog.java
src/main/java/com/gitblit/client/FeedEntryTableModel.java
src/main/java/com/gitblit/client/FeedsPanel.java
src/main/java/com/gitblit/client/FeedsTableModel.java
src/main/java/com/gitblit/client/GitblitClient.java
src/main/java/com/gitblit/client/GitblitManager.java
File was renamed from src/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 src/main/java/com/gitblit/client/GitblitManagerLauncher.java
File was renamed from src/com/gitblit/Launcher.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); } } } src/main/java/com/gitblit/client/GitblitPanel.java
src/main/java/com/gitblit/client/GitblitRegistration.java
src/main/java/com/gitblit/client/GitblitWorker.java
src/main/java/com/gitblit/client/HeaderPanel.java
src/main/java/com/gitblit/client/IndicatorsRenderer.java
src/main/java/com/gitblit/client/JPalette.java
src/main/java/com/gitblit/client/MessageRenderer.java
src/main/java/com/gitblit/client/NameRenderer.java
src/main/java/com/gitblit/client/PropertiesTableModel.java
src/main/java/com/gitblit/client/RegistrantPermissionsPanel.java
src/main/java/com/gitblit/client/RegistrantPermissionsTableModel.java
src/main/java/com/gitblit/client/RegistrationsDialog.java
src/main/java/com/gitblit/client/RegistrationsTableModel.java
src/main/java/com/gitblit/client/RepositoriesPanel.java
src/main/java/com/gitblit/client/RepositoriesTableModel.java
src/main/java/com/gitblit/client/SearchDialog.java
src/main/java/com/gitblit/client/SettingCellRenderer.java
src/main/java/com/gitblit/client/SettingPanel.java
src/main/java/com/gitblit/client/SettingsPanel.java
src/main/java/com/gitblit/client/SettingsTableModel.java
src/main/java/com/gitblit/client/StatusPanel.java
src/main/java/com/gitblit/client/SubscribedRepositoryRenderer.java
src/main/java/com/gitblit/client/SubscriptionsDialog.java
src/main/java/com/gitblit/client/TeamsPanel.java
src/main/java/com/gitblit/client/TeamsTableModel.java
src/main/java/com/gitblit/client/Translation.java
src/main/java/com/gitblit/client/UsersPanel.java
src/main/java/com/gitblit/client/UsersTableModel.java
src/main/java/com/gitblit/client/Utils.java
src/main/java/com/gitblit/client/splash.pngsrc/main/java/com/gitblit/fanout/FanoutClient.java
src/main/java/com/gitblit/fanout/FanoutConstants.java
src/main/java/com/gitblit/fanout/FanoutNioService.java
src/main/java/com/gitblit/fanout/FanoutService.java
src/main/java/com/gitblit/fanout/FanoutServiceConnection.java
src/main/java/com/gitblit/fanout/FanoutSocketService.java
src/main/java/com/gitblit/fanout/FanoutStats.java
src/main/java/com/gitblit/models/Activity.java
src/main/java/com/gitblit/models/AnnotatedLine.java
src/main/java/com/gitblit/models/FederationModel.java
src/main/java/com/gitblit/models/FederationProposal.java
src/main/java/com/gitblit/models/FederationSet.java
src/main/java/com/gitblit/models/FeedEntryModel.java
src/main/java/com/gitblit/models/FeedModel.java
src/main/java/com/gitblit/models/ForkModel.java
src/main/java/com/gitblit/models/GitNote.java
src/main/java/com/gitblit/models/GravatarProfile.java
src/main/java/com/gitblit/models/IssueModel.java
src/main/java/com/gitblit/models/Metric.java
src/main/java/com/gitblit/models/PathModel.java
src/main/java/com/gitblit/models/ProjectModel.java
src/main/java/com/gitblit/models/PushLogEntry.java
src/main/java/com/gitblit/models/RefModel.java
src/main/java/com/gitblit/models/RegistrantAccessPermission.java
src/main/java/com/gitblit/models/RepositoryCommit.java
src/main/java/com/gitblit/models/RepositoryModel.java
src/main/java/com/gitblit/models/SearchResult.java
src/main/java/com/gitblit/models/ServerSettings.java
src/main/java/com/gitblit/models/ServerStatus.java
File was renamed from src/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(); src/main/java/com/gitblit/models/SettingModel.java
src/main/java/com/gitblit/models/SubmoduleModel.java
src/main/java/com/gitblit/models/TeamModel.java
src/main/java/com/gitblit/models/TicketModel.java
src/main/java/com/gitblit/models/UserModel.java
src/main/java/com/gitblit/utils/ActivityUtils.java
src/main/java/com/gitblit/utils/ArrayUtils.java
src/main/java/com/gitblit/utils/Base64.java
src/main/java/com/gitblit/utils/ByteFormat.java
src/main/java/com/gitblit/utils/ClientLogger.java
src/main/java/com/gitblit/utils/CompressionUtils.java
src/main/java/com/gitblit/utils/ConnectionUtils.java
src/main/java/com/gitblit/utils/ContainerUtils.javaold mode 100755 new mode 100644
src/main/java/com/gitblit/utils/DeepCopier.java
src/main/java/com/gitblit/utils/DiffUtils.java
src/main/java/com/gitblit/utils/FederationUtils.java
src/main/java/com/gitblit/utils/FileUtils.java
src/main/java/com/gitblit/utils/GitBlitDiffFormatter.java
src/main/java/com/gitblit/utils/GitWebDiffFormatter.java
src/main/java/com/gitblit/utils/HttpUtils.java
src/main/java/com/gitblit/utils/IssueUtils.java
src/main/java/com/gitblit/utils/JGitUtils.java
src/main/java/com/gitblit/utils/JsonUtils.java
src/main/java/com/gitblit/utils/MarkdownUtils.java
src/main/java/com/gitblit/utils/MetricUtils.java
src/main/java/com/gitblit/utils/ObjectCache.java
src/main/java/com/gitblit/utils/PatchFormatter.java
src/main/java/com/gitblit/utils/PushLogUtils.java
src/main/java/com/gitblit/utils/RpcUtils.java
src/main/java/com/gitblit/utils/StringUtils.java
src/main/java/com/gitblit/utils/SyndicationUtils.java
src/main/java/com/gitblit/utils/TicgitUtils.java
src/main/java/com/gitblit/utils/TimeUtils.java
src/main/java/com/gitblit/utils/X509Utils.java
src/main/java/com/gitblit/wicket/AuthorizationStrategy.java
src/main/java/com/gitblit/wicket/ExternalImage.java
src/main/java/com/gitblit/wicket/GitBlitWebApp.java
src/main/java/com/gitblit/wicket/GitBlitWebApp.properties
src/main/java/com/gitblit/wicket/GitBlitWebApp_es.properties
src/main/java/com/gitblit/wicket/GitBlitWebApp_ja.propertiesold mode 100755 new mode 100644
src/main/java/com/gitblit/wicket/GitBlitWebApp_ko.properties
src/main/java/com/gitblit/wicket/GitBlitWebApp_nl.properties
src/main/java/com/gitblit/wicket/GitBlitWebApp_pl.properties
src/main/java/com/gitblit/wicket/GitBlitWebApp_pt_BR.properties
src/main/java/com/gitblit/wicket/GitBlitWebApp_zh_CN.properties
src/main/java/com/gitblit/wicket/GitBlitWebSession.java
src/main/java/com/gitblit/wicket/GitblitParamUrlCodingStrategy.java
src/main/java/com/gitblit/wicket/GitblitRedirectException.java
src/main/java/com/gitblit/wicket/PageRegistration.java
src/main/java/com/gitblit/wicket/RequiresAdminRole.java
src/main/java/com/gitblit/wicket/SessionlessForm.java
src/main/java/com/gitblit/wicket/StringChoiceRenderer.java
src/main/java/com/gitblit/wicket/WicketUtils.java
src/main/java/com/gitblit/wicket/charting/GoogleChart.java
src/main/java/com/gitblit/wicket/charting/GoogleCharts.java
src/main/java/com/gitblit/wicket/charting/GoogleLineChart.java
src/main/java/com/gitblit/wicket/charting/GooglePieChart.java
src/main/java/com/gitblit/wicket/pages/ActivityPage.html
src/main/java/com/gitblit/wicket/pages/ActivityPage.java
src/main/java/com/gitblit/wicket/pages/BasePage.html
src/main/java/com/gitblit/wicket/pages/BasePage.java
File was renamed from src/com/gitblit/wicket/pages/BasePage.java @@ -184,7 +184,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(); } src/main/java/com/gitblit/wicket/pages/BlamePage.html
src/main/java/com/gitblit/wicket/pages/BlamePage.java
src/main/java/com/gitblit/wicket/pages/BlobDiffPage.html
src/main/java/com/gitblit/wicket/pages/BlobDiffPage.java
src/main/java/com/gitblit/wicket/pages/BlobPage.html
src/main/java/com/gitblit/wicket/pages/BlobPage.java
src/main/java/com/gitblit/wicket/pages/BranchesPage.html
src/main/java/com/gitblit/wicket/pages/BranchesPage.java
src/main/java/com/gitblit/wicket/pages/ChangePasswordPage.html
src/main/java/com/gitblit/wicket/pages/ChangePasswordPage.java
src/main/java/com/gitblit/wicket/pages/CommitDiffPage.html
src/main/java/com/gitblit/wicket/pages/CommitDiffPage.java
src/main/java/com/gitblit/wicket/pages/CommitPage.html
src/main/java/com/gitblit/wicket/pages/CommitPage.java
src/main/java/com/gitblit/wicket/pages/DocsPage.html
src/main/java/com/gitblit/wicket/pages/DocsPage.java
src/main/java/com/gitblit/wicket/pages/EditRepositoryPage.html
src/main/java/com/gitblit/wicket/pages/EditRepositoryPage.java
src/main/java/com/gitblit/wicket/pages/EditTeamPage.html
src/main/java/com/gitblit/wicket/pages/EditTeamPage.java
src/main/java/com/gitblit/wicket/pages/EditUserPage.html
src/main/java/com/gitblit/wicket/pages/EditUserPage.java
src/main/java/com/gitblit/wicket/pages/EmptyRepositoryPage.html
src/main/java/com/gitblit/wicket/pages/EmptyRepositoryPage.java
src/main/java/com/gitblit/wicket/pages/EmptyRepositoryPage_es.html
src/main/java/com/gitblit/wicket/pages/EmptyRepositoryPage_ko.html
src/main/java/com/gitblit/wicket/pages/EmptyRepositoryPage_nl.html
src/main/java/com/gitblit/wicket/pages/EmptyRepositoryPage_pl.html
src/main/java/com/gitblit/wicket/pages/EmptyRepositoryPage_pt_BR.html
src/main/java/com/gitblit/wicket/pages/EmptyRepositoryPage_zh_CN.html
src/main/java/com/gitblit/wicket/pages/FederationPage.html
src/main/java/com/gitblit/wicket/pages/FederationPage.java
src/main/java/com/gitblit/wicket/pages/FederationRegistrationPage.html
src/main/java/com/gitblit/wicket/pages/FederationRegistrationPage.java
src/main/java/com/gitblit/wicket/pages/ForkPage.html
src/main/java/com/gitblit/wicket/pages/ForkPage.java
src/main/java/com/gitblit/wicket/pages/ForksPage.html
src/main/java/com/gitblit/wicket/pages/ForksPage.java
src/main/java/com/gitblit/wicket/pages/GitSearchPage.html
src/main/java/com/gitblit/wicket/pages/GitSearchPage.java
src/main/java/com/gitblit/wicket/pages/GravatarProfilePage.html
src/main/java/com/gitblit/wicket/pages/GravatarProfilePage.java
src/main/java/com/gitblit/wicket/pages/HistoryPage.html
src/main/java/com/gitblit/wicket/pages/HistoryPage.java
src/main/java/com/gitblit/wicket/pages/LogPage.html
src/main/java/com/gitblit/wicket/pages/LogPage.java
src/main/java/com/gitblit/wicket/pages/LogoutPage.html
New file @@ -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> src/main/java/com/gitblit/wicket/pages/LogoutPage.java
src/main/java/com/gitblit/wicket/pages/LuceneSearchPage.html
src/main/java/com/gitblit/wicket/pages/LuceneSearchPage.java
src/main/java/com/gitblit/wicket/pages/MarkdownPage.html
src/main/java/com/gitblit/wicket/pages/MarkdownPage.java
src/main/java/com/gitblit/wicket/pages/MetricsPage.html
src/main/java/com/gitblit/wicket/pages/MetricsPage.java
src/main/java/com/gitblit/wicket/pages/PatchPage.html
src/main/java/com/gitblit/wicket/pages/PatchPage.java
src/main/java/com/gitblit/wicket/pages/ProjectPage.html
src/main/java/com/gitblit/wicket/pages/ProjectPage.java
src/main/java/com/gitblit/wicket/pages/ProjectsPage.html
src/main/java/com/gitblit/wicket/pages/ProjectsPage.java
src/main/java/com/gitblit/wicket/pages/RawPage.java
src/main/java/com/gitblit/wicket/pages/RepositoriesPage.html
src/main/java/com/gitblit/wicket/pages/RepositoriesPage.java
src/main/java/com/gitblit/wicket/pages/RepositoryPage.html
src/main/java/com/gitblit/wicket/pages/RepositoryPage.java
src/main/java/com/gitblit/wicket/pages/ReviewProposalPage.html
src/main/java/com/gitblit/wicket/pages/ReviewProposalPage.java
src/main/java/com/gitblit/wicket/pages/RootPage.html
src/main/java/com/gitblit/wicket/pages/RootPage.java
src/main/java/com/gitblit/wicket/pages/RootSubPage.html
src/main/java/com/gitblit/wicket/pages/RootSubPage.java
src/main/java/com/gitblit/wicket/pages/SendProposalPage.html
src/main/java/com/gitblit/wicket/pages/SendProposalPage.java
src/main/java/com/gitblit/wicket/pages/SummaryPage.html
src/main/java/com/gitblit/wicket/pages/SummaryPage.java
src/main/java/com/gitblit/wicket/pages/TagPage.html
src/main/java/com/gitblit/wicket/pages/TagPage.java
src/main/java/com/gitblit/wicket/pages/TagsPage.html
src/main/java/com/gitblit/wicket/pages/TagsPage.java
src/main/java/com/gitblit/wicket/pages/TicketPage.html
src/main/java/com/gitblit/wicket/pages/TicketPage.java
src/main/java/com/gitblit/wicket/pages/TicketsPage.html
src/main/java/com/gitblit/wicket/pages/TicketsPage.java
src/main/java/com/gitblit/wicket/pages/TreePage.html
src/main/java/com/gitblit/wicket/pages/TreePage.java
src/main/java/com/gitblit/wicket/pages/UserPage.html
src/main/java/com/gitblit/wicket/pages/UserPage.java
src/main/java/com/gitblit/wicket/pages/UsersPage.html
src/main/java/com/gitblit/wicket/pages/UsersPage.java
src/main/java/com/gitblit/wicket/pages/prettify/lang-apollo.js
src/main/java/com/gitblit/wicket/pages/prettify/lang-css.js
src/main/java/com/gitblit/wicket/pages/prettify/lang-hs.js
src/main/java/com/gitblit/wicket/pages/prettify/lang-lisp.js
src/main/java/com/gitblit/wicket/pages/prettify/lang-lua.js
src/main/java/com/gitblit/wicket/pages/prettify/lang-ml.js
src/main/java/com/gitblit/wicket/pages/prettify/lang-proto.js
src/main/java/com/gitblit/wicket/pages/prettify/lang-scala.js
src/main/java/com/gitblit/wicket/pages/prettify/lang-sql.js
src/main/java/com/gitblit/wicket/pages/prettify/lang-vb.js
src/main/java/com/gitblit/wicket/pages/prettify/lang-vhdl.js
src/main/java/com/gitblit/wicket/pages/prettify/lang-wiki.js
src/main/java/com/gitblit/wicket/pages/prettify/lang-yaml.js
src/main/java/com/gitblit/wicket/pages/prettify/prettify.css
src/main/java/com/gitblit/wicket/pages/prettify/prettify.js
src/main/java/com/gitblit/wicket/panels/ActivityPanel.html
src/main/java/com/gitblit/wicket/panels/ActivityPanel.java
src/main/java/com/gitblit/wicket/panels/BasePanel.java
src/main/java/com/gitblit/wicket/panels/BranchesPanel.html
src/main/java/com/gitblit/wicket/panels/BranchesPanel.java
src/main/java/com/gitblit/wicket/panels/BulletListPanel.html
src/main/java/com/gitblit/wicket/panels/BulletListPanel.java
src/main/java/com/gitblit/wicket/panels/CommitHeaderPanel.html
src/main/java/com/gitblit/wicket/panels/CommitHeaderPanel.java
src/main/java/com/gitblit/wicket/panels/CommitLegendPanel.html
src/main/java/com/gitblit/wicket/panels/CommitLegendPanel.java
src/main/java/com/gitblit/wicket/panels/CompressedDownloadsPanel.html
src/main/java/com/gitblit/wicket/panels/CompressedDownloadsPanel.java
src/main/java/com/gitblit/wicket/panels/DropDownMenu.html
src/main/java/com/gitblit/wicket/panels/DropDownMenu.java
src/main/java/com/gitblit/wicket/panels/FederationProposalsPanel.html
src/main/java/com/gitblit/wicket/panels/FederationProposalsPanel.java
src/main/java/com/gitblit/wicket/panels/FederationRegistrationsPanel.html
src/main/java/com/gitblit/wicket/panels/FederationRegistrationsPanel.java
src/main/java/com/gitblit/wicket/panels/FederationTokensPanel.html
src/main/java/com/gitblit/wicket/panels/FederationTokensPanel.java
src/main/java/com/gitblit/wicket/panels/GravatarImage.html
src/main/java/com/gitblit/wicket/panels/GravatarImage.java
src/main/java/com/gitblit/wicket/panels/HistoryPanel.html
src/main/java/com/gitblit/wicket/panels/HistoryPanel.java
src/main/java/com/gitblit/wicket/panels/LinkPanel.html
src/main/java/com/gitblit/wicket/panels/LinkPanel.java
src/main/java/com/gitblit/wicket/panels/LogPanel.html
src/main/java/com/gitblit/wicket/panels/LogPanel.java
src/main/java/com/gitblit/wicket/panels/NavigationPanel.html
src/main/java/com/gitblit/wicket/panels/NavigationPanel.java
src/main/java/com/gitblit/wicket/panels/ObjectContainer.java
src/main/java/com/gitblit/wicket/panels/PagerPanel.html
src/main/java/com/gitblit/wicket/panels/PagerPanel.java
src/main/java/com/gitblit/wicket/panels/PathBreadcrumbsPanel.html
src/main/java/com/gitblit/wicket/panels/PathBreadcrumbsPanel.java
src/main/java/com/gitblit/wicket/panels/ProjectRepositoryPanel.html
src/main/java/com/gitblit/wicket/panels/ProjectRepositoryPanel.java
src/main/java/com/gitblit/wicket/panels/RefsPanel.html
src/main/java/com/gitblit/wicket/panels/RefsPanel.java
src/main/java/com/gitblit/wicket/panels/RegistrantPermissionsPanel.html
src/main/java/com/gitblit/wicket/panels/RegistrantPermissionsPanel.java
src/main/java/com/gitblit/wicket/panels/RepositoriesPanel.html
src/main/java/com/gitblit/wicket/panels/RepositoriesPanel.java
src/main/java/com/gitblit/wicket/panels/RepositoryUrlPanel.html
src/main/java/com/gitblit/wicket/panels/RepositoryUrlPanel.java
src/main/java/com/gitblit/wicket/panels/SearchPanel.html
src/main/java/com/gitblit/wicket/panels/SearchPanel.java
src/main/java/com/gitblit/wicket/panels/ShockWaveComponent.java
src/main/java/com/gitblit/wicket/panels/TagsPanel.html
src/main/java/com/gitblit/wicket/panels/TagsPanel.java
src/main/java/com/gitblit/wicket/panels/TeamsPanel.html
src/main/java/com/gitblit/wicket/panels/TeamsPanel.java
src/main/java/com/gitblit/wicket/panels/UsersPanel.html
src/main/java/com/gitblit/wicket/panels/UsersPanel.java
src/main/java/log4j.properties
src/main/resources/add_16x16.pngsrc/main/resources/arrow_down.pngsrc/main/resources/arrow_left.pngsrc/main/resources/arrow_off.pngsrc/main/resources/arrow_page.pngsrc/main/resources/arrow_up.pngsrc/main/resources/background.pngsrc/main/resources/blank.pngsrc/main/resources/book_16x16.pngsrc/main/resources/bootstrap/css/bootstrap-responsive.css
src/main/resources/bootstrap/css/bootstrap.css
src/main/resources/bootstrap/img/glyphicons-halflings-white.pngsrc/main/resources/bootstrap/img/glyphicons-halflings.pngsrc/main/resources/bootstrap/js/bootstrap.js
src/main/resources/bootstrap/js/jquery.js
src/main/resources/bug_16x16.pngsrc/main/resources/bullet_black.pngsrc/main/resources/bullet_blue.pngsrc/main/resources/bullet_delete.pngsrc/main/resources/bullet_error.pngsrc/main/resources/bullet_feed.pngsrc/main/resources/bullet_green.pngsrc/main/resources/bullet_key.pngsrc/main/resources/bullet_orange.pngsrc/main/resources/bullet_red.pngsrc/main/resources/bullet_white.pngsrc/main/resources/bullet_yellow.pngsrc/main/resources/clipboard_13x13.pngsrc/main/resources/clipboard_16x16.pngsrc/main/resources/clippy.pngsrc/main/resources/clippy.swfBinary files differ
src/main/resources/cold_16x16.pngsrc/main/resources/commit_branch_16x16.pngsrc/main/resources/commit_changes_16x16.pngsrc/main/resources/commit_divide_16x16.pngsrc/main/resources/commit_join_16x16.pngsrc/main/resources/commit_merge_16x16.pngsrc/main/resources/commit_up_16x16.pngsrc/main/resources/federated_16x16.pngsrc/main/resources/feed_16x16.pngsrc/main/resources/file_16x16.pngsrc/main/resources/file_acrobat_16x16.pngsrc/main/resources/file_c_16x16.pngsrc/main/resources/file_code_16x16.pngsrc/main/resources/file_cpp_16x16.pngsrc/main/resources/file_cs_16x16.pngsrc/main/resources/file_doc_16x16.pngsrc/main/resources/file_excel_16x16.pngsrc/main/resources/file_h_16x16.pngsrc/main/resources/file_java_16x16.pngsrc/main/resources/file_php_16x16.pngsrc/main/resources/file_ppt_16x16.pngsrc/main/resources/file_ruby_16x16.pngsrc/main/resources/file_settings_16x16.pngsrc/main/resources/file_vs_16x16.pngsrc/main/resources/file_world_16x16.pngsrc/main/resources/file_zip_16x16.pngsrc/main/resources/folder_16x16.pngsrc/main/resources/folder_star_16x16.pngsrc/main/resources/folder_star_32x32.pngsrc/main/resources/fork_16x16.pngsrc/main/resources/git-black-16x16.pngsrc/main/resources/git-black.pngsrc/main/resources/git-black_210x210.pngsrc/main/resources/git-orange-16x16.pngsrc/main/resources/gitblit.css
src/main/resources/gitblt-favicon.pngsrc/main/resources/gitblt-logo.pngsrc/main/resources/gitblt2.pngsrc/main/resources/gitblt2_white.pngsrc/main/resources/gitblt_25.pngsrc/main/resources/gitblt_25_white.pngsrc/main/resources/gitweb-favicon.pngsrc/main/resources/health_16x16.pngsrc/main/resources/heart_16x16.pngsrc/main/resources/information_16x16.pngsrc/main/resources/lock_16x16.pngsrc/main/resources/lock_go_16x16.pngsrc/main/resources/lock_pull_16x16.pngsrc/main/resources/login.mkd
src/main/resources/login_es.mkd
src/main/resources/login_ko.mkd
src/main/resources/login_nl.mkd
src/main/resources/login_pl.mkd
src/main/resources/login_pt_br.mkd
src/main/resources/login_zh_CN.mkd
src/main/resources/mail_16x16.pngsrc/main/resources/pixel.pngsrc/main/resources/rosette_16x16.pngsrc/main/resources/rosette_32x32.pngsrc/main/resources/script_16x16.pngsrc/main/resources/search-icon.pngsrc/main/resources/settings_16x16.pngsrc/main/resources/settings_32x32.pngsrc/main/resources/shield_16x16.pngsrc/main/resources/star_16x16.pngsrc/main/resources/star_32x32.pngsrc/main/resources/tag_16x16.pngsrc/main/resources/user_16x16.pngsrc/main/resources/users_16x16.pngsrc/main/resources/vcard_16x16.pngsrc/main/resources/welcome.mkd
src/main/resources/welcome_es.mkd
src/main/resources/welcome_ko.mkd
src/main/resources/welcome_nl.mkd
src/main/resources/welcome_pl.mkd
src/main/resources/welcome_pt_br.mkd
src/main/resources/welcome_zh_CN.mkd
src/site/.gitignore
src/site/architecture.odgBinary files differ
src/site/custom.less
New file @@ -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; } src/site/design.mkd
File was renamed from docs/04_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.
src/site/fancybox/jquery.easing-1.3.pack.js
src/site/fancybox/jquery.fancybox-1.3.4.css
src/site/fancybox/jquery.fancybox-1.3.4.js
src/site/fancybox/jquery.fancybox-1.3.4.pack.js
src/site/fancybox/jquery.mousewheel-3.0.4.pack.js
src/site/faq.mkd
src/site/features.mkd
src/site/federation.mkd
File was renamed from docs/02_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. src/site/federation.odgBinary files differ
src/site/gitblit_logo_white.xcfBinary files differ
src/site/openshift.mkd
src/site/permissions_matrix.odsBinary files differ
src/site/properties.mkd
src/site/releasecurrent.mkd
New file @@ -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" src/site/releasehistory.mkd
New file @@ -0,0 +1,488 @@ ## Older Releases <div class="alert alert-info"> <h4>Update Note 1.2.0</h4> The permissions model has changed in the 1.2.0 release. <p>If you are updating your server, you must also update any Gitblit Manager and Federation Client installs to 1.2.0 as well. The data model used by the RPC mechanism has changed slightly for the new permissions infrastructure.</p> </div> **1.2.0** *released 2012-12-31* #### fixes - Fixed regression in *isFrozen* (issue 181) - Author metrics can be broken by newlines in email addresses from converted repositories (issue 176) - Set subjectAlternativeName on generated SSL cert if CN is an ip address (issue 170) - Fixed incorrect links on history page for files not in the current/active commit (issue 166) - Empty repository page failed to handle missing repository (issue 160) - Fixed broken ticgit urls (issue 157) - Exclude submodules from zip downloads (issue 151) - Fixed bug where repository ownership was not updated on rename user - Fixed bug in create/rename repository if you explicitly specified the alias for the root group (e.g. main/myrepo) (issue 143) - Wrapped Markdown parser with improved exception handler (issue 142) - Fixed duplicate entries in repository cache (issue 140) - Fixed connection leak in LDAPUserService (issue 139) - Fixed bug in commit page where changes to a submodule threw a null pointer exception (issue 132) - Fixed bug in the diff view for filenames that have non-ASCII characters (issue 128) #### additions - Implemented discrete repository permissions (issue 36) - V (view in web ui, RSS feeds, download zip) - R (clone) - RW (clone and push) - RWC (clone and push with ref creation) - RWD (clone and push with ref creation, deletion) - RW+ (clone and push with ref creation, deletion, rewind) While not as sophisticated as Gitolite, this does give finer access controls. These permissions fit in cleanly with the existing users.conf and users.properties files. In Gitblit <= 1.1.0, all your existing user accounts have RW+ access. If you are upgrading to 1.2.0, the RW+ access is *preserved* and you will have to lower/adjust accordingly. - Implemented *case-insensitive* regex repository permission matching (issue 36)<br/> This allows you to specify a permission like `RW:mygroup/.*` to grant push privileges to all repositories within the *mygroup* project/folder. - Added DELETE, CREATE, and NON-FAST-FORWARD ref change logging - Added support for personal repositories.<br/> Personal repositories can be created by accounts with the *create* permission and are stored in *git.repositoriesFolder/~username*. Each user with personal repositories will have a user page, something like the GitHub profile page. Personal repositories have all the same features as common repositories, except personal repositories can be renamed by their owner. - Added support for server-side forking of a repository to a personal repository (issue 137)<br/> In order to fork a repository, the user account must have the *fork* permission **and** the repository must *allow forks*. The clone inherits the access list of its origin. i.e. if Team A has clone access to the origin repository, then by default Team A also has clone access to the fork. This is to facilitate collaboration. The fork owner may change access to the fork and add/remove users/teams, etc as required <u>however</u> it should be noted that all personal forks will be enumerated in the fork network regardless of access view restrictions. If you really must have an invisible fork, the clone it locally, create a new repository for your invisible fork, and push it back to Gitblit.<br/> **New:** *web.allowForking=true* - Added optional *create-on-push* support<br/> **New:** *git.allowCreateOnPush=true* - Added **experimental** JGit-based garbage collection service. This service is disabled by default.<br/> **New:** *git.allowGarbageCollection=false*<br/> **New:** *git.garbageCollectionHour = 0*<br/> **New:** *git.defaultGarbageCollectionThreshold = 500k*<br/> **New:** *git.defaultGarbageCollectionPeriod = 7 days* - Added support for X509 client certificate authentication (github/kevinanderson1). (issue 106)<br/> You can require all git servlet access be authenticated by a client certificate. You may also specify the OID fingerprint to use for mapping a certificate to a username. It should be noted that the user account MUST already exist in Gitblit for this authentication mechanism to work; this mechanism can not be used to automatically create user accounts from a certificate.<br/> **New:** *git.requireClientCertificates = false*<br/> **New:** *git.enforceCertificateValidity = true*<br/> **New:** *git.certificateUsernameOIDs = CN* - Revised clean install certificate generation to create a Gitblit GO Certificate Authority certificate; an SSL certificate signed by the CA certificate; and to create distinct server key and server trust stores. <u>The store files have been renamed!</u> - Added support for Gitblit GO to require usage of client certificates to access the entire server.<br/> This is extreme and should be considered carefully since it affects every https access. The default is to **want** client certificates. Setting this value to *true* changes that to **need** client certificates.<br/> **New:** *server.requireClientCertificates = false* - Added **Gitblit Certificate Authority**, an x509 PKI management tool for Gitblit GO to encourage use of x509 client certificate authentication. - Added setting to control length of shortened commit ids<br/> **New:** *web.shortCommitIdLength=8* - Added alternate compressed download formats: tar.gz, tar.xz, tar.bzip2 (issue 174)<br/> **New:** *web.compressedDownloads = zip gz* - Added simple project pages. A project is a subfolder off the *git.repositoriesFolder*. - Added support for X-Forwarded-Context for Apache subdomain proxy configurations (issue 135) - Delete branch feature (issue 121, Github/ajermakovics) - Added line links to blob view (issue 130) - Added HTML sendmail hook script and Gitblit.sendHtmlMail method (github/sauthieg) - Added RedmineUserService (github/mallowlabs) - Support for committer verification. Requires use of *--no-ff* when merging branches or pull requests. See setup page for details. - Added Brazilian Portuguese translation (github/rafaelcavazin) #### changes - Added server setting to specify keystore alias for ssl certificate (issue 98) - Added optional global and per-repository activity page commit contribution throttle to help tame *really* active repositories (issue 173) - Added support for symlinks in tree page and commit page (issue 171) - All access restricted servlets (e.g. DownloadZip, RSS, etc) will try to authenticate using X509 certificates, container principals, cookies, and BASIC headers, in that order. - Added *groovy* and *scala* to *web.prettyPrintExtensions* - Added short commit id column to log and history tables (issue 168) - Teams can now specify the *admin*, *create*, and *fork* roles to simplify user administration - Use https Gravatar urls to avoid browser complaints - Added frm to default pretty print extensions (issue 156) - Expose ReceivePack to Groovy push hooks (issue 125) - Redirect to summary page when refreshing the empty repository page on a repository that is not empty (issue 129) - Emit a warning in the log file if running on a Tomcat-based servlet container which is unfriendly to %2F forward-slash url encoding AND Gitblit is configured to mount parameters with %2F forward-slash url encoding (Github/jpyeron, issue 126) - LDAP admin attribute setting is now consistent with LDAP teams setting and admin teams list. If *realm.ldap.maintainTeams==true* **AND** *realm.ldap.admins* is not empty, then User.canAdmin() is controlled by LDAP administrative team membership. Otherwise, User.canAdmin() is controlled by Gitblit. - Support servlet container authentication for existing UserModels (issue 68) #### dependency changes - updated to Jetty 7.6.8 - updated to JGit 2.2.0.201212191850-r - updated to Groovy 1.8.8 - updated to Wicket 1.4.21 - updated to Lucene 3.6.1 - updated to BouncyCastle 1.47 - updated to MarkdownPapers 1.3.2 - added JCalendar 1.3.2 - added Commons-Compress 1.4.1 - added XZ for Java 1.0 <hr/> <div class="alert alert-error"> <h4>Update Note 1.1.0</h4> If you are updating from an earlier release AND you have indexed branches with the Lucene indexing feature, you need to be aware that this release will completely re-index your repositories. Please be sure to provide ample heap resources as appropriate for your installation. </div> **1.1.0** *released 2012-08-25* #### fixes - Bypass Wicket's inability to handle direct url addressing of a view-restricted, grouped repository for new, unauthenticated sessions (e.g. click link from email or rss feed without having an active Wicket session) - Fixed MailExecutor's failure to cope with mail server connection troubles resulting in 100% CPU usage - Fixed generated urls in Groovy *sendmail* hook script for grouped repositories - Fixed generated urls in RSS feeds for grouped repositories - Fixed nullpointer exception in git servlet security filter (issue 123) - Eliminated an unnecessary repository enumeration call on the root page which should result in faster page loads (issue 103) - Gitblit could not delete a Lucene index in a working copy on index upgrade - Do not index submodule links (issue 119) - Restore original user or team object on failure to update (issue 118) - Fixes to relative path determination in repository search algorithm for symlinks (issue 116) - Fix to GitServlet to allow pushing to symlinked repositories (issue 116) - Repository URL now uses `X-Forwarded-Proto` and `X-Forwarded-Port`, if available, for reverse proxy configurations (issue 115) - Output real RAW content, not simulated RAW content (issue 114) - Fixed Lucene charset encoding bug when reindexing a repository (issue 112) - Fixed search box linking to Lucene page for grouped repository on Tomcat (issue 111) - Fixed null pointer in LdapUserSerivce if account has a null email address (issue 110) - Really fixed failure to update a GO setting from the manager (issue 85) #### additions - Identified repository list is now cached by default to reduce disk io and to improve performance (issue 103)<br/> **New:** *git.cacheRepositoryList=true* - Preliminary bare repository submodule support<br/> **New:** *git.submoduleUrlPatterns=* - *git.submoduleUrlPatterns* is a space-delimited list of regular expressions for extracting a repository name from a submodule url.<br/> For example, `git.submoduleUrlPatterns = .*?://github.com/(.*)` would extract *gitblit/gitblit.git* from *git://github.git/gitblit/gitblit.git*<br/> **Note:** You may not need this control to work with submodules, but it is there if you do. - If there are no matches from *git.submoduleUrlPatterns* then the repository name is assumed to be whatever comes after the last `/` character *(e.g. gitblit.git)* - Gitblit will try to locate this repository relative to the current repository *(e.g. myfolder/myrepo.git, myfolder/mysubmodule.git)* and then at the root level *(mysubmodule.git)* if that fails. - Submodule references in a working copy will be properly identified as gitlinks, but Gitblit will not traverse into the working copy submodule repository. - Added a repository setting to control authorization as AUTHENTICATED or NAMED. (issue 117)<br/> NAMED is the original behavior for authorizing against a list of permitted users or permitted teams. AUTHENTICATED allows restricted access for any authenticated user. This is a looser authorization control. - Added default authorization control setting (AUTHENTICATED or NAMED)<br/> **New:** *git.defaultAuthorizationControl=NAMED* - Added setting to control how deep Gitblit will recurse into *git.repositoriesFolder* looking for repositories (issue 103)<br/> **New:** *git.searchRecursionDepth=-1* - Added setting to specify regex exclusions for repositories (issue 103)<br/> **New:** *git.searchExclusions=* - Blob page now supports displaying images (issue 6) - Non-image binary files can now be downloaded using the RAW link - Support StartTLS in LdapUserService (Steffen Gebert, issue 122) - Added Korean translation #### changes - Line breaks inserted for readability in raw Markdown content display in the event of a parsing/transformation error. An error message is now displayed prepended to the raw content. - Improve UTF-8 reading for Markdown files - Updated Polish translation - Updated Japanese translation - Updated Spanish translation <hr/> **1.0.0** *released 2012-07-14* #### fixes - Fixed bug in Lucene search where old/stale blobs were never properly deleted during incremental updates. This resulted in duplicate blob entries in the index. - Fixed intermittent bug in identifying line numbers in Lucene search (issue 105) - Adjust repository identification algorithm to handle the scenario where a repository name collides with a group/folder name (e.g. foo.git and foo/bar.git) (issue 104) - Fixed bug where a repository set as *authenticated push* did not have anonymous clone access (issue 96) - Fixed bug in Basic authentication if passwords had a colon (Github/peterloron) - Fixed bug where the Gitblit Manager could not update a setting that was not referenced in reference.properties (issue 85) #### changes - **Updated Lucene index version which will force a rebuild of ALL your Lucene indexes**<br/> Make sure to properly set *web.blobEncodings* before starting Gitblit if you are updating! (issue 97) - Changed default layout for web ui from Fixed-Width layout to Responsive layout (issue 101) - IUserService interface has changed to better accomodate custom authentication and/or custom authorization<br/> The default `users.conf` now supports persisting display names and email addresses. - Updated Japanese translation (Github/zakki) #### additions - Added setting to allow specification of a robots.txt file (issue 99)<br/> **New:** *web.robots.txt =* - Added setting to control Responsive layout or Fixed-Width layout (issue 101)<br/> Responsive layout is now the default. This layout gracefully scales the web ui from a desktop layout to a mobile layout by hiding page components. It is easy to try, just resize your browser or point your Android/iOS device to the url of your Gitblit install. **New:** *web.useResponsiveLayout = true* - Added setting to control charsets for blob string decoding. Default encodings are UTF-8, ISO-8859-1, and server's default charset. (issue 97)<br/> **New:** *web.blobEncodings = UTF-8 ISO-8859-1* - Exposed JGit's internal configuration settings in gitblit.properties/web.xml (issue 93)<br/> Review your `gitblit.properties` or `web.xml` for detailed explanations of these settings.<br/> **New:** *git.packedGitWindowSize = 8k*<br/> **New:** *git.packedGitLimit = 10m*<br/> **New:** *git.deltaBaseCacheLimit = 10m*<br/> **New:** *git.packedGitOpenFiles = 128*<br/> **New:** *git.streamFileThreshold = 50m*<br/> **New:** *git.packedGitMmap = false* - Added default access restriction. Applies to new repositories and repositories that have not been configured with Gitblit. (issue 88)<br/> **New:** *git.defaultAccessRestriction = NONE* - Added Ivy 2.2.0 dependency which enables Groovy Grapes, a mechanism to resolve and retrieve library dependencies from a Maven 2 repository within a Groovy push hook script - Added setting to control Groovy Grape root folder (location where resolved dependencies are stored)<br/> [Grape](http://groovy.codehaus.org/Grape) allows you to add Maven dependencies to your pre-/post-receive hook script classpath.<br/> **New:** *groovy.grapeFolder = groovy/grape* - Added LDAP User Service with many new *realm.ldap* keys (Github/jcrygier) - Added support for custom repository properties for Groovy hooks (Github/jcrygier)<br/> Custom repository properties complement hook scripts by providing text field prompts in the web ui and the Gitblit Manager for the defined properties. This allows your push hooks to be parameterized. - Added script to facilitate proxy environment setup on Linux (Github/mragab) - Added Polish translation (Lukasz Jader) - Added Spanish translation (Eduardo Guervos Narvaez) #### dependency changes - updated to Bootstrap 2.0.4 - updated to JGit 2.0.0.201206130900-r - updated to Groovy 1.8.6 - updated to Gson 1.7.2 - updated to Log4J 1.2.17 - updated to SLF4J 1.6.6 - updated to Apache Commons Daemon 1.0.10 - added Ivy 2.2.0 <hr/> **0.9.3** *released 2012-04-11* #### fixes - Fixed bug where you could not remove all selections from a RepositoryModel list (permitted users, permitted teams, hook scripts, federation sets, etc) (issue 81) - Automatically set *java.awt.headless=true* for Gitblit GO <hr/> **0.9.2** *released 2012-04-04* #### changes - Added *clientLogger* bound variable to Groovy hook mechanism to allow custom info and error messages to be returned to the client (Github/jcrygier) #### fixes - Fixed absolute path/canonical path discrepancy between Gitblit and JGit regarding use of symlinks (issue 78) - Fixed row layout on activity page (issue 79) - Fixed Centos service script (Github/mohamedmansour) - Fixed EditRepositoryPage for IE8; missing save button (issue 80, Github/jonnybbb) <hr/> **0.9.1** *released 2012-03-27* #### fixes - Lucene folder was stored in working copy instead of in .git folder <hr/> **0.9.0** *released 2012-03-27* #### security - Fixed session fixation vulnerability where the session identifier was not reset during the login process (issue 62) #### changes - Reject pushes to a repository with a working copy (i.e. non-bare repository) (issue-49) - Changed default web.datetimestampLongFormat from *EEEE, MMMM d, yyyy h:mm a z* to *EEEE, MMMM d, yyyy HH:mm Z* (issue 50) - Expanded commit age coloring from 2 days to 30 days (issue 57) #### additions - Added optional Lucene branch indexing (issue 16)<br/> **New:** *web.allowLuceneIndexing = true*<br/> **New:** *web.luceneIgnoreExtensions = 7z arc arj bin bmp dll doc docx exe gif gz jar jpg lib lzh odg odf odt pdf ppt png so swf xcf xls xlsx zip* Repository branches may be optionally indexed by Lucene for improved searching. To use this feature you must specify which branches to index within the *Edit Repository* page; _no repositories are automatically indexed_. Gitblit will build or incrementally update enrolled repositories on a 2 minute cycle. (i.e you will have to wait 2-3 minutes after respecifying indexed branches or pushing new commits before Gitblit will build/update the repository's Lucene index.) If a repository has Lucene-indexed branches the *search* form on the repository pages will redirect to the root-level Lucene search page and only the content of those branches can be searched.<br/> If the repository does not specify any indexed branches then repository commit-traversal search is used. **Note:** Initial indexing of an existing repository can be memory-exhaustive. Be sure to provide your Gitblit server adequate heap space to index your repositories (e.g. -Xmx1024M).<br/> See the [setup](setup.html) page for additional details. - Allow specifying timezone to use for Gitblit which is independent of both the JVM and the system timezone (issue 54)<br/> **New:** *web.timezone =* - Added a built-in AJP connector for integrating Gitblit GO into an Apache mod_proxy setup (issue 59)<br/> **New:** *server.ajpPort = 0*<br/> **New:** *server.ajpBindInterface = localhost* - On the Repositories page show a bang *!* character in the color swatch of a repository with a working copy (issue 49)<br/> Push requests to these repositories will be rejected. - On all non-bare Repository pages show *WORKING COPY* in the upper right corner (issue 49) - New setting to prevent display/serving non-bare repositories<br/> **New:** *git.onlyAccessBareRepositories = false* - Added *protect-refs.groovy* (Github/plm) - Allow setting default branch (relinking HEAD) to a branch or a tag (Github/plm) - Added Ubuntu service init script (issue 72) - Added partial Japanese translation (Github/zakki) #### fixes - Ensure that Welcome message is parsed using UTF-8 encoding (issue 74) - Activity page chart layout broken by Google (issue 73) - Uppercase repositories not selectable in edit palettes (issue 71) - Not all git notes were properly displayed on the commit page (issue 70) - Activity page now displays all local branches (issue 65) - Fixed (harmless) nullpointer on pushing to an empty repository (issue 69) - Fixed possible nullpointer from the servlet container on startup (issue 67) - Fixed UTF-8 encoding bug on diff page (issue 66) - Fixed timezone bugs on the activity page (issue 54) - Prevent add/edit team with no selected repositories (issue 56) - Disallow browser autocomplete on add/edit user/team/repository pages - Fixed username case-sensitivity issues (issue 43) - Disregard searching a subfolder if Gitblit does not have filesystem permissions (Github/lemval issue 51) #### dependency changes - updated to Bootstrap 2.0.2 - added GLYPHICONS (as bundled with Bootstrap 2.0.2) - updated to MarkdownPapers 1.2.7 - updated to JGit 1.3.0.201202151440-r - updated to Wicket 1.4.20 <hr/> **0.8.2** ([go](http://code.google.com/p/gitblit/downloads/detail?name=gitblit-0.8.2.zip) | [war](http://code.google.com/p/gitblit/downloads/detail?name=gitblit-0.8.2.war) | [express](http://code.google.com/p/gitblit/downloads/detail?name=express-0.8.2.zip) | [fedclient](http://code.google.com/p/gitblit/downloads/detail?name=fedclient-0.8.2.zip) | [manager](http://code.google.com/p/gitblit/downloads/detail?name=manager-0.8.2.zip) | [api](http://code.google.com/p/gitblit/downloads/detail?name=gbapi-0.8.2.zip)) based on [JGit 1.2.0 (201112221803-r)][jgit] *released 2012-01-13* #### fixes - Fixed bug when upgrading from users.properties to users.conf (issue 41) <hr/> **0.8.1** *released 2012-01-11* #### fixes - Include missing icon resource for the manager (issue 40) - Fixed sendmail.groovy message content with incorrect tag/branch labels <hr/> **0.8.0** *released 2012-01-11* #### additions - Platform-independent, Groovy push hook script mechanism.<br/> Hook scripts can be set per-repository, per-team, or globally for all repositories.<br/> **New:** *groovy.scriptsFolder = groovy*<br/> **New:** *groovy.preReceiveScripts =*<br/> **New:** *groovy.postReceiveScripts =* - *sendmail.groovy* for optional email notifications on push.<br/> You must properly configure your SMTP server settings in `gitblit.properties` or `web.xml` to use *sendmail.groovy*. - New global key for mailing lists. This is used in conjunction with the *sendmail.groovy* hook script. All repositories that use the *sendmail.groovy* script will include these addresses in the notification process. Please see the Setup page for more details about configuring sendmail.<br/> **New:** *mail.mailingLists =* - *com.gitblit.GitblitUserService*. This is a wrapper object for the built-in user service implementations. For those wanting to only implement custom authentication it is recommended to subclass GitblitUserService and override the appropriate methods. Going forward, this will help insulate custom authentication from new IUserService API and/or changes in model classes. - New default user service implementation: *com.gitblit.ConfigUserService* (`users.conf`)<br/> This user service implementation allows for serialization and deserialization of more sophisticated Gitblit User objects without requiring the encoding trickery now present in FileUserService (users.properties). This will open the door for more advanced Gitblit features. For those upgrading from an earlier Gitblit version, a `users.conf` file will automatically be created for you from your existing `users.properties` file on your first launch of Gitblit <u>however</u> you will have to manually set *realm.userService=users.conf* to switch to the new user service.<br/> The original `users.properties` file and it's corresponding implementation are **deprecated**.<br/> **New:** *realm.userService = users.conf* - Teams for specifying user-repository access in bulk. Teams may also specify mailing lists addresses and pre- & post- receive hook scripts. - Gravatar integration<br/> **New:** *web.allowGravatar = true* - Activity page for aggregated repository activity. This is a timeline of commit activity over the last N days for one or more repositories.<br/> **New:** *web.activityDuration = 14*<br/> **New:** *web.timeFormat = HH:mm*<br/> **New:** *web.datestampLongFormat = EEEE, MMMM d, yyyy* - *Filters* menu for the Repositories page and Activity page. You can filter by federation set, team, and simple custom regular expressions. Custom expressions can be stored in `gitblit.properties` or `web.xml` or directly defined in your url (issue 27)<br/> **New:** *web.customFilters=* - Flash-based 1-step *copy to clipboard* of the primary repository url based on Clippy<br/> **New:** *web.allowFlashCopyToClipboard = true* - JavaScript-based 3-step (click, ctrl+c, enter) *copy to clipboard* of the primary repository url in the event that you do not want to use Flash on your installation - Empty repositories now link to an *empty repository* page which gives some direction to the user for the next step in using Gitblit. This page displays the primary push/clone url of the repository and gives sample syntax for the git command-line client. (issue 31) - Repositories with a *gh-pages* branch will now have a *pages* link which will serve the content of this branch. All resource requests are against the repository, Gitblit does not checkout/export this branch to a temporary filesystem. Jekyll templating is not supported. - Gitblit Express bundle to get started running Gitblit on RedHat's OpenShift cloud <span class="label label-warning">BETA</span> #### changes - Dropped display of trailing .git from repository names - Gitblit GO is now monolithic like the WAR build. (issue 30)<br/> This change helps adoption of GO in environments without an internet connection or with a restricted connection. - Unit testing framework has been migrated to JUnit4 syntax and the test suite has been redesigned to run all unit tests, including rpc, federation, and git push/clone tests #### fixes - Several a bugs in FileUserService related to cleaning up old repository permissions on a rename or delete - Renaming a repository into a new subfolder failed (issue 33) #### dependency changes - updated to JGit 1.2.0 - added Groovy 1.8.5 - added Clippy (bundled) <hr/> **0.7.0** *released 2011-11-11* - **security**: fixed security hole when cloning clone-restricted repository with TortoiseGit (issue 28) - improved: updated ui with Twitter's Bootstrap CSS toolkit<br/> **New:** *web.loginMessage = gitblit* - improved: repositories list performance by caching repository sizes (issue 27) - improved: summary page performance by caching metric calculations (issue 25) - added: authenticated JSON RPC mechanism<br/> **New:** *web.enableRpcServlet = true*<br/> **New:** *web.enableRpcManagement = false*<br/> **New:** *web.enableRpcAdministration = false* - added: Gitblit API RSS/JSON RPC library - added: Gitblit Manager (Java/Swing Application) for remote administration of a Gitblit server. - added: per-repository setting to skip size calculation (faster repositories page loading) - added: per-repository setting to skip summary metrics calculation (faster summary page loading) - added: IUserService.setup(IStoredSettings) for custom user service implementations - added: setting to control Gitblit GO context path for proxy setups *(Github/trygvis)*<br/> **New:** *server.contextPath = /* - added: *combined-md5* password storage option which stores the hash of username+password as the password *(Github/alyandon)* - added: repository owners are automatically granted access for git, feeds, and zip downloads without explicitly selecting them *(Github/dadalar)* - added: RSS feeds now include regex substitutions on commit messages for bug trackers, etc - fixed: federation protocol timestamps. dates are now serialized to the [iso8601](http://en.wikipedia.org/wiki/ISO_8601) standard.<br/> **This breaks 0.6.0 federation clients/servers.** - fixed: collision on rename for repositories and users - fixed: Gitblit can now browse the Linux kernel repository (issue 25) - fixed: Gitblit now runs on Servlet 3.0 webservers (e.g. Tomcat 7, Jetty 8) (issue 23) - fixed: Set the RSS content type of syndication feeds for Firefox 4 (issue 22) - fixed: RSS feeds are now properly encoded to UTF-8 - fixed: RSS feeds now properly generate parameterized links if *web.mountParameters=false* - fixed: Null pointer exception if did not set federation strategy (issue 20) - fixed: Gitblit GO allows SSL renegotiation if running on Java 1.6.0_22 or later - updated: MarkdownPapers 1.2.5 - updated: Wicket 1.4.19 <hr/> **0.6.0** *released 2011-09-27* - added: federation feature to allow gitblit instances (or gitblit federation clients) to pull repositories and, optionally, settings and accounts from other gitblit instances. This is something like [svn-sync](http://svnbook.red-bean.com/en/1.5/svn.ref.svnsync.html) for gitblit.<br/> **New:** *federation.name =*<br/> **New:** *federation.passphrase =*<br/> **New:** *federation.allowProposals = false*<br/> **New:** *federation.proposalsFolder = proposals*<br/> **New:** *federation.defaultFrequency = 60 mins*<br/> **New:** *federation.sets =*<br/> **New:** *mail.* settings for sending emails<br/> **New:** user role *#notfederated* to prevent a user account from being pulled by a federated Gitblit instance - added: google-gson dependency - added: javamail dependency - updated: MarkdownPapers 1.1.1 - updated: Wicket 1.4.18 - updated: JGit 1.1.0 - fixed: syndication urls for WAR deployments - fixed: authentication for zip downloads <hr/> **0.5.2** *released 2011-07-27* - fixed: active repositories with a HEAD that pointed to an empty branch caused internal errors (issue 14) - fixed: bare-cloned repositories were listed as (empty) and were not clickable (issue 13) - fixed: default port for Gitblit GO is now 8443 to be more linux/os x friendly (issue 12) - fixed: repositories can now be reliably deleted and renamed (issue 10) - fixed: users can now change their passwords (issue 1) - fixed: always show root repository group first, i.e. don't sort root group with other groups - fixed: tone-down repository group header color - added: optionally display repository on-disk size on repositories page<br/> **New:** *web.showRepositorySizes = true* - added: forward-slashes ('/', %2F) can be encoded using a custom character to workaround some servlet container default security measures for proxy servers<br/> **New:** *web.forwardSlashCharacter = /* - updated: MarkdownPapers 1.1.0 - updated: Jetty 7.4.3 <hr/> **0.5.1** *released 2011-06-28* - clarified SSL certificate generation and configuration for both server-side and client-side - added some more troubleshooting information to documentation - replaced JavaService with Apache Commons Daemon <hr/> **0.5.0** *released 2011-06-26* - initial release [jgit]: http://eclipse.org/jgit "Eclipse JGit Site" src/site/releases.mkd
src/site/resources/architecture.pngsrc/site/resources/fed_aggregation.pngsrc/site/resources/fed_mirror.pngsrc/site/resources/ldapSample.pngsrc/site/resources/permissions_matrix.pngsrc/site/resources/screenshots.js
src/site/resources/stjude_150x150.gifsrc/site/roadmap.mkd
src/site/rpc.mkd
src/site/screenshots.mkd
File was renamed from docs/01_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> </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> src/site/screenshots/00.pngsrc/site/screenshots/00b.pngsrc/site/screenshots/00c.pngsrc/site/screenshots/00d.pngsrc/site/screenshots/01.pngsrc/site/screenshots/01b.pngsrc/site/screenshots/01c.pngsrc/site/screenshots/02.pngsrc/site/screenshots/03.pngsrc/site/screenshots/04.pngsrc/site/screenshots/05.pngsrc/site/screenshots/06.pngsrc/site/screenshots/07.pngsrc/site/screenshots/08.pngsrc/site/screenshots/09.pngsrc/site/screenshots/10.pngsrc/site/screenshots/11.pngsrc/site/screenshots/12.pngsrc/site/screenshots/13.pngsrc/site/screenshots/14.pngsrc/site/screenshots/15.pngsrc/site/screenshots/image_processing.txt
src/site/screenshots/m00.pngsrc/site/screenshots/m01.pngsrc/site/screenshots/m02.pngsrc/site/screenshots/m03.pngsrc/site/screenshots/m04.pngsrc/site/screenshots/m05.pngsrc/site/screenshots/m06.pngsrc/site/screenshots/m07.pngsrc/site/screenshots/m08.pngsrc/site/screenshots/m09.pngsrc/site/screenshots/m10.pngsrc/site/setup.mkd
File was renamed from docs/01_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. @@ -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
File was renamed from docs/00_index.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> src/site/templates/atom.ftl
New file @@ -0,0 +1,2 @@ <#include "macros.ftl"> <@AtomMacro posts=releases posturl="${project.url}/history.html#" /> src/site/templates/macros.ftl
New file @@ -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> src/site/templates/releasecurrent.ftl
New file @@ -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> src/site/templates/releasehistory.ftl
New file @@ -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> src/site/templates/rss.ftl
New file @@ -0,0 +1,2 @@ <#include "macros.ftl"> <@RssMacro posts=releases posturl="${project.url}/releases.html#" /> src/test/config/test-gitblit.properties
src/test/config/test-ui-gitblit.properties
src/test/config/test-ui-users.conf
src/test/config/test-users.conf
src/test/java/com/gitblit/tests/ActivityTest.java
src/test/java/com/gitblit/tests/ArrayUtilsTest.java
src/test/java/com/gitblit/tests/Base64Test.java
src/test/java/com/gitblit/tests/ByteFormatTest.java
src/test/java/com/gitblit/tests/DiffUtilsTest.java
src/test/java/com/gitblit/tests/FanoutServiceTest.java
src/test/java/com/gitblit/tests/FederationTests.java
src/test/java/com/gitblit/tests/FileUtilsTest.java
src/test/java/com/gitblit/tests/GitBlitSuite.java
src/test/java/com/gitblit/tests/GitBlitTest.java
src/test/java/com/gitblit/tests/GitServletTest.java
src/test/java/com/gitblit/tests/GroovyScriptTest.java
src/test/java/com/gitblit/tests/IssuesTest.java
src/test/java/com/gitblit/tests/JGitUtilsTest.java
src/test/java/com/gitblit/tests/JsonUtilsTest.java
src/test/java/com/gitblit/tests/LdapUserServiceTest.java
src/test/java/com/gitblit/tests/LuceneExecutorTest.java
src/test/java/com/gitblit/tests/MailTest.java
src/test/java/com/gitblit/tests/MarkdownUtilsTest.java
src/test/java/com/gitblit/tests/MetricUtilsTest.java
src/test/java/com/gitblit/tests/ObjectCacheTest.java
src/test/java/com/gitblit/tests/PermissionsTest.java
src/test/java/com/gitblit/tests/PushLogTest.java
src/test/java/com/gitblit/tests/RedmineUserServiceTest.java
src/test/java/com/gitblit/tests/RepositoryModelTest.java
src/test/java/com/gitblit/tests/RpcTests.java
src/test/java/com/gitblit/tests/StringUtilsTest.java
src/test/java/com/gitblit/tests/SyndicationUtilsTest.java
src/test/java/com/gitblit/tests/TicgitUtilsTest.java
src/test/java/com/gitblit/tests/TimeUtilsTest.java
src/test/java/com/gitblit/tests/UserServiceTest.java
src/test/java/com/gitblit/tests/X509UtilsTest.java
src/test/java/com/gitblit/tests/mock/MemorySettings.java
src/test/java/com/gitblit/tests/resources/ldapUserServiceSampleData.ldif
src/test/java/de/akquinet/devops/GitBlit4UITests.java
src/test/java/de/akquinet/devops/GitBlitServer4UITests.java
src/test/java/de/akquinet/devops/GitblitRunnable.java
src/test/java/de/akquinet/devops/LaunchWithUITestConfig.java
File was renamed from tests/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, src/test/java/de/akquinet/devops/ManualUITestLaunch.java
File was renamed from tests/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, src/test/java/de/akquinet/devops/test/ui/TestUISuite.java
src/test/java/de/akquinet/devops/test/ui/cases/UI_MultiAdminSupportTest.java
src/test/java/de/akquinet/devops/test/ui/generic/AbstractUITest.java
src/test/java/de/akquinet/devops/test/ui/view/Exp.java
src/test/java/de/akquinet/devops/test/ui/view/GitblitDashboardView.java
src/test/java/de/akquinet/devops/test/ui/view/GitblitPageView.java
src/test/java/de/akquinet/devops/test/ui/view/RepoEditView.java
src/test/java/de/akquinet/devops/test/ui/view/RepoListView.java
tmplt.pom.xml
File was deleted tools/GenJar.jarBinary files differ
tools/ant-googlecode-0.0.3.jarBinary files differ
