From f76fee63ed9cb3a30d3c0c092d860b1cb93a481b Mon Sep 17 00:00:00 2001
From: Gerard Smyth <gerard.smyth@gmail.com>
Date: Thu, 08 May 2014 13:09:30 -0400
Subject: [PATCH] Updated the SyndicationServlet to provide an additional option to return details of the tags in the repository instead of the commits. This uses a new 'ot' request parameter to indicate the object type of the content to return, which can be ither TAG or COMMIT. If this is not provided, then COMMIT is assumed to maintain backwards compatability. If tags are returned, then the paging parameters, 'l' and 'pg' are still supported, but searching options are currently ignored.
---
src/main/java/com/gitblit/WebXmlSettings.java | 36 +++++++++++++++++++++++++++++++++---
1 files changed, 33 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/gitblit/WebXmlSettings.java b/src/main/java/com/gitblit/WebXmlSettings.java
index 7c8120b..228c27d 100644
--- a/src/main/java/com/gitblit/WebXmlSettings.java
+++ b/src/main/java/com/gitblit/WebXmlSettings.java
@@ -31,9 +31,9 @@
/**
* Loads Gitblit settings from the context-parameter values of a web.xml file.
- *
+ *
* @author James Moger
- *
+ *
*/
public class WebXmlSettings extends IStoredSettings {
@@ -54,7 +54,7 @@
public void applyOverrides(File overrideFile) {
this.overrideFile = overrideFile;
-
+
// apply any web-configured overrides
if (overrideFile.exists()) {
try {
@@ -80,6 +80,36 @@
}
@Override
+ public synchronized boolean saveSettings() {
+ try {
+ Properties props = new Properties();
+ // load pre-existing web-configuration
+ if (overrideFile.exists()) {
+ InputStream is = new FileInputStream(overrideFile);
+ props.load(is);
+ is.close();
+ }
+
+ // put all new settings and persist
+ for (String key : removals) {
+ props.remove(key);
+ }
+ removals.clear();
+ OutputStream os = new FileOutputStream(overrideFile);
+ props.store(os, null);
+ os.close();
+
+ // override current runtime settings
+ properties.clear();
+ properties.putAll(props);
+ return true;
+ } catch (Throwable t) {
+ logger.error("Failed to save settings!", t);
+ }
+ return false;
+ }
+
+ @Override
public synchronized boolean saveSettings(Map<String, String> settings) {
try {
Properties props = new Properties();
--
Gitblit v1.9.1