Merge pull request #185 from igniterealtime/OF-877

OF-877 breaks plugins webservices fix

src/java/org/jivesoftware/openfire/http/HttpBindManager.java

@@ -173,6 +173,9 @@ public final class HttpBindManager {
         PropertyEventDispatcher.addListener(new HttpServerPropertyListener());
         this.httpSessionManager = new HttpSessionManager();
 
+        // we need to initialise contexts at constructor time in order for plugins to add their contexts before start()
+        contexts = new ContextHandlerCollection();
+
         // setup the cache for the allowed origins
         this.setupAllowedOriginsMap();
     }
@@ -540,7 +543,9 @@ public final class HttpBindManager {
             httpBindServer.addConnector(httpsConnector);
         }
 
-        contexts = new ContextHandlerCollection();
+        //contexts = new ContextHandlerCollection();
+        // TODO implement a way to get plugins to add their their web services to contexts
+
         createBoshHandler(contexts, "/http-bind");
         createCrossDomainHandler(contexts, "/crossdomain.xml");
         loadStaticDirectory(contexts);