Skip to content

Commit f66e896

Browse files
rafaelcavazinrafaelcavazin
committed
Merge branch 'master' of https://github.com/gitblit/gitblit 
2 parents 05bf3d5 + dd60365 commit f66e896

File tree

803 files changed

+24238
-11013
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

803 files changed

+24238
-11013
lines changed

‎.checkstyle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22

33
<fileset-config file-format-version="1.2.0" simple-config="true" sync-formatter="false">
4-
<local-check-config name="Gitblit" location="checkstyle.xml" type="project" description="">
4+
<local-check-config name="Gitblit" location="src/main/config/checkstyle.xml" type="project" description="">
55
<additional-data name="protect-config-file" value="false"/>
66
</local-check-config>
77
<fileset name="all" enabled="true" check-config-name="Gitblit" local="true">

‎.classpath‎

Lines changed: 58 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -1,55 +1,65 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<classpath>
3-
<classpathentry kind="src" path="src" />
4-
<classpathentry kind="src" path="resources" />
5-
<classpathentry kind="src" path="tests" output="bin/test-classes" />
6-
<classpathentry kind="lib" path="ext/jcommander-1.17.jar" sourcepath="ext/src/jcommander-1.17-sources.jar" />
7-
<classpathentry kind="lib" path="ext/log4j-1.2.17.jar" sourcepath="ext/src/log4j-1.2.17-sources.jar" />
8-
<classpathentry kind="lib" path="ext/slf4j-api-1.6.6.jar" sourcepath="ext/src/slf4j-api-1.6.6-sources.jar" />
9-
<classpathentry kind="lib" path="ext/slf4j-log4j12-1.6.6.jar" sourcepath="ext/src/slf4j-log4j12-1.6.6-sources.jar" />
10-
<classpathentry kind="lib" path="ext/mail-1.4.3.jar" sourcepath="ext/src/mail-1.4.3-sources.jar" />
11-
<classpathentry kind="lib" path="ext/javax.servlet-api-3.0.1.jar" sourcepath="ext/src/javax.servlet-api-3.0.1-sources.jar" />
12-
<classpathentry kind="lib" path="ext/jetty-webapp-7.6.8.v20121106.jar" sourcepath="ext/src/jetty-webapp-7.6.8.v20121106-sources.jar" />
13-
<classpathentry kind="lib" path="ext/jetty-ajp-7.6.8.v20121106.jar" sourcepath="ext/src/jetty-ajp-7.6.8.v20121106-sources.jar" />
14-
<classpathentry kind="lib" path="ext/wicket-1.4.21.jar" sourcepath="ext/src/wicket-1.4.21-sources.jar" />
15-
<classpathentry kind="lib" path="ext/wicket-auth-roles-1.4.21.jar" sourcepath="ext/src/wicket-auth-roles-1.4.21-sources.jar" />
16-
<classpathentry kind="lib" path="ext/wicket-extensions-1.4.21.jar" sourcepath="ext/src/wicket-extensions-1.4.21-sources.jar" />
17-
<classpathentry kind="lib" path="ext/googlecharts-1.4.21.jar" sourcepath="ext/src/googlecharts-1.4.21-sources.jar" />
18-
<classpathentry kind="lib" path="ext/lucene-core-3.6.1.jar" sourcepath="ext/src/lucene-core-3.6.1-sources.jar" />
19-
<classpathentry kind="lib" path="ext/lucene-highlighter-3.6.1.jar" sourcepath="ext/src/lucene-highlighter-3.6.1-sources.jar" />
20-
<classpathentry kind="lib" path="ext/lucene-memory-3.6.1.jar" sourcepath="ext/src/lucene-memory-3.6.1-sources.jar" />
21-
<classpathentry kind="lib" path="ext/lucene-queries-3.6.1.jar" sourcepath="ext/src/lucene-queries-3.6.1-sources.jar" />
3+
<classpathentry kind="src" path="src/main/java" />
4+
<classpathentry kind="src" path="src/test/java" output="bin/test-classes" />
5+
<classpathentry kind="src" path="src/main/resources" />
6+
<classpathentry kind="lib" path="ext/jcommander-1.17.jar" sourcepath="ext/src/jcommander-1.17.jar" />
7+
<classpathentry kind="lib" path="ext/log4j-1.2.17.jar" sourcepath="ext/src/log4j-1.2.17.jar" />
8+
<classpathentry kind="lib" path="ext/slf4j-api-1.6.6.jar" sourcepath="ext/src/slf4j-api-1.6.6.jar" />
9+
<classpathentry kind="lib" path="ext/slf4j-log4j12-1.6.6.jar" sourcepath="ext/src/slf4j-log4j12-1.6.6.jar" />
10+
<classpathentry kind="lib" path="ext/mail-1.4.3.jar" sourcepath="ext/src/mail-1.4.3.jar" />
11+
<classpathentry kind="lib" path="ext/javax.servlet-api-3.0.1.jar" sourcepath="ext/src/javax.servlet-api-3.0.1.jar" />
12+
<classpathentry kind="lib" path="ext/jetty-webapp-7.6.8.v20121106.jar" sourcepath="ext/src/jetty-webapp-7.6.8.v20121106.jar" />
13+
<classpathentry kind="lib" path="ext/jetty-ajp-7.6.8.v20121106.jar" sourcepath="ext/src/jetty-ajp-7.6.8.v20121106.jar" />
14+
<classpathentry kind="lib" path="ext/wicket-1.4.21.jar" sourcepath="ext/src/wicket-1.4.21.jar" />
15+
<classpathentry kind="lib" path="ext/wicket-auth-roles-1.4.21.jar" sourcepath="ext/src/wicket-auth-roles-1.4.21.jar" />
16+
<classpathentry kind="lib" path="ext/wicket-extensions-1.4.21.jar" sourcepath="ext/src/wicket-extensions-1.4.21.jar" />
17+
<classpathentry kind="lib" path="ext/googlecharts-1.4.21.jar" sourcepath="ext/src/googlecharts-1.4.21.jar" />
18+
<classpathentry kind="lib" path="ext/lucene-core-3.6.1.jar" sourcepath="ext/src/lucene-core-3.6.1.jar" />
19+
<classpathentry kind="lib" path="ext/lucene-highlighter-3.6.1.jar" sourcepath="ext/src/lucene-highlighter-3.6.1.jar" />
20+
<classpathentry kind="lib" path="ext/lucene-memory-3.6.1.jar" sourcepath="ext/src/lucene-memory-3.6.1.jar" />
21+
<classpathentry kind="lib" path="ext/lucene-queries-3.6.1.jar" sourcepath="ext/src/lucene-queries-3.6.1.jar" />
2222
<classpathentry kind="lib" path="ext/jakarta-regexp-1.4.jar" />
23-
<classpathentry kind="lib" path="ext/markdownpapers-core-1.3.2.jar" sourcepath="ext/src/markdownpapers-core-1.3.2-sources.jar" />
24-
<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" />
25-
<classpathentry kind="lib" path="ext/jsch-0.1.44-1.jar" sourcepath="ext/src/jsch-0.1.44-1-sources.jar" />
26-
<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" />
27-
<classpathentry kind="lib" path="ext/bcprov-jdk15on-1.47.jar" sourcepath="ext/src/bcprov-jdk15on-1.47-sources.jar" />
28-
<classpathentry kind="lib" path="ext/bcmail-jdk15on-1.47.jar" sourcepath="ext/src/bcmail-jdk15on-1.47-sources.jar" />
29-
<classpathentry kind="lib" path="ext/bcpkix-jdk15on-1.47.jar" sourcepath="ext/src/bcpkix-jdk15on-1.47-sources.jar" />
30-
<classpathentry kind="lib" path="ext/rome-0.9.jar" sourcepath="ext/src/rome-0.9-sources.jar" />
31-
<classpathentry kind="lib" path="ext/jdom-1.0.jar" sourcepath="ext/src/jdom-1.0-sources.jar" />
32-
<classpathentry kind="lib" path="ext/gson-1.7.2.jar" sourcepath="ext/src/gson-1.7.2-sources.jar" />
33-
<classpathentry kind="lib" path="ext/groovy-all-1.8.8.jar" sourcepath="ext/src/groovy-all-1.8.8-sources.jar" />
34-
<classpathentry kind="lib" path="ext/unboundid-ldapsdk-2.3.0.jar" sourcepath="ext/src/unboundid-ldapsdk-2.3.0-sources.jar" />
35-
<classpathentry kind="lib" path="ext/ivy-2.2.0.jar" sourcepath="ext/src/ivy-2.2.0-sources.jar" />
23+
<classpathentry kind="lib" path="ext/markdownpapers-core-1.3.2.jar" sourcepath="ext/src/markdownpapers-core-1.3.2.jar" />
24+
<classpathentry kind="lib" path="ext/org.eclipse.jgit-3.0.0.201306101825-r.jar" sourcepath="ext/src/org.eclipse.jgit-3.0.0.201306101825-r.jar" />
25+
<classpathentry kind="lib" path="ext/jsch-0.1.46.jar" sourcepath="ext/src/jsch-0.1.46.jar" />
26+
<classpathentry kind="lib" path="ext/JavaEWAH-0.5.6.jar" sourcepath="ext/src/JavaEWAH-0.5.6.jar" />
27+
<classpathentry kind="lib" path="ext/org.eclipse.jgit.http.server-3.0.0.201306101825-r.jar" sourcepath="ext/src/org.eclipse.jgit.http.server-3.0.0.201306101825-r.jar" />
28+
<classpathentry kind="lib" path="ext/bcprov-jdk15on-1.47.jar" sourcepath="ext/src/bcprov-jdk15on-1.47.jar" />
29+
<classpathentry kind="lib" path="ext/bcmail-jdk15on-1.47.jar" sourcepath="ext/src/bcmail-jdk15on-1.47.jar" />
30+
<classpathentry kind="lib" path="ext/bcpkix-jdk15on-1.47.jar" sourcepath="ext/src/bcpkix-jdk15on-1.47.jar" />
31+
<classpathentry kind="lib" path="ext/rome-0.9.jar" sourcepath="ext/src/rome-0.9.jar" />
32+
<classpathentry kind="lib" path="ext/jdom-1.0.jar" sourcepath="ext/src/jdom-1.0.jar" />
33+
<classpathentry kind="lib" path="ext/gson-1.7.2.jar" sourcepath="ext/src/gson-1.7.2.jar" />
34+
<classpathentry kind="lib" path="ext/groovy-all-1.8.8.jar" sourcepath="ext/src/groovy-all-1.8.8.jar" />
35+
<classpathentry kind="lib" path="ext/unboundid-ldapsdk-2.3.0.jar" sourcepath="ext/src/unboundid-ldapsdk-2.3.0.jar" />
36+
<classpathentry kind="lib" path="ext/ivy-2.2.0.jar" sourcepath="ext/src/ivy-2.2.0.jar" />
3637
<classpathentry kind="lib" path="ext/jcalendar-1.3.2.jar" />
37-
<classpathentry kind="lib" path="ext/commons-compress-1.4.1.jar" sourcepath="ext/src/commons-compress-1.4.1-sources.jar" />
38-
<classpathentry kind="lib" path="ext/xz-1.0.jar" sourcepath="ext/src/xz-1.0-sources.jar" />
39-
<classpathentry kind="lib" path="ext/junit-4.10.jar" sourcepath="ext/src/junit-4.10-sources.jar" />
40-
<classpathentry kind="lib" path="ext/hamcrest-core-1.1.jar" />
41-
<classpathentry kind="lib" path="ext/seleniumhq/selenium-java-2.28.0.jar"/>
42-
<classpathentry kind="lib" path="ext/seleniumhq/selenium-api-2.28.0.jar"/>
43-
<classpathentry kind="lib" path="ext/seleniumhq/selenium-remote-driver-2.28.0.jar"/>
44-
<classpathentry kind="lib" path="ext/seleniumhq/selenium-support-2.28.0.jar"/>
45-
<classpathentry kind="lib" path="ext/seleniumhq/guava-12.0.jar"/>
46-
<classpathentry kind="lib" path="ext/seleniumhq/json-20080701.jar"/>
47-
<classpathentry kind="lib" path="ext/seleniumhq/commons-exec-1.1.jar"/>
48-
<classpathentry kind="lib" path="ext/seleniumhq/httpcore-4.2.1.jar"/>
49-
<classpathentry kind="lib" path="ext/seleniumhq/httpmime-4.2.1.jar"/>
50-
<classpathentry kind="lib" path="ext/seleniumhq/httpclient-4.2.1.jar"/>
51-
<classpathentry kind="lib" path="ext/seleniumhq/commons-logging-1.1.1.jar"/>
52-
<classpathentry kind="lib" path="ext/seleniumhq/selenium-firefox-driver-2.28.0.jar"/>
38+
<classpathentry kind="lib" path="ext/commons-compress-1.4.1.jar" sourcepath="ext/src/commons-compress-1.4.1.jar" />
39+
<classpathentry kind="lib" path="ext/xz-1.0.jar" sourcepath="ext/src/xz-1.0.jar" />
40+
<classpathentry kind="lib" path="ext/force-partner-api-24.0.0.jar" sourcepath="ext/src/force-partner-api-24.0.0.jar" />
41+
<classpathentry kind="lib" path="ext/force-wsc-24.0.0.jar" sourcepath="ext/src/force-wsc-24.0.0.jar" />
42+
<classpathentry kind="lib" path="ext/js-1.7R2.jar" sourcepath="ext/src/js-1.7R2.jar" />
43+
<classpathentry kind="lib" path="ext/freemarker-2.3.19.jar" sourcepath="ext/src/freemarker-2.3.19.jar" />
44+
<classpathentry kind="lib" path="ext/waffle-jna-1.5.jar" sourcepath="ext/src/waffle-jna-1.5.jar" />
45+
<classpathentry kind="lib" path="ext/platform-3.5.0.jar" sourcepath="ext/src/platform-3.5.0.jar" />
46+
<classpathentry kind="lib" path="ext/jna-3.5.0.jar" sourcepath="ext/src/jna-3.5.0.jar" />
47+
<classpathentry kind="lib" path="ext/guava-13.0.1.jar" sourcepath="ext/src/guava-13.0.1.jar" />
48+
<classpathentry kind="lib" path="ext/junit-4.11.jar" sourcepath="ext/src/junit-4.11.jar" />
49+
<classpathentry kind="lib" path="ext/hamcrest-core-1.3.jar" sourcepath="ext/src/hamcrest-core-1.3.jar" />
50+
<classpathentry kind="lib" path="ext/selenium-java-2.28.0.jar" sourcepath="ext/src/selenium-java-2.28.0.jar" />
51+
<classpathentry kind="lib" path="ext/selenium-support-2.28.0.jar" sourcepath="ext/src/selenium-support-2.28.0.jar" />
52+
<classpathentry kind="lib" path="ext/selenium-firefox-driver-2.28.0.jar" sourcepath="ext/src/selenium-firefox-driver-2.28.0.jar" />
53+
<classpathentry kind="lib" path="ext/selenium-remote-driver-2.28.0.jar" sourcepath="ext/src/selenium-remote-driver-2.28.0.jar" />
54+
<classpathentry kind="lib" path="ext/cglib-nodep-2.1_3.jar" sourcepath="ext/src/cglib-nodep-2.1_3.jar" />
55+
<classpathentry kind="lib" path="ext/json-20080701.jar" sourcepath="ext/src/json-20080701.jar" />
56+
<classpathentry kind="lib" path="ext/selenium-api-2.28.0.jar" sourcepath="ext/src/selenium-api-2.28.0.jar" />
57+
<classpathentry kind="lib" path="ext/httpclient-4.2.1.jar" sourcepath="ext/src/httpclient-4.2.1.jar" />
58+
<classpathentry kind="lib" path="ext/httpcore-4.2.1.jar" sourcepath="ext/src/httpcore-4.2.1.jar" />
59+
<classpathentry kind="lib" path="ext/commons-logging-1.1.1.jar" sourcepath="ext/src/commons-logging-1.1.1.jar" />
60+
<classpathentry kind="lib" path="ext/commons-codec-1.6.jar" sourcepath="ext/src/commons-codec-1.6.jar" />
61+
<classpathentry kind="lib" path="ext/commons-exec-1.1.jar" sourcepath="ext/src/commons-exec-1.1.jar" />
62+
<classpathentry kind="lib" path="ext/commons-io-2.2.jar" sourcepath="ext/src/commons-io-2.2.jar" />
5363
<classpathentry kind="output" path="bin/classes" />
5464
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER" />
5565
</classpath>

