Joakim Erdfelt 70247d74d9 Issue #1124 - Fixing up merge issues ... + Making WebSocketServletFactory always load a new WebSocketServerFactory + Making WebSocketServerFactory need a ServletContext to construct it, if appropriate (the WebSocketHandler approach doesn't use a ServletContext) + NativeWebSocketConfiguration is now a bean of ServerContainer + Removed WebSocketServletFactory.init(ServletContext) method + Renamed WebSocketServletFactory.init() to .start() + Renamed WebSocketServletFactory.cleanup() to .stop() + CDI & Websocket now works + Using a ServletContextListener now works + DecoderFactory and EncoderFactory now work		2016-11-29 15:46:03 -07:00
..
src	Issue #1124 - Fixing up merge issues	2016-11-29 15:46:03 -07:00
pom.xml	Updating to version 9.3.15-SNAPSHOT	2016-10-28 13:01:34 -07:00