Updated Branches: refs/heads/master 63bc8ff5f -> 19dcb9630
http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/29667c95/src/org/waveprotocol/wave/federation/xmpp/XmppDisco.java ---------------------------------------------------------------------- diff --git a/src/org/waveprotocol/wave/federation/xmpp/XmppDisco.java b/src/org/waveprotocol/wave/federation/xmpp/XmppDisco.java index 5745f91..2d10211 100644 --- a/src/org/waveprotocol/wave/federation/xmpp/XmppDisco.java +++ b/src/org/waveprotocol/wave/federation/xmpp/XmppDisco.java @@ -22,23 +22,27 @@ package org.waveprotocol.wave.federation.xmpp; import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Function; import com.google.common.base.Preconditions; +import com.google.common.cache.CacheBuilder; +import com.google.common.cache.CacheLoader; +import com.google.common.cache.LoadingCache; import com.google.common.collect.MapMaker; import com.google.inject.Inject; import com.google.inject.name.Named; -import org.dom4j.Element; -import org.waveprotocol.wave.federation.FederationErrors; -import org.waveprotocol.wave.federation.FederationSettings; -import org.waveprotocol.wave.federation.FederationErrorProto.FederationError; -import org.xmpp.packet.IQ; - import java.util.Map; -import java.util.concurrent.ConcurrentMap; +import java.util.concurrent.ExecutionException; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicLong; import java.util.logging.Level; import java.util.logging.Logger; +import org.dom4j.Element; +import org.xmpp.packet.IQ; + +import org.waveprotocol.wave.federation.FederationErrorProto.FederationError; +import org.waveprotocol.wave.federation.FederationErrors; +import org.waveprotocol.wave.federation.FederationSettings; + /** * Implementation of XMPP Discovery. Provides public methods to respond to incoming disco requests * (via {@link XmppManager}), as well as outgoing disco via {{@link #discoverRemoteJid}. @@ -55,16 +59,15 @@ public class XmppDisco { static final String DISCO_INFO_TYPE = "google-wave"; // This tracks the number of disco attempts started. - public static final Map<String, AtomicLong> statDiscoStarted = - new MapMaker().makeComputingMap( - new Function<String, AtomicLong>() { + public static final LoadingCache<String, AtomicLong> statDiscoStarted = + CacheBuilder.newBuilder().build(new CacheLoader<String, AtomicLong>() { @Override - public AtomicLong apply(String domain) { + public AtomicLong load(String domain) { return new AtomicLong(); } }); - private final ConcurrentMap<String, RemoteDisco> discoRequests; + private final LoadingCache<String, RemoteDisco> discoRequests; private final String serverDescription; private XmppManager manager = null; @@ -89,16 +92,18 @@ public class XmppDisco { this.successExpirySecs = successExpirySecs; discoRequests = - new MapMaker().expireAfterWrite(DISCO_EXPIRATION_HOURS, TimeUnit.HOURS).makeComputingMap( - new Function<String, RemoteDisco>() { - @Override - public RemoteDisco apply(String domain) { - statDiscoStarted.get(domain).incrementAndGet(); - return new RemoteDisco(manager, domain, failExpirySecs, successExpirySecs); - } - }); + CacheBuilder.newBuilder().expireAfterWrite( + DISCO_EXPIRATION_HOURS, TimeUnit.HOURS).build( + new CacheLoader<String, RemoteDisco>() { + + @Override + public RemoteDisco load(String domain) throws Exception { + statDiscoStarted.get(domain).incrementAndGet(); + return new RemoteDisco(manager, domain, failExpirySecs, successExpirySecs); + } + }); } - + /** * Set the manager instance for this class. Must be invoked before any other * methods are used. @@ -152,18 +157,23 @@ public class XmppDisco { */ public void discoverRemoteJid(String remoteDomain, SuccessFailCallback<String, String> callback) { Preconditions.checkNotNull("Must call setManager first", manager); - if (discoRequests.containsKey(remoteDomain)) { + RemoteDisco disco = discoRequests.getIfPresent(remoteDomain); + if (disco != null) { // This is a race condition, but we don't care if we lose it, because the ttl timestamp // won't be exceeded in that case. - if (discoRequests.get(remoteDomain).ttlExceeded()) { + if (disco.ttlExceeded()) { if (LOG.isLoggable(Level.FINE)) { LOG.info("discoverRemoteJid for " + remoteDomain + ": result ttl exceeded."); } // TODO(arb): should we expose the disco cache somehow for debugging? - discoRequests.remove(remoteDomain); + discoRequests.invalidate(remoteDomain); } } - discoRequests.get(remoteDomain).discoverRemoteJID(callback); + try { + discoRequests.get(remoteDomain).discoverRemoteJID(callback); + } catch (ExecutionException ex) { + throw new RuntimeException(ex); + } } /** @@ -180,8 +190,9 @@ public class XmppDisco { if (jid == null) { error = FederationErrors.badRequest("Fake injected error"); } - Preconditions.checkState( - discoRequests.putIfAbsent(domain, new RemoteDisco(domain, jid, error)) == null); + RemoteDisco disco = discoRequests.getIfPresent(domain); + Preconditions.checkState(disco == null); + discoRequests.put(domain, new RemoteDisco(domain, jid, error)); } /** @@ -191,8 +202,9 @@ public class XmppDisco { * @return true/false */ @VisibleForTesting - boolean isDiscoRequestPending(String domain) { - return discoRequests.containsKey(domain) && discoRequests.get(domain).isRequestPending(); + boolean isDiscoRequestPending(String domain) throws ExecutionException { + RemoteDisco disco = discoRequests.getIfPresent(domain); + return disco != null && disco.isRequestPending(); } /** @@ -204,7 +216,6 @@ public class XmppDisco { */ @VisibleForTesting boolean isDiscoRequestAvailable(String domain) { - return discoRequests.containsKey(domain); + return discoRequests.getIfPresent(domain) != null; } - } http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/29667c95/src/org/waveprotocol/wave/federation/xmpp/XmppFederationHost.java ---------------------------------------------------------------------- diff --git a/src/org/waveprotocol/wave/federation/xmpp/XmppFederationHost.java b/src/org/waveprotocol/wave/federation/xmpp/XmppFederationHost.java index a666d53..7194584 100644 --- a/src/org/waveprotocol/wave/federation/xmpp/XmppFederationHost.java +++ b/src/org/waveprotocol/wave/federation/xmpp/XmppFederationHost.java @@ -19,8 +19,9 @@ package org.waveprotocol.wave.federation.xmpp; -import com.google.common.base.Function; -import com.google.common.collect.MapMaker; +import com.google.common.cache.CacheBuilder; +import com.google.common.cache.CacheLoader; +import com.google.common.cache.LoadingCache; import com.google.inject.Inject; import com.google.inject.name.Named; import com.google.protobuf.ByteString; @@ -42,7 +43,7 @@ import org.waveprotocol.wave.model.id.URIEncoderDecoder.EncodingException; import org.xmpp.packet.IQ; import java.util.List; -import java.util.Map; +import java.util.concurrent.ExecutionException; import java.util.logging.Logger; /** @@ -63,14 +64,13 @@ public class XmppFederationHost implements WaveletFederationListener.Factory { // A map of update listeners. There is one per remote domain we are sending updates to. // The name 'listener' refers to them listening for updates from the waveserver to send to the // network. - private final Map<String, WaveletFederationListener> listeners = - new MapMaker().softValues().makeComputingMap( - new Function<String, WaveletFederationListener>() { - @Override - public WaveletFederationListener apply(String domain) { - return new XmppFederationHostForDomain(domain, manager, disco, jid); - } - }); + private final LoadingCache<String, WaveletFederationListener> listeners = + CacheBuilder.newBuilder().build(new CacheLoader<String, WaveletFederationListener>() { + @Override + public WaveletFederationListener load(String domain) { + return new XmppFederationHostForDomain(domain, manager, disco, jid); + } + }); /** * Constructor. Note that {@link #setManager} must be called before this class @@ -442,8 +442,12 @@ public class XmppFederationHost implements WaveletFederationListener.Factory { @Override public WaveletFederationListener listenerForDomain(String domain) { - // TODO(thorogood): Kick off disco here instead of inside - // XmppFederationHostForDomain. - return listeners.get(domain); + try { + // TODO(thorogood): Kick off disco here instead of inside + // XmppFederationHostForDomain. + return listeners.get(domain); + } catch (ExecutionException ex) { + throw new RuntimeException(ex); + } } } http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/29667c95/test/org/waveprotocol/box/server/robots/dataapi/DataApiOAuthServletTest.java ---------------------------------------------------------------------- diff --git a/test/org/waveprotocol/box/server/robots/dataapi/DataApiOAuthServletTest.java b/test/org/waveprotocol/box/server/robots/dataapi/DataApiOAuthServletTest.java index d625c60..4016ab9 100644 --- a/test/org/waveprotocol/box/server/robots/dataapi/DataApiOAuthServletTest.java +++ b/test/org/waveprotocol/box/server/robots/dataapi/DataApiOAuthServletTest.java @@ -57,6 +57,7 @@ import java.util.Locale; import java.util.Map; import javax.servlet.ServletOutputStream; +import javax.servlet.WriteListener; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpSession; @@ -97,6 +98,15 @@ public class DataApiOAuthServletTest extends TestCase { stringWriter.close(); closed = true; } + + @Override + public boolean isReady() { + return true; + } + + @Override + public void setWriteListener(WriteListener wl) { + } } private static final String FAKE_TOKEN = "fake_token"; http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/29667c95/test/org/waveprotocol/box/server/rpc/RpcTest.java ---------------------------------------------------------------------- diff --git a/test/org/waveprotocol/box/server/rpc/RpcTest.java b/test/org/waveprotocol/box/server/rpc/RpcTest.java index 5a0b07c..d86ddf8 100644 --- a/test/org/waveprotocol/box/server/rpc/RpcTest.java +++ b/test/org/waveprotocol/box/server/rpc/RpcTest.java @@ -23,6 +23,8 @@ import com.google.common.collect.Lists; import com.google.inject.AbstractModule; import com.google.inject.Guice; import com.google.inject.Injector; +import com.google.inject.Key; +import com.google.inject.name.Names; import com.google.protobuf.Descriptors; import com.google.protobuf.RpcCallback; import com.google.protobuf.RpcController; @@ -46,6 +48,7 @@ import java.util.List; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicBoolean; +import org.waveprotocol.box.server.CoreSettings; /** * Test case for ClientRpcChannelImpl and ServerRpcProvider. @@ -76,6 +79,8 @@ public class RpcTest extends TestCase { @Override protected void configure() { bind(ServerRpcProvider.class).toInstance(server); + bind(Key.get(Integer.class, Names.named(CoreSettings.WEBSOCKET_MAX_IDLE_TIME))).toInstance(0); + bind(Key.get(Integer.class, Names.named(CoreSettings.WEBSOCKET_MAX_MESSAGE_SIZE))).toInstance(2); } }); server.startWebSocketServer(injector); http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/29667c95/test/org/waveprotocol/box/server/rpc/WebSocketChannelTest.java ---------------------------------------------------------------------- diff --git a/test/org/waveprotocol/box/server/rpc/WebSocketChannelTest.java b/test/org/waveprotocol/box/server/rpc/WebSocketChannelTest.java index e5ab7b9..d920445 100644 --- a/test/org/waveprotocol/box/server/rpc/WebSocketChannelTest.java +++ b/test/org/waveprotocol/box/server/rpc/WebSocketChannelTest.java @@ -56,17 +56,6 @@ public class WebSocketChannelTest extends TestCase { this.sequenceNumber = sequenceNo; this.savedMessage = message; } - - @Override - public void unknown(int sequenceNo, final String messageType, - final UnknownFieldSet message) { - fail("unknown"); - } - - @Override - public void unknown(int sequenceNo, final String messageType, final String message) { - fail("unknown"); - } } @Override http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/29667c95/test/org/waveprotocol/wave/federation/xmpp/MockDisco.java ---------------------------------------------------------------------- diff --git a/test/org/waveprotocol/wave/federation/xmpp/MockDisco.java b/test/org/waveprotocol/wave/federation/xmpp/MockDisco.java index 28f25c7..6a0193e 100644 --- a/test/org/waveprotocol/wave/federation/xmpp/MockDisco.java +++ b/test/org/waveprotocol/wave/federation/xmpp/MockDisco.java @@ -20,11 +20,17 @@ package org.waveprotocol.wave.federation.xmpp; import com.google.common.base.Function; +import com.google.common.cache.CacheBuilder; +import com.google.common.cache.CacheLoader; +import com.google.common.cache.LoadingCache; import com.google.common.collect.Lists; import com.google.common.collect.MapMaker; import java.util.Map; import java.util.Queue; +import java.util.concurrent.ExecutionException; +import java.util.logging.Level; +import java.util.logging.Logger; /** * Tiny MockDisco class that wraps XmppDisco. @@ -56,10 +62,10 @@ public class MockDisco extends XmppDisco { } } - public Map<String, PendingMockDisco> pending = new MapMaker().makeComputingMap( - new Function<String, PendingMockDisco>() { + public LoadingCache<String, PendingMockDisco> pending = CacheBuilder.newBuilder() + .build(new CacheLoader<String, PendingMockDisco>() { @Override - public PendingMockDisco apply(String domain) { + public PendingMockDisco load(String domain) { return new PendingMockDisco(domain); } }); @@ -71,7 +77,11 @@ public class MockDisco extends XmppDisco { // below, but since this is only used in tests, we can probably ignore it. super.discoverRemoteJid(remoteDomain, callback); } else { - pending.get(remoteDomain).addCallback(callback); + try { + pending.get(remoteDomain).addCallback(callback); + } catch (ExecutionException ex) { + throw new RuntimeException(ex); + } } } http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/29667c95/test/org/waveprotocol/wave/federation/xmpp/XmppDiscoTest.java ---------------------------------------------------------------------- diff --git a/test/org/waveprotocol/wave/federation/xmpp/XmppDiscoTest.java b/test/org/waveprotocol/wave/federation/xmpp/XmppDiscoTest.java index aad419d..9be9588 100644 --- a/test/org/waveprotocol/wave/federation/xmpp/XmppDiscoTest.java +++ b/test/org/waveprotocol/wave/federation/xmpp/XmppDiscoTest.java @@ -38,6 +38,7 @@ import org.xmpp.packet.PacketError; import org.joda.time.DateTimeUtils; import java.util.List; +import java.util.concurrent.ExecutionException; import java.util.concurrent.atomic.AtomicLong; /** @@ -101,10 +102,17 @@ public class XmppDiscoTest extends TestCase { private SuccessFailCallback<String, String> discoCallback; private static final int DISCO_FAIL_EXPIRY_SECS = 5 * 60; private static final int DISCO_SUCCESS_EXPIRY_SECS = 2 * 60 * 60; - private AtomicLong counterStarted = XmppDisco.statDiscoStarted.get(REMOTE_DOMAIN); - private AtomicLong counterSuccess = RemoteDisco.statDiscoSuccess.get(REMOTE_DOMAIN); - private AtomicLong counterFailed = RemoteDisco.statDiscoFailed.get(REMOTE_DOMAIN); + private final AtomicLong counterStarted; + private final AtomicLong counterSuccess; + private final AtomicLong counterFailed; + + public XmppDiscoTest() throws ExecutionException { + counterStarted = XmppDisco.statDiscoStarted.get(REMOTE_DOMAIN); + counterSuccess = RemoteDisco.statDiscoSuccess.get(REMOTE_DOMAIN); + counterFailed = RemoteDisco.statDiscoFailed.get(REMOTE_DOMAIN); + } + @Override protected void setUp() throws Exception { super.setUp(); @@ -191,7 +199,7 @@ public class XmppDiscoTest extends TestCase { * Tests that starting disco sends a disco#items to the remote server, and no * subsequent disco requests start after we get a successful reply. */ - public void testDiscoNoRetransmitsAfterReply() { + public void testDiscoNoRetransmitsAfterReply() throws ExecutionException { XmppUtil.fakeUniqueId = DISCO_ITEMS_ID; disco.discoverRemoteJid(REMOTE_DOMAIN, discoCallback); checkAndResetStats(1, 0, 0); // started http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/29667c95/test/org/waveprotocol/wave/federation/xmpp/XmppFederationHostForDomainTest.java ---------------------------------------------------------------------- diff --git a/test/org/waveprotocol/wave/federation/xmpp/XmppFederationHostForDomainTest.java b/test/org/waveprotocol/wave/federation/xmpp/XmppFederationHostForDomainTest.java index c47d01f..6994484 100644 --- a/test/org/waveprotocol/wave/federation/xmpp/XmppFederationHostForDomainTest.java +++ b/test/org/waveprotocol/wave/federation/xmpp/XmppFederationHostForDomainTest.java @@ -41,6 +41,7 @@ import org.xmpp.packet.Packet; import java.util.Collections; import java.util.List; import java.util.concurrent.Callable; +import java.util.concurrent.ExecutionException; /** * Tests for {@link XmppFederationHostForDomain}. @@ -237,7 +238,7 @@ public class XmppFederationHostForDomainTest extends TestCase { * Confirm that there is one outstanding disco request to REMOTE_DOMAIN, and * force its success. */ - private void successDiscoRequest() { + private void successDiscoRequest() throws ExecutionException { assertEquals(1, disco.pending.size()); PendingMockDisco v = disco.pending.get(REMOTE_DOMAIN); assertEquals(REMOTE_DOMAIN, v.remoteDomain); @@ -250,7 +251,7 @@ public class XmppFederationHostForDomainTest extends TestCase { * Confirm that there is one outstanding disco request to REMOTE_DOMAIN, and * force its failure. */ - private void failDiscoRequest() { + private void failDiscoRequest() throws ExecutionException { assertEquals(1, disco.pending.size()); PendingMockDisco v = disco.pending.get(REMOTE_DOMAIN); assertEquals(REMOTE_DOMAIN, v.remoteDomain); http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/29667c95/third_party/runtime/gson/LICENSE ---------------------------------------------------------------------- diff --git a/third_party/runtime/gson/LICENSE b/third_party/runtime/gson/LICENSE new file mode 100644 index 0000000..892eaed --- /dev/null +++ b/third_party/runtime/gson/LICENSE @@ -0,0 +1,203 @@ +Google Gson + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright 2008-2011 Google Inc. + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/29667c95/third_party/runtime/gson/README.google ---------------------------------------------------------------------- diff --git a/third_party/runtime/gson/README.google b/third_party/runtime/gson/README.google index 6136ac4..a0562cc 100644 --- a/third_party/runtime/gson/README.google +++ b/third_party/runtime/gson/README.google @@ -1,11 +1,7 @@ -URL: http://code.google.com/p/google-gson/ -Version: 1.4 -License: Apache 2.0 +Gson is a Java library that can be used to convert a Java object into its +JSON representation. It can also be used to convert a JSON string into an +equivalent Java object. Gson can work with arbitrary Java objects including +pre-existing objects that you do not have source-code of. -License File: COPYING - -Description: -A Google Java Library that can convert a Java Object into its JSON representations and back. - -Local Modifications: -No modifications. +Complete Gson documentation is available at its project page +http://code.google.com/p/google-gson http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/29667c95/third_party/runtime/gson/gson-1.4.jar ---------------------------------------------------------------------- diff --git a/third_party/runtime/gson/gson-1.4.jar b/third_party/runtime/gson/gson-1.4.jar deleted file mode 100644 index b9c33d0..0000000 Binary files a/third_party/runtime/gson/gson-1.4.jar and /dev/null differ http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/29667c95/third_party/runtime/gson/gson-2.2.4.jar ---------------------------------------------------------------------- diff --git a/third_party/runtime/gson/gson-2.2.4.jar b/third_party/runtime/gson/gson-2.2.4.jar new file mode 100644 index 0000000..9478253 Binary files /dev/null and b/third_party/runtime/gson/gson-2.2.4.jar differ http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/29667c95/third_party/runtime/guava/README.google ---------------------------------------------------------------------- diff --git a/third_party/runtime/guava/README.google b/third_party/runtime/guava/README.google index 1bcc427..f381e22 100644 --- a/third_party/runtime/guava/README.google +++ b/third_party/runtime/guava/README.google @@ -1,5 +1,5 @@ URL: http://code.google.com/p/guava-libraries/ -Version: r09 +Version: r15 License: Apache 2.0 License File: COPYING http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/29667c95/third_party/runtime/guava/guava-15.0.jar ---------------------------------------------------------------------- diff --git a/third_party/runtime/guava/guava-15.0.jar b/third_party/runtime/guava/guava-15.0.jar new file mode 100644 index 0000000..eb9ef8a Binary files /dev/null and b/third_party/runtime/guava/guava-15.0.jar differ http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/29667c95/third_party/runtime/guava/guava-gwt-15.0.jar ---------------------------------------------------------------------- diff --git a/third_party/runtime/guava/guava-gwt-15.0.jar b/third_party/runtime/guava/guava-gwt-15.0.jar new file mode 100644 index 0000000..840c3c3 Binary files /dev/null and b/third_party/runtime/guava/guava-gwt-15.0.jar differ http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/29667c95/third_party/runtime/guava/guava-r09-gwt.jar ---------------------------------------------------------------------- diff --git a/third_party/runtime/guava/guava-r09-gwt.jar b/third_party/runtime/guava/guava-r09-gwt.jar deleted file mode 100644 index 5f130e5..0000000 Binary files a/third_party/runtime/guava/guava-r09-gwt.jar and /dev/null differ http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/29667c95/third_party/runtime/guava/guava-r09.jar ---------------------------------------------------------------------- diff --git a/third_party/runtime/guava/guava-r09.jar b/third_party/runtime/guava/guava-r09.jar deleted file mode 100644 index f8da8b1..0000000 Binary files a/third_party/runtime/guava/guava-r09.jar and /dev/null differ http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/29667c95/third_party/runtime/jetty/README.google ---------------------------------------------------------------------- diff --git a/third_party/runtime/jetty/README.google b/third_party/runtime/jetty/README.google index 50e1266..29f4ead 100644 --- a/third_party/runtime/jetty/README.google +++ b/third_party/runtime/jetty/README.google @@ -1,5 +1,5 @@ URL: http://www.eclipse.org/jetty/downloads.php -Version: 8.1.1.v20120215 (for websocket) +Version: 9.1.0 License: Apache 2.0 License File: COPYING http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/29667c95/third_party/runtime/jetty/jetty-annotations-9.1.0.v20131115.jar ---------------------------------------------------------------------- diff --git a/third_party/runtime/jetty/jetty-annotations-9.1.0.v20131115.jar b/third_party/runtime/jetty/jetty-annotations-9.1.0.v20131115.jar new file mode 100644 index 0000000..11860c2 Binary files /dev/null and b/third_party/runtime/jetty/jetty-annotations-9.1.0.v20131115.jar differ http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/29667c95/third_party/runtime/jetty/jetty-client-8.1.1.v20120215.jar ---------------------------------------------------------------------- diff --git a/third_party/runtime/jetty/jetty-client-8.1.1.v20120215.jar b/third_party/runtime/jetty/jetty-client-8.1.1.v20120215.jar deleted file mode 100755 index c0dbff1..0000000 Binary files a/third_party/runtime/jetty/jetty-client-8.1.1.v20120215.jar and /dev/null differ http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/29667c95/third_party/runtime/jetty/jetty-client-9.1.0.v20131115.jar ---------------------------------------------------------------------- diff --git a/third_party/runtime/jetty/jetty-client-9.1.0.v20131115.jar b/third_party/runtime/jetty/jetty-client-9.1.0.v20131115.jar new file mode 100644 index 0000000..8706fce Binary files /dev/null and b/third_party/runtime/jetty/jetty-client-9.1.0.v20131115.jar differ http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/29667c95/third_party/runtime/jetty/jetty-continuation-8.1.1.v20120215.jar ---------------------------------------------------------------------- diff --git a/third_party/runtime/jetty/jetty-continuation-8.1.1.v20120215.jar b/third_party/runtime/jetty/jetty-continuation-8.1.1.v20120215.jar deleted file mode 100755 index 321153c..0000000 Binary files a/third_party/runtime/jetty/jetty-continuation-8.1.1.v20120215.jar and /dev/null differ http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/29667c95/third_party/runtime/jetty/jetty-continuation-9.1.0.v20131115.jar ---------------------------------------------------------------------- diff --git a/third_party/runtime/jetty/jetty-continuation-9.1.0.v20131115.jar b/third_party/runtime/jetty/jetty-continuation-9.1.0.v20131115.jar new file mode 100644 index 0000000..019b1a5 Binary files /dev/null and b/third_party/runtime/jetty/jetty-continuation-9.1.0.v20131115.jar differ http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/29667c95/third_party/runtime/jetty/jetty-http-8.1.1.v20120215.jar ---------------------------------------------------------------------- diff --git a/third_party/runtime/jetty/jetty-http-8.1.1.v20120215.jar b/third_party/runtime/jetty/jetty-http-8.1.1.v20120215.jar deleted file mode 100755 index 3a2b3f0..0000000 Binary files a/third_party/runtime/jetty/jetty-http-8.1.1.v20120215.jar and /dev/null differ http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/29667c95/third_party/runtime/jetty/jetty-http-9.1.0.v20131115.jar ---------------------------------------------------------------------- diff --git a/third_party/runtime/jetty/jetty-http-9.1.0.v20131115.jar b/third_party/runtime/jetty/jetty-http-9.1.0.v20131115.jar new file mode 100644 index 0000000..600d064 Binary files /dev/null and b/third_party/runtime/jetty/jetty-http-9.1.0.v20131115.jar differ http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/29667c95/third_party/runtime/jetty/jetty-io-8.1.1.v20120215.jar ---------------------------------------------------------------------- diff --git a/third_party/runtime/jetty/jetty-io-8.1.1.v20120215.jar b/third_party/runtime/jetty/jetty-io-8.1.1.v20120215.jar deleted file mode 100755 index d9f67c2..0000000 Binary files a/third_party/runtime/jetty/jetty-io-8.1.1.v20120215.jar and /dev/null differ http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/29667c95/third_party/runtime/jetty/jetty-io-9.1.0.v20131115.jar ---------------------------------------------------------------------- diff --git a/third_party/runtime/jetty/jetty-io-9.1.0.v20131115.jar b/third_party/runtime/jetty/jetty-io-9.1.0.v20131115.jar new file mode 100644 index 0000000..1049cb1 Binary files /dev/null and b/third_party/runtime/jetty/jetty-io-9.1.0.v20131115.jar differ http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/29667c95/third_party/runtime/jetty/jetty-proxy-9.1.0.v20131115.jar ---------------------------------------------------------------------- diff --git a/third_party/runtime/jetty/jetty-proxy-9.1.0.v20131115.jar b/third_party/runtime/jetty/jetty-proxy-9.1.0.v20131115.jar new file mode 100644 index 0000000..d734aa1 Binary files /dev/null and b/third_party/runtime/jetty/jetty-proxy-9.1.0.v20131115.jar differ http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/29667c95/third_party/runtime/jetty/jetty-security-8.1.1.v20120215.jar ---------------------------------------------------------------------- diff --git a/third_party/runtime/jetty/jetty-security-8.1.1.v20120215.jar b/third_party/runtime/jetty/jetty-security-8.1.1.v20120215.jar deleted file mode 100755 index f75dbd1..0000000 Binary files a/third_party/runtime/jetty/jetty-security-8.1.1.v20120215.jar and /dev/null differ http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/29667c95/third_party/runtime/jetty/jetty-security-9.1.0.v20131115.jar ---------------------------------------------------------------------- diff --git a/third_party/runtime/jetty/jetty-security-9.1.0.v20131115.jar b/third_party/runtime/jetty/jetty-security-9.1.0.v20131115.jar new file mode 100644 index 0000000..2b0ba3d Binary files /dev/null and b/third_party/runtime/jetty/jetty-security-9.1.0.v20131115.jar differ http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/29667c95/third_party/runtime/jetty/jetty-server-8.1.1.v20120215.jar ---------------------------------------------------------------------- diff --git a/third_party/runtime/jetty/jetty-server-8.1.1.v20120215.jar b/third_party/runtime/jetty/jetty-server-8.1.1.v20120215.jar deleted file mode 100755 index 0a313af..0000000 Binary files a/third_party/runtime/jetty/jetty-server-8.1.1.v20120215.jar and /dev/null differ http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/29667c95/third_party/runtime/jetty/jetty-server-9.1.0.v20131115.jar ---------------------------------------------------------------------- diff --git a/third_party/runtime/jetty/jetty-server-9.1.0.v20131115.jar b/third_party/runtime/jetty/jetty-server-9.1.0.v20131115.jar new file mode 100644 index 0000000..159c698 Binary files /dev/null and b/third_party/runtime/jetty/jetty-server-9.1.0.v20131115.jar differ http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/29667c95/third_party/runtime/jetty/jetty-servlet-8.1.1.v20120215.jar ---------------------------------------------------------------------- diff --git a/third_party/runtime/jetty/jetty-servlet-8.1.1.v20120215.jar b/third_party/runtime/jetty/jetty-servlet-8.1.1.v20120215.jar deleted file mode 100755 index aec7b8f..0000000 Binary files a/third_party/runtime/jetty/jetty-servlet-8.1.1.v20120215.jar and /dev/null differ http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/29667c95/third_party/runtime/jetty/jetty-servlet-9.1.0.v20131115.jar ---------------------------------------------------------------------- diff --git a/third_party/runtime/jetty/jetty-servlet-9.1.0.v20131115.jar b/third_party/runtime/jetty/jetty-servlet-9.1.0.v20131115.jar new file mode 100644 index 0000000..31c23f5 Binary files /dev/null and b/third_party/runtime/jetty/jetty-servlet-9.1.0.v20131115.jar differ http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/29667c95/third_party/runtime/jetty/jetty-servlets-8.1.1.v20120215.jar ---------------------------------------------------------------------- diff --git a/third_party/runtime/jetty/jetty-servlets-8.1.1.v20120215.jar b/third_party/runtime/jetty/jetty-servlets-8.1.1.v20120215.jar deleted file mode 100755 index 9bb787e..0000000 Binary files a/third_party/runtime/jetty/jetty-servlets-8.1.1.v20120215.jar and /dev/null differ http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/29667c95/third_party/runtime/jetty/jetty-servlets-9.1.0.v20131115.jar ---------------------------------------------------------------------- diff --git a/third_party/runtime/jetty/jetty-servlets-9.1.0.v20131115.jar b/third_party/runtime/jetty/jetty-servlets-9.1.0.v20131115.jar new file mode 100644 index 0000000..7122df2 Binary files /dev/null and b/third_party/runtime/jetty/jetty-servlets-9.1.0.v20131115.jar differ http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/29667c95/third_party/runtime/jetty/jetty-util-8.1.1.v20120215.jar ---------------------------------------------------------------------- diff --git a/third_party/runtime/jetty/jetty-util-8.1.1.v20120215.jar b/third_party/runtime/jetty/jetty-util-8.1.1.v20120215.jar deleted file mode 100755 index 096f6cf..0000000 Binary files a/third_party/runtime/jetty/jetty-util-8.1.1.v20120215.jar and /dev/null differ http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/29667c95/third_party/runtime/jetty/jetty-util-9.1.0.v20131115.jar ---------------------------------------------------------------------- diff --git a/third_party/runtime/jetty/jetty-util-9.1.0.v20131115.jar b/third_party/runtime/jetty/jetty-util-9.1.0.v20131115.jar new file mode 100644 index 0000000..36382b2 Binary files /dev/null and b/third_party/runtime/jetty/jetty-util-9.1.0.v20131115.jar differ http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/29667c95/third_party/runtime/jetty/jetty-webapp-8.1.1.v20120215.jar ---------------------------------------------------------------------- diff --git a/third_party/runtime/jetty/jetty-webapp-8.1.1.v20120215.jar b/third_party/runtime/jetty/jetty-webapp-8.1.1.v20120215.jar deleted file mode 100755 index 0c8aa4a..0000000 Binary files a/third_party/runtime/jetty/jetty-webapp-8.1.1.v20120215.jar and /dev/null differ http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/29667c95/third_party/runtime/jetty/jetty-webapp-9.1.0.v20131115.jar ---------------------------------------------------------------------- diff --git a/third_party/runtime/jetty/jetty-webapp-9.1.0.v20131115.jar b/third_party/runtime/jetty/jetty-webapp-9.1.0.v20131115.jar new file mode 100644 index 0000000..0098ec8 Binary files /dev/null and b/third_party/runtime/jetty/jetty-webapp-9.1.0.v20131115.jar differ http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/29667c95/third_party/runtime/jetty/jetty-websocket-8.1.1.v20120215.jar ---------------------------------------------------------------------- diff --git a/third_party/runtime/jetty/jetty-websocket-8.1.1.v20120215.jar b/third_party/runtime/jetty/jetty-websocket-8.1.1.v20120215.jar deleted file mode 100755 index b398c79..0000000 Binary files a/third_party/runtime/jetty/jetty-websocket-8.1.1.v20120215.jar and /dev/null differ http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/29667c95/third_party/runtime/jetty/jetty-xml-8.1.1.v20120215.jar ---------------------------------------------------------------------- diff --git a/third_party/runtime/jetty/jetty-xml-8.1.1.v20120215.jar b/third_party/runtime/jetty/jetty-xml-8.1.1.v20120215.jar deleted file mode 100755 index 9df8fbd..0000000 Binary files a/third_party/runtime/jetty/jetty-xml-8.1.1.v20120215.jar and /dev/null differ http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/29667c95/third_party/runtime/jetty/jetty-xml-9.1.0.v20131115.jar ---------------------------------------------------------------------- diff --git a/third_party/runtime/jetty/jetty-xml-9.1.0.v20131115.jar b/third_party/runtime/jetty/jetty-xml-9.1.0.v20131115.jar new file mode 100644 index 0000000..ba86703 Binary files /dev/null and b/third_party/runtime/jetty/jetty-xml-9.1.0.v20131115.jar differ http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/29667c95/third_party/runtime/jetty/servlet-api-3.0.jar ---------------------------------------------------------------------- diff --git a/third_party/runtime/jetty/servlet-api-3.0.jar b/third_party/runtime/jetty/servlet-api-3.0.jar deleted file mode 100755 index b135409..0000000 Binary files a/third_party/runtime/jetty/servlet-api-3.0.jar and /dev/null differ http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/29667c95/third_party/runtime/jetty/servlet-api-3.1.jar ---------------------------------------------------------------------- diff --git a/third_party/runtime/jetty/servlet-api-3.1.jar b/third_party/runtime/jetty/servlet-api-3.1.jar new file mode 100644 index 0000000..6b14c3d Binary files /dev/null and b/third_party/runtime/jetty/servlet-api-3.1.jar differ http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/29667c95/third_party/runtime/jetty/websocket-api-9.1.0.v20131115.jar ---------------------------------------------------------------------- diff --git a/third_party/runtime/jetty/websocket-api-9.1.0.v20131115.jar b/third_party/runtime/jetty/websocket-api-9.1.0.v20131115.jar new file mode 100644 index 0000000..350484c Binary files /dev/null and b/third_party/runtime/jetty/websocket-api-9.1.0.v20131115.jar differ http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/29667c95/third_party/runtime/jetty/websocket-client-9.1.0.v20131115.jar ---------------------------------------------------------------------- diff --git a/third_party/runtime/jetty/websocket-client-9.1.0.v20131115.jar b/third_party/runtime/jetty/websocket-client-9.1.0.v20131115.jar new file mode 100644 index 0000000..9470642 Binary files /dev/null and b/third_party/runtime/jetty/websocket-client-9.1.0.v20131115.jar differ http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/29667c95/third_party/runtime/jetty/websocket-common-9.1.0.v20131115.jar ---------------------------------------------------------------------- diff --git a/third_party/runtime/jetty/websocket-common-9.1.0.v20131115.jar b/third_party/runtime/jetty/websocket-common-9.1.0.v20131115.jar new file mode 100644 index 0000000..8da2059 Binary files /dev/null and b/third_party/runtime/jetty/websocket-common-9.1.0.v20131115.jar differ http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/29667c95/third_party/runtime/jetty/websocket-server-9.1.0.v20131115.jar ---------------------------------------------------------------------- diff --git a/third_party/runtime/jetty/websocket-server-9.1.0.v20131115.jar b/third_party/runtime/jetty/websocket-server-9.1.0.v20131115.jar new file mode 100644 index 0000000..1d74cbe Binary files /dev/null and b/third_party/runtime/jetty/websocket-server-9.1.0.v20131115.jar differ http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/29667c95/third_party/runtime/jetty/websocket-servlet-9.1.0.v20131115.jar ---------------------------------------------------------------------- diff --git a/third_party/runtime/jetty/websocket-servlet-9.1.0.v20131115.jar b/third_party/runtime/jetty/websocket-servlet-9.1.0.v20131115.jar new file mode 100644 index 0000000..c168b34 Binary files /dev/null and b/third_party/runtime/jetty/websocket-servlet-9.1.0.v20131115.jar differ http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/29667c95/third_party/runtime/protobuf/README.google ---------------------------------------------------------------------- diff --git a/third_party/runtime/protobuf/README.google b/third_party/runtime/protobuf/README.google index aa7c8c2..de193f6 100644 --- a/third_party/runtime/protobuf/README.google +++ b/third_party/runtime/protobuf/README.google @@ -1,5 +1,5 @@ URL: http://code.google.com/apis/protocolbuffers/ -Version: 2.3.0 +Version: 2.5.0 License: New BSD License File: LICENSE http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/29667c95/third_party/runtime/protobuf/protobuf-2.3.0-src.jar ---------------------------------------------------------------------- diff --git a/third_party/runtime/protobuf/protobuf-2.3.0-src.jar b/third_party/runtime/protobuf/protobuf-2.3.0-src.jar deleted file mode 100644 index ab81e5e..0000000 Binary files a/third_party/runtime/protobuf/protobuf-2.3.0-src.jar and /dev/null differ http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/29667c95/third_party/runtime/protobuf/protobuf-java-2.3.0.jar ---------------------------------------------------------------------- diff --git a/third_party/runtime/protobuf/protobuf-java-2.3.0.jar b/third_party/runtime/protobuf/protobuf-java-2.3.0.jar deleted file mode 100644 index f78b32b..0000000 Binary files a/third_party/runtime/protobuf/protobuf-java-2.3.0.jar and /dev/null differ http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/29667c95/third_party/runtime/protobuf/protobuf-java-2.5.0.jar ---------------------------------------------------------------------- diff --git a/third_party/runtime/protobuf/protobuf-java-2.5.0.jar b/third_party/runtime/protobuf/protobuf-java-2.5.0.jar new file mode 100644 index 0000000..ae274c7 Binary files /dev/null and b/third_party/runtime/protobuf/protobuf-java-2.5.0.jar differ http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/29667c95/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 deleted file mode 100755 index 5316cf0..0000000 Binary files a/third_party/runtime/socketio/socketio-jetty-0.1-SNAPSHOT-sources.jar and /dev/null differ http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/29667c95/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 deleted file mode 100755 index a40c88f..0000000 Binary files a/third_party/runtime/socketio/socketio-jetty-0.1-SNAPSHOT.jar and /dev/null differ
