Browse Source

Reorganized to Apache Standard Directory Layout & integrated Moxie

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

The Ant build script will likely require additional fine-tuning, but
this is big step forward.
tags/v1.3.0
James Moger 11 years ago
parent
commit
f6b200be4c
100 changed files with 3391 additions and 1421 deletions
  1. 54
    48
      .classpath
  2. 161
    0
      build.moxie
  3. 681
    980
      build.xml
  4. BIN
      distrib/amd64/gitblit.exe
  5. 0
    1
      distrib/authority.cmd
  6. 0
    37
      distrib/gitblit
  7. BIN
      distrib/gitblitw.exe
  8. BIN
      distrib/ia64/gitblit.exe
  9. 0
    3
      distrib/install-service-centos.sh
  10. 0
    3
      distrib/install-service.sh
  11. BIN
      distrib/x86/gitblit.exe
  12. 0
    8
      docs/doc_footer.html
  13. 0
    33
      docs/doc_header.html
  14. 0
    8
      docs/site_footer.html
  15. 0
    51
      docs/site_header.html
  16. 244
    46
      gitblit.iml
  17. 694
    0
      releases.moxie
  18. 0
    54
      src/com/gitblit/FederationClientLauncher.java
  19. 0
    112
      src/com/gitblit/client/GitblitManagerLauncher.java
  20. 0
    0
      src/main/config/checkstyle.xml
  21. 0
    0
      src/main/distrib/data/certs/authority.conf
  22. 0
    0
      src/main/distrib/data/certs/instructions.tmpl
  23. 0
    0
      src/main/distrib/data/certs/mail.tmpl
  24. 1
    1
      src/main/distrib/data/gitblit.properties
  25. 0
    0
      src/main/distrib/data/groovy/.gitignore
  26. 0
    0
      src/main/distrib/data/groovy/blockpush.groovy
  27. 0
    0
      src/main/distrib/data/groovy/jenkins.groovy
  28. 0
    0
      src/main/distrib/data/groovy/localclone.groovy
  29. 0
    0
      src/main/distrib/data/groovy/protect-refs.groovy
  30. 0
    0
      src/main/distrib/data/groovy/sendmail-html.groovy
  31. 0
    0
      src/main/distrib/data/groovy/sendmail.groovy
  32. 0
    0
      src/main/distrib/data/groovy/thebuggenie.groovy
  33. 0
    0
      src/main/distrib/data/projects.conf
  34. 0
    0
      src/main/distrib/data/users.conf
  35. 0
    0
      src/main/distrib/federation.properties
  36. 0
    0
      src/main/distrib/groovy/fogbugz.groovy
  37. 21
    0
      src/main/distrib/linux/add-indexed-branch.sh
  38. 2
    0
      src/main/distrib/linux/authority.sh
  39. 2
    0
      src/main/distrib/linux/gitblit-stop.sh
  40. 2
    0
      src/main/distrib/linux/gitblit.sh
  41. 3
    0
      src/main/distrib/linux/install-service-centos.sh
  42. 3
    0
      src/main/distrib/linux/install-service-ubuntu.sh
  43. 0
    0
      src/main/distrib/linux/java-proxy-config.sh
  44. 0
    0
      src/main/distrib/linux/service-centos.sh
  45. 0
    0
      src/main/distrib/linux/service-ubuntu.sh
  46. 0
    0
      src/main/distrib/win/add-indexed-branch.cmd
  47. 1
    0
      src/main/distrib/win/authority.cmd
  48. 0
    0
      src/main/distrib/win/gitblit-stop.cmd
  49. 0
    0
      src/main/distrib/win/gitblit.cmd
  50. 2
    2
      src/main/distrib/win/installService.cmd
  51. 0
    0
      src/main/distrib/win/uninstallService.cmd
  52. 1311
    0
      src/main/java/WEB-INF/reference.properties
  53. 0
    0
      src/main/java/WEB-INF/web.xml
  54. 0
    0
      src/main/java/com/gitblit/.gitignore
  55. 0
    0
      src/main/java/com/gitblit/AccessRestrictionFilter.java
  56. 0
    0
      src/main/java/com/gitblit/AddIndexedBranch.java
  57. 0
    0
      src/main/java/com/gitblit/AuthenticationFilter.java
  58. 0
    0
      src/main/java/com/gitblit/ConfigUserService.java
  59. 36
    15
      src/main/java/com/gitblit/Constants.java
  60. 0
    0
      src/main/java/com/gitblit/DownloadZipFilter.java
  61. 0
    0
      src/main/java/com/gitblit/DownloadZipServlet.java
  62. 102
    0
      src/main/java/com/gitblit/EnforceAuthenticationFilter.java
  63. 1
    1
      src/main/java/com/gitblit/FederationClient.java
  64. 0
    0
      src/main/java/com/gitblit/FederationPullExecutor.java
  65. 0
    0
      src/main/java/com/gitblit/FederationServlet.java
  66. 0
    0
      src/main/java/com/gitblit/FileSettings.java
  67. 0
    0
      src/main/java/com/gitblit/FileUserService.java
  68. 0
    0
      src/main/java/com/gitblit/GCExecutor.java
  69. 0
    0
      src/main/java/com/gitblit/GitBlit.java
  70. 0
    0
      src/main/java/com/gitblit/GitBlitException.java
  71. 0
    0
      src/main/java/com/gitblit/GitBlitServer.java
  72. 0
    0
      src/main/java/com/gitblit/GitFilter.java
  73. 0
    0
      src/main/java/com/gitblit/GitServlet.java
  74. 0
    0
      src/main/java/com/gitblit/GitblitSslContextFactory.java
  75. 0
    0
      src/main/java/com/gitblit/GitblitTrustManager.java
  76. 0
    0
      src/main/java/com/gitblit/GitblitUserService.java
  77. 0
    0
      src/main/java/com/gitblit/IStoredSettings.java
  78. 0
    0
      src/main/java/com/gitblit/IUserService.java
  79. 0
    0
      src/main/java/com/gitblit/JsonServlet.java
  80. 0
    0
      src/main/java/com/gitblit/LdapUserService.java
  81. 0
    0
      src/main/java/com/gitblit/LuceneExecutor.java
  82. 0
    0
      src/main/java/com/gitblit/MailExecutor.java
  83. 0
    0
      src/main/java/com/gitblit/PagesFilter.java
  84. 0
    0
      src/main/java/com/gitblit/PagesServlet.java
  85. 0
    0
      src/main/java/com/gitblit/RedmineUserService.java
  86. 0
    0
      src/main/java/com/gitblit/RobotsTxtServlet.java
  87. 0
    0
      src/main/java/com/gitblit/RpcFilter.java
  88. 0
    0
      src/main/java/com/gitblit/RpcServlet.java
  89. 0
    0
      src/main/java/com/gitblit/ServletRequestWrapper.java
  90. 0
    0
      src/main/java/com/gitblit/SyndicationFilter.java
  91. 0
    0
      src/main/java/com/gitblit/SyndicationServlet.java
  92. 0
    0
      src/main/java/com/gitblit/WebXmlSettings.java
  93. 0
    0
      src/main/java/com/gitblit/authority/AuthorityWorker.java
  94. 0
    0
      src/main/java/com/gitblit/authority/CertificateStatus.java
  95. 0
    0
      src/main/java/com/gitblit/authority/CertificateStatusRenderer.java
  96. 0
    0
      src/main/java/com/gitblit/authority/CertificatesTableModel.java
  97. 0
    0
      src/main/java/com/gitblit/authority/DefaultOidsPanel.java
  98. 1
    1
      src/main/java/com/gitblit/authority/GitblitAuthority.java
  99. 69
    17
      src/main/java/com/gitblit/authority/Launcher.java
  100. 0
    0
      src/main/java/com/gitblit/authority/NewCertificateConfig.java