‎.gitignore‎

Lines changed: 23 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,24 @@
1-
/temp
2-
/lib
3-
/ext
4-
/build
5-
/keystore
6-
/*.zip
7-
/gitblit.properties
8-
/users.properties
9-
/site
10-
/git
11-
/target
12-
/build.properties
13-
/war
14-
/*.war
15-
/proposals
16-
/*.jar
17-
/federation.properties
18-
/mailtest.properties
19-
/.settings/*.prefs
20-
/src/WEB-INF/reference.properties
21-
/bin/
22-
/.settings/
23-
/javadoc
24-
/express
25-
/build-demo.xml
26-
/users.conf
27-
*.directory
28-
/.gradle
29-
/projects.conf
30-
/pom.xml
31-
/deploy
32-
/*.jks
33-
/x509test
34-
/certs
1+
/temp
2+
/lib
3+
/ext
4+
/build
5+
/site
6+
/git
7+
/build.properties
8+
/federation.properties
9+
/mailtest.properties
10+
/test-users.conf
11+
/.settings/
12+
/src/main/java/reference.properties
13+
/src/main/java/WEB-INF/reference.properties
14+
/bin/
15+
/build-demo.xml
16+
*.directory
17+
/.gradle
18+
/pom.xml
19+
/x509test
3520
/data
21+
/*.conf
22+
/build-next.xml
23+
/*.ps1
24+
/*.sh

‎NOTICE‎

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -255,3 +255,51 @@ XZ for Java
255255

256256
http://tukaani.org/xz/java.html
257257

258+
---------------------------------------------------------------------------
259+
Iconic
260+
---------------------------------------------------------------------------
261+
Iconic, release under the
262+
Creative Commons Share Alike 3.0 License.
263+
264+
http://somerandomdude.com/work/iconic
265+
266+
---------------------------------------------------------------------------
267+
AngularJS
268+
---------------------------------------------------------------------------
269+
AngularJS, release under the
270+
MIT License.
271+
272+
http://angularjs.org/
273+
274+
---------------------------------------------------------------------------
275+
FreeMarker
276+
---------------------------------------------------------------------------
277+
FreeMarker, release under a
278+
modified BSD License. (http://www.freemarker.org/docs/app_license.html)
279+
280+
http://www.freemarker.org/
281+
282+
---------------------------------------------------------------------------
283+
Waffle
284+
---------------------------------------------------------------------------
285+
Waffle, release under the
286+
Eclipse Public License, version 1.0
287+
288+
http://dblock.github.io/waffle
289+
290+
---------------------------------------------------------------------------
291+
JNA
292+
---------------------------------------------------------------------------
293+
JNA, release under the
294+
Lesser GNU Public License, version 2.1
295+
296+
https://github.com/twall/jna
297+
298+
---------------------------------------------------------------------------
299+
Guava
300+
---------------------------------------------------------------------------
301+
Guava, release under the
302+
Apache License 2.0.
303+
304+
https://code.google.com/p/guava-libraries
305+

‎README.markdown‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,4 +32,9 @@ Building Gitblit
3232
3. Select your gitblit project root and **Refresh** the project, this should correct all build problems.
3333
4. Using JUnit, execute the `com.gitblit.tests.GitBlitSuite` test suite.<br/>
3434
*This will clone some repositories from the web and run through the unit tests.*
35-
5. Execute the *com.gitblit.Launcher* class to start Gitblit.
35+
5. Execute the *com.gitblit.GitBlitServer* class to start Gitblit GO.
36+
37+
Building Tips & Tricks
38+
----------------------
39+
1. If you are running Ant from an ANSI-capable console, consider setting the `MX_COLOR` ennvironment variable before executing Ant.<pre>set MX_COLOR=true</pre>
40+
2. The build script will honor your Maven proxy settings. If you need to fine-tune this, please review the [settings.moxie](http://gitblit.github.io/moxie/settings.html) documentation.

0 commit comments

Comments
 (0)