Minor changes
Project: http://git-wip-us.apache.org/repos/asf/incubator-wave/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-wave/commit/011bdc31 Tree: http://git-wip-us.apache.org/repos/asf/incubator-wave/tree/011bdc31 Diff: http://git-wip-us.apache.org/repos/asf/incubator-wave/diff/011bdc31 Branch: refs/heads/master Commit: 011bdc31c794d5cf43b1fd9dd303295654e1d107 Parents: 2e979b6 Author: Andrew Kaplanov <[email protected]> Authored: Fri Jan 17 00:11:16 2014 +0600 Committer: Andrew Kaplanov <[email protected]> Committed: Fri Jan 17 00:11:16 2014 +0600 ---------------------------------------------------------------------- .../box/server/persistence/file/FileDeltaStore.java | 5 +++-- .../box/server/rpc/ServerRpcProvider.java | 15 ++------------- third_party/runtime/gson/README.google | 16 ++++++++++------ 3 files changed, 15 insertions(+), 21 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/011bdc31/src/org/waveprotocol/box/server/persistence/file/FileDeltaStore.java ---------------------------------------------------------------------- diff --git a/src/org/waveprotocol/box/server/persistence/file/FileDeltaStore.java b/src/org/waveprotocol/box/server/persistence/file/FileDeltaStore.java index 72e3ea8..46b00bf 100644 --- a/src/org/waveprotocol/box/server/persistence/file/FileDeltaStore.java +++ b/src/org/waveprotocol/box/server/persistence/file/FileDeltaStore.java @@ -24,7 +24,6 @@ import com.google.common.collect.ImmutableSet; import com.google.inject.Inject; import com.google.inject.name.Named; -import org.eclipse.jetty.util.log.Log; import org.waveprotocol.box.common.ExceptionalIterator; import org.waveprotocol.box.server.CoreSettings; import org.waveprotocol.box.server.persistence.PersistenceException; @@ -33,6 +32,7 @@ import org.waveprotocol.wave.model.id.WaveId; import org.waveprotocol.wave.model.id.WaveletId; import org.waveprotocol.wave.model.id.WaveletName; import org.waveprotocol.wave.model.version.HashedVersion; +import org.waveprotocol.wave.util.logging.Log; import java.io.File; import java.io.FilenameFilter; @@ -54,6 +54,7 @@ import java.util.NoSuchElementException; * @author [email protected] (Joseph Gentle) */ public class FileDeltaStore implements DeltaStore { + private static final Log LOG = Log.get(FileDeltaStore.class); /** * The directory in which the wavelets are stored */ @@ -108,7 +109,7 @@ public class FileDeltaStore implements DeltaStore { try { deltas.close(); } catch (IOException e) { - Log.getLog().info("Failed to close deltas file " + name, e); + LOG.info("Failed to close deltas file " + name, e); } } http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/011bdc31/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 1226701..0809e9b 100755 --- a/src/org/waveprotocol/box/server/rpc/ServerRpcProvider.java +++ b/src/org/waveprotocol/box/server/rpc/ServerRpcProvider.java @@ -430,18 +430,7 @@ public class ServerRpcProvider { // 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. - // Issue https://issues.apache.org/jira/browse/WAVE-405. - // ServletHolder sioholder = addServlet("/socket.io/*", WaveSocketIOServlet.class ); - // // TODO(zamfi): fix to let messages span frames. - // sioholder.setInitParameter("bufferSize", "" + BUFFER_SIZE); - // sioholder.setInitParameter(FlashSocketTransport.PARAM_FLASHPOLICY_SERVER_HOST, - // flashPolicyServerHost); - // sioholder.setInitParameter(FlashSocketTransport.PARAM_FLASHPOLICY_SERVER_PORT, - // ""+flashsocketPolicyPort); - // // TODO: Change to use the public http address and all other bound addresses. - // sioholder.setInitParameter(FlashSocketTransport.PARAM_FLASHPOLICY_DOMAIN, "*"); - // sioholder.setInitParameter(FlashSocketTransport.PARAM_FLASHPOLICY_PORTS, - // flashPolicyAllowedPorts.toString()); + // https://issues.apache.org/jira/browse/WAVE-405 /* * Loop through addresses, collect list of ports, and determine if we are to use "localhost" @@ -587,7 +576,7 @@ public class ServerRpcProvider { if (websocketMaxIdleTime != 0) { factory.getPolicy().setIdleTimeout(websocketMaxIdleTime); } - factory.getPolicy().setMaxTextMessageSize(websocketMaxMessageSize*1024*1024); + factory.getPolicy().setMaxTextMessageSize(websocketMaxMessageSize * 1024 * 1024); factory.setCreator(new WebSocketCreator() { @Override public Object createWebSocket(ServletUpgradeRequest req, ServletUpgradeResponse resp) { http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/011bdc31/third_party/runtime/gson/README.google ---------------------------------------------------------------------- diff --git a/third_party/runtime/gson/README.google b/third_party/runtime/gson/README.google index a0562cc..6136ac4 100644 --- a/third_party/runtime/gson/README.google +++ b/third_party/runtime/gson/README.google @@ -1,7 +1,11 @@ -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. +URL: http://code.google.com/p/google-gson/ +Version: 1.4 +License: Apache 2.0 -Complete Gson documentation is available at its project page -http://code.google.com/p/google-gson +License File: COPYING + +Description: +A Google Java Library that can convert a Java Object into its JSON representations and back. + +Local Modifications: +No modifications.
