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/transport/ssh/NullKeyManager.java | 27 ++++++++++++++++-----------
1 files changed, 16 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/gitblit/transport/ssh/NullKeyManager.java b/src/main/java/com/gitblit/transport/ssh/NullKeyManager.java
index 454d3cf..0761d84 100644
--- a/src/main/java/com/gitblit/transport/ssh/NullKeyManager.java
+++ b/src/main/java/com/gitblit/transport/ssh/NullKeyManager.java
@@ -15,20 +15,19 @@
*/
package com.gitblit.transport.ssh;
-import java.security.PublicKey;
import java.util.List;
/**
- * Rejects all SSH key management requests.
- *
+ * Rejects all public key management requests.
+ *
* @author James Moger
*
*/
-public class NullKeyManager implements IKeyManager {
+public class NullKeyManager extends IPublicKeyManager {
public NullKeyManager() {
}
-
+
@Override
public String toString() {
return getClass().getSimpleName();
@@ -36,31 +35,37 @@
@Override
public NullKeyManager start() {
+ log.info(toString());
return this;
}
-
+
@Override
public boolean isReady() {
return true;
}
-
+
@Override
public NullKeyManager stop() {
return this;
}
@Override
- public List<PublicKey> getKeys(String username) {
+ protected boolean isStale(String username) {
+ return false;
+ }
+
+ @Override
+ protected List<SshKey> getKeysImpl(String username) {
return null;
}
@Override
- public boolean addKey(String username, String data) {
+ public boolean addKey(String username, SshKey key) {
return false;
}
-
+
@Override
- public boolean removeKey(String username, String data) {
+ public boolean removeKey(String username, SshKey key) {
return false;
}
--
Gitblit v1.9.1