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

guacamole-common/pom.xml

@@ -104,6 +104,14 @@
             <scope>provided</scope>
         </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 -->
         <dependency>
             <groupId>org.slf4j</groupId>

guacamole-common/src/main/java/org/glyptodon/guacamole/websocket/GuacamoleWebSocketTunnelEndpoint.java

@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.net.basic.websocket.jsr;
+package org.glyptodon.guacamole.websocket;
 
 import java.io.IOException;
 import javax.websocket.CloseReason;
@@ -100,7 +100,8 @@ public abstract class GuacamoleWebSocketTunnelEndpoint extends Endpoint {
      * @throws GuacamoleException If an error occurs while retrieving the
      *                            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
     @OnOpen

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

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