Documentation. Updated snapshot to 0.7.0. Merged server.contextPath.

distrib/gitblit.properties

@@ -114,7 +114,7 @@ web.showFederationRegistrations = false
 # This can point to a file with Markdown content.
 # Specifying "gitblit" uses the internal login message.
 #
-# SINCE 0.6.1
+# SINCE 0.7.0
 web.loginMessage = gitblit
 
 # This is the message displayed above the repositories table.
@@ -453,6 +453,12 @@ server.tempFolder = temp
 # RESTART REQUIRED
 server.useNio = true
 
+# Context path for the application.
+#
+# SINCE 0.7.0
+# RESTART REQUIRED
+server.contextPath = /
+
 # Standard http port to serve.  <= 0 disables this connector.
 # On Unix/Linux systems, ports < 1024 require root permissions.
 # Recommended value: 80 or 8080
@@ -501,9 +507,3 @@ server.storePassword = gitblit
 # SINCE 0.5.0
 # RESTART REQUIRED
 server.shutdownPort = 8081
-
-# Context path for the application.
-#
-# SINCE 0.7.0+
-# RESTART REQUIRED
-server.contextPath = /

docs/00_index.mkd

@@ -35,6 +35,7 @@ Gitblit requires a Java 6 Runtime Environment (JRE) or a Java 6 Development Kit
 - 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
+- added: setting to control Gitblit GO context path for proxy setups<br/>**New:** *server.contextPath = /*
 
 issues, binaries, and sources @ [Google Code][googlecode]<br/>
 sources @ [Github][gitbltsrc]

docs/03_faq.mkd

@@ -36,12 +36,14 @@ Run the server as *root* (security concern) or change the ports you are serving
 ### Gitblit WAR will not authenticate any users?!
 Confirm that the <context-param> *realm.userService* value in your `web.xml` file actually points to a `users.properties` file.
 
-### Gitblit won't open my grouped repository (/group/myrepo.git) or browse my branch/tag/ref?!
-This is likely an url encoding/decoding problem related to your servlet container's security.  There are two possible workarounds for this issue.  In `gitblit.properties` or `web.xml`:
+### Gitblit won't open my grouped repository (/group/myrepo.git) or browse my log/branch/tag/ref?!
+This is likely an url encoding/decoding problem with forward slashes.  There are two possible workarounds for this issue.  In `gitblit.properties` or `web.xml`:
 
 1. try setting *web.mountParameters* to *false*.<br/>This changes the url scheme from mounted (*/commit/myrepo.git/abcdef*) to parameterized (*/commit/?r=myrepo.git&h=abcdef*).
 2. try changing *web.forwardSlashCharacter* to an asterisk or a **!**
 
+Also, if you are running Gitblit behind a proxy, you must ensure that the proxy does not decode and then re-encode request urls with interpretation of *%2F*.  If you are using Apache mod_proxy, specify [AllowEncodedSlashes NoDecode](http://httpd.apache.org/docs/2.2/mod/core.html#allowencodedslashes).
+
 ## General Interest Questions
 
 ### Gitblit?  What kind of name is that?

docs/04_releases.mkd

@@ -10,6 +10,7 @@
 - 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
+- added: setting to control Gitblit GO context path for proxy setups<br/>**New:** *server.contextPath = /*
 
 ### Older Releases
 

src/com/gitblit/Constants.java

@@ -29,7 +29,7 @@ public class Constants {
 
 	// 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 = "0.6.1-SNAPSHOT";
+	public static final String VERSION = "0.7.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.

src/com/gitblit/wicket/GitblitParamUrlCodingStrategy.java

@@ -15,8 +15,15 @@
  */
 package com.gitblit.wicket;
 
+import java.text.MessageFormat;
+
+import org.apache.wicket.IRequestTarget;
 import org.apache.wicket.Page;
+import org.apache.wicket.PageParameters;
+import org.apache.wicket.request.RequestParameters;
 import org.apache.wicket.request.target.coding.MixedParamUrlCodingStrategy;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import com.gitblit.GitBlit;
 import com.gitblit.Keys;
@@ -33,6 +40,8 @@ import com.gitblit.Keys;
  */
 public class GitblitParamUrlCodingStrategy extends MixedParamUrlCodingStrategy {
 
+	private Logger logger = LoggerFactory.getLogger(GitblitParamUrlCodingStrategy.class);
+
 	/**
 	 * Construct.
 	 * 
@@ -78,4 +87,23 @@ public class GitblitParamUrlCodingStrategy extends MixedParamUrlCodingStrategy {
 		}
 		return super.urlDecodePathComponent(value);
 	}
+
+	/**
+	 * Gets the decoded request target.
+	 * 
+	 * @param requestParameters
+	 *            the request parameters
+	 * @return the decoded request target
+	 */
+	@Override
+	public IRequestTarget decode(RequestParameters requestParameters) {
+		final String parametersFragment = requestParameters.getPath().substring(
+				getMountPath().length());
+		logger.debug(MessageFormat
+				.format("REQ: {0} PARAMS {1}", getMountPath(), parametersFragment));
+
+		final PageParameters parameters = new PageParameters(decodeParameters(parametersFragment,
+				requestParameters.getParameters()));
+		return super.decode(requestParameters);
+	}
 }