merge pull request 23 into master

Project: http://git-wip-us.apache.org/repos/asf/incubator-wave/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-wave/commit/050fbb41
Tree: http://git-wip-us.apache.org/repos/asf/incubator-wave/tree/050fbb41
Diff: http://git-wip-us.apache.org/repos/asf/incubator-wave/diff/050fbb41

Branch: refs/heads/master
Commit: 050fbb412b629eb3be9e6d0feb1ee2869b5598bc
Parents: d35211b 38bc93e
Author: wisebaldone <[email protected]>
Authored: Tue Apr 25 00:48:51 2017 +1000
Committer: wisebaldone <[email protected]>
Committed: Tue Apr 25 00:48:51 2017 +1000

----------------------------------------------------------------------
 wave/build.gradle                               |   20 +-
 .../compile/runtime/javascript-2.1.5.war        |  Bin 35299 -> 0 bytes
 .../javascript/atmosphere-min.js                | 1028 ------
 .../javascript-2.1.5/javascript/atmosphere.js   | 3081 ------------------
 .../box/server/rpc/ServerRpcProvider.java       |  283 +-
 .../rpc/atmosphere/AtmosphereChannel.java       |  116 -
 .../atmosphere/AtmosphereClientInterceptor.java |  103 -
 .../rpc/atmosphere/GuiceAtmosphereFactory.java  |   71 -
 .../box/webclient/client/WaveSocketFactory.java |   52 +-
 .../webclient/client/WaveWebSocketClient.java   |   16 +-
 .../client/atmosphere/AtmosphereConnection.java |   53 -
 .../atmosphere/AtmosphereConnectionImpl.java    |  232 --
 .../AtmosphereConnectionListener.java           |   48 -
 .../atmosphere/AtmosphereConnectionState.java   |   53 -
 14 files changed, 68 insertions(+), 5088 deletions(-)
----------------------------------------------------------------------


Reply via email to