From f762b160efd5cafd919a6fd7f9587f578eceb454 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Sun, 02 Oct 2011 16:59:44 -0400
Subject: [PATCH] Merge branch 'master' into rpc
---
src/com/gitblit/WebXmlSettings.java | 91 +++++++++++++++++++++------------------------
1 files changed, 43 insertions(+), 48 deletions(-)
diff --git a/src/com/gitblit/WebXmlSettings.java b/src/com/gitblit/WebXmlSettings.java
index 00084bf..4b0358d 100644
--- a/src/com/gitblit/WebXmlSettings.java
+++ b/src/com/gitblit/WebXmlSettings.java
@@ -1,65 +1,60 @@
+/*
+ * Copyright 2011 gitblit.com.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
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));
+ }
}
-
- @Override
- public List<String> getAllKeys(String startingWith) {
- // TODO Auto-generated method stub
- return null;
+
+ private String decodeValue(String value) {
+ // decode escaped backslashes and HTML entities
+ return StringUtils.decodeFromHtml(value).replace("\\\\", "\\");
}
@Override
- public boolean getBoolean(String name, boolean defaultValue) {
- // TODO Auto-generated method stub
- return false;
+ protected Properties read() {
+ return properties;
}
- @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;
- }
-
@Override
public String toString() {
- return getClass().getSimpleName() + ": web.xml";
+ return "WEB.XML";
}
}
--
Gitblit v1.9.1