safebox/guacamole-client
4
0
Fork 0
mirror of https://github.com/gyurix1968/guacamole-client.git synced 2025-09-06 13:17:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

GUAC-442: Move base JSR implementation of WebSocket tunnel to guacamole-common.

Browse Source
This commit is contained in:
Michael Jumper
2014-10-09 21:06:07 -07:00
parent c30afba91d
commit 8b13bfdb80
3 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
guacamole-common/pom.xml
View File

@@ -104,6 +104,14 @@
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<!-- JSR 356 WebSocket API -->
<dependency>
<groupId>javax.websocket</groupId>
<artifactId>javax.websocket-api</artifactId>
<version>1.0</version>
<scope>provided</scope>
</dependency>
<!-- SLF4J - logging --> <!-- SLF4J - logging -->
<dependency> <dependency>
<groupId>org.slf4j</groupId> <groupId>org.slf4j</groupId>

5
guacamole/src/main/java/org/glyptodon/guacamole/net/basic/websocket/jsr/GuacamoleWebSocketTunnelEndpoint.java → guacamole-common/src/main/java/org/glyptodon/guacamole/websocket/GuacamoleWebSocketTunnelEndpoint.java
View File

@@ -20,7 +20,7 @@
* THE SOFTWARE. * THE SOFTWARE.
*/ */
package org.glyptodon.guacamole.net.basic.websocket.jsr; package org.glyptodon.guacamole.websocket;
import java.io.IOException; import java.io.IOException;
import javax.websocket.CloseReason; import javax.websocket.CloseReason;
@@ -100,7 +100,8 @@ public abstract class GuacamoleWebSocketTunnelEndpoint extends Endpoint {
* @throws GuacamoleException If an error occurs while retrieving the * @throws GuacamoleException If an error occurs while retrieving the
* tunnel, or if access to the tunnel is denied. * tunnel, or if access to the tunnel is denied.
*/ */
protected abstract GuacamoleTunnel createTunnel(Session session, EndpointConfig config) throws GuacamoleException; protected abstract GuacamoleTunnel createTunnel(Session session, EndpointConfig config)
throws GuacamoleException;
@Override @Override
@OnOpen @OnOpen

1
guacamole/src/main/java/org/glyptodon/guacamole/net/basic/websocket/jsr/BasicGuacamoleWebSocketTunnelEndpoint.java
View File

@@ -32,6 +32,7 @@ import javax.websocket.server.ServerEndpointConfig;
import org.glyptodon.guacamole.GuacamoleException; import org.glyptodon.guacamole.GuacamoleException;
import org.glyptodon.guacamole.net.GuacamoleTunnel; import org.glyptodon.guacamole.net.GuacamoleTunnel;
import org.glyptodon.guacamole.net.basic.BasicTunnelRequestUtility; import org.glyptodon.guacamole.net.basic.BasicTunnelRequestUtility;
import org.glyptodon.guacamole.websocket.GuacamoleWebSocketTunnelEndpoint;
/** /**
* Tunnel implementation which uses WebSocket as a tunnel backend, rather than * Tunnel implementation which uses WebSocket as a tunnel backend, rather than