+ 54
- 48
.classpath View File

@@ -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>

+ 161
- 0
build.moxie View 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'


+ 681
- 980
build.xml
File diff suppressed because it is too large
View File


BIN
distrib/amd64/gitblit.exe View File


+ 0
- 1
distrib/authority.cmd View File

@@ -1 +0,0 @@
@java -jar authority.jar --baseFolder data %*

+ 0
- 37
distrib/gitblit View File

@@ -1,37 +0,0 @@
#!/bin/sh

set -e

GITBLIT_PATH=/opt/gitblit
GITBLIT_BASE_FOLDER=/opt/gitblit/data
GITBLIT_HTTP_PORT=0
GITBLIT_HTTPS_PORT=8443
source ${GITBLIT_PATH}/java-proxy-config.sh
JAVA="java -server -Xmx1024M ${JAVA_PROXY_CONFIG} -Djava.awt.headless=true -jar"

. /lib/lsb/init-functions

case "$1" in
start)
log_action_begin_msg "Starting gitblit server"
cd $GITBLIT_PATH
$JAVA $GITBLIT_PATH/gitblit.jar --httpsPort $GITBLIT_HTTPS_PORT --httpPort $GITBLIT_HTTP_PORT --baseFolder $GITBLIT_BASE_FOLDER > /dev/null &
log_action_end_msg $?
;;
stop)
log_action_begin_msg "Stopping gitblit server"
cd $GITBLIT_PATH
$JAVA $GITBLIT_PATH/gitblit.jar --baseFolder $GITBLIT_BASE_FOLDER --stop > /dev/null &
log_action_end_msg $?
;;
force-reload|restart)
$0 stop
$0 start
;;
*)
echo "Usage: /etc/init.d/gitblit {start|stop|restart|force-reload}"
exit 1
;;
esac

exit 0

BIN
distrib/gitblitw.exe View File


BIN
distrib/ia64/gitblit.exe View File


+ 0
- 3
distrib/install-service-centos.sh View File

@@ -1,3 +0,0 @@
cp gitblit-centos /etc/init.d/gitblit
chmod +x /etc/init.d/gitblit
sudo chkconfig --add gitblit

+ 0
- 3
distrib/install-service.sh View File

@@ -1,3 +0,0 @@
cp gitblit /etc/init.d/
chmod +x /etc/init.d/gitblit
sudo update-rc.d gitblit defaults

BIN
distrib/x86/gitblit.exe View File


+ 0
- 8
docs/doc_footer.html View File

@@ -1,8 +0,0 @@
</div> <!-- markdown -->
<footer>
<p class="pull-right">{0}</p>
The content of this page is licensed under the <a href="http://creativecommons.org/licenses/by/3.0">Creative Commons Attribution 3.0 License</a>.
</footer>
</div> <!-- container -->
</body>
</html>

+ 0
- 33
docs/doc_header.html View File

@@ -1,33 +0,0 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
<html>
<head>
<title>Gitblit</title>
<link rel="stylesheet" href="./bootstrap/css/bootstrap.css"/>
<link rel="stylesheet" type="text/css" href="./gitblit.css"/>
<link rel="shortcut icon" type="image/png" href="./gitblt-favicon.png" />
<meta name="ROBOTS" content="INDEX, NOFOLLOW">
<meta http-equiv="imagetoolbar" content="no" />
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
<meta name="keywords" content="java git server" />
<script type="text/javascript" src="./bootstrap/js/jquery.js"></script>
<script type="text/javascript" src="./bootstrap/js/bootstrap.js"></script>
<script type="text/javascript" src="prettify/prettify.js"></script>
<link href="prettify/prettify.css" type="text/css" rel="stylesheet" />
</head>
<body onload="prettyPrint()">
<div class="navbar navbar-fixed-top">
<div class="navbar-inner">
<div class="container">
<a class="brand" href="http://gitblit.com" title="gitblit homepage">
<img src="gitblt_25_white.png" width="79" height="25" alt="gitblit" class="logo"/>
</a>
<ul class="nav">
{1}
</ul>
</div>
</div>
</div>
<div class="container">
<div class="markdown">

+ 0
- 8
docs/site_footer.html View File

@@ -1,8 +0,0 @@
</div> <!-- markdown -->
<footer>
<p class="pull-right">{0}</p>
The content of this page is licensed under the <a href="http://creativecommons.org/licenses/by/3.0">Creative Commons Attribution 3.0 License</a>.
</footer>
</div> <!-- container -->
</body>
</html>

+ 0
- 51
docs/site_header.html View File

