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

GUAC-442: Clean up packages.

Browse Source
This commit is contained in:
Michael Jumper
2014-10-09 21:15:21 -07:00
parent 8b13bfdb80
commit b7548675df
6 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
guacamole/src/main/java/org/glyptodon/guacamole/net/basic/GuacamoleClassLoader.java
View File

@@ -158,7 +158,7 @@ public class GuacamoleClassLoader extends ClassLoader {
} }
@Override @Override
protected Class<?> findClass(String name) throws ClassNotFoundException { public Class<?> findClass(String name) throws ClassNotFoundException {
// If no classloader, use default loader // If no classloader, use default loader
if (classLoader == null) if (classLoader == null)

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

@@ -20,7 +20,7 @@
* THE SOFTWARE. * THE SOFTWARE.
*/ */
package org.glyptodon.guacamole.net.basic.websocket.jsr; package org.glyptodon.guacamole.net.basic.websocket;
import java.util.Map; import java.util.Map;
import javax.websocket.EndpointConfig; import javax.websocket.EndpointConfig;

3
guacamole/src/main/java/org/glyptodon/guacamole/net/basic/WebSocketSupportLoader.java → guacamole/src/main/java/org/glyptodon/guacamole/net/basic/websocket/WebSocketSupportLoader.java
View File

@@ -20,7 +20,7 @@
* THE SOFTWARE. * THE SOFTWARE.
*/ */
package org.glyptodon.guacamole.net.basic; package org.glyptodon.guacamole.net.basic.websocket;
import java.lang.reflect.InvocationTargetException; import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method; import java.lang.reflect.Method;
@@ -29,6 +29,7 @@ import javax.servlet.ServletContext;
import javax.servlet.ServletContextEvent; import javax.servlet.ServletContextEvent;
import javax.servlet.ServletContextListener; import javax.servlet.ServletContextListener;
import org.glyptodon.guacamole.GuacamoleException; import org.glyptodon.guacamole.GuacamoleException;
import org.glyptodon.guacamole.net.basic.GuacamoleClassLoader;
import org.glyptodon.guacamole.properties.BooleanGuacamoleProperty; import org.glyptodon.guacamole.properties.BooleanGuacamoleProperty;
import org.glyptodon.guacamole.properties.GuacamoleProperties; import org.glyptodon.guacamole.properties.GuacamoleProperties;
import org.slf4j.Logger; import org.slf4j.Logger;

2
guacamole/src/main/java/org/glyptodon/guacamole/net/basic/websocket/jsr/WebSocketTunnelRequest.java → guacamole/src/main/java/org/glyptodon/guacamole/net/basic/websocket/WebSocketTunnelRequest.java
View File

@@ -20,7 +20,7 @@
* THE SOFTWARE. * THE SOFTWARE.
*/ */
package org.glyptodon.guacamole.net.basic.websocket.jsr; package org.glyptodon.guacamole.net.basic.websocket;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;

2
guacamole/src/main/java/org/glyptodon/guacamole/net/basic/websocket/jsr/package-info.java → guacamole/src/main/java/org/glyptodon/guacamole/net/basic/websocket/package-info.java
View File

@@ -24,5 +24,5 @@
* Standard WebSocket tunnel implementation. The classes here require a recent * Standard WebSocket tunnel implementation. The classes here require a recent
* servlet container that supports JSR 356. * servlet container that supports JSR 356.
*/ */
package org.glyptodon.guacamole.net.basic.websocket.jsr; package org.glyptodon.guacamole.net.basic.websocket;

2
guacamole/src/main/webapp/WEB-INF/web.xml
View File

@@ -34,7 +34,7 @@
<!-- Automatically detect and load WebSocket support --> <!-- Automatically detect and load WebSocket support -->
<listener> <listener>
<listener-class>org.glyptodon.guacamole.net.basic.WebSocketSupportLoader</listener-class> <listener-class>org.glyptodon.guacamole.net.basic.websocket.WebSocketSupportLoader</listener-class>
</listener> </listener>
<!-- Authenticate against service calls and pages --> <!-- Authenticate against service calls and pages -->