Update of third party libraries
Project: http://git-wip-us.apache.org/repos/asf/incubator-wave/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-wave/commit/af10e491 Tree: http://git-wip-us.apache.org/repos/asf/incubator-wave/tree/af10e491 Diff: http://git-wip-us.apache.org/repos/asf/incubator-wave/diff/af10e491 Branch: refs/heads/master Commit: af10e491ed930bb6401314a9997240777e12c5a9 Parents: 29667c9 Author: ÐндÑей <[email protected]> Authored: Mon Jan 6 16:20:35 2014 +0600 Committer: ÐндÑей <[email protected]> Committed: Mon Jan 6 16:20:35 2014 +0600 ---------------------------------------------------------------------- .../box/server/rpc/ServerRpcProvider.java | 11 ++++++----- .../socketio-jetty-0.1-SNAPSHOT-sources.jar | Bin 0 -> 19065 bytes .../socketio/socketio-jetty-0.1-SNAPSHOT.jar | Bin 0 -> 28574 bytes 3 files changed, 6 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/af10e491/src/org/waveprotocol/box/server/rpc/ServerRpcProvider.java ---------------------------------------------------------------------- diff --git a/src/org/waveprotocol/box/server/rpc/ServerRpcProvider.java b/src/org/waveprotocol/box/server/rpc/ServerRpcProvider.java index 2c89187..ec98309 100755 --- a/src/org/waveprotocol/box/server/rpc/ServerRpcProvider.java +++ b/src/org/waveprotocol/box/server/rpc/ServerRpcProvider.java @@ -43,6 +43,7 @@ import com.glines.socketio.server.transport.HTMLFileTransport; import com.glines.socketio.server.transport.JSONPPollingTransport; import com.glines.socketio.server.transport.XHRMultipartTransport; import com.glines.socketio.server.transport.XHRPollingTransport; +import com.glines.socketio.server.transport.jetty.JettyWebSocketTransport; import org.apache.commons.lang.StringUtils; import org.eclipse.jetty.server.Connector; @@ -425,6 +426,10 @@ public class ServerRpcProvider { // TODO(zamfi): fix to let messages span frames. wsholder.setInitParameter("bufferSize", "" + BUFFER_SIZE); + // Set flash policy server parameters + String flashPolicyServerHost = "localhost"; + StringBuilder flashPolicyAllowedPorts = new StringBuilder(); + // Servlet where the socketio connection is served from. // TODO(akaplanov): add servlet when https://github.com/vjrj/Socket.IO-Java will updated to Jetty v9. // ServletHolder sioholder = addServlet("/socket.io/*", WaveSocketIOServlet.class ); @@ -439,9 +444,6 @@ public class ServerRpcProvider { // sioholder.setInitParameter(FlashSocketTransport.PARAM_FLASHPOLICY_PORTS, // flashPolicyAllowedPorts.toString()); - // Set flash policy server parameters - String flashPolicyServerHost = "localhost"; - StringBuilder flashPolicyAllowedPorts = new StringBuilder(); /* * Loop through addresses, collect list of ports, and determine if we are to use "localhost" * of the AnyHost wildcard. @@ -612,8 +614,7 @@ public class ServerRpcProvider { AbstractWaveSocketIOServlet socketIOServlet = new AbstractWaveSocketIOServlet( new Transport[] { new XHRMultipartTransport(), new XHRPollingTransport(), new FlashSocketTransport(), - // TODO(akaplanov): add JettyWebSocketTransport when https://github.com/vjrj/Socket.IO-Java will updated to Jetty v9. - new JSONPPollingTransport(), new HTMLFileTransport()}) { + new JettyWebSocketTransport(), new JSONPPollingTransport(), new HTMLFileTransport()}) { @Override protected SocketIOInbound doSocketIOConnect(HttpServletRequest request) { ParticipantId loggedInUser = provider.sessionManager.getLoggedInUser( http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/af10e491/third_party/runtime/socketio/socketio-jetty-0.1-SNAPSHOT-sources.jar ---------------------------------------------------------------------- diff --git a/third_party/runtime/socketio/socketio-jetty-0.1-SNAPSHOT-sources.jar b/third_party/runtime/socketio/socketio-jetty-0.1-SNAPSHOT-sources.jar new file mode 100755 index 0000000..5316cf0 Binary files /dev/null and b/third_party/runtime/socketio/socketio-jetty-0.1-SNAPSHOT-sources.jar differ http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/af10e491/third_party/runtime/socketio/socketio-jetty-0.1-SNAPSHOT.jar ---------------------------------------------------------------------- diff --git a/third_party/runtime/socketio/socketio-jetty-0.1-SNAPSHOT.jar b/third_party/runtime/socketio/socketio-jetty-0.1-SNAPSHOT.jar new file mode 100755 index 0000000..a40c88f Binary files /dev/null and b/third_party/runtime/socketio/socketio-jetty-0.1-SNAPSHOT.jar differ
