From dcf753f2afa3a6c20739afc77aeb675b45edaabe Mon Sep 17 00:00:00 2001 From: Sebastian Sdorra Date: Thu, 9 Jan 2014 17:39:25 +0100 Subject: [PATCH] disable remote plugins for early 2.0.0-SNAPSHOT versions --- .../scm/plugin/DefaultPluginManager.java | 25 ++++++++++++------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/scm-webapp/src/main/java/sonia/scm/plugin/DefaultPluginManager.java b/scm-webapp/src/main/java/sonia/scm/plugin/DefaultPluginManager.java index 8dba208e15..f1cdd688b6 100644 --- a/scm-webapp/src/main/java/sonia/scm/plugin/DefaultPluginManager.java +++ b/scm-webapp/src/main/java/sonia/scm/plugin/DefaultPluginManager.java @@ -36,6 +36,7 @@ package sonia.scm.plugin; //~--- non-JDK imports -------------------------------------------------------- import com.github.legman.Subscribe; + import com.google.common.collect.Sets; import com.google.common.io.Files; import com.google.inject.Inject; @@ -51,6 +52,7 @@ import sonia.scm.SCMContextProvider; import sonia.scm.cache.Cache; import sonia.scm.cache.CacheManager; import sonia.scm.config.ScmConfiguration; +import sonia.scm.config.ScmConfigurationChangedEvent; import sonia.scm.io.ZipUnArchiver; import sonia.scm.net.HttpClient; import sonia.scm.util.AssertUtil; @@ -80,15 +82,13 @@ import javax.xml.bind.JAXB; import javax.xml.bind.JAXBContext; import javax.xml.bind.JAXBException; import javax.xml.bind.Unmarshaller; -import sonia.scm.config.ScmConfigurationChangedEvent; /** * * @author Sebastian Sdorra */ @Singleton -public class DefaultPluginManager - implements PluginManager +public class DefaultPluginManager implements PluginManager { /** Field description */ @@ -101,6 +101,9 @@ public class DefaultPluginManager private static final Logger logger = LoggerFactory.getLogger(DefaultPluginManager.class); + /** enable or disable remote plugins */ + private static final boolean REMOTE_PLUGINS_ENABLED = false; + /** Field description */ public static final PluginFilter FILTER_UPDATES = new StatePluginFilter(PluginState.UPDATE_AVAILABLE); @@ -613,7 +616,11 @@ public class DefaultPluginManager logger.info("fetch plugin informations from {}", pluginUrl); } - if (Util.isNotEmpty(pluginUrl)) + /** + * remote plugins are disabled for early 2.0.0-SNAPSHOTS + * TODO enable remote plugins later + */ + if (REMOTE_PLUGINS_ENABLED && Util.isNotEmpty(pluginUrl)) { InputStream input = null; @@ -743,19 +750,19 @@ public class DefaultPluginManager //~--- fields --------------------------------------------------------------- /** Field description */ - private Cache cache; + private final Cache cache; /** Field description */ - private Provider clientProvider; + private final Provider clientProvider; /** Field description */ - private ScmConfiguration configuration; + private final ScmConfiguration configuration; /** Field description */ - private SCMContextProvider context; + private final SCMContextProvider context; /** Field description */ - private Map installedPlugins; + private final Map installedPlugins; /** Field description */ private AetherPluginHandler pluginHandler;