Author: yurize
Date: Tue May 29 17:20:13 2012
New Revision: 1343860
URL: http://svn.apache.org/viewvc?rev=1343860&view=rev
Log:
Remove useSocketIO configuration parameter. By Vicente J. Ruiz Jurado
https://reviews.apache.org/r/5258
Modified:
incubator/wave/trunk/server-config.xml
incubator/wave/trunk/server.config.example
incubator/wave/trunk/src/org/waveprotocol/box/server/CoreSettings.java
incubator/wave/trunk/src/org/waveprotocol/box/server/gxp/WaveClientPage.gxp
incubator/wave/trunk/src/org/waveprotocol/box/server/rpc/WaveClientServlet.java
Modified: incubator/wave/trunk/server-config.xml
URL:
http://svn.apache.org/viewvc/incubator/wave/trunk/server-config.xml?rev=1343860&r1=1343859&r2=1343860&view=diff
==============================================================================
--- incubator/wave/trunk/server-config.xml (original)
+++ incubator/wave/trunk/server-config.xml Tue May 29 17:20:13 2012
@@ -15,7 +15,6 @@
<property name="account_store_directory" value="_accounts" />
<property name="delta_store_directory" value="_deltas" />
<property name="sessions_store_directory" value="_sessions" />
- <property name="use_socketio" value="true" />
<property name="admin_user" value="@${wave_server_domain}" />
<property name="welcome_wave_id" value="" />
<property name="listener_executor_thread_count" value="1" />
@@ -85,7 +84,6 @@
value="${account_store_directory}" />
<token key="DELTA_STORE_DIRECTORY" value="${delta_store_directory}"
/>
<token key="SESSIONS_STORE_DIRECTORY"
value="${sessions_store_directory}" />
- <token key="USE_SOCKETIO" value="${use_socketio}" />
<token key="ADMIN_USER" value="${admin_user}" />
<token key="WELCOME_WAVE_ID" value="${welcome_wave_id}" />
<token key="LISTENER_EXECUTOR_THREAD_COUNT"
value="${listener_executor_thread_count}" />
Modified: incubator/wave/trunk/server.config.example
URL:
http://svn.apache.org/viewvc/incubator/wave/trunk/server.config.example?rev=1343860&r1=1343859&r2=1343860&view=diff
==============================================================================
--- incubator/wave/trunk/server.config.example (original)
+++ incubator/wave/trunk/server.config.example Tue May 29 17:20:13 2012
@@ -71,10 +71,6 @@ delta_store_directory = @DELTA_STORE_DIR
# Default value: _sessions
sessions_store_directory = @SESSIONS_STORE_DIRECTORY@
-# Set false to use raw WebSockets instead of Socket.IO (still a bit
experimental) in the webclient
-# Default value: true
-use_socketio = @USE_SOCKETIO@
-
# Note: the default value for admin is an invalid user id that cannot be
registered.
# To become an admin: Register a user and set its address as the value below.
# Admin has a privilege to change passwords of other users using an agent
robot.
Modified: incubator/wave/trunk/src/org/waveprotocol/box/server/CoreSettings.java
URL:
http://svn.apache.org/viewvc/incubator/wave/trunk/src/org/waveprotocol/box/server/CoreSettings.java?rev=1343860&r1=1343859&r2=1343860&view=diff
==============================================================================
--- incubator/wave/trunk/src/org/waveprotocol/box/server/CoreSettings.java
(original)
+++ incubator/wave/trunk/src/org/waveprotocol/box/server/CoreSettings.java Tue
May 29 17:20:13 2012
@@ -44,7 +44,6 @@ public class CoreSettings {
public static final String DELTA_STORE_DIRECTORY = "delta_store_directory";
public static final String SESSIONS_STORE_DIRECTORY =
"sessions_store_directory";
public static final String FLASHSOCKET_POLICY_PORT =
"flashsocket_policy_port";
- public static final String USE_SOCKETIO = "use_socketio";
public static final String GADGET_SERVER_HOSTNAME = "gadget_server_hostname";
public static final String GADGET_SERVER_PORT = "gadget_server_port";
public static final String GADGET_SERVER_PATH = "gadget_server_path";
@@ -141,10 +140,6 @@ public class CoreSettings {
defaultValue = "843")
private static int flashsocketPolicyPort;
- @Setting(name = USE_SOCKETIO,
- description = "Enable use of Socket.IO instead of native WebSockets",
defaultValue = "false")
- private static boolean useSocketIO;
-
@Setting(name = GADGET_SERVER_HOSTNAME, description = "The hostname of the
gadget server.",
defaultValue = "gmodules.com")
private static String gadgetServerHostname;
Modified:
incubator/wave/trunk/src/org/waveprotocol/box/server/gxp/WaveClientPage.gxp
URL:
http://svn.apache.org/viewvc/incubator/wave/trunk/src/org/waveprotocol/box/server/gxp/WaveClientPage.gxp?rev=1343860&r1=1343859&r2=1343860&view=diff
==============================================================================
--- incubator/wave/trunk/src/org/waveprotocol/box/server/gxp/WaveClientPage.gxp
(original)
+++ incubator/wave/trunk/src/org/waveprotocol/box/server/gxp/WaveClientPage.gxp
Tue May 29 17:20:13 2012
@@ -32,7 +32,6 @@
<gxp:param name='sessionJson' type='JSONObject' />
<gxp:param name='clientFlags' type='JSONObject' />
<gxp:param name='topBar' type='HtmlClosure' />
- <gxp:param name='useSocketIO' type='boolean' />
<gxp:param name='analyticsAccount' type='String'/>
<!-- Generate doctype to trigger standards mode -->
@@ -46,7 +45,6 @@
<script type="text/javascript" language="javascript">
var __session = <gxp:eval expr='sessionJson' />;
var __client_flags = <gxp:eval expr='clientFlags' />;
- var __useSocketIO = <gxp:eval expr='useSocketIO' />;
</script>
<style type="text/css">
/* TODO: Minimize this. */
Modified:
incubator/wave/trunk/src/org/waveprotocol/box/server/rpc/WaveClientServlet.java
URL:
http://svn.apache.org/viewvc/incubator/wave/trunk/src/org/waveprotocol/box/server/rpc/WaveClientServlet.java?rev=1343860&r1=1343859&r2=1343860&view=diff
==============================================================================
---
incubator/wave/trunk/src/org/waveprotocol/box/server/rpc/WaveClientServlet.java
(original)
+++
incubator/wave/trunk/src/org/waveprotocol/box/server/rpc/WaveClientServlet.java
Tue May 29 17:20:13 2012
@@ -67,7 +67,6 @@ public class WaveClientServlet extends H
}
private final String domain;
- private final Boolean useSocketIO;
private final String analyticsAccount;
private final SessionManager sessionManager;
@@ -77,11 +76,9 @@ public class WaveClientServlet extends H
@Inject
public WaveClientServlet(
@Named(CoreSettings.WAVE_SERVER_DOMAIN) String domain,
- @Named(CoreSettings.USE_SOCKETIO) Boolean useSocketIO,
@Named(CoreSettings.ANALYTICS_ACCOUNT) String analyticsAccount,
SessionManager sessionManager) {
this.domain = domain;
- this.useSocketIO = useSocketIO;
this.analyticsAccount = analyticsAccount;
this.sessionManager = sessionManager;
}
@@ -110,7 +107,7 @@ public class WaveClientServlet extends H
try {
WaveClientPage.write(response.getWriter(), new
GxpContext(request.getLocale()),
getSessionJson(request.getSession(false)), getClientFlags(request),
- TopBar.getGxpClosure(username, userDomain), useSocketIO,
analyticsAccount);
+ TopBar.getGxpClosure(username, userDomain), analyticsAccount);
} catch (IOException e) {
LOG.warning("Failed to write GXP for request " + request, e);
response.setStatus(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
