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/29667c95 Tree: http://git-wip-us.apache.org/repos/asf/incubator-wave/tree/29667c95 Diff: http://git-wip-us.apache.org/repos/asf/incubator-wave/diff/29667c95 Branch: refs/heads/master Commit: 29667c95ca1145084fb34a302c27b4a3af384858 Parents: 9d02cde Author: ÐндÑей <[email protected]> Authored: Sun Jan 5 03:30:16 2014 +0600 Committer: ÐндÑей <[email protected]> Committed: Sun Jan 5 03:30:16 2014 +0600 ---------------------------------------------------------------------- build.xml | 8 + .../box/attachment/AttachmentProto.java | 3011 ++- .../box/common/comms/WaveClientRpc.java | 11448 +++++++++--- .../waveprotocol/box/profile/ProfilesProto.java | 2516 ++- .../waveprotocol/box/search/SearchProto.java | 3795 +++- .../protos/ProtoAccountStoreData.java | 4611 +++-- .../persistence/protos/ProtoDeltaStoreData.java | 1170 +- .../org/waveprotocol/box/server/rpc/Rpc.java | 912 +- .../org/waveprotocol/protobuf/Extensions.java | 38 +- .../wave/concurrencycontrol/ClientServer.java | 16415 ++++++++++++----- proto_src/org/waveprotocol/wave/diff/Diff.java | 7723 ++++++-- .../wave/federation/FederationErrorProto.java | 797 +- .../org/waveprotocol/wave/federation/Proto.java | 16024 ++++++++++++---- .../wave/api/robot/HttpRobotConnection.java | 5 +- .../box/common/comms/waveclient-rpc.proto | 1 + src/org/waveprotocol/box/server/ServerMain.java | 9 +- .../waveprotocol/box/server/ServerModule.java | 4 +- .../server/frontend/WaveViewSubscription.java | 44 +- .../box/server/frontend/WaveletInfo.java | 83 +- .../server/persistence/file/FileDeltaStore.java | 2 +- .../server/persistence/protos/delta-store.proto | 2 +- .../robots/agent/passwd/PasswordRobot.java | 2 +- .../robots/dataapi/DataApiOAuthServlet.java | 7 +- .../robots/dataapi/DataApiTokenContainer.java | 7 +- .../server/rpc/AbstractWaveSocketIOServlet.java | 9 - .../box/server/rpc/GadgetProviderServlet.java | 34 +- .../box/server/rpc/ProtoCallback.java | 3 - .../box/server/rpc/ServerRpcProvider.java | 140 +- .../box/server/rpc/WebSocketChannelImpl.java | 80 + .../box/server/rpc/WebSocketClientChannel.java | 86 - .../server/rpc/WebSocketClientRpcChannel.java | 77 +- .../box/server/rpc/WebSocketServerChannel.java | 109 - .../waveserver/DeltaStoreBasedWaveletState.java | 4 +- .../LucenePerUserWaveViewHandlerImpl.java | 6 +- .../MemoryPerUserWaveViewHandlerImpl.java | 31 +- .../box/server/waveserver/Wave.java | 53 +- .../box/server/waveserver/WaveMap.java | 49 +- .../box/server/waveserver/WaveServerModule.java | 2 +- .../WaveletNotificationDispatcher.java | 38 +- .../examples/robots/echoey/Echoey.java | 4 +- .../wave/federation/xmpp/RemoteDisco.java | 44 +- .../wave/federation/xmpp/XmppDisco.java | 73 +- .../federation/xmpp/XmppFederationHost.java | 32 +- .../robots/dataapi/DataApiOAuthServletTest.java | 10 + .../waveprotocol/box/server/rpc/RpcTest.java | 5 + .../box/server/rpc/WebSocketChannelTest.java | 11 - .../wave/federation/xmpp/MockDisco.java | 18 +- .../wave/federation/xmpp/XmppDiscoTest.java | 16 +- .../xmpp/XmppFederationHostForDomainTest.java | 5 +- third_party/runtime/gson/LICENSE | 203 + third_party/runtime/gson/README.google | 16 +- third_party/runtime/gson/gson-1.4.jar | Bin 166372 -> 0 bytes third_party/runtime/gson/gson-2.2.4.jar | Bin 0 -> 190418 bytes third_party/runtime/guava/README.google | 2 +- third_party/runtime/guava/guava-15.0.jar | Bin 0 -> 2172168 bytes third_party/runtime/guava/guava-gwt-15.0.jar | Bin 0 -> 822893 bytes third_party/runtime/guava/guava-r09-gwt.jar | Bin 545124 -> 0 bytes third_party/runtime/guava/guava-r09.jar | Bin 1141964 -> 0 bytes third_party/runtime/jetty/README.google | 2 +- .../jetty/jetty-annotations-9.1.0.v20131115.jar | Bin 0 -> 77147 bytes .../jetty/jetty-client-8.1.1.v20120215.jar | Bin 86894 -> 0 bytes .../jetty/jetty-client-9.1.0.v20131115.jar | Bin 0 -> 204066 bytes .../jetty-continuation-8.1.1.v20120215.jar | Bin 21215 -> 0 bytes .../jetty-continuation-9.1.0.v20131115.jar | Bin 0 -> 15989 bytes .../jetty/jetty-http-8.1.1.v20120215.jar | Bin 93374 -> 0 bytes .../jetty/jetty-http-9.1.0.v20131115.jar | Bin 0 -> 102510 bytes .../runtime/jetty/jetty-io-8.1.1.v20120215.jar | Bin 101442 -> 0 bytes .../runtime/jetty/jetty-io-9.1.0.v20131115.jar | Bin 0 -> 98075 bytes .../jetty/jetty-proxy-9.1.0.v20131115.jar | Bin 0 -> 39232 bytes .../jetty/jetty-security-8.1.1.v20120215.jar | Bin 86268 -> 0 bytes .../jetty/jetty-security-9.1.0.v20131115.jar | Bin 0 -> 95821 bytes .../jetty/jetty-server-8.1.1.v20120215.jar | Bin 329793 -> 0 bytes .../jetty/jetty-server-9.1.0.v20131115.jar | Bin 0 -> 387030 bytes .../jetty/jetty-servlet-8.1.1.v20120215.jar | Bin 95458 -> 0 bytes .../jetty/jetty-servlet-9.1.0.v20131115.jar | Bin 0 -> 106855 bytes .../jetty/jetty-servlets-8.1.1.v20120215.jar | Bin 72028 -> 0 bytes .../jetty/jetty-servlets-9.1.0.v20131115.jar | Bin 0 -> 100328 bytes .../jetty/jetty-util-8.1.1.v20120215.jar | Bin 268118 -> 0 bytes .../jetty/jetty-util-9.1.0.v20131115.jar | Bin 0 -> 328644 bytes .../jetty/jetty-webapp-8.1.1.v20120215.jar | Bin 106937 -> 0 bytes .../jetty/jetty-webapp-9.1.0.v20131115.jar | Bin 0 -> 110889 bytes .../jetty/jetty-websocket-8.1.1.v20120215.jar | Bin 125073 -> 0 bytes .../runtime/jetty/jetty-xml-8.1.1.v20120215.jar | Bin 37931 -> 0 bytes .../runtime/jetty/jetty-xml-9.1.0.v20131115.jar | Bin 0 -> 41766 bytes third_party/runtime/jetty/servlet-api-3.0.jar | Bin 200387 -> 0 bytes third_party/runtime/jetty/servlet-api-3.1.jar | Bin 0 -> 95806 bytes .../jetty/websocket-api-9.1.0.v20131115.jar | Bin 0 -> 44023 bytes .../jetty/websocket-client-9.1.0.v20131115.jar | Bin 0 -> 34370 bytes .../jetty/websocket-common-9.1.0.v20131115.jar | Bin 0 -> 149436 bytes .../jetty/websocket-server-9.1.0.v20131115.jar | Bin 0 -> 36498 bytes .../jetty/websocket-servlet-9.1.0.v20131115.jar | Bin 0 -> 12819 bytes third_party/runtime/protobuf/README.google | 2 +- .../runtime/protobuf/protobuf-2.3.0-src.jar | Bin 191426 -> 0 bytes .../runtime/protobuf/protobuf-java-2.3.0.jar | Bin 328571 -> 0 bytes .../runtime/protobuf/protobuf-java-2.5.0.jar | Bin 0 -> 532441 bytes .../socketio-jetty-0.1-SNAPSHOT-sources.jar | Bin 19065 -> 0 bytes .../socketio/socketio-jetty-0.1-SNAPSHOT.jar | Bin 28574 -> 0 bytes 97 files changed, 53792 insertions(+), 16006 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/29667c95/build.xml ---------------------------------------------------------------------- diff --git a/build.xml b/build.xml index 70db95c..6602a26 100644 --- a/build.xml +++ b/build.xml @@ -544,10 +544,18 @@ <fileset dir="${lib.runtime}"> <include name="*/*.jar"/> </fileset> + </unzip> + <copy todir="${web.default.staging.dir}" preservelastmodified="true"> + <fileset file="${web.default}"/> + </copy> + <unzip dest="${staging.dir}"> <fileset dir="${lib.codegen}"> <include name="gwt/gwt-user.jar"/> <include name="gwt/gwt-dev.jar"/> </fileset> + <patternset> + <exclude name="javax/servlet/**/*"/> + </patternset> </unzip> <copy todir="${staging.dir}" preservelastmodified="true"> <fileset dir="${build.src.dir}"/>
