Repository: incubator-wave Updated Branches: refs/heads/master 0328b9a8a -> 10db75ac7
Source Tinder and Whack from maven repositories. These were causing build failures as they could no longer be fetched from my server. Project: http://git-wip-us.apache.org/repos/asf/incubator-wave/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-wave/commit/10db75ac Tree: http://git-wip-us.apache.org/repos/asf/incubator-wave/tree/10db75ac Diff: http://git-wip-us.apache.org/repos/asf/incubator-wave/diff/10db75ac Branch: refs/heads/master Commit: 10db75ac7656fc26135ed8b3323fa55f51b219aa Parents: 0328b9a Author: Ali Lown <[email protected]> Authored: Mon Aug 25 14:47:08 2014 +0100 Committer: Ali Lown <[email protected]> Committed: Mon Aug 25 18:58:42 2014 +0100 ---------------------------------------------------------------------- .classpath | 2 +- build.xml | 12 ++++++++++-- .../server/waveserver/RemoteWaveletContainerImpl.java | 5 +++-- 3 files changed, 14 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/10db75ac/.classpath ---------------------------------------------------------------------- diff --git a/.classpath b/.classpath index fd33457..aaaf662 100644 --- a/.classpath +++ b/.classpath @@ -60,7 +60,7 @@ <classpathentry kind="lib" path="third_party/runtime/websocket-server-9.1.1.v20140108.jar"/> <classpathentry kind="lib" path="third_party/runtime/websocket-servlet-9.1.1.v20140108.jar"/> <classpathentry kind="lib" path="third_party/runtime/whack.jar"/> - <classpathentry kind="lib" path="third_party/runtime/xmpp.jar"/> + <classpathentry kind="lib" path="third_party/runtime/tinder-1.0.0.jar"/> <classpathentry kind="lib" path="third_party/runtime/xpp3_xpath-1.1.4c.jar"/> <classpathentry kind="lib" path="third_party/runtime/xpp3-1.1.4c.jar"/> <classpathentry kind="lib" path="third_party/test/ant-junit-1.7.0.jar"/> http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/10db75ac/build.xml ---------------------------------------------------------------------- diff --git a/build.xml b/build.xml index 565465f..fc97f5f 100644 --- a/build.xml +++ b/build.xml @@ -1065,8 +1065,7 @@ <url url="https://oauth.googlecode.com/svn/code/maven/net/oauth/core/oauth-consumer/20100527/oauth-consumer-20100527.jar"; /> <url url="http://central.maven.org/maven2/com/google/protobuf/protobuf-java/2.5.0/protobuf-java-2.5.0.jar"; /> <url url="https://protobuf-java-format.googlecode.com/files/protobuf-format-java-1.1.jar"; /> - <url url="http://wave.alown.co.uk/third_party/whack.jar"; /> - <url url="http://wave.alown.co.uk/third_party/xmpp.jar"; /> + <url url="http://central.maven.org/maven2/org/igniterealtime/tinder/1.0.0/tinder-1.0.0.jar"; /> <url url="http://central.maven.org/maven2/xpp3/xpp3/1.1.4c/xpp3-1.1.4c.jar"; /> <url url="http://central.maven.org/maven2/xpp3/xpp3_xpath/1.1.4c/xpp3_xpath-1.1.4c.jar"; /> <url url="http://repo1.maven.org/maven2/org/gnu/inet/libidn/1.15/libidn-1.15.jar"; /> @@ -1074,6 +1073,15 @@ <url url="http://archiva.comunes.org/repository/comunes-snapshots/cc/kune/gwt-initials-avatars-shared/1.0-SNAPSHOT/gwt-initials-avatars-shared-1.0-20140324.102812-16-sources.jar"; /> <url url="http://archiva.comunes.org/repository/comunes-snapshots/cc/kune/gwt-initials-avatars-server/1.0-SNAPSHOT/gwt-initials-avatars-server-1.0-20140324.102825-10.jar"; /> </get> + <get dest="${lib.runtime}/whack_1_0_0.zip" usetimestamp="true" skipexisting="true"> + <url url="http://www.igniterealtime.org/downloadServlet?filename=whack/whack_1_0_0.zip"; /> + </get> + <unzip src="${lib.runtime}/whack_1_0_0.zip" dest="${lib.runtime}"> + <patternset> + <include name="whack_1_0_0/whack.jar" /> + </patternset> + <mapper type="flatten"/> + </unzip> </target> <target name="get-third-party-test" description="Download testing third party dependencies"> http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/10db75ac/src/org/waveprotocol/box/server/waveserver/RemoteWaveletContainerImpl.java ---------------------------------------------------------------------- diff --git a/src/org/waveprotocol/box/server/waveserver/RemoteWaveletContainerImpl.java b/src/org/waveprotocol/box/server/waveserver/RemoteWaveletContainerImpl.java index 1cfaf46..85ba4f6 100644 --- a/src/org/waveprotocol/box/server/waveserver/RemoteWaveletContainerImpl.java +++ b/src/org/waveprotocol/box/server/waveserver/RemoteWaveletContainerImpl.java @@ -29,7 +29,8 @@ import com.google.common.util.concurrent.SettableFuture; import com.google.protobuf.ByteString; import com.google.protobuf.InvalidProtocolBufferException; -import org.jivesoftware.util.Base64; +import org.apache.commons.codec.binary.Base64; + import org.waveprotocol.box.server.common.CoreWaveletOperationSerializer; import org.waveprotocol.box.server.waveserver.CertificateManager.SignerInfoPrefetchResultListener; import org.waveprotocol.wave.crypto.SignatureException; @@ -206,7 +207,7 @@ class RemoteWaveletContainerImpl extends WaveletContainerImpl implements RemoteW } for (ProtocolSignature sig : toVerify.getSignatureList()) { if (certificateManager.retrieveSignerInfo(sig.getSignerId()) == null) { - LOG.info("Fetching signer info " + Base64.encodeBytes(sig.getSignerId().toByteArray())); + LOG.info("Fetching signer info " + Base64.encodeBase64(sig.getSignerId().toByteArray())); numSignerInfoPrefetched.incrementAndGet(); certificateManager.prefetchDeltaSignerInfo(federationProvider, sig.getSignerId(), getWaveletName(), deltaEndVersion, prefetchListener);