@@ -1,51 +0,0 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
<html>
<head>
<title>Gitblit</title>
<link rel="stylesheet" href="./bootstrap/css/bootstrap.css"/>
<link rel="stylesheet" type="text/css" href="./gitblit.css"/>
<link rel="shortcut icon" type="image/png" href="./gitblt-favicon.png" />
<meta name="ROBOTS" content="INDEX">
<meta http-equiv="imagetoolbar" content="no" />
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
<meta name="keywords" content="java git server" />
<script type="text/javascript" src="./bootstrap/js/jquery.js"></script>
<script type="text/javascript" src="./bootstrap/js/bootstrap.js"></script>
<script type="text/javascript" src="./fancybox/query.mousewheel-3.0.4.pack.js"></script>
<script type="text/javascript" src="./fancybox/jquery.fancybox-1.3.4.pack.js"></script>
<link rel="stylesheet" type="text/css" href="./fancybox/jquery.fancybox-1.3.4.css" media="screen" />
<script type="text/javascript" src="./screenshots.js"></script>
<script type="text/javascript" src="prettify/prettify.js"></script>
<link href="prettify/prettify.css" type="text/css" rel="stylesheet" />
<!-- Place this tag in your head or just before your close body tag -->
<link rel="canonical" href="http://gitblit.com" />
<link rel="publisher" href="https://plus.google.com/114464678392593421684" />
<script type="text/javascript" src="https://apis.google.com/js/plusone.js"></script>
<!-- ANALYTICS -->
</head>
<body onload="prettyPrint()">
<div class="navbar navbar-fixed-top">
<div class="navbar-inner">
<div class="container">
<a class="brand" href="http://gitblit.com" title="gitblit homepage">
<img src="gitblt_25_white.png" width="79" height="25" alt="gitblit" class="logo"/>
</a>
<ul class="nav">
{1}
<!-- Google Plus Badge -->
<li><a href="https://plus.google.com/114464678392593421684?prsrc=3" style="margin-top:3px;text-decoration: none;"><img src="https://ssl.gstatic.com/images/icons/gplus-16.png" width="16" height="16" style="border: 0;"/></a></li>
<!-- Google Plus One -->
<li><div style="margin-top:14px;"><g:plusone size="small" href="http://gitblit.com"></g:plusone></div></li>
</ul>
</div>
</div>
</div>
<div class="container">
<div class="markdown">

+ 244
- 46
gitblit.iml View File

