summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJames Moger <james.moger@gitblit.com>2011-10-10 19:11:35 -0400
committerJames Moger <james.moger@gitblit.com>2011-10-10 19:11:35 -0400
commit70b492b89bdad54abc10795d12f306d8972d94a7 (patch)
treec26e474aeffd47623c8f83f82de3c356438311e6 /src
parent0dccce1b5cffce03124f001ae03b66962f36fee6 (diff)
downloadgitblit-70b492b89bdad54abc10795d12f306d8972d94a7.tar.gz
gitblit-70b492b89bdad54abc10795d12f306d8972d94a7.zip
Documentation. Updated snapshot to 0.7.0. Merged server.contextPath.
Diffstat (limited to 'src')
-rw-r--r--src/com/gitblit/Constants.java2
-rw-r--r--src/com/gitblit/wicket/GitblitParamUrlCodingStrategy.java28
2 files changed, 29 insertions, 1 deletions
diff --git a/src/com/gitblit/Constants.java b/src/com/gitblit/Constants.java
index f4541c9f..a5b7c4f1 100644
--- a/src/com/gitblit/Constants.java
+++ b/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.
diff --git a/src/com/gitblit/wicket/GitblitParamUrlCodingStrategy.java b/src/com/gitblit/wicket/GitblitParamUrlCodingStrategy.java
index 3248a082..fb86fb0e 100644
--- a/src/com/gitblit/wicket/GitblitParamUrlCodingStrategy.java
+++ b/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);
+ }
} \ No newline at end of file