On 16/08/2013 15:46, Mark Thomas wrote: > The JSR-356 API and implementation has been back-ported to Tomcat 7. > > The necessary plumbing for the non-blocking support required by JSR-356 > has been back-ported to Tomcat 7. > > All compilation errors have been resolved. > > The unit tests all pass. > > Still to do: > > 1. Remove any Java 7 features so the code can compile with source -1.6 > and target -1.6.
Done. > 2. Add a check for Java 7 to the SCI so WebSocket is only loaded when > Tomcat 7 is running on Java 7 or later. Implemented locally and working but not committed. > 3. Add the WebSocket module into the build scripts. Done locally but not committed. Basics working. Still checking tests execute correctly. See longer note below. > 4. Test with Autobahn. TODO. > 5. Switch the WebSocket examples to the new API. Done locally but not committed. > 6. Deprecate the old HTTP upgrade and WebSocket implementations. TODO. Updating the build script has proved "interesting". The WebSocket implementation depends on Tomcat internals but was also required to build the examples. That meant that the WebSocket build script was significantly intertwined with the main build script. There was also going to be a lot of duplication between the scripts. Therefore, I have opted to move the WebSocket code into the main code from modules and the build code into the main build script. Considering the problem we are trying to solve (DBCP must be built with Java 6, WebSocket must be built with Java 7) the changes required to handle this are pretty minor. Most of the build script changes are copied straight from Tomcat 8 and would be required regardless of the Java version used to build WebSocket. I plan to commit what I have so far once I am happy that the unit tests still work. I do want to look at removing the Java 7 dependency from the WebSocket implementation - at least for Tomcat 7 - but I don't have the time to do that immediately. Whether to implement this for Tomcat 7, Tomcat 7 & 8 or not at all will depend how complex the code ends up being. At the moment I simply don't have a feel for it. Mark --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
