From 27ae9095639bb228a1b7ff86a3ebe4264abf05be Mon Sep 17 00:00:00 2001
From: mschaefers <mschaefers@scoop-gmbh.de>
Date: Thu, 29 Nov 2012 12:33:09 -0500
Subject: [PATCH] feature: when using LdapUserService one can configure Gitblit to fetch all users from ldap that can possibly login. This allows to see newly generated LDAP users instantly in Gitblit. By now an LDAP user had to log in once to appear in GitBlit.
---
src/com/gitblit/build/BuildWebXml.java | 17 +++++++++++++++--
1 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/src/com/gitblit/build/BuildWebXml.java b/src/com/gitblit/build/BuildWebXml.java
index c37f014..4fcc6e9 100644
--- a/src/com/gitblit/build/BuildWebXml.java
+++ b/src/com/gitblit/build/BuildWebXml.java
@@ -29,9 +29,15 @@
import com.beust.jcommander.ParameterException;
import com.beust.jcommander.Parameters;
import com.gitblit.Keys;
-import com.gitblit.Keys.server;
import com.gitblit.utils.StringUtils;
+/**
+ * Builds the Gitblit WAR web.xml file by merging the Gitblit GO web.xml file
+ * with the gitblit.properties comments, settings, and values.
+ *
+ * @author James Moger
+ *
+ */
public class BuildWebXml {
private static final String PARAMS = "<!-- PARAMS -->";
@@ -88,7 +94,8 @@
for (String comment : setting.comments) {
parameters.append(MessageFormat.format(COMMENT_PATTERN, comment));
}
- parameters.append(MessageFormat.format(PARAM_PATTERN, setting.name, StringUtils.escapeForHtml(setting.value, false)));
+ parameters.append(MessageFormat.format(PARAM_PATTERN, setting.name,
+ StringUtils.escapeForHtml(setting.value, false)));
}
// Read the prototype web.xml file
@@ -119,6 +126,9 @@
return key.startsWith(Keys.server._ROOT);
}
+ /**
+ * Setting represents a setting and its comments from the properties file.
+ */
private static class Setting {
final String name;
final String value;
@@ -131,6 +141,9 @@
}
}
+ /**
+ * JCommander Parameters class for BuildWebXml.
+ */
@Parameters(separators = " ")
private static class Params {
--
Gitblit v1.9.1