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

GUACAMOLE-1: Finish refactor within classname strings. Fix comments.

Browse Source
This commit is contained in:
Michael Jumper
2016-03-22 15:38:58 -07:00
parent b7b5873a92
commit 2cb1ffa60d
7 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
guacamole/src/main/java/org/apache/guacamole/auth/file/FileAuthenticationProvider.java
View File

@@ -94,8 +94,8 @@ public class FileAuthenticationProvider extends SimpleAuthenticationProvider {
public static final String USER_MAPPING_FILENAME = "user-mapping.xml"; public static final String USER_MAPPING_FILENAME = "user-mapping.xml";
/** /**
* Creates a new BasicFileAuthenticationProvider that authenticates users * Creates a new FileAuthenticationProvider that authenticates users against
* against simple, monolithic XML file. * simple, monolithic XML file.
* *
* @throws GuacamoleException * @throws GuacamoleException
* If a required property is missing, or an error occurs while parsing * If a required property is missing, or an error occurs while parsing

3
guacamole/src/main/java/org/apache/guacamole/rest/auth/HashTokenSessionMap.java
View File

@@ -72,8 +72,7 @@ public class HashTokenSessionMap implements TokenSessionMap {
}; };
/** /**
* Create a new BasicTokenGuacamoleSessionMap configured using the given * Create a new HashTokenSessionMap configured using the given environment.
* environment.
* *
* @param environment * @param environment
* The environment to use when configuring the token session map. * The environment to use when configuring the token session map.

8
guacamole/src/main/java/org/apache/guacamole/tunnel/TunnelModule.java
View File

@@ -44,10 +44,10 @@ public class TunnelModule extends ServletModule {
* Classnames of all implementation-specific WebSocket tunnel modules. * Classnames of all implementation-specific WebSocket tunnel modules.
*/ */
private static final String[] WEBSOCKET_MODULES = { private static final String[] WEBSOCKET_MODULES = {
"org.apache.guacamole.websocket.WebSocketTunnelModule", "org.apache.guacamole.tunnel.websocket.WebSocketTunnelModule",
"org.apache.guacamole.websocket.jetty8.WebSocketTunnelModule", "org.apache.guacamole.tunnel.websocket.jetty8.WebSocketTunnelModule",
"org.apache.guacamole.websocket.jetty9.WebSocketTunnelModule", "org.apache.guacamole.tunnel.websocket.jetty9.WebSocketTunnelModule",
"org.apache.guacamole.websocket.tomcat.WebSocketTunnelModule" "org.apache.guacamole.tunnel.websocket.tomcat.WebSocketTunnelModule"
}; };
private boolean loadWebSocketModule(String classname) { private boolean loadWebSocketModule(String classname) {

1
guacamole/src/main/java/org/apache/guacamole/tunnel/websocket/RestrictedGuacamoleWebSocketTunnelEndpoint.java
View File

@@ -34,7 +34,6 @@ import org.apache.guacamole.net.GuacamoleTunnel;
import org.apache.guacamole.tunnel.TunnelRequest; import org.apache.guacamole.tunnel.TunnelRequest;
import org.apache.guacamole.tunnel.TunnelRequestService; import org.apache.guacamole.tunnel.TunnelRequestService;
import org.apache.guacamole.websocket.GuacamoleWebSocketTunnelEndpoint; import org.apache.guacamole.websocket.GuacamoleWebSocketTunnelEndpoint;
import org.apache.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

2
guacamole/src/main/java/org/apache/guacamole/tunnel/websocket/jetty8/WebSocketTunnelModule.java
View File

@@ -45,7 +45,7 @@ public class WebSocketTunnelModule extends ServletModule implements TunnelLoader
try { try {
// Attempt to find WebSocket servlet // Attempt to find WebSocket servlet
Class.forName("org.apache.guacamole.websocket.jetty8.BasicGuacamoleWebSocketTunnelServlet"); Class.forName("org.apache.guacamole.tunnel.websocket.jetty8.RestrictedGuacamoleWebSocketTunnelServlet");
// Support found // Support found
return true; return true;

2
guacamole/src/main/java/org/apache/guacamole/tunnel/websocket/jetty9/WebSocketTunnelModule.java
View File

@@ -45,7 +45,7 @@ public class WebSocketTunnelModule extends ServletModule implements TunnelLoader
try { try {
// Attempt to find WebSocket servlet // Attempt to find WebSocket servlet
Class.forName("org.apache.guacamole.websocket.jetty9.BasicGuacamoleWebSocketTunnelServlet"); Class.forName("org.apache.guacamole.tunnel.websocket.jetty9.RestrictedGuacamoleWebSocketTunnelServlet");
// Support found // Support found
return true; return true;

2
guacamole/src/main/java/org/apache/guacamole/tunnel/websocket/tomcat/WebSocketTunnelModule.java
View File

@@ -45,7 +45,7 @@ public class WebSocketTunnelModule extends ServletModule implements TunnelLoader
try { try {
// Attempt to find WebSocket servlet // Attempt to find WebSocket servlet
Class.forName("org.apache.guacamole.websocket.tomcat.BasicGuacamoleWebSocketTunnelServlet"); Class.forName("org.apache.guacamole.tunnel.websocket.tomcat.RestrictedGuacamoleWebSocketTunnelServlet");
// Support found // Support found
return true; return true;