@@ -5,9 +5,9 @@
<output-test url="file://$MODULE_DIR$/bin/test-classes" />
<exclude-output />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/resources" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/tests" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" isTestSource="false" />
</content>
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module-library">
@@ -17,7 +17,7 @@
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$MODULE_DIR$/ext/src/jcommander-1.17-sources.jar!/" />
<root url="jar://$MODULE_DIR$/ext/src/jcommander-1.17.jar!/" />
</SOURCES>
</library>
</orderEntry>
@@ -28,7 +28,7 @@
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$MODULE_DIR$/ext/src/log4j-1.2.17-sources.jar!/" />
<root url="jar://$MODULE_DIR$/ext/src/log4j-1.2.17.jar!/" />
</SOURCES>
</library>
</orderEntry>
@@ -39,7 +39,7 @@
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$MODULE_DIR$/ext/src/slf4j-api-1.6.6-sources.jar!/" />
<root url="jar://$MODULE_DIR$/ext/src/slf4j-api-1.6.6.jar!/" />
</SOURCES>
</library>
</orderEntry>
@@ -50,7 +50,7 @@
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$MODULE_DIR$/ext/src/slf4j-log4j12-1.6.6-sources.jar!/" />
<root url="jar://$MODULE_DIR$/ext/src/slf4j-log4j12-1.6.6.jar!/" />
</SOURCES>
</library>
</orderEntry>
@@ -61,7 +61,7 @@
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$MODULE_DIR$/ext/src/mail-1.4.3-sources.jar!/" />
<root url="jar://$MODULE_DIR$/ext/src/mail-1.4.3.jar!/" />
</SOURCES>
</library>
</orderEntry>
@@ -72,7 +72,7 @@
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$MODULE_DIR$/ext/src/javax.servlet-api-3.0.1-sources.jar!/" />
<root url="jar://$MODULE_DIR$/ext/src/javax.servlet-api-3.0.1.jar!/" />
</SOURCES>
</library>
</orderEntry>
@@ -83,7 +83,7 @@
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$MODULE_DIR$/ext/src/jetty-webapp-7.6.8.v20121106-sources.jar!/" />
<root url="jar://$MODULE_DIR$/ext/src/jetty-webapp-7.6.8.v20121106.jar!/" />
</SOURCES>
</library>
</orderEntry>
@@ -94,7 +94,7 @@
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$MODULE_DIR$/ext/src/jetty-ajp-7.6.8.v20121106-sources.jar!/" />
<root url="jar://$MODULE_DIR$/ext/src/jetty-ajp-7.6.8.v20121106.jar!/" />
</SOURCES>
</library>
</orderEntry>
@@ -105,7 +105,7 @@
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$MODULE_DIR$/ext/src/wicket-1.4.21-sources.jar!/" />
<root url="jar://$MODULE_DIR$/ext/src/wicket-1.4.21.jar!/" />
</SOURCES>
</library>
</orderEntry>
@@ -116,7 +116,7 @@
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$MODULE_DIR$/ext/src/wicket-auth-roles-1.4.21-sources.jar!/" />
<root url="jar://$MODULE_DIR$/ext/src/wicket-auth-roles-1.4.21.jar!/" />
</SOURCES>
</library>
</orderEntry>
@@ -127,7 +127,7 @@
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$MODULE_DIR$/ext/src/wicket-extensions-1.4.21-sources.jar!/" />
<root url="jar://$MODULE_DIR$/ext/src/wicket-extensions-1.4.21.jar!/" />
</SOURCES>
</library>
</orderEntry>
@@ -138,7 +138,7 @@
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$MODULE_DIR$/ext/src/googlecharts-1.4.21-sources.jar!/" />
<root url="jar://$MODULE_DIR$/ext/src/googlecharts-1.4.21.jar!/" />
</SOURCES>
</library>
</orderEntry>
@@ -149,7 +149,7 @@
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$MODULE_DIR$/ext/src/lucene-core-3.6.1-sources.jar!/" />
<root url="jar://$MODULE_DIR$/ext/src/lucene-core-3.6.1.jar!/" />
</SOURCES>
</library>
</orderEntry>
@@ -160,7 +160,7 @@
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$MODULE_DIR$/ext/src/lucene-highlighter-3.6.1-sources.jar!/" />
<root url="jar://$MODULE_DIR$/ext/src/lucene-highlighter-3.6.1.jar!/" />
</SOURCES>
</library>
</orderEntry>
@@ -171,7 +171,7 @@
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$MODULE_DIR$/ext/src/lucene-memory-3.6.1-sources.jar!/" />
<root url="jar://$MODULE_DIR$/ext/src/lucene-memory-3.6.1.jar!/" />
</SOURCES>
</library>
</orderEntry>
@@ -182,7 +182,7 @@
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$MODULE_DIR$/ext/src/lucene-queries-3.6.1-sources.jar!/" />
<root url="jar://$MODULE_DIR$/ext/src/lucene-queries-3.6.1.jar!/" />
</SOURCES>
</library>
</orderEntry>
@@ -202,40 +202,40 @@
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$MODULE_DIR$/ext/src/markdownpapers-core-1.3.2-sources.jar!/" />
<root url="jar://$MODULE_DIR$/ext/src/markdownpapers-core-1.3.2.jar!/" />
</SOURCES>
</library>
</orderEntry>
<orderEntry type="module-library">
<library name="org.eclipse.jgit-2.2.0.201212191850-r.jar">
<library name="org.eclipse.jgit-2.3.1.201302201838-r.jar">
<CLASSES>
<root url="jar://$MODULE_DIR$/ext/org.eclipse.jgit-2.2.0.201212191850-r.jar!/" />
<root url="jar://$MODULE_DIR$/ext/org.eclipse.jgit-2.3.1.201302201838-r.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$MODULE_DIR$/ext/src/org.eclipse.jgit-2.2.0.201212191850-r-sources.jar!/" />
<root url="jar://$MODULE_DIR$/ext/src/org.eclipse.jgit-2.3.1.201302201838-r.jar!/" />
</SOURCES>
</library>
</orderEntry>
<orderEntry type="module-library">
<library name="jsch-0.1.44-1.jar">
<library name="jsch-0.1.46.jar">
<CLASSES>
<root url="jar://$MODULE_DIR$/ext/jsch-0.1.44-1.jar!/" />
<root url="jar://$MODULE_DIR$/ext/jsch-0.1.46.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$MODULE_DIR$/ext/src/jsch-0.1.44-1-sources.jar!/" />
<root url="jar://$MODULE_DIR$/ext/src/jsch-0.1.46.jar!/" />
</SOURCES>
</library>
</orderEntry>
<orderEntry type="module-library">
<library name="org.eclipse.jgit.http.server-2.2.0.201212191850-r.jar">
<library name="org.eclipse.jgit.http.server-2.3.1.201302201838-r.jar">
<CLASSES>
<root url="jar://$MODULE_DIR$/ext/org.eclipse.jgit.http.server-2.2.0.201212191850-r.jar!/" />
<root url="jar://$MODULE_DIR$/ext/org.eclipse.jgit.http.server-2.3.1.201302201838-r.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$MODULE_DIR$/ext/src/org.eclipse.jgit.http.server-2.2.0.201212191850-r-sources.jar!/" />
<root url="jar://$MODULE_DIR$/ext/src/org.eclipse.jgit.http.server-2.3.1.201302201838-r.jar!/" />
</SOURCES>
</library>
</orderEntry>
@@ -246,7 +246,7 @@
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$MODULE_DIR$/ext/src/bcprov-jdk15on-1.47-sources.jar!/" />
<root url="jar://$MODULE_DIR$/ext/src/bcprov-jdk15on-1.47.jar!/" />
</SOURCES>
</library>
</orderEntry>
@@ -257,7 +257,7 @@
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$MODULE_DIR$/ext/src/bcmail-jdk15on-1.47-sources.jar!/" />
<root url="jar://$MODULE_DIR$/ext/src/bcmail-jdk15on-1.47.jar!/" />
</SOURCES>
</library>
</orderEntry>
@@ -268,7 +268,7 @@
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$MODULE_DIR$/ext/src/bcpkix-jdk15on-1.47-sources.jar!/" />
<root url="jar://$MODULE_DIR$/ext/src/bcpkix-jdk15on-1.47.jar!/" />
</SOURCES>
</library>
</orderEntry>
@@ -279,7 +279,7 @@
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$MODULE_DIR$/ext/src/rome-0.9-sources.jar!/" />
<root url="jar://$MODULE_DIR$/ext/src/rome-0.9.jar!/" />
</SOURCES>
</library>
</orderEntry>
@@ -290,7 +290,7 @@
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$MODULE_DIR$/ext/src/jdom-1.0-sources.jar!/" />
<root url="jar://$MODULE_DIR$/ext/src/jdom-1.0.jar!/" />
</SOURCES>
</library>
</orderEntry>
@@ -301,7 +301,7 @@
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$MODULE_DIR$/ext/src/gson-1.7.2-sources.jar!/" />
<root url="jar://$MODULE_DIR$/ext/src/gson-1.7.2.jar!/" />
</SOURCES>
</library>
</orderEntry>
@@ -312,7 +312,7 @@
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$MODULE_DIR$/ext/src/groovy-all-1.8.8-sources.jar!/" />
<root url="jar://$MODULE_DIR$/ext/src/groovy-all-1.8.8.jar!/" />
</SOURCES>
</library>
</orderEntry>
@@ -323,7 +323,7 @@
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$MODULE_DIR$/ext/src/unboundid-ldapsdk-2.3.0-sources.jar!/" />
<root url="jar://$MODULE_DIR$/ext/src/unboundid-ldapsdk-2.3.0.jar!/" />
</SOURCES>
</library>
</orderEntry>
@@ -334,7 +334,7 @@
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$MODULE_DIR$/ext/src/ivy-2.2.0-sources.jar!/" />
<root url="jar://$MODULE_DIR$/ext/src/ivy-2.2.0.jar!/" />
</SOURCES>
</library>
</orderEntry>
@@ -354,7 +354,7 @@
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$MODULE_DIR$/ext/src/commons-compress-1.4.1-sources.jar!/" />
<root url="jar://$MODULE_DIR$/ext/src/commons-compress-1.4.1.jar!/" />
</SOURCES>
</library>
</orderEntry>
@@ -365,28 +365,226 @@
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$MODULE_DIR$/ext/src/xz-1.0-sources.jar!/" />
<root url="jar://$MODULE_DIR$/ext/src/xz-1.0.jar!/" />
</SOURCES>
</library>
</orderEntry>
<orderEntry type="module-library" scope="PROVIDED">
<library name="commons-daemon-1.0.14.jar">
<CLASSES>
<root url="jar://$MODULE_DIR$/ext/commons-daemon-1.0.14.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$MODULE_DIR$/ext/src/commons-daemon-1.0.14.jar!/" />
</SOURCES>
</library>
</orderEntry>
<orderEntry type="module-library" scope="PROVIDED">
<library name="commons-daemon-1.0.14-bin-windows.zip">
<CLASSES>
<root url="jar://$MODULE_DIR$/ext/commons-daemon-1.0.14-bin-windows.zip!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library" scope="TEST">
<library name="junit-4.10.jar">
<library name="junit-4.11.jar">
<CLASSES>
<root url="jar://$MODULE_DIR$/ext/junit-4.10.jar!/" />
<root url="jar://$MODULE_DIR$/ext/junit-4.11.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$MODULE_DIR$/ext/src/junit-4.10-sources.jar!/" />
<root url="jar://$MODULE_DIR$/ext/src/junit-4.11.jar!/" />
</SOURCES>
</library>
</orderEntry>
<orderEntry type="module-library" scope="TEST">
<library name="hamcrest-core-1.1.jar">
<library name="hamcrest-core-1.3.jar">
<CLASSES>
<root url="jar://$MODULE_DIR$/ext/hamcrest-core-1.1.jar!/" />
<root url="jar://$MODULE_DIR$/ext/hamcrest-core-1.3.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
<SOURCES>
<root url="jar://$MODULE_DIR$/ext/src/hamcrest-core-1.3.jar!/" />
</SOURCES>
</library>
</orderEntry>
<orderEntry type="module-library" scope="TEST">
<library name="selenium-java-2.28.0.jar">
<CLASSES>
<root url="jar://$MODULE_DIR$/ext/selenium-java-2.28.0.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$MODULE_DIR$/ext/src/selenium-java-2.28.0.jar!/" />
</SOURCES>
</library>
</orderEntry>
<orderEntry type="module-library" scope="TEST">
<library name="selenium-support-2.28.0.jar">
<CLASSES>
<root url="jar://$MODULE_DIR$/ext/selenium-support-2.28.0.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$MODULE_DIR$/ext/src/selenium-support-2.28.0.jar!/" />
</SOURCES>
</library>
</orderEntry>
<orderEntry type="module-library" scope="TEST">
<library name="selenium-firefox-driver-2.28.0.jar">
<CLASSES>
<root url="jar://$MODULE_DIR$/ext/selenium-firefox-driver-2.28.0.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$MODULE_DIR$/ext/src/selenium-firefox-driver-2.28.0.jar!/" />
</SOURCES>
</library>
</orderEntry>
<orderEntry type="module-library" scope="TEST">
<library name="selenium-remote-driver-2.28.0.jar">
<CLASSES>
<root url="jar://$MODULE_DIR$/ext/selenium-remote-driver-2.28.0.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$MODULE_DIR$/ext/src/selenium-remote-driver-2.28.0.jar!/" />
</SOURCES>
</library>
</orderEntry>
<orderEntry type="module-library" scope="TEST">
<library name="cglib-nodep-2.1_3.jar">
<CLASSES>
<root url="jar://$MODULE_DIR$/ext/cglib-nodep-2.1_3.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$MODULE_DIR$/ext/src/cglib-nodep-2.1_3.jar!/" />
</SOURCES>
</library>
</orderEntry>
<orderEntry type="module-library" scope="TEST">
<library name="json-20080701.jar">
<CLASSES>
<root url="jar://$MODULE_DIR$/ext/json-20080701.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$MODULE_DIR$/ext/src/json-20080701.jar!/" />
</SOURCES>
</library>
</orderEntry>
<orderEntry type="module-library" scope="TEST">
<library name="selenium-api-2.28.0.jar">
<CLASSES>
<root url="jar://$MODULE_DIR$/ext/selenium-api-2.28.0.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$MODULE_DIR$/ext/src/selenium-api-2.28.0.jar!/" />
</SOURCES>
</library>
</orderEntry>
<orderEntry type="module-library" scope="TEST">
<library name="guava-13.0.1.jar">
<CLASSES>
<root url="jar://$MODULE_DIR$/ext/guava-13.0.1.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$MODULE_DIR$/ext/src/guava-13.0.1.jar!/" />
</SOURCES>
</library>
</orderEntry>
<orderEntry type="module-library" scope="TEST">
<library name="httpclient-4.2.1.jar">
<CLASSES>
<root url="jar://$MODULE_DIR$/ext/httpclient-4.2.1.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$MODULE_DIR$/ext/src/httpclient-4.2.1.jar!/" />
</SOURCES>
</library>
</orderEntry>
<orderEntry type="module-library" scope="TEST">
<library name="httpcore-4.2.1.jar">
<CLASSES>
<root url="jar://$MODULE_DIR$/ext/httpcore-4.2.1.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$MODULE_DIR$/ext/src/httpcore-4.2.1.jar!/" />
</SOURCES>
</library>
</orderEntry>
<orderEntry type="module-library" scope="TEST">
<library name="commons-logging-1.1.1.jar">
<CLASSES>
<root url="jar://$MODULE_DIR$/ext/commons-logging-1.1.1.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$MODULE_DIR$/ext/src/commons-logging-1.1.1.jar!/" />
</SOURCES>
</library>
</orderEntry>
<orderEntry type="module-library" scope="TEST">
<library name="commons-codec-1.6.jar">
<CLASSES>
<root url="jar://$MODULE_DIR$/ext/commons-codec-1.6.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$MODULE_DIR$/ext/src/commons-codec-1.6.jar!/" />
</SOURCES>
</library>
</orderEntry>
<orderEntry type="module-library" scope="TEST">
<library name="commons-exec-1.1.jar">
<CLASSES>
<root url="jar://$MODULE_DIR$/ext/commons-exec-1.1.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$MODULE_DIR$/ext/src/commons-exec-1.1.jar!/" />
</SOURCES>
</library>
</orderEntry>
<orderEntry type="module-library" scope="TEST">
<library name="jna-3.4.0.jar">
<CLASSES>
<root url="jar://$MODULE_DIR$/ext/jna-3.4.0.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$MODULE_DIR$/ext/src/jna-3.4.0.jar!/" />
</SOURCES>
</library>
</orderEntry>
<orderEntry type="module-library" scope="TEST">
<library name="platform-3.4.0.jar">
<CLASSES>
<root url="jar://$MODULE_DIR$/ext/platform-3.4.0.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$MODULE_DIR$/ext/src/platform-3.4.0.jar!/" />
</SOURCES>
</library>
</orderEntry>
<orderEntry type="module-library" scope="TEST">
<library name="commons-io-2.2.jar">
<CLASSES>
<root url="jar://$MODULE_DIR$/ext/commons-io-2.2.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$MODULE_DIR$/ext/src/commons-io-2.2.jar!/" />
</SOURCES>
</library>
</orderEntry>
<orderEntry type="inheritedJdk" />

