Commit de1f6408 authored by Dele Olajide's avatar Dele Olajide

OF-877 breaks plugins webservices fix

This fix reverts behavour to reset the web contexts handler collection as it removes the webservices added by plugins at class construction time.
parent 77942590
...@@ -173,6 +173,9 @@ public final class HttpBindManager { ...@@ -173,6 +173,9 @@ public final class HttpBindManager {
PropertyEventDispatcher.addListener(new HttpServerPropertyListener()); PropertyEventDispatcher.addListener(new HttpServerPropertyListener());
this.httpSessionManager = new HttpSessionManager(); 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 // setup the cache for the allowed origins
this.setupAllowedOriginsMap(); this.setupAllowedOriginsMap();
} }
...@@ -540,7 +543,9 @@ public final class HttpBindManager { ...@@ -540,7 +543,9 @@ public final class HttpBindManager {
httpBindServer.addConnector(httpsConnector); 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"); createBoshHandler(contexts, "/http-bind");
createCrossDomainHandler(contexts, "/crossdomain.xml"); createCrossDomainHandler(contexts, "/crossdomain.xml");
loadStaticDirectory(contexts); loadStaticDirectory(contexts);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment