From 671c19d3695a165687d621690fdb52ac453070b9 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Mon, 25 Jul 2011 16:47:22 -0400
Subject: [PATCH] Cleanup imports and formatting.
---
src/com/gitblit/WebXmlSettings.java | 74 +++++++++++++-----------------------
1 files changed, 27 insertions(+), 47 deletions(-)
diff --git a/src/com/gitblit/WebXmlSettings.java b/src/com/gitblit/WebXmlSettings.java
index 6ca38f7..4b0358d 100644
--- a/src/com/gitblit/WebXmlSettings.java
+++ b/src/com/gitblit/WebXmlSettings.java
@@ -15,62 +15,42 @@
*/
package com.gitblit;
-import java.util.List;
+import java.util.Enumeration;
+import java.util.Properties;
import javax.servlet.ServletContext;
-public class WebXmlSettings implements IStoredSettings {
+import com.gitblit.utils.StringUtils;
+
+/**
+ * Loads Gitblit settings from the context-parameter values of a web.xml file.
+ *
+ * @author James Moger
+ *
+ */
+public class WebXmlSettings extends IStoredSettings {
+
+ private final Properties properties = new Properties();
public WebXmlSettings(ServletContext context) {
+ super(WebXmlSettings.class);
+ Enumeration<?> keys = context.getInitParameterNames();
+ while (keys.hasMoreElements()) {
+ String key = keys.nextElement().toString();
+ String value = context.getInitParameter(key);
+ properties.put(key, decodeValue(value));
+ logger.debug(key + "=" + properties.getProperty(key));
+ }
+ }
+ private String decodeValue(String value) {
+ // decode escaped backslashes and HTML entities
+ return StringUtils.decodeFromHtml(value).replace("\\\\", "\\");
}
@Override
- public List<String> getAllKeys(String startingWith) {
- // TODO Auto-generated method stub
- return null;
- }
-
- @Override
- public boolean getBoolean(String name, boolean defaultValue) {
- // TODO Auto-generated method stub
- return false;
- }
-
- @Override
- public int getInteger(String name, int defaultValue) {
- // TODO Auto-generated method stub
- return 0;
- }
-
- @Override
- public String getString(String name, String defaultValue) {
- // TODO Auto-generated method stub
- return null;
- }
-
- @Override
- public List<String> getStrings(String name) {
- // TODO Auto-generated method stub
- return null;
- }
-
- @Override
- public List<String> getStringsFromValue(String value) {
- // TODO Auto-generated method stub
- return null;
- }
-
- @Override
- public List<String> getStrings(String name, String separator) {
- // TODO Auto-generated method stub
- return null;
- }
-
- @Override
- public List<String> getStringsFromValue(String value, String separator) {
- // TODO Auto-generated method stub
- return null;
+ protected Properties read() {
+ return properties;
}
@Override
--
Gitblit v1.9.1