+ 694
- 0
releases.moxie View 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]

+ 0
- 54
src/com/gitblit/FederationClientLauncher.java View File

@@ -1,54 +0,0 @@
/*
* Copyright 2011 gitblit.com.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.gitblit;
import java.io.File;
import java.io.IOException;
import java.util.Collections;
import java.util.List;
import com.gitblit.build.Build;
/**
* Downloads dependencies and launches command-line Federation client.
*
* @author James Moger
*
*/
public class FederationClientLauncher {
public static void main(String[] args) {
// download federation client runtime dependencies
Build.federationClient();
File libFolder = new File("ext");
List<File> jars = Launcher.findJars(libFolder.getAbsoluteFile());
// sort the jars by name and then reverse the order so the newer version
// of the library gets loaded in the event that this is an upgrade
Collections.sort(jars);
Collections.reverse(jars);
for (File jar : jars) {
try {
Launcher.addJarFile(jar);
} catch (IOException e) {
}
}
FederationClient.main(args);
}
}

+ 0
- 112
src/com/gitblit/client/GitblitManagerLauncher.java View File

@@ -1,112 +0,0 @@
/*
* Copyright 2011 gitblit.com.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.gitblit.client;
import java.awt.Color;
import java.awt.EventQueue;
import java.awt.FontMetrics;
import java.awt.Graphics2D;
import java.awt.SplashScreen;
import java.io.File;
import java.io.IOException;
import java.util.Collections;
import java.util.List;
import com.gitblit.Constants;
import com.gitblit.Launcher;
import com.gitblit.build.Build;
import com.gitblit.build.Build.DownloadListener;
/**
* Downloads dependencies and launches Gitblit Manager.
*
* @author James Moger
*
*/
public class GitblitManagerLauncher {
public static void main(String[] args) {
final SplashScreen splash = SplashScreen.getSplashScreen();
DownloadListener downloadListener = new DownloadListener() {
@Override
public void downloading(String name) {
updateSplash(splash, Translation.get("gb.downloading") + " " + name);
}
};
// download rpc client runtime dependencies
Build.manager(downloadListener);
File libFolder = new File("ext");
List<File> jars = Launcher.findJars(libFolder.getAbsoluteFile());
// sort the jars by name and then reverse the order so the newer version
// of the library gets loaded in the event that this is an upgrade
Collections.sort(jars);
Collections.reverse(jars);
for (File jar : jars) {
try {
updateSplash(splash, Translation.get("gb.loading") + " " + jar.getName() + "...");
Launcher.addJarFile(jar);
} catch (IOException e) {
}
}
updateSplash(splash, Translation.get("gb.starting") + " Gitblit Manager...");
GitblitManager.main(args);
}
private static void updateSplash(final SplashScreen splash, final String string) {
if (splash == null) {
return;
}
try {
EventQueue.invokeAndWait(new Runnable() {
public void run() {
Graphics2D g = splash.createGraphics();
if (g != null) {
// Splash is 320x120
FontMetrics fm = g.getFontMetrics();
// paint startup status
g.setColor(Color.darkGray);
int h = fm.getHeight() + fm.getMaxDescent();
int x = 5;
int y = 115;
int w = 320 - 2 * x;
g.fillRect(x, y - h, w, h);
g.setColor(Color.lightGray);
g.drawRect(x, y - h, w, h);
g.setColor(Color.WHITE);
int xw = fm.stringWidth(string);
g.drawString(string, x + ((w - xw) / 2), y - 5);
// paint version
String ver = "v" + Constants.VERSION;
int vw = g.getFontMetrics().stringWidth(ver);
g.drawString(ver, 320 - vw - 5, 34);
g.dispose();
splash.update();
}
}
});
} catch (Throwable t) {
t.printStackTrace();
}
}
}

