Michael, can you please add Vicente to the contributors in Jira so he will be able to assign to himself issues he is working on? The user is is: vjrj
On Tue, Oct 25, 2011 at 9:04 PM, Yuri Zelikov <[email protected]> wrote: > This is an automatically generated e-mail. To reply, visit: > https://reviews.apache.org/r/2533/ > > Ship it! > > LGTM beside minor comments. I will address them and commit if you don't mind. > > > > /src/org/waveprotocol/box/server/rpc/ServerRpcProvider.java<https://reviews.apache.org/r/2533/diff/4/?file=52681#file52681line343> > (Diff > revision 4) > > public void startWebSocketServer(final Injector injector) { > > 343 > > // This disable JSessionIDs in URLs redirects > > disable->disables > > > > /src/org/waveprotocol/box/server/rpc/WebSocketServerChannel.java<https://reviews.apache.org/r/2533/diff/4/?file=52683#file52683line28> > (Diff > revision 4) > > 28 > > public class WebSocketServerChannel extends WebSocketChannel implements > WebSocket { > > 28 > > public class WebSocketServerChannel extends WebSocketChannel implements > WebSocket, WebSocket.OnTextMessage { > > Line too long. > > > > /src/org/waveprotocol/box/server/rpc/WebSocketServerChannel.java<https://reviews.apache.org/r/2533/diff/4/?file=52683#file52683line78> > (Diff > revision 4) > > public void onDisconnect() { > > public void onClose(int closeCode, String message) { > > 76 > > LOG.info("websocket disconnected: "+this); > > 69 > > LOG.info("websocket disconnected (" + closeCode + " - " + message +"): " > +this); > > Add space after + please. > > > - Yuri > > On October 24th, 2011, 2:39 p.m., vjrj wrote: > Review request for wave, Yuri Zelikov, Tad Glines, soren, and Nelson > Silva. > By vjrj. > > *Updated 2011-10-24 14:39:57* > Description > > New chrome (14, 15) use the new websocket specification that is not support > by socketio-java (that uses socket-io.js 0.6). > > As a temporal solution (while the websocket stuff is more stable) this patch: > - Upgrades WIAB to use a 8 jetty version > - Upgrades socketio-java to use the same jetty version > - Enables both socket and socket-io in client side then if client supports > websocket it will connect via jetty and if not, it will use socket-io-java. > > For now, I did not removed use_socketio server parameter to make this patch > more clear. > > Yuri, can you add more reviewers? because I don't know the new usernames here. > > The binaries:http://homes.ourproject.org/~vjrj/otros/patch-socketio.tgz > > Testing > > To connect to WIAB correctly using firefox 7.0.1 and chormmium (15). > > Diffs > > - /.classpath (1187587) > - /src/org/waveprotocol/box/server/robots/agent/passwd/PasswordRobot.java > (1187587) > - /src/org/waveprotocol/box/server/rpc/AbstractWaveSocketIOServlet.java > (PRE-CREATION) > - /src/org/waveprotocol/box/server/rpc/ServerRpcProvider.java (1187587) > - /src/org/waveprotocol/box/server/rpc/SocketIOServerChannel.java > (1187587) > - /src/org/waveprotocol/box/server/rpc/WebSocketServerChannel.java > (1187587) > - /src/org/waveprotocol/box/webclient/client/WaveSocketFactory.java > (1187587) > - /src/org/waveprotocol/box/webclient/client/WebClient.java (1187587) > - /third_party/codegen/socketio/COPYING (PRE-CREATION) > - /third_party/codegen/socketio/README.google (PRE-CREATION) > - /third_party/codegen/socketio/socketio-gwt-0.1-SNAPSHOT-sources.jar > (UNKNOWN) > - /third_party/codegen/socketio/socketio-gwt-0.1-SNAPSHOT.jar (UNKNOWN) > - /third_party/runtime/jetty/jetty-client-7.1.6.v20100715.jar (UNKNOWN) > - /third_party/runtime/jetty/jetty-client-8.0.0.v20110901.jar (UNKNOWN) > - /third_party/runtime/jetty/jetty-continuation-7.1.6.v20100715.jar > (UNKNOWN) > - /third_party/runtime/jetty/jetty-continuation-8.0.0.v20110901.jar > (UNKNOWN) > - /third_party/runtime/jetty/jetty-http-7.1.6.v20100715.jar (UNKNOWN) > - /third_party/runtime/jetty/jetty-http-8.0.0.v20110901.jar (UNKNOWN) > - /third_party/runtime/jetty/jetty-io-7.1.6.v20100715.jar (UNKNOWN) > - /third_party/runtime/jetty/jetty-io-8.0.0.v20110901.jar (UNKNOWN) > - /third_party/runtime/jetty/jetty-security-7.1.6.v20100715.jar > (UNKNOWN) > - /third_party/runtime/jetty/jetty-security-8.0.0.v20110901.jar > (UNKNOWN) > - /third_party/runtime/jetty/jetty-server-7.1.6.v20100715.jar (UNKNOWN) > - /third_party/runtime/jetty/jetty-server-8.0.0.v20110901.jar (UNKNOWN) > - /third_party/runtime/jetty/jetty-servlet-7.1.6.v20100715.jar > (UNKNOWN) > - /third_party/runtime/jetty/jetty-servlet-8.0.0.v20110901.jar > (UNKNOWN) > - /third_party/runtime/jetty/jetty-servlets-7.1.6.v20100715.jar > (UNKNOWN) > - /third_party/runtime/jetty/jetty-servlets-8.0.0.v20110901.jar > (UNKNOWN) > - /third_party/runtime/jetty/jetty-util-7.1.6.v20100715.jar (UNKNOWN) > - /third_party/runtime/jetty/jetty-util-8.0.0.v20110901.jar (UNKNOWN) > - /third_party/runtime/jetty/jetty-webapp-7.1.6.v20100715.jar (UNKNOWN) > - /third_party/runtime/jetty/jetty-webapp-8.0.0.v20110901.jar (UNKNOWN) > - /third_party/runtime/jetty/jetty-websocket-7.1.6.v20100715.jar > (UNKNOWN) > - /third_party/runtime/jetty/jetty-websocket-8.0.0.v20110901.jar > (UNKNOWN) > - /third_party/runtime/jetty/jetty-xml-7.1.6.v20100715.jar (UNKNOWN) > - /third_party/runtime/jetty/jetty-xml-8.0.0.v20110901.jar (UNKNOWN) > - /third_party/runtime/jetty/servlet-api-2.5.jar (UNKNOWN) > - /third_party/runtime/jetty/servlet-api-3.0.jar (UNKNOWN) > - /third_party/runtime/socketio/README.google (1187587) > - /third_party/runtime/socketio/socketio-core-0.1-SNAPSHOT-sources.jar > (UNKNOWN) > - /third_party/runtime/socketio/socketio-core-0.1-SNAPSHOT.jar > (UNKNOWN) > - /third_party/runtime/socketio/socketio-java-src.jar (UNKNOWN) > - /third_party/runtime/socketio/socketio-java.jar (UNKNOWN) > - /third_party/runtime/socketio/socketio-jetty-0.1-SNAPSHOT-sources.jar > (UNKNOWN) > - /third_party/runtime/socketio/socketio-jetty-0.1-SNAPSHOT.jar > (UNKNOWN) > > View Diff <https://reviews.apache.org/r/2533/diff/> >
