guacamole-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jmuehl...@apache.org
Subject [24/51] [abbrv] incubator-guacamole-client git commit: GUACAMOLE-1: Finish refactor within classname strings. Fix comments.
Date Tue, 29 Mar 2016 04:20:33 GMT
GUACAMOLE-1: Finish refactor within classname strings. Fix comments.


Project: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/commit/2cb1ffa6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/tree/2cb1ffa6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/diff/2cb1ffa6

Branch: refs/heads/master
Commit: 2cb1ffa60d4d2dab3e83cf625f683ce31e1a3645
Parents: b7b5873
Author: Michael Jumper <mjumper@apache.org>
Authored: Tue Mar 22 15:38:58 2016 -0700
Committer: Michael Jumper <mjumper@apache.org>
Committed: Mon Mar 28 20:50:13 2016 -0700

----------------------------------------------------------------------
 .../guacamole/auth/file/FileAuthenticationProvider.java      | 4 ++--
 .../org/apache/guacamole/rest/auth/HashTokenSessionMap.java  | 3 +--
 .../main/java/org/apache/guacamole/tunnel/TunnelModule.java  | 8 ++++----
 .../RestrictedGuacamoleWebSocketTunnelEndpoint.java          | 1 -
 .../tunnel/websocket/jetty8/WebSocketTunnelModule.java       | 2 +-
 .../tunnel/websocket/jetty9/WebSocketTunnelModule.java       | 2 +-
 .../tunnel/websocket/tomcat/WebSocketTunnelModule.java       | 2 +-
 7 files changed, 10 insertions(+), 12 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/blob/2cb1ffa6/guacamole/src/main/java/org/apache/guacamole/auth/file/FileAuthenticationProvider.java
