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/authority/NewCertificateConfig.java | 17 +++++++++--------
1 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/gitblit/authority/NewCertificateConfig.java b/src/main/java/com/gitblit/authority/NewCertificateConfig.java
index ca047c8..b6ba6e6 100644
--- a/src/main/java/com/gitblit/authority/NewCertificateConfig.java
+++ b/src/main/java/com/gitblit/authority/NewCertificateConfig.java
@@ -26,11 +26,12 @@
/**
* Certificate config file parser.
- *
+ *
* @author James Moger
*/
public class NewCertificateConfig {
public static final SectionParser<NewCertificateConfig> KEY = new SectionParser<NewCertificateConfig>() {
+ @Override
public NewCertificateConfig parse(final Config cfg) {
return new NewCertificateConfig(cfg);
}
@@ -41,18 +42,18 @@
public String L;
public String ST;
public String C;
-
+
public int duration;
-
+
private NewCertificateConfig(final Config c) {
duration = c.getInt("new", null, "duration", 0);
OU = c.getString("new", null, "organizationalUnit");
O = c.getString("new", null, "organization");
L = c.getString("new", null, "locality");
ST = c.getString("new", null, "stateProvince");
- C = c.getString("new", null, "countryCode");
+ C = c.getString("new", null, "countryCode");
}
-
+
public void update(X509Metadata metadata) {
update(metadata, "OU", OU);
update(metadata, "O", O);
@@ -63,13 +64,13 @@
metadata.notAfter = new Date(System.currentTimeMillis() + duration*TimeUtils.ONEDAY);
}
}
-
+
private void update(X509Metadata metadata, String oid, String value) {
if (!StringUtils.isEmpty(value)) {
metadata.oids.put(oid, value);
}
}
-
+
public void store(Config c, X509Metadata metadata) {
store(c, "new", "organizationalUnit", metadata.getOID("OU", null));
store(c, "new", "organization", metadata.getOID("O", null));
@@ -82,7 +83,7 @@
c.setInt("new", null, "duration", duration);
}
}
-
+
private void store(Config c, String section, String name, String value) {
if (StringUtils.isEmpty(value)) {
c.unset(section, null, name);
--
Gitblit v1.9.1