You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2013/02/19 00:16:53 UTC
svn commit: r1447548 - in /tomcat/trunk/java/org/apache/tomcat/websocket:
WsSession.java WsWebSocketContainer.java server/WsProtocolHandler.java
server/WsServlet.java
Author: markt
Date: Mon Feb 18 23:16:53 2013
New Revision: 1447548
URL: http://svn.apache.org/r1447548
Log:
Server side wss support
Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/WsSession.java
tomcat/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java
tomcat/trunk/java/org/apache/tomcat/websocket/server/WsProtocolHandler.java
tomcat/trunk/java/org/apache/tomcat/websocket/server/WsServlet.java
Modified: tomcat/trunk/java/org/apache/tomcat/websocket/WsSession.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/WsSession.java?rev=1447548&r1=1447547&r2=1447548&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/websocket/WsSession.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/WsSession.java Mon Feb 18 23:16:53 2013
@@ -60,6 +60,7 @@ public class WsSession implements Sessio
private final WsRequest request;
private final String subProtocol;
private final Map<String,String> pathParameters;
+ private final boolean secure;
private MessageHandler textMessageHandler = null;
private MessageHandler binaryMessageHandler = null;
@@ -88,7 +89,8 @@ public class WsSession implements Sessio
WsRemoteEndpointBase wsRemoteEndpoint,
WsWebSocketContainer wsWebSocketContainer,
WsRequest request, String subProtocol,
- Map<String,String> pathParameters) {
+ Map<String,String> pathParameters,
+ boolean secure) {
this.localEndpoint = localEndpoint;
this.wsRemoteEndpoint = wsRemoteEndpoint;
this.wsRemoteEndpoint.setSession(this);
@@ -105,6 +107,7 @@ public class WsSession implements Sessio
this.request = request;
this.subProtocol = subProtocol;
this.pathParameters = pathParameters;
+ this.secure = secure;
}
@@ -206,8 +209,7 @@ public class WsSession implements Sessio
@Override
public boolean isSecure() {
- // TODO Auto-generated method stub
- return false;
+ return secure;
}
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=1447548&r1=1447547&r2=1447548&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java Mon Feb 18 23:16:53 2013
@@ -173,7 +173,7 @@ public class WsWebSocketContainer
}
WsSession wsSession = new WsSession(endpoint, wsRemoteEndpointClient,
- this, null, subProtocol, Collections.EMPTY_MAP);
+ this, null, subProtocol, Collections.EMPTY_MAP, false);
endpoint.onOpen(wsSession, clientEndpointConfiguration);
registerSession(clazz, wsSession);
Modified: tomcat/trunk/java/org/apache/tomcat/websocket/server/WsProtocolHandler.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/server/WsProtocolHandler.java?rev=1447548&r1=1447547&r2=1447548&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/websocket/server/WsProtocolHandler.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/server/WsProtocolHandler.java Mon Feb 18 23:16:53 2013
@@ -43,7 +43,7 @@ import org.apache.tomcat.websocket.WsSes
*/
public class WsProtocolHandler implements HttpUpgradeHandler {
- private static StringManager sm =
+ private static final StringManager sm =
StringManager.getManager(Constants.PACKAGE_NAME);
private static final Log log =
LogFactory.getLog(WsProtocolHandler.class);
@@ -55,19 +55,21 @@ public class WsProtocolHandler implement
private final WsRequest request;
private final String subProtocol;
private final Map<String,String> pathParameters;
+ private final boolean secure;
private WsSession wsSession;
public WsProtocolHandler(Endpoint ep, EndpointConfiguration endpointConfig,
ServerContainerImpl wsc, WsRequest request, String subProtocol,
- Map<String,String> pathParameters) {
+ Map<String,String> pathParameters, boolean secure) {
this.ep = ep;
this.endpointConfig = endpointConfig;
this.webSocketContainer = wsc;
this.request = request;
this.subProtocol = subProtocol;
this.pathParameters = pathParameters;
+ this.secure = secure;
applicationClassLoader = Thread.currentThread().getContextClassLoader();
}
@@ -93,7 +95,8 @@ public class WsProtocolHandler implement
WsRemoteEndpointServer wsRemoteEndpointServer =
new WsRemoteEndpointServer(sos, webSocketContainer);
wsSession = new WsSession(ep, wsRemoteEndpointServer,
- webSocketContainer, request, subProtocol, pathParameters);
+ webSocketContainer, request, subProtocol, pathParameters,
+ secure);
WsFrameServer wsFrame = new WsFrameServer(
sis,
wsSession);
Modified: tomcat/trunk/java/org/apache/tomcat/websocket/server/WsServlet.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/server/WsServlet.java?rev=1447548&r1=1447547&r2=1447548&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/websocket/server/WsServlet.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/server/WsServlet.java Mon Feb 18 23:16:53 2013
@@ -139,7 +139,7 @@ public class WsServlet extends HttpServl
}
WsRequest wsRequest = createWsRequest(req);
HttpUpgradeHandler wsHandler = new WsProtocolHandler(ep, sec, sc,
- wsRequest, subProtocol, pathParameters);
+ wsRequest, subProtocol, pathParameters, req.isSecure());
req.upgrade(wsHandler);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org