FELIX-2240 Move initial configuration to after loading the initial plugins. This is required since the HTTP Service is now started to be tracked when the console is configured. This may cause a race condition between the Http Service being bound and built-in plugins being registered but not initialized.
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@957858 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/webconsole/src/main/java/org/apache/felix/webconsole/internal/servlet/OsgiManager.java b/webconsole/src/main/java/org/apache/felix/webconsole/internal/servlet/OsgiManager.java
index 9bcbbbb..3f667d2 100644
--- a/webconsole/src/main/java/org/apache/felix/webconsole/internal/servlet/OsgiManager.java
+++ b/webconsole/src/main/java/org/apache/felix/webconsole/internal/servlet/OsgiManager.java
@@ -204,29 +204,6 @@
this.bundleContext = bundleContext;
this.holder = new PluginHolder( bundleContext );
- securityProviderTracker = new ServiceTracker( bundleContext, WebConsoleSecurityProvider.class.getName(), null );
- securityProviderTracker.open();
-
- updateConfiguration( null );
-
- try
- {
- this.configurationListener = ConfigurationListener2.create( this );
- }
- catch ( Throwable t2 )
- {
- // might be caused by Metatype API not available
- // try without MetaTypeProvider
- try
- {
- this.configurationListener = ConfigurationListener.create( this );
- }
- catch ( Throwable t )
- {
- // might be caused by CM API not available
- }
- }
-
// setup the included plugins
ClassLoader classLoader = getClass().getClassLoader();
for ( int i = 0; i < PLUGIN_CLASSES.length; i++ )
@@ -295,6 +272,31 @@
// accept new console branding service
brandingTracker = new BrandingServiceTracker( this );
brandingTracker.open();
+
+ // add support for pluggable security
+ securityProviderTracker = new ServiceTracker( bundleContext, WebConsoleSecurityProvider.class.getName(), null );
+ securityProviderTracker.open();
+
+ // configure and start listening for configuration
+ updateConfiguration( null );
+
+ try
+ {
+ this.configurationListener = ConfigurationListener2.create( this );
+ }
+ catch ( Throwable t2 )
+ {
+ // might be caused by Metatype API not available
+ // try without MetaTypeProvider
+ try
+ {
+ this.configurationListener = ConfigurationListener.create( this );
+ }
+ catch ( Throwable t )
+ {
+ // might be caused by CM API not available
+ }
+ }
}