checkstyle.xml → src/main/config/checkstyle.xml View File


distrib/authority.conf → src/main/distrib/data/certs/authority.conf View File


distrib/instructions.tmpl → src/main/distrib/data/certs/instructions.tmpl View File


distrib/mail.tmpl → src/main/distrib/data/certs/mail.tmpl View File


distrib/gitblit.properties → src/main/distrib/data/gitblit.properties View File

@@ -440,7 +440,7 @@ fanout.connectionLimit = 0
# RESTART REQUIRED
web.authenticateViewPages = false
# if web.authenticateViewPages=true you may optionally require a client-side
# If web.authenticateViewPages=true you may optionally require a client-side
# basic authentication prompt instead of the standard form-based login.
#
# SINCE 1.3.0

distrib/groovy/.gitignore → src/main/distrib/data/groovy/.gitignore View File


distrib/groovy/blockpush.groovy → src/main/distrib/data/groovy/blockpush.groovy View File


distrib/groovy/jenkins.groovy → src/main/distrib/data/groovy/jenkins.groovy View File


distrib/groovy/localclone.groovy → src/main/distrib/data/groovy/localclone.groovy View File


distrib/groovy/protect-refs.groovy → src/main/distrib/data/groovy/protect-refs.groovy View File


distrib/groovy/sendmail-html.groovy → src/main/distrib/data/groovy/sendmail-html.groovy View File


distrib/groovy/sendmail.groovy → src/main/distrib/data/groovy/sendmail.groovy View File


distrib/groovy/thebuggenie.groovy → src/main/distrib/data/groovy/thebuggenie.groovy View File


distrib/projects.conf → src/main/distrib/data/projects.conf View File


distrib/users.conf → src/main/distrib/data/users.conf View File


distrib/federation.properties → src/main/distrib/federation.properties View File


distrib/groovy/fogbugz.groovy → src/main/distrib/groovy/fogbugz.groovy View File


+ 21
- 0
src/main/distrib/linux/add-indexed-branch.sh View 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%

+ 2
- 0
src/main/distrib/linux/authority.sh View File

@@ -0,0 +1,2 @@
#!/bin/bash
java -cp gitblit.jar com.gitblit.authority.Launcher --baseFolder data

+ 2
- 0
src/main/distrib/linux/gitblit-stop.sh View File

@@ -0,0 +1,2 @@
#!/bin/bash
java -jar gitblit.jar --baseFolder data --stop

+ 2
- 0
src/main/distrib/linux/gitblit.sh View File

@@ -0,0 +1,2 @@
#!/bin/bash
java -jar gitblit.jar --baseFolder data

+ 3
- 0
src/main/distrib/linux/install-service-centos.sh View File

@@ -0,0 +1,3 @@
#!/bin/bash
sudo cp service-centos.sh /etc/init.d/gitblit
sudo chkconfig --add gitblit

+ 3
- 0
src/main/distrib/linux/install-service-ubuntu.sh View File

@@ -0,0 +1,3 @@
#!/bin/bash
sudo cp service-ubuntu.sh /etc/init.d/gitblit
sudo update-rc.d gitblit defaults

distrib/java-proxy-config.sh → src/main/distrib/linux/java-proxy-config.sh View File


distrib/gitblit-centos → src/main/distrib/linux/service-centos.sh View File


distrib/gitblit-ubuntu → src/main/distrib/linux/service-ubuntu.sh View File


distrib/add-indexed-branch.cmd → src/main/distrib/win/add-indexed-branch.cmd View File


+ 1
- 0
src/main/distrib/win/authority.cmd View File

@@ -0,0 +1 @@
@java -cp gitblit.jar com.gitblit.authority.Launcher --baseFolder data %*

distrib/gitblit-stop.cmd → src/main/distrib/win/gitblit-stop.cmd View File


distrib/gitblit.cmd → src/main/distrib/win/gitblit.cmd View File


