mirror of
https://github.com/jenkinsci/jenkins.git
synced 2026-11-17 05:52:26 +00:00
[FIXED HUDSON-5427] recognize @Initializer marked tasks from plugins
git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@35980 71c3de6d-444a-0410-be80-ed276b4c234a
This commit is contained in:
1 parent
84a923ea22
commit
aded9afbe6
3 files changed
+19
-2
No files matched your search
@@ -29,6 +29,7 @@ import static hudson.init.InitMilestone.PLUGINS_LISTED;
|
||||
|
||||
import hudson.PluginWrapper.Dependency;
|
||||
import hudson.init.InitStrategy;
|
||||
import hudson.init.InitializerFinder;
|
||||
import hudson.model.AbstractModelObject;
|
||||
import hudson.model.Failure;
|
||||
import hudson.model.Hudson;
|
||||
@@ -249,8 +250,11 @@ public abstract class PluginManager extends AbstractModelObject {
|
||||
builder = TaskBuilder.EMPTY_BUILDER;
|
||||
}
|
||||
|
||||
final InitializerFinder initializerFinder = new InitializerFinder(uberClassLoader); // misc. stuff
|
||||
|
||||
// lists up initialization tasks about loading plugins.
|
||||
return TaskBuilder.union(builder,new TaskGraphBuilder() {{
|
||||
return TaskBuilder.union(initializerFinder, // this scans @Initializer in the core once
|
||||
builder,new TaskGraphBuilder() {{
|
||||
requires(PLUGINS_LISTED).attains(PLUGINS_PREPARED).add("Loading plugins",new Executable() {
|
||||
/**
|
||||
* Once the plugins are listed, schedule their initialization.
|
||||
@@ -292,6 +296,13 @@ public abstract class PluginManager extends AbstractModelObject {
|
||||
});
|
||||
}
|
||||
|
||||
g.followedBy().attains(PLUGINS_STARTED).add("Discovering plugin initialization tasks", new Executable() {
|
||||
public void run(Reactor reactor) throws Exception {
|
||||
// rescan to find plugin-contributed @Initializer
|
||||
reactor.addAll(initializerFinder.discoverTasks(reactor));
|
||||
}
|
||||
});
|
||||
|
||||
// register them all
|
||||
session.addAll(g.discoverTasks(session));
|
||||
}
|
||||
|
||||
@@ -37,7 +37,9 @@ import java.lang.reflect.Method;
|
||||
import java.lang.reflect.Modifier;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Collection;
|
||||
import java.util.HashSet;
|
||||
import java.util.List;
|
||||
import java.util.Set;
|
||||
import java.util.logging.Logger;
|
||||
|
||||
import hudson.model.Hudson;
|
||||
@@ -52,6 +54,8 @@ import static java.util.logging.Level.WARNING;
|
||||
public class InitializerFinder extends TaskBuilder {
|
||||
private final ClassLoader cl;
|
||||
|
||||
private final Set<Method> discovered = new HashSet<Method>();
|
||||
|
||||
public InitializerFinder(ClassLoader cl) {
|
||||
this.cl = cl;
|
||||
}
|
||||
@@ -63,6 +67,9 @@ public class InitializerFinder extends TaskBuilder {
|
||||
public Collection<Task> discoverTasks(Reactor session) throws IOException {
|
||||
List<Task> result = new ArrayList<Task>();
|
||||
for (Method e : Index.list(Initializer.class,cl,Method.class)) {
|
||||
if (!discovered.add(e))
|
||||
continue; // already reported once
|
||||
|
||||
if (!Modifier.isStatic(e.getModifiers()))
|
||||
throw new IOException(e+" is not a static method");
|
||||
|
||||
|
||||
@@ -626,7 +626,6 @@ public final class Hudson extends Node implements ItemGroup<TopLevelItem>, Stapl
|
||||
|
||||
// initialization consists of ...
|
||||
executeReactor( is,
|
||||
new InitializerFinder(), // misc. stuff
|
||||
pluginManager.initTasks(is), // loading and preparing plugins
|
||||
loadTasks(), // load jobs
|
||||
InitMilestone.ordering() // forced ordering among key milestones
|
||||
|
||||
Reference in new issue
Block a user