Merge branch 'master' into rpc

4 files changed, 145 insertions, 108 deletions

diff --git a/src/com/gitblit/Constants.java b/src/com/gitblit/Constants.java
index 5b4b0b6a..52af3e91 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/GitBlitServer.java b/src/com/gitblit/GitBlitServer.java
index 5c8c5fe4..1b079de8 100644
--- a/src/com/gitblit/GitBlitServer.java
+++ b/src/com/gitblit/GitBlitServer.java
@@ -209,7 +209,7 @@ public class GitBlitServer {
 

 		// Root WebApp Context

 		WebAppContext rootContext = new WebAppContext();

-		rootContext.setContextPath("/");

+		rootContext.setContextPath(settings.getString(Keys.server.contextPath, "/"));

 		rootContext.setServer(server);

 		rootContext.setWar(location.toExternalForm());

 		rootContext.setTempDirectory(tempDir);

diff --git a/src/com/gitblit/build/BuildSite.java b/src/com/gitblit/build/BuildSite.java
index 0746a6b7..efff5a34 100644
--- a/src/com/gitblit/build/BuildSite.java
+++ b/src/com/gitblit/build/BuildSite.java
@@ -56,7 +56,7 @@ import com.gitblit.utils.StringUtils;
 public class BuildSite {

 

 	private static final String SPACE_DELIMITED = "SPACE-DELIMITED";

-	

+

 	private static final String CASE_SENSITIVE = "CASE-SENSITIVE";

 

 	private static final String RESTART_REQUIRED = "RESTART REQUIRED";

@@ -91,24 +91,6 @@ public class BuildSite {
 

 		System.out.println(MessageFormat.format("Generating site from {0} Markdown Docs in {1} ",

 				markdownFiles.length, sourceFolder.getAbsolutePath()));

-		String linkPattern = "<li><a href=''{0}''>{1}</a></li>";

-		StringBuilder sb = new StringBuilder();

-		for (File file : markdownFiles) {

-			String documentName = getDocumentName(file);

-			if (!params.skips.contains(documentName)) {

-				String displayName = documentName;

-				if (aliasMap.containsKey(documentName)) {

-					displayName = aliasMap.get(documentName);

-				} else {

-					displayName = displayName.replace('_', ' ');

-				}

-				String fileName = documentName + ".html";

-				sb.append(MessageFormat.format(linkPattern, fileName, displayName));

-				sb.append(" | ");

-			}

-		}

-		sb.setLength(sb.length() - 3);

-		sb.trimToSize();

 

 		String htmlHeader = FileUtils.readContent(new File(params.pageHeader), "\n");

 

@@ -120,105 +102,105 @@ public class BuildSite {
 			}

 		}

 		String htmlFooter = FileUtils.readContent(new File(params.pageFooter), "\n");

-		String links = sb.toString();

-		String header = MessageFormat.format(htmlHeader, Constants.FULL_NAME, links);

-		if (!StringUtils.isEmpty(params.analyticsSnippet)) {

-			File snippet = new File(params.analyticsSnippet);

-			if (snippet.exists()) {

-				String htmlSnippet = FileUtils.readContent(snippet, "\n");

-				header = header.replace("<!-- ANALYTICS -->", htmlSnippet);

-			}

-		}

 		final String date = new SimpleDateFormat("yyyy-MM-dd").format(new Date());

 		final String footer = MessageFormat.format(htmlFooter, "generated " + date);

 		for (File file : markdownFiles) {

+			String documentName = getDocumentName(file);

+			if (params.skips.contains(documentName)) {

+				continue;

+			}

 			try {

-				String documentName = getDocumentName(file);

-				if (!params.skips.contains(documentName)) {

-					String fileName = documentName + ".html";

-					System.out.println(MessageFormat.format("  {0} => {1}", file.getName(),

-							fileName));

-					String rawContent = FileUtils.readContent(file, "\n");

-					String markdownContent = rawContent;

-

-					Map<String, List<String>> nomarkdownMap = new HashMap<String, List<String>>();

-

-					// extract sections marked as no-markdown

-					int nmd = 0;

-					for (String token : params.nomarkdown) {

-						StringBuilder strippedContent = new StringBuilder();

-

-						String nomarkdownKey = "%NOMARKDOWN" + nmd + "%";

-						String[] kv = token.split(":", 2);

-						String beginToken = kv[0];

-						String endToken = kv[1];

-

-						// strip nomarkdown chunks from markdown and cache them

-						List<String> chunks = new Vector<String>();

-						int beginCode = 0;

-						int endCode = 0;

-						while ((beginCode = markdownContent.indexOf(beginToken, endCode)) > -1) {

-							if (endCode == 0) {

-								strippedContent.append(markdownContent.substring(0, beginCode));

-							} else {

-								strippedContent.append(markdownContent

-										.substring(endCode, beginCode));

-							}

-							strippedContent.append(nomarkdownKey);

-							endCode = markdownContent.indexOf(endToken, beginCode);

-							chunks.add(markdownContent.substring(beginCode, endCode));

-							nomarkdownMap.put(nomarkdownKey, chunks);

-						}

-

-						// get remainder of text

-						if (endCode < markdownContent.length()) {

-							strippedContent.append(markdownContent.substring(endCode,

-									markdownContent.length()));

-						}

-						markdownContent = strippedContent.toString();

-						nmd++;

+				String links = createLinks(file, markdownFiles, aliasMap, params.skips);

+				String header = MessageFormat.format(htmlHeader, Constants.FULL_NAME, links);

+				if (!StringUtils.isEmpty(params.analyticsSnippet)) {

+					File snippet = new File(params.analyticsSnippet);

+					if (snippet.exists()) {

+						String htmlSnippet = FileUtils.readContent(snippet, "\n");

+						header = header.replace("<!-- ANALYTICS -->", htmlSnippet);

 					}

+				}

 

-					// transform markdown to html

-					String content = transformMarkdown(markdownContent.toString());

-

-					// reinsert nomarkdown chunks

-					for (Map.Entry<String, List<String>> nomarkdown : nomarkdownMap.entrySet()) {

-						for (String chunk : nomarkdown.getValue()) {

-							content = content.replaceFirst(nomarkdown.getKey(), chunk);

+				String fileName = documentName + ".html";

+				System.out.println(MessageFormat.format("  {0} => {1}", file.getName(), fileName));

+				String rawContent = FileUtils.readContent(file, "\n");

+				String markdownContent = rawContent;

+

+				Map<String, List<String>> nomarkdownMap = new HashMap<String, List<String>>();

+

+				// extract sections marked as no-markdown

+				int nmd = 0;

+				for (String token : params.nomarkdown) {

+					StringBuilder strippedContent = new StringBuilder();

+

+					String nomarkdownKey = "%NOMARKDOWN" + nmd + "%";

+					String[] kv = token.split(":", 2);

+					String beginToken = kv[0];

+					String endToken = kv[1];

+

+					// strip nomarkdown chunks from markdown and cache them

+					List<String> chunks = new Vector<String>();

+					int beginCode = 0;

+					int endCode = 0;

+					while ((beginCode = markdownContent.indexOf(beginToken, endCode)) > -1) {

+						if (endCode == 0) {

+							strippedContent.append(markdownContent.substring(0, beginCode));

+						} else {

+							strippedContent.append(markdownContent.substring(endCode, beginCode));

 						}

+						strippedContent.append(nomarkdownKey);

+						endCode = markdownContent.indexOf(endToken, beginCode);

+						chunks.add(markdownContent.substring(beginCode, endCode));

+						nomarkdownMap.put(nomarkdownKey, chunks);

 					}

 

-					for (String token : params.substitutions) {

-						String[] kv = token.split("=", 2);

-						content = content.replace(kv[0], kv[1]);

-					}

-					for (String token : params.regex) {

-						String[] kv = token.split("!!!", 2);

-						content = content.replaceAll(kv[0], kv[1]);

-					}

-					for (String alias : params.properties) {

-						String[] kv = alias.split("=", 2);

-						String loadedContent = generatePropertiesContent(new File(kv[1]));

-						content = content.replace(kv[0], loadedContent);

-					}

-					for (String alias : params.loads) {

-						String[] kv = alias.split("=", 2);

-						String loadedContent = FileUtils.readContent(new File(kv[1]), "\n");

-						loadedContent = StringUtils.escapeForHtml(loadedContent, false);

-						loadedContent = StringUtils.breakLinesForHtml(loadedContent);

-						content = content.replace(kv[0], loadedContent);

+					// get remainder of text

+					if (endCode < markdownContent.length()) {

+						strippedContent.append(markdownContent.substring(endCode,

+								markdownContent.length()));

 					}

-					OutputStreamWriter writer = new OutputStreamWriter(new FileOutputStream(

-							new File(destinationFolder, fileName)), Charset.forName("UTF-8"));

-					writer.write(header);

-					if (!StringUtils.isEmpty(htmlAdSnippet)) {

-						writer.write(htmlAdSnippet);

+					markdownContent = strippedContent.toString();

+					nmd++;

+				}

+

+				// transform markdown to html

+				String content = transformMarkdown(markdownContent.toString());

+

+				// reinsert nomarkdown chunks

+				for (Map.Entry<String, List<String>> nomarkdown : nomarkdownMap.entrySet()) {

+					for (String chunk : nomarkdown.getValue()) {

+						content = content.replaceFirst(nomarkdown.getKey(), chunk);

 					}

-					writer.write(content);

-					writer.write(footer);

-					writer.close();

 				}

+

+				for (String token : params.substitutions) {

+					String[] kv = token.split("=", 2);

+					content = content.replace(kv[0], kv[1]);

+				}

+				for (String token : params.regex) {

+					String[] kv = token.split("!!!", 2);

+					content = content.replaceAll(kv[0], kv[1]);

+				}

+				for (String alias : params.properties) {

+					String[] kv = alias.split("=", 2);

+					String loadedContent = generatePropertiesContent(new File(kv[1]));

+					content = content.replace(kv[0], loadedContent);

+				}

+				for (String alias : params.loads) {

+					String[] kv = alias.split("=", 2);

+					String loadedContent = FileUtils.readContent(new File(kv[1]), "\n");

+					loadedContent = StringUtils.escapeForHtml(loadedContent, false);

+					loadedContent = StringUtils.breakLinesForHtml(loadedContent);

+					content = content.replace(kv[0], loadedContent);

+				}

+				OutputStreamWriter writer = new OutputStreamWriter(new FileOutputStream(new File(

+						destinationFolder, fileName)), Charset.forName("UTF-8"));

+				writer.write(header);

+				if (!StringUtils.isEmpty(htmlAdSnippet)) {

+					writer.write(htmlAdSnippet);

+				}

+				writer.write(content);

+				writer.write(footer);

+				writer.close();

 			} catch (Throwable t) {

 				System.err.println("Failed to transform " + file.getName());

 				t.printStackTrace();

@@ -237,6 +219,33 @@ public class BuildSite {
 		return displayName;

 	}

 

+	private static String createLinks(File currentFile, File[] markdownFiles,

+			Map<String, String> aliasMap, List<String> skips) {

+		String linkPattern = "<li><a href=''{0}''>{1}</a></li>";

+		String currentLinkPattern = "<li class=''active''><a href=''{0}''>{1}</a></li>";

+		StringBuilder sb = new StringBuilder();

+		for (File file : markdownFiles) {

+			String documentName = getDocumentName(file);

+			if (!skips.contains(documentName)) {

+				String displayName = documentName;

+				if (aliasMap.containsKey(documentName)) {

+					displayName = aliasMap.get(documentName);

+				} else {

+					displayName = displayName.replace('_', ' ');

+				}

+				String fileName = documentName + ".html";

+				if (currentFile.getName().equals(file.getName())) {

+					sb.append(MessageFormat.format(currentLinkPattern, fileName, displayName));

+				} else {

+					sb.append(MessageFormat.format(linkPattern, fileName, displayName));

+				}

+			}

+		}

+		sb.setLength(sb.length() - 3);

+		sb.trimToSize();

+		return sb.toString();

+	}

+

 	private static String generatePropertiesContent(File propertiesFile) throws Exception {

 		// Read the current Gitblit properties

 		BufferedReader propertiesReader = new BufferedReader(new FileReader(propertiesFile));

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