distrib/installService.cmd → src/main/distrib/win/installService.cmd View File

@@ -23,12 +23,12 @@ SET ARCH=amd64
--StdOutput=auto ^
--StdError=auto ^
--StartPath="%CD%" ^
--StartClass=com.gitblit.Launcher ^
--StartClass=org.moxie.MxLauncher ^
--StartMethod=main ^
--StartParams="--storePassword;gitblit;--baseFolder;%CD%\data" ^
--StartMode=jvm ^
--StopPath="%CD%" ^
--StopClass=com.gitblit.Launcher ^
--StopClass=org.moxie.MxLauncher ^
--StopMethod=main ^
--StopParams="--stop;--baseFolder;%CD%\data" ^
--StopMode=jvm ^

distrib/uninstallService.cmd → src/main/distrib/win/uninstallService.cmd View File


+ 1311
- 0
src/main/java/WEB-INF/reference.properties
File diff suppressed because it is too large
View File


src/WEB-INF/web.xml → src/main/java/WEB-INF/web.xml View File


src/com/gitblit/.gitignore → src/main/java/com/gitblit/.gitignore View File


src/com/gitblit/AccessRestrictionFilter.java → src/main/java/com/gitblit/AccessRestrictionFilter.java View File


src/com/gitblit/AddIndexedBranch.java → src/main/java/com/gitblit/AddIndexedBranch.java View File


src/com/gitblit/AuthenticationFilter.java → src/main/java/com/gitblit/AuthenticationFilter.java View File


src/com/gitblit/ConfigUserService.java → src/main/java/com/gitblit/ConfigUserService.java View File


src/com/gitblit/Constants.java → src/main/java/com/gitblit/Constants.java View File

