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/wicket/PluginClassResolver.java | 20 +++++++++-----------
1 files changed, 9 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/gitblit/wicket/PluginClassResolver.java b/src/main/java/com/gitblit/wicket/PluginClassResolver.java
index ba53b04..476f961 100644
--- a/src/main/java/com/gitblit/wicket/PluginClassResolver.java
+++ b/src/main/java/com/gitblit/wicket/PluginClassResolver.java
@@ -23,7 +23,6 @@
import java.util.Set;
import java.util.TreeSet;
-import org.apache.wicket.Application;
import org.apache.wicket.WicketRuntimeException;
import org.apache.wicket.application.IClassResolver;
import org.slf4j.Logger;
@@ -40,9 +39,11 @@
public class PluginClassResolver implements IClassResolver {
private static final Logger logger = LoggerFactory.getLogger(PluginClassResolver.class);
+ private final IClassResolver coreResolver;
private final IPluginManager pluginManager;
- public PluginClassResolver(IPluginManager pluginManager) {
+ public PluginClassResolver(IClassResolver coreResolver, IPluginManager pluginManager) {
+ this.coreResolver = coreResolver;
this.pluginManager = pluginManager;
}
@@ -65,7 +66,7 @@
}
}
- throw new ClassNotFoundException(className);
+ return coreResolver.resolveClass(className);
}
@Override
@@ -85,6 +86,11 @@
}
}
+ Iterator<URL> it = coreResolver.getResources(name);
+ while (it.hasNext()) {
+ URL url = it.next();
+ urls.add(url);
+ }
return urls.iterator();
}
@@ -93,14 +99,6 @@
try {
// Try the classloader for the wicket jar/bundle
Enumeration<URL> resources = plugin.getPluginClassLoader().getResources(name);
- loadResources(resources, loadedFiles);
-
- // Try the classloader for the user's application jar/bundle
- resources = Application.get().getClass().getClassLoader().getResources(name);
- loadResources(resources, loadedFiles);
-
- // Try the context class loader
- resources = Thread.currentThread().getContextClassLoader().getResources(name);
loadResources(resources, loadedFiles);
} catch (IOException e) {
throw new WicketRuntimeException(e);
--
Gitblit v1.9.1