----------------------------------------------------------------------
diff --git a/guacamole/src/main/java/org/apache/guacamole/auth/file/FileAuthenticationProvider.java
b/guacamole/src/main/java/org/apache/guacamole/auth/file/FileAuthenticationProvider.java
index 75230fd..13ebe62 100644
--- a/guacamole/src/main/java/org/apache/guacamole/auth/file/FileAuthenticationProvider.java
+++ b/guacamole/src/main/java/org/apache/guacamole/auth/file/FileAuthenticationProvider.java
@@ -94,8 +94,8 @@ public class FileAuthenticationProvider extends SimpleAuthenticationProvider
{
     public static final String USER_MAPPING_FILENAME = "user-mapping.xml";
     
     /**
-     * Creates a new BasicFileAuthenticationProvider that authenticates users
-     * against simple, monolithic XML file.
+     * Creates a new FileAuthenticationProvider that authenticates users against
+     * simple, monolithic XML file.
      *
      * @throws GuacamoleException
      *     If a required property is missing, or an error occurs while parsing

http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/blob/2cb1ffa6/guacamole/src/main/java/org/apache/guacamole/rest/auth/HashTokenSessionMap.java
----------------------------------------------------------------------
diff --git a/guacamole/src/main/java/org/apache/guacamole/rest/auth/HashTokenSessionMap.java
b/guacamole/src/main/java/org/apache/guacamole/rest/auth/HashTokenSessionMap.java
index a362c69..5c5f46f 100644
--- a/guacamole/src/main/java/org/apache/guacamole/rest/auth/HashTokenSessionMap.java
+++ b/guacamole/src/main/java/org/apache/guacamole/rest/auth/HashTokenSessionMap.java
@@ -72,8 +72,7 @@ public class HashTokenSessionMap implements TokenSessionMap {
     };
 
     /**
-     * Create a new BasicTokenGuacamoleSessionMap configured using the given
-     * environment.
+     * Create a new HashTokenSessionMap configured using the given environment.
      *
      * @param environment
      *     The environment to use when configuring the token session map.

http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/blob/2cb1ffa6/guacamole/src/main/java/org/apache/guacamole/tunnel/TunnelModule.java
----------------------------------------------------------------------
diff --git a/guacamole/src/main/java/org/apache/guacamole/tunnel/TunnelModule.java b/guacamole/src/main/java/org/apache/guacamole/tunnel/TunnelModule.java
index 331184f..12f3b74 100644
--- a/guacamole/src/main/java/org/apache/guacamole/tunnel/TunnelModule.java
+++ b/guacamole/src/main/java/org/apache/guacamole/tunnel/TunnelModule.java
@@ -44,10 +44,10 @@ public class TunnelModule extends ServletModule {
      * Classnames of all implementation-specific WebSocket tunnel modules.
      */
     private static final String[] WEBSOCKET_MODULES = {
-        "org.apache.guacamole.websocket.WebSocketTunnelModule",
-        "org.apache.guacamole.websocket.jetty8.WebSocketTunnelModule",
-        "org.apache.guacamole.websocket.jetty9.WebSocketTunnelModule",
-        "org.apache.guacamole.websocket.tomcat.WebSocketTunnelModule"
+        "org.apache.guacamole.tunnel.websocket.WebSocketTunnelModule",
+        "org.apache.guacamole.tunnel.websocket.jetty8.WebSocketTunnelModule",
+        "org.apache.guacamole.tunnel.websocket.jetty9.WebSocketTunnelModule",
+        "org.apache.guacamole.tunnel.websocket.tomcat.WebSocketTunnelModule"
     };
 
     private boolean loadWebSocketModule(String classname) {

http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/blob/2cb1ffa6/guacamole/src/main/java/org/apache/guacamole/tunnel/websocket/RestrictedGuacamoleWebSocketTunnelEndpoint.java
----------------------------------------------------------------------
diff --git a/guacamole/src/main/java/org/apache/guacamole/tunnel/websocket/RestrictedGuacamoleWebSocketTunnelEndpoint.java
b/guacamole/src/main/java/org/apache/guacamole/tunnel/websocket/RestrictedGuacamoleWebSocketTunnelEndpoint.java
index 09b7487..5e5560f 100644
--- a/guacamole/src/main/java/org/apache/guacamole/tunnel/websocket/RestrictedGuacamoleWebSocketTunnelEndpoint.java
+++ b/guacamole/src/main/java/org/apache/guacamole/tunnel/websocket/RestrictedGuacamoleWebSocketTunnelEndpoint.java
@@ -34,7 +34,6 @@ import org.apache.guacamole.net.GuacamoleTunnel;
 import org.apache.guacamole.tunnel.TunnelRequest;
 import org.apache.guacamole.tunnel.TunnelRequestService;
 import org.apache.guacamole.websocket.GuacamoleWebSocketTunnelEndpoint;
-import org.apache.guacamole.websocket.GuacamoleWebSocketTunnelEndpoint;
 
 /**
  * Tunnel implementation which uses WebSocket as a tunnel backend, rather than

http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/blob/2cb1ffa6/guacamole/src/main/java/org/apache/guacamole/tunnel/websocket/jetty8/WebSocketTunnelModule.java
----------------------------------------------------------------------
diff --git a/guacamole/src/main/java/org/apache/guacamole/tunnel/websocket/jetty8/WebSocketTunnelModule.java
b/guacamole/src/main/java/org/apache/guacamole/tunnel/websocket/jetty8/WebSocketTunnelModule.java
index 79a09db..d5d45bd 100644
--- a/guacamole/src/main/java/org/apache/guacamole/tunnel/websocket/jetty8/WebSocketTunnelModule.java
+++ b/guacamole/src/main/java/org/apache/guacamole/tunnel/websocket/jetty8/WebSocketTunnelModule.java
@@ -45,7 +45,7 @@ public class WebSocketTunnelModule extends ServletModule implements TunnelLoader
         try {
 
             // Attempt to find WebSocket servlet
-            Class.forName("org.apache.guacamole.websocket.jetty8.BasicGuacamoleWebSocketTunnelServlet");
+            Class.forName("org.apache.guacamole.tunnel.websocket.jetty8.RestrictedGuacamoleWebSocketTunnelServlet");
 
             // Support found
             return true;

http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/blob/2cb1ffa6/guacamole/src/main/java/org/apache/guacamole/tunnel/websocket/jetty9/WebSocketTunnelModule.java
----------------------------------------------------------------------
diff --git a/guacamole/src/main/java/org/apache/guacamole/tunnel/websocket/jetty9/WebSocketTunnelModule.java
b/guacamole/src/main/java/org/apache/guacamole/tunnel/websocket/jetty9/WebSocketTunnelModule.java
index 3477894..9def8e6 100644
--- a/guacamole/src/main/java/org/apache/guacamole/tunnel/websocket/jetty9/WebSocketTunnelModule.java
+++ b/guacamole/src/main/java/org/apache/guacamole/tunnel/websocket/jetty9/WebSocketTunnelModule.java
@@ -45,7 +45,7 @@ public class WebSocketTunnelModule extends ServletModule implements TunnelLoader
         try {
 
             // Attempt to find WebSocket servlet
-            Class.forName("org.apache.guacamole.websocket.jetty9.BasicGuacamoleWebSocketTunnelServlet");
+            Class.forName("org.apache.guacamole.tunnel.websocket.jetty9.RestrictedGuacamoleWebSocketTunnelServlet");
 
             // Support found
             return true;

http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/blob/2cb1ffa6/guacamole/src/main/java/org/apache/guacamole/tunnel/websocket/tomcat/WebSocketTunnelModule.java
----------------------------------------------------------------------
diff --git a/guacamole/src/main/java/org/apache/guacamole/tunnel/websocket/tomcat/WebSocketTunnelModule.java
b/guacamole/src/main/java/org/apache/guacamole/tunnel/websocket/tomcat/WebSocketTunnelModule.java
index 1b553b9..650522e 100644
--- a/guacamole/src/main/java/org/apache/guacamole/tunnel/websocket/tomcat/WebSocketTunnelModule.java
+++ b/guacamole/src/main/java/org/apache/guacamole/tunnel/websocket/tomcat/WebSocketTunnelModule.java
@@ -45,7 +45,7 @@ public class WebSocketTunnelModule extends ServletModule implements TunnelLoader
         try {
 
             // Attempt to find WebSocket servlet
-            Class.forName("org.apache.guacamole.websocket.tomcat.BasicGuacamoleWebSocketTunnelServlet");
+            Class.forName("org.apache.guacamole.tunnel.websocket.tomcat.RestrictedGuacamoleWebSocketTunnelServlet");
 
             // Support found
             return true;


Mime
View raw message