@@ -18,7 +18,9 @@ package com.gitblit;
import java.lang.annotation.Documented;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.net.URL;
import java.util.jar.Attributes;
import java.util.jar.Manifest;
/**
* Constant values used by Gitblit.
@@ -32,18 +34,6 @@ public class Constants {
public static final String FULL_NAME = "Gitblit - a pure Java Git solution";
// The build script extracts this exact line so be careful editing it
// and only use A-Z a-z 0-9 .-_ in the string.
public static final String VERSION = "1.3.0-SNAPSHOT";
// The build script extracts this exact line so be careful editing it
// and only use A-Z a-z 0-9 .-_ in the string.
public static final String VERSION_DATE = "PENDING";
// The build script extracts this exact line so be careful editing it
// and only use A-Z a-z 0-9 .-_ in the string.
public static final String JGIT_VERSION = "JGit 2.2.0 (201212191850-r)";
public static final String ADMIN_ROLE = "#admin";
public static final String FORK_ROLE = "#fork";
@@ -95,9 +85,40 @@ public class Constants {
public static final String baseFolder$ = "${" + baseFolder + "}";
public static final String contextFolder$ = "${contextFolder}";
public static String getVersion() {
String v = Constants.class.getPackage().getImplementationVersion();
if (v == null) {
return "0.0.0-SNAPSHOT";
}
return v;
}
public static String getGitBlitVersion() {
return NAME + " v" + VERSION;
return NAME + " v" + getVersion();
}
public static String getBuildDate() {
return getManifestValue("build-date", "PENDING");
}
private static String getManifestValue(String attrib, String defaultValue) {
Class<?> clazz = Constants.class;
String className = clazz.getSimpleName() + ".class";
String classPath = clazz.getResource(className).toString();
if (!classPath.startsWith("jar")) {
// Class not from JAR
return defaultValue;
}
try {
String manifestPath = classPath.substring(0, classPath.lastIndexOf("!") + 1) + "/META-INF/MANIFEST.MF";
Manifest manifest = new Manifest(new URL(manifestPath).openStream());
Attributes attr = manifest.getMainAttributes();
String value = attr.getValue(attrib);
return value;
} catch (Exception e) {
}
return defaultValue;
}
/**

src/com/gitblit/DownloadZipFilter.java → src/main/java/com/gitblit/DownloadZipFilter.java View File


src/com/gitblit/DownloadZipServlet.java → src/main/java/com/gitblit/DownloadZipServlet.java View File


+ 102
- 0
src/main/java/com/gitblit/EnforceAuthenticationFilter.java View 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/com/gitblit/FederationClient.java → src/main/java/com/gitblit/FederationClient.java View File

@@ -67,7 +67,7 @@ public class FederationClient {
System.exit(0);
}
System.out.println("Gitblit Federation Client v" + Constants.VERSION + " (" + Constants.VERSION_DATE + ")");
System.out.println("Gitblit Federation Client v" + Constants.getVersion() + " (" + Constants.getBuildDate() + ")");
// command-line specified repositories folder
if (!StringUtils.isEmpty(params.repositoriesFolder)) {

src/com/gitblit/FederationPullExecutor.java → src/main/java/com/gitblit/FederationPullExecutor.java View File


src/com/gitblit/FederationServlet.java → src/main/java/com/gitblit/FederationServlet.java View File


src/com/gitblit/FileSettings.java → src/main/java/com/gitblit/FileSettings.java View File


src/com/gitblit/FileUserService.java → src/main/java/com/gitblit/FileUserService.java View File


src/com/gitblit/GCExecutor.java → src/main/java/com/gitblit/GCExecutor.java View File


src/com/gitblit/GitBlit.java → src/main/java/com/gitblit/GitBlit.java View File


src/com/gitblit/GitBlitException.java → src/main/java/com/gitblit/GitBlitException.java View File


src/com/gitblit/GitBlitServer.java → src/main/java/com/gitblit/GitBlitServer.java View File


src/com/gitblit/GitFilter.java → src/main/java/com/gitblit/GitFilter.java View File


src/com/gitblit/GitServlet.java → src/main/java/com/gitblit/GitServlet.java View File


src/com/gitblit/GitblitSslContextFactory.java → src/main/java/com/gitblit/GitblitSslContextFactory.java View File


src/com/gitblit/GitblitTrustManager.java → src/main/java/com/gitblit/GitblitTrustManager.java View File


src/com/gitblit/GitblitUserService.java → src/main/java/com/gitblit/GitblitUserService.java View File


src/com/gitblit/IStoredSettings.java → src/main/java/com/gitblit/IStoredSettings.java View File


src/com/gitblit/IUserService.java → src/main/java/com/gitblit/IUserService.java View File


src/com/gitblit/JsonServlet.java → src/main/java/com/gitblit/JsonServlet.java View File


src/com/gitblit/LdapUserService.java → src/main/java/com/gitblit/LdapUserService.java View File


src/com/gitblit/LuceneExecutor.java → src/main/java/com/gitblit/LuceneExecutor.java View File


src/com/gitblit/MailExecutor.java → src/main/java/com/gitblit/MailExecutor.java View File


src/com/gitblit/PagesFilter.java → src/main/java/com/gitblit/PagesFilter.java View File


src/com/gitblit/PagesServlet.java → src/main/java/com/gitblit/PagesServlet.java View File


src/com/gitblit/RedmineUserService.java → src/main/java/com/gitblit/RedmineUserService.java View File


src/com/gitblit/RobotsTxtServlet.java → src/main/java/com/gitblit/RobotsTxtServlet.java View File


src/com/gitblit/RpcFilter.java → src/main/java/com/gitblit/RpcFilter.java View File


src/com/gitblit/RpcServlet.java → src/main/java/com/gitblit/RpcServlet.java View File


src/com/gitblit/ServletRequestWrapper.java → src/main/java/com/gitblit/ServletRequestWrapper.java View File


src/com/gitblit/SyndicationFilter.java → src/main/java/com/gitblit/SyndicationFilter.java View File


src/com/gitblit/SyndicationServlet.java → src/main/java/com/gitblit/SyndicationServlet.java View File


src/com/gitblit/WebXmlSettings.java → src/main/java/com/gitblit/WebXmlSettings.java View File


src/com/gitblit/authority/AuthorityWorker.java → src/main/java/com/gitblit/authority/AuthorityWorker.java View File


src/com/gitblit/authority/CertificateStatus.java → src/main/java/com/gitblit/authority/CertificateStatus.java View File


src/com/gitblit/authority/CertificateStatusRenderer.java → src/main/java/com/gitblit/authority/CertificateStatusRenderer.java View File


src/com/gitblit/authority/CertificatesTableModel.java → src/main/java/com/gitblit/authority/CertificatesTableModel.java View File


src/com/gitblit/authority/DefaultOidsPanel.java → src/main/java/com/gitblit/authority/DefaultOidsPanel.java View File


src/com/gitblit/authority/GitblitAuthority.java → src/main/java/com/gitblit/authority/GitblitAuthority.java View File

@@ -175,7 +175,7 @@ public class GitblitAuthority extends JFrame implements X509Log {
public void initialize(String baseFolder) {
setIconImage(new ImageIcon(getClass().getResource("/gitblt-favicon.png")).getImage());
setTitle("Gitblit Certificate Authority v" + Constants.VERSION + " (" + Constants.VERSION_DATE + ")");
setTitle("Gitblit Certificate Authority v" + Constants.getVersion() + " (" + Constants.getBuildDate() + ")");
setContentPane(getUI());
setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
addWindowListener(new WindowAdapter() {

src/com/gitblit/authority/GitblitAuthorityLauncher.java → src/main/java/com/gitblit/authority/Launcher.java View File

@@ -21,14 +21,18 @@ import java.awt.FontMetrics;
import java.awt.Graphics2D;
import java.awt.SplashScreen;
import java.io.File;
import java.io.FileFilter;
import java.io.IOException;
import java.lang.reflect.Method;
import java.net.URL;
import java.net.URLClassLoader;
import java.text.MessageFormat;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
import com.gitblit.Constants;
import com.gitblit.Launcher;
import com.gitblit.build.Build;
import com.gitblit.build.Build.DownloadListener;
import com.gitblit.client.Translation;
/**
@@ -37,23 +41,21 @@ import com.gitblit.client.Translation;
* @author James Moger
*
*/
public class GitblitAuthorityLauncher {
public class Launcher {
public static final boolean DEBUG = false;
/**
* Parameters of the method to add an URL to the System classes.
*/
private static final Class<?>[] PARAMETERS = new Class[] { URL.class };
public static void main(String[] args) {
final SplashScreen splash = SplashScreen.getSplashScreen();
DownloadListener downloadListener = new DownloadListener() {
@Override
public void downloading(String name) {
updateSplash(splash, Translation.get("gb.downloading") + " " + name);
}
};
// download authority runtime dependencies
Build.authority(downloadListener);
File libFolder = new File("ext");
List<File> jars = Launcher.findJars(libFolder.getAbsoluteFile());
List<File> jars = findJars(libFolder.getAbsoluteFile());
// sort the jars by name and then reverse the order so the newer version
// of the library gets loaded in the event that this is an upgrade
@@ -62,7 +64,7 @@ public class GitblitAuthorityLauncher {
for (File jar : jars) {
try {
updateSplash(splash, Translation.get("gb.loading") + " " + jar.getName() + "...");
Launcher.addJarFile(jar);
addJarFile(jar);
} catch (IOException e) {
}
@@ -98,7 +100,7 @@ public class GitblitAuthorityLauncher {
g.drawString(string, x + ((w - xw) / 2), y - 5);
// paint version
String ver = "v" + Constants.VERSION;
String ver = "v" + Constants.getVersion();
int vw = g.getFontMetrics().stringWidth(ver);
g.drawString(ver, 320 - vw - 5, 34);
g.dispose();
@@ -110,4 +112,54 @@ public class GitblitAuthorityLauncher {
t.printStackTrace();
}
}
public static List<File> findJars(File folder) {
List<File> jars = new ArrayList<File>();
if (folder.exists()) {
File[] libs = folder.listFiles(new FileFilter() {
@Override
public boolean accept(File file) {
return !file.isDirectory() && file.getName().toLowerCase().endsWith(".jar");
}
});
if (libs != null && libs.length > 0) {
jars.addAll(Arrays.asList(libs));
if (DEBUG) {
for (File jar : jars) {
System.out.println("found " + jar);
}
}
}
}
return jars;
}
/**
* Adds a file to the classpath
*
* @param f
* the file to be added
* @throws IOException
*/
public static void addJarFile(File f) throws IOException {
if (f.getName().indexOf("-sources") > -1 || f.getName().indexOf("-javadoc") > -1) {
// don't add source or javadoc jars to runtime classpath
return;
}
URL u = f.toURI().toURL();
if (DEBUG) {
System.out.println("load=" + u.toExternalForm());
}
URLClassLoader sysloader = (URLClassLoader) ClassLoader.getSystemClassLoader();
Class<?> sysclass = URLClassLoader.class;
try {
Method method = sysclass.getDeclaredMethod("addURL", PARAMETERS);
method.setAccessible(true);
method.invoke(sysloader, new Object[] { u });
} catch (Throwable t) {
throw new IOException(MessageFormat.format(
"Error, could not add {0} to system classloader", f.getPath()), t);
}
}
}

src/com/gitblit/authority/NewCertificateConfig.java → src/main/java/com/gitblit/authority/NewCertificateConfig.java View File


Some files were not shown because too many files changed in this diff

Loading…
Cancel
Save