Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2025-11-06 05:25:44 +01:00
Code Issues Packages Projects Releases Activity

fix usage of AuthenticationSelector

Browse Source
This commit is contained in:
Sebastian Sdorra
2014-07-20 14:01:20 +02:00
parent 8d4a1419cf
commit 15ac8740e6
4 changed files with 48 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
scm-webapp/src/main/java/sonia/scm/plugin/DefaultPluginManager.java
View File

@@ -98,6 +98,10 @@ public class DefaultPluginManager
/** Field description */
public static final String ENCODING = "UTF-8";
/** Field description */
private static final String ADVANCED_CONFIGURATION =
"advanced-configuration.xml";
/** the logger for DefaultPluginManager */
private static final Logger logger =
LoggerFactory.getLogger(DefaultPluginManager.class);
@@ -106,9 +110,6 @@ public class DefaultPluginManager
public static final PluginFilter FILTER_UPDATES =
new StatePluginFilter(PluginState.UPDATE_AVAILABLE);
private static final String ADVANCED_CONFIGURATION = "advanced-configuration.xml";
//~--- constructors ---------------------------------------------------------
/**
@@ -151,21 +152,23 @@ public class DefaultPluginManager
{
throw new ConfigurationException(ex);
}
File file = new File(context.getBaseDirectory(), ADVANCED_CONFIGURATION);
if (file.exists())
{
advancedPluginConfiguration = JAXB.unmarshal(file, AdvancedPluginConfiguration.class);
} else {
logger.info("load advanced plugin configuration from {}", file);
advancedPluginConfiguration = JAXB.unmarshal(file,
AdvancedPluginConfiguration.class);
}
else
{
logger.debug("no advanced plugin configuration found");
advancedPluginConfiguration = new AdvancedPluginConfiguration();
}
this.configuration.addListener(this);
}
private final AdvancedPluginConfiguration advancedPluginConfiguration;
//~--- methods --------------------------------------------------------------
@@ -650,10 +653,12 @@ public class DefaultPluginManager
if (pluginHandler == null)
{
pluginHandler = new AetherPluginHandler(this,
SCMContext.getContext(), configuration, advancedPluginConfiguration);
SCMContext.getContext(), configuration,
advancedPluginConfiguration);
}
Builder<PluginRepository> builder = ImmutableSet.builder();
builder.addAll(advancedPluginConfiguration.getRepositories());
builder.addAll(center.getRepositories());
@@ -760,6 +765,9 @@ public class DefaultPluginManager
//~--- fields ---------------------------------------------------------------
/** Field description */
private final AdvancedPluginConfiguration advancedPluginConfiguration;
/** Field description */
private Cache<String, PluginCenter> cache;