OpenSource/jenkins
1
0 Fork 0
mirror of https://github.com/jenkinsci/jenkins.git synced 2026-11-04 15:45:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'guice'

Browse Source
This commit is contained in:
Kohsuke Kawaguchi committed 2011-09-23 15:17:06 -07:00
2 parents 8c95d32086 5d903514bd
commit 74358e7086
14 files changed
+525 -68
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

core/src/main/java/hudson/PluginManager.java
+4
View File
@@ -27,6 +27,8 @@ import static hudson.init.InitMilestone.PLUGINS_PREPARED;
import static hudson.init.InitMilestone.PLUGINS_STARTED;
import static hudson.init.InitMilestone.PLUGINS_LISTED;
import com.google.inject.Guice;
import com.google.inject.Injector;
import hudson.PluginWrapper.Dependency;
import hudson.init.InitStrategy;
import hudson.init.InitializerFinder;
@@ -277,6 +279,8 @@ public abstract class PluginManager extends AbstractModelObject {
Jenkins.getInstance().lookup.set(PluginInstanceStore.class,new PluginInstanceStore());
TaskGraphBuilder g = new TaskGraphBuilder();
Jenkins.getInstance().lookup.set(Injector.class,Guice.createInjector());
// schedule execution of loading plugins
for (final PluginWrapper p : activePlugins.toArray(new PluginWrapper[activePlugins.size()])) {
g.followedBy().notFatal().attains(PLUGINS_PREPARED).add("Loading plugin " + p.getShortName(), new Executable() {