Author: markt
Date: Sun Mar 17 18:49:45 2013
New Revision: 1457513
URL: http://svn.apache.org/r1457513
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=54709
http -> ws
https -> wss
Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java
tomcat/trunk/test/org/apache/tomcat/websocket/TestWsRemoteEndpoint.java
tomcat/trunk/test/org/apache/tomcat/websocket/TestWsWebSocketContainer.java
tomcat/trunk/test/org/apache/tomcat/websocket/pojo/TestEncodingDecoding.java
tomcat/trunk/test/org/apache/tomcat/websocket/pojo/TestPojoMethodMapping.java
Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java?rev=1457513&r1=1457512&r2=1457513&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java Sun
Mar 17 18:49:45 2013
@@ -156,8 +156,8 @@ public class WsWebSocketContainer
throws DeploymentException {
String scheme = path.getScheme();
- if (!("http".equalsIgnoreCase(scheme) ||
- "https".equalsIgnoreCase(scheme))) {
+ if (!("ws".equalsIgnoreCase(scheme) ||
+ "wss".equalsIgnoreCase(scheme))) {
throw new DeploymentException(sm.getString(
"wsWebSocketContainer.pathWrongScheme", scheme));
}
@@ -175,7 +175,7 @@ public class WsWebSocketContainer
SocketAddress sa;
if (port == -1) {
- if ("http".equalsIgnoreCase(scheme)) {
+ if ("ws".equalsIgnoreCase(scheme)) {
sa = new InetSocketAddress(host, 80);
} else {
// TODO HTTPS support
Modified:
tomcat/trunk/test/org/apache/tomcat/websocket/TestWsRemoteEndpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/websocket/TestWsRemoteEndpoint.java?rev=1457513&r1=1457512&r2=1457513&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/tomcat/websocket/TestWsRemoteEndpoint.java
(original)
+++ tomcat/trunk/test/org/apache/tomcat/websocket/TestWsRemoteEndpoint.java Sun
Mar 17 18:49:45 2013
@@ -76,7 +76,7 @@ public class TestWsRemoteEndpoint extend
tomcat.start();
Session wsSession;
- URI uri = new URI("http://localhost:"; + getPort() +
+ URI uri = new URI("ws://localhost:" + getPort() +
TesterEchoServer.Config.PATH_ASYNC);
if (Endpoint.class.isAssignableFrom(clazz)) {
@SuppressWarnings("unchecked")
Modified:
tomcat/trunk/test/org/apache/tomcat/websocket/TestWsWebSocketContainer.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/websocket/TestWsWebSocketContainer.java?rev=1457513&r1=1457512&r2=1457513&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/tomcat/websocket/TestWsWebSocketContainer.java
(original)
+++ tomcat/trunk/test/org/apache/tomcat/websocket/TestWsWebSocketContainer.java
Sun Mar 17 18:49:45 2013
@@ -85,7 +85,7 @@ public class TestWsWebSocketContainer ex
ContainerProvider.getWebSocketContainer();
Session wsSession =
wsContainer.connectToServer(TesterProgrammaticEndpoint.class,
ClientEndpointConfig.Builder.create().build(),
- new URI("http://localhost:"; + getPort() +
+ new URI("ws://localhost:" + getPort() +
TesterEchoServer.Config.PATH_ASYNC));
CountDownLatch latch = new CountDownLatch(1);
BasicText handler = new BasicText(latch);
@@ -135,7 +135,7 @@ public class TestWsWebSocketContainer ex
ContainerProvider.getWebSocketContainer();
wsContainer.connectToServer(TesterProgrammaticEndpoint.class,
ClientEndpointConfig.Builder.create().build(),
- new URI("http://"; + TesterEchoServer.Config.PATH_ASYNC));
+ new URI("ws://" + TesterEchoServer.Config.PATH_ASYNC));
}
@@ -223,7 +223,7 @@ public class TestWsWebSocketContainer ex
Session wsSession =
wsContainer.connectToServer(TesterProgrammaticEndpoint.class,
ClientEndpointConfig.Builder.create().build(),
- new URI("http://localhost:"; + getPort() +
+ new URI("ws://localhost:" + getPort() +
TesterEchoServer.Config.PATH_BASIC));
BasicHandler<?> handler;
CountDownLatch latch = new CountDownLatch(1);
@@ -294,7 +294,7 @@ public class TestWsWebSocketContainer ex
Session wsSession =
wsContainer.connectToServer(TesterProgrammaticEndpoint.class,
ClientEndpointConfig.Builder.create().build(),
- new URI("http://localhost:"; + getPort() +
BlockingConfig.PATH));
+ new URI("ws://localhost:" + getPort() + BlockingConfig.PATH));
if (!setTimeoutOnContainer) {
wsSession.getAsyncRemote().setSendTimeout(TIMEOUT_MS);
@@ -375,7 +375,7 @@ public class TestWsWebSocketContainer ex
Session wsSession =
wsContainer.connectToServer(TesterProgrammaticEndpoint.class,
ClientEndpointConfig.Builder.create().build(),
- new URI("http://localhost:"; + getPort() +
+ new URI("ws://localhost:" + getPort() +
ConstantTxConfig.PATH));
wsSession.addMessageHandler(new BlockingBinaryHandler());
@@ -669,7 +669,7 @@ public class TestWsWebSocketContainer ex
Class<? extends Endpoint> clazz) throws Exception {
return wsContainer.connectToServer(clazz,
ClientEndpointConfig.Builder.create().build(),
- new URI("http://localhost:"; + getPort() +
+ new URI("ws://localhost:" + getPort() +
TesterEchoServer.Config.PATH_BASIC));
}
Modified:
tomcat/trunk/test/org/apache/tomcat/websocket/pojo/TestEncodingDecoding.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/websocket/pojo/TestEncodingDecoding.java?rev=1457513&r1=1457512&r2=1457513&view=diff
==============================================================================
---
tomcat/trunk/test/org/apache/tomcat/websocket/pojo/TestEncodingDecoding.java
(original)
+++
tomcat/trunk/test/org/apache/tomcat/websocket/pojo/TestEncodingDecoding.java
Sun Mar 17 18:49:45 2013
@@ -66,7 +66,7 @@ public class TestEncodingDecoding extend
tomcat.start();
Client client = new Client();
- URI uri = new URI("http://localhost:"; + getPort() + "/");
+ URI uri = new URI("ws://localhost:" + getPort() + "/");
Session session = wsContainer.connectToServer(client, uri);
MsgString msg1 = new MsgString();
Modified:
tomcat/trunk/test/org/apache/tomcat/websocket/pojo/TestPojoMethodMapping.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/websocket/pojo/TestPojoMethodMapping.java?rev=1457513&r1=1457512&r2=1457513&view=diff
==============================================================================
---
tomcat/trunk/test/org/apache/tomcat/websocket/pojo/TestPojoMethodMapping.java
(original)
+++
tomcat/trunk/test/org/apache/tomcat/websocket/pojo/TestPojoMethodMapping.java
Sun Mar 17 18:49:45 2013
@@ -66,7 +66,7 @@ public class TestPojoMethodMapping exten
tomcat.start();
Client client = new Client();
- URI uri = new URI("http://localhost:"; + getPort() + "/" + PARAM_ONE +
+ URI uri = new URI("ws://localhost:" + getPort() + "/" + PARAM_ONE +
"/" + PARAM_TWO + "/" + PARAM_THREE);
Session session = wsContainer.connectToServer(client, uri);
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
