From: James Moger Date: Tue, 11 Oct 2011 21:39:26 +0000 (-0400) Subject: Merge branch 'master' into rpc X-Git-Tag: v0.7.0~87 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=d4c9083f82d9c5e01d9694f02f66cee1084b66ff;p=gitblit.git Merge branch 'master' into rpc --- d4c9083f82d9c5e01d9694f02f66cee1084b66ff diff --cc docs/00_index.mkd index 16a7a9e3,83456a5c..b208ccad --- a/docs/00_index.mkd +++ b/docs/00_index.mkd @@@ -5,21 -5,20 +5,21 @@@ Gitblit is an open-source, pure Java st Its designed primarily as a tool for small workgroups who want to host centralized repositories. Gitblit is available in two variations: - ### Tools - + ++- *Gitblit RPC Client* - a Java Swing tool to clone repositories and remotely administer a Gitblit server + - *Gitblit Federation Client* - a command line tool to clone/pull groups of repositories and optionally users and settings ### Java Runtime Requirement @@@ -27,16 -26,10 +27,17 @@@ Gitblit requires a Java 6 Runtime Envir ### Current Release -**%VERSION%** ([go](http://code.google.com/p/gitblit/downloads/detail?name=%GO%)|[war](http://code.google.com/p/gitblit/downloads/detail?name=%WAR%)|[fedclient](http://code.google.com/p/gitblit/downloads/detail?name=%FEDCLIENT%)) based on [%JGIT%][jgit]   *released %BUILDDATE%* +**%VERSION%** ([go](http://code.google.com/p/gitblit/downloads/detail?name=%GO%)|[war](http://code.google.com/p/gitblit/downloads/detail?name=%WAR%)|[fedclient](http://code.google.com/p/gitblit/downloads/detail?name=%FEDCLIENT%)|[rpcclient](http://code.google.com/p/gitblit/downloads/detail?name=%RPCCLIENT%)) based on [%JGIT%][jgit]   *released %BUILDDATE%* - - improved: overhauled web ui with Twitter's Bootstrap CSS toolkit -
**New:** *web.loginMessage = gitblit* - - added: authenticated JSON RPC mechanism -
**New:** *web.enableRpcServlet = true* -
**New:** *web.enableRpcAdministration = false* + - improved: updated ui with Twitter's Bootstrap CSS toolkit + **New:** *web.loginMessage = gitblit* ++- added: authenticated JSON RPC mechanism ++ **New:** *web.enableRpcServlet = true* ++ **New:** *web.enableRpcAdministration = false* +- added: reusable JSON RPC client class - - added: Swing RPC Client application for cloning and administration of repositories, users, and federation proposals. - - fixed/broke: federation protocol. dates are now serialized to the [iso8601](http://en.wikipedia.org/wiki/ISO_8601) standard. This breaks 0.6.0 federation clients/servers. ++- added: Swing RPC Client application for cloning and administration of repositories, users, & federation proposals. ++- fixed: 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.** - fixed: Gitblit now runs on Servlet 3.0 webservers (e.g. Tomcat 7, Jetty 8) - fixed: Set the RSS content type for Firefox 4 (issue 22) - fixed: Null pointer exception if did not set federation strategy (issue 20) diff --cc docs/01_features.mkd index 1a546128,3769ead2..93647101 --- a/docs/01_features.mkd +++ b/docs/01_features.mkd @@@ -2,14 -2,12 +2,13 @@@ - JGit SmartHTTP servlet - Browser and git client authentication - Four *per-repository* access control configurations with a Read-Only control flag - + - ![anonymous](blank.png) *Anonymous View, Clone & Push* + - ![push](lock_go_16x16.png) *Authenticated Push* + - ![clone](lock_pull_16x16.png) *Authenticated Clone & Push* + - ![view](shield_16x16.png) *Authenticated View, Clone & Push* + - ![freeze](cold_16x16.png) Freeze repository (i.e. deny push, make read-only) - Ability to federate with one or more other Gitblit instances ++- JSON RPC interface - Gitweb inspired web UI - Administrators may create, edit, rename, or delete repositories through the web UI - Administrators may create, edit, rename, or delete users through the web UI diff --cc docs/01_setup.mkd index 125bac23,978f347c..42f7c0ca --- a/docs/01_setup.mkd +++ b/docs/01_setup.mkd @@@ -9,7 -9,7 +9,7 @@@ Open `web.xml` in your favorite text ed - <context-parameter> *realm.userService* (set the full path to `users.properties`) 5. You may have to restart your servlet container. 6. Open your browser to or whatever the url should be. - 7. Click the *Login* link and enter the default administrator credentials: **admin / admin**
-7. Click the *Login* link and enter the default administrator credentials: **admin / admin** ++7. Enter the default administrator credentials: **admin / admin** and click the *Login* button **NOTE:** Make sure to change the administrator username and/or password!! ## Gitblit GO Setup @@@ -21,12 -21,13 +21,13 @@@ Open `gitblit.properties` in your favor - *git.repositoryFolder* (path may be relative or absolute) - *server.tempFolder* (path may be relative or absolute) - *server.httpPort* and *server.httpsPort* - - *server.httpBindInterface* and *server.httpsBindInterface*
+ - *server.httpBindInterface* and *server.httpsBindInterface* **https** is strongly recommended because passwords are insecurely transmitted form your browser/git client using Basic authentication! 3. Execute `gitblit.cmd` or `java -jar gitblit.jar` from a command-line - 4. Wait a minute or two while all dependencies are downloaded and your self-signed *localhost* certificate is generated.
Please see the section titled **Creating your own Self-Signed Certificate** to generate a certificate for *your hostname*. + 4. Wait a minute or two while all dependencies are downloaded and your self-signed *localhost* certificate is generated. + Please see the section titled **Creating your own Self-Signed Certificate** to generate a certificate for *your hostname*. 5. Open your browser to or depending on your chosen configuration. - 6. Click the *Login* link and enter the default administrator credentials: **admin / admin**
-6. Click the *Login* link and enter the default administrator credentials: **admin / admin** ++6. Enter the default administrator credentials: **admin / admin** and click the *Login* button **NOTE:** Make sure to change the administrator username and/or password!! ### Creating your own Self-Signed Certificate diff --cc docs/02_federation.mkd index abf171e3,3199065e..dff71875 --- a/docs/02_federation.mkd +++ b/docs/02_federation.mkd @@@ -11,6 -11,6 +11,12 @@@ Please review all the documentation to ![block diagram](fed_aggregation.png "Gitblit Federation Aggregation") ++### Important Changes to Note ++ ++The Gitblit 0.7.0 federation protocol is incompatible with the 0.6.0 federation protocol because of a change in the way timestamps are formatted. ++ ++Gitblit 0.6.0 uses the default [google-gson](http://google-gson.googlecode.com) timestamp serializer which generates locally formatted timestamps. Unfortunately, this creates problems for distributed repositories and distributed developers. Gitblit 0.7.0 corrects this error by serializing dates to the [iso8601](http://en.wikipedia.org/wiki/ISO_8601) standard. As a result 0.7.0 is not compatible with 0.6.0. A partial backwards-compatibility fallback was considered but it would only work one direction and since the federation mechanism is bidirectional it was not implemented. ++ ### Origin Gitblit Instance Requirements - *git.enableGitServlet* must be true, all Git clone and pull requests are handled through Gitblit's JGit servlet diff --cc docs/04_releases.mkd index ea383b9e,aebd9494..35dd188c --- a/docs/04_releases.mkd +++ b/docs/04_releases.mkd @@@ -1,18 -1,12 +1,19 @@@ ## Release History ### Current Release -**%VERSION%** ([go](http://code.google.com/p/gitblit/downloads/detail?name=%GO%)|[war](http://code.google.com/p/gitblit/downloads/detail?name=%WAR%)|[fedclient](http://code.google.com/p/gitblit/downloads/detail?name=%FEDCLIENT%)) based on [%JGIT%][jgit]   *released %BUILDDATE%* +**%VERSION%** ([go](http://code.google.com/p/gitblit/downloads/detail?name=%GO%)|[war](http://code.google.com/p/gitblit/downloads/detail?name=%WAR%)|[fedclient](http://code.google.com/p/gitblit/downloads/detail?name=%FEDCLIENT%)|[rpcclient](http://code.google.com/p/gitblit/downloads/detail?name=%RPCCLIENT%)) based on [%JGIT%][jgit]   *released %BUILDDATE%* - - improved: overhauled web ui with Twitter's Bootstrap CSS toolkit -
**New:** *web.loginMessage = gitblit* - - added: authenticated JSON RPC mechanism -
**New:** *web.enableRpcServlet = true* -
**New:** *web.enableRpcAdministration = false* + - improved: updated ui with Twitter's Bootstrap CSS toolkit + **New:** *web.loginMessage = gitblit* ++- added: authenticated JSON RPC mechanism ++ **New:** *web.enableRpcServlet = true* ++ **New:** *web.enableRpcAdministration = false* +- added: reusable JSON RPC client class - - added: Swing RPC Client application for cloning and administration of repositories, users, and federation proposals. - - fixed/broke: federation protocol. dates are now serialized to the [iso8601](http://en.wikipedia.org/wiki/ISO_8601) standard. This breaks 0.6.0 federation clients/servers. ++- added: Swing RPC Client application for cloning and administration of repositories, users, & federation proposals. ++- fixed: 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.** - fixed: Gitblit now runs on Servlet 3.0 webservers (e.g. Tomcat 7, Jetty 8) - - fixed: Set the RSS content type for Firefox 4 (issue 22) + - fixed: Set the RSS content type for Firefox 4 (issue 22) - fixed: Null pointer exception if did not set federation strategy (issue 20) - fixed: Gitblit GO allows SSL renegotiation if running on Java 1.6.0_22 or later - added: IUserService.setup(IStoredSettings) for custom user service implementations diff --cc tests/com/gitblit/tests/MarkdownUtilsTest.java index 451b9f0d,451b9f0d..d421fb16 --- a/tests/com/gitblit/tests/MarkdownUtilsTest.java +++ b/tests/com/gitblit/tests/MarkdownUtilsTest.java @@@ -34,6 -34,6 +34,11 @@@ public class MarkdownUtilsTest extends MarkdownUtils.transformMarkdown("**THIS ** is a test")); assertEquals("

** THIS** is a test

", MarkdownUtils.transformMarkdown("** THIS** is a test")); ++ ++ assertEquals("
test
", MarkdownUtils.transformMarkdown("
test
")); ++ assertEquals("
<test>
", ++ MarkdownUtils.transformMarkdown("
<test>
")); ++ try { MarkdownUtils.transformMarkdown((String) null); assertTrue(false);