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

Refactor to org.glyptodon.guacamole.

Browse Source
This commit is contained in:
Michael Jumper
2012-09-05 13:16:25 -07:00
parent 70d456f9a7
commit 982dcb9881
14 changed files with 72 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
guacamole/pom.xml
View File

@@ -2,7 +2,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>net.sourceforge.guacamole</groupId> <groupId>org.glyptodon.guacamole</groupId>
<artifactId>guacamole</artifactId> <artifactId>guacamole</artifactId>
<packaging>war</packaging> <packaging>war</packaging>
<version>0.6.1</version> <version>0.6.1</version>
@@ -42,7 +42,7 @@
<!-- Add files from guacamole-common-js --> <!-- Add files from guacamole-common-js -->
<overlays> <overlays>
<overlay> <overlay>
<groupId>net.sourceforge.guacamole</groupId> <groupId>org.glyptodon.guacamole</groupId>
<artifactId>guacamole-common-js</artifactId> <artifactId>guacamole-common-js</artifactId>
<type>zip</type> <type>zip</type>
</overlay> </overlay>
@@ -79,21 +79,21 @@
<!-- Guacamole Java API --> <!-- Guacamole Java API -->
<dependency> <dependency>
<groupId>net.sourceforge.guacamole</groupId> <groupId>org.glyptodon.guacamole</groupId>
<artifactId>guacamole-common</artifactId> <artifactId>guacamole-common</artifactId>
<version>0.6.1</version> <version>0.6.1</version>
</dependency> </dependency>
<!-- Guacamole Extension API --> <!-- Guacamole Extension API -->
<dependency> <dependency>
<groupId>net.sourceforge.guacamole</groupId> <groupId>org.glyptodon.guacamole</groupId>
<artifactId>guacamole-ext</artifactId> <artifactId>guacamole-ext</artifactId>
<version>0.6.1</version> <version>0.6.1</version>
</dependency> </dependency>
<!-- Guacamole JavaScript API --> <!-- Guacamole JavaScript API -->
<dependency> <dependency>
<groupId>net.sourceforge.guacamole</groupId> <groupId>org.glyptodon.guacamole</groupId>
<artifactId>guacamole-common-js</artifactId> <artifactId>guacamole-common-js</artifactId>
<version>0.6.1</version> <version>0.6.1</version>
<type>zip</type> <type>zip</type>

24
guacamole/src/main/java/net/sourceforge/guacamole/net/basic/AuthenticatingHttpServlet.java → guacamole/src/main/java/org/glyptodon/guacamole/net/basic/AuthenticatingHttpServlet.java
View File

@@ -1,5 +1,5 @@
package net.sourceforge.guacamole.net.basic; package org.glyptodon.guacamole.net.basic;
import java.io.IOException; import java.io.IOException;
import java.util.Collection; import java.util.Collection;
@@ -9,17 +9,17 @@ import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession; import javax.servlet.http.HttpSession;
import net.sourceforge.guacamole.GuacamoleException; import org.glyptodon.guacamole.GuacamoleException;
import net.sourceforge.guacamole.net.auth.AuthenticationProvider; import org.glyptodon.guacamole.net.auth.AuthenticationProvider;
import net.sourceforge.guacamole.net.auth.Credentials; import org.glyptodon.guacamole.net.auth.Credentials;
import net.sourceforge.guacamole.net.basic.event.SessionListenerCollection; import org.glyptodon.guacamole.net.basic.event.SessionListenerCollection;
import net.sourceforge.guacamole.net.basic.properties.BasicGuacamoleProperties; import org.glyptodon.guacamole.net.basic.properties.BasicGuacamoleProperties;
import net.sourceforge.guacamole.net.event.AuthenticationFailureEvent; import org.glyptodon.guacamole.net.event.AuthenticationFailureEvent;
import net.sourceforge.guacamole.net.event.AuthenticationSuccessEvent; import org.glyptodon.guacamole.net.event.AuthenticationSuccessEvent;
import net.sourceforge.guacamole.net.event.listener.AuthenticationFailureListener; import org.glyptodon.guacamole.net.event.listener.AuthenticationFailureListener;
import net.sourceforge.guacamole.net.event.listener.AuthenticationSuccessListener; import org.glyptodon.guacamole.net.event.listener.AuthenticationSuccessListener;
import net.sourceforge.guacamole.properties.GuacamoleProperties; import org.glyptodon.guacamole.properties.GuacamoleProperties;
import net.sourceforge.guacamole.protocol.GuacamoleConfiguration; import org.glyptodon.guacamole.protocol.GuacamoleConfiguration;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;

14
guacamole/src/main/java/net/sourceforge/guacamole/net/basic/BasicFileAuthenticationProvider.java → guacamole/src/main/java/org/glyptodon/guacamole/net/basic/BasicFileAuthenticationProvider.java
View File

@@ -1,5 +1,5 @@
package net.sourceforge.guacamole.net.basic; package org.glyptodon.guacamole.net.basic;
/* /*
* Guacamole - Clientless Remote Desktop * Guacamole - Clientless Remote Desktop
@@ -20,7 +20,7 @@ package net.sourceforge.guacamole.net.basic;
*/ */
import java.io.BufferedReader; import java.io.BufferedReader;
import net.sourceforge.guacamole.net.auth.AuthenticationProvider; import org.glyptodon.guacamole.net.auth.AuthenticationProvider;
import java.io.File; import java.io.File;
import java.io.FileReader; import java.io.FileReader;
import java.io.IOException; import java.io.IOException;
@@ -30,11 +30,11 @@ import java.security.NoSuchAlgorithmException;
import java.util.Collections; import java.util.Collections;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
import net.sourceforge.guacamole.GuacamoleException; import org.glyptodon.guacamole.GuacamoleException;
import net.sourceforge.guacamole.net.auth.Credentials; import org.glyptodon.guacamole.net.auth.Credentials;
import net.sourceforge.guacamole.properties.FileGuacamoleProperty; import org.glyptodon.guacamole.properties.FileGuacamoleProperty;
import net.sourceforge.guacamole.properties.GuacamoleProperties; import org.glyptodon.guacamole.properties.GuacamoleProperties;
import net.sourceforge.guacamole.protocol.GuacamoleConfiguration; import org.glyptodon.guacamole.protocol.GuacamoleConfiguration;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.xml.sax.Attributes; import org.xml.sax.Attributes;

32
guacamole/src/main/java/net/sourceforge/guacamole/net/basic/BasicGuacamoleTunnelServlet.java → guacamole/src/main/java/org/glyptodon/guacamole/net/basic/BasicGuacamoleTunnelServlet.java
View File

@@ -1,4 +1,4 @@
package net.sourceforge.guacamole.net.basic; package org.glyptodon.guacamole.net.basic;
/* /*
* Guacamole - Clientless Remote Desktop * Guacamole - Clientless Remote Desktop
@@ -25,21 +25,21 @@ import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession; import javax.servlet.http.HttpSession;
import net.sourceforge.guacamole.GuacamoleException; import org.glyptodon.guacamole.GuacamoleException;
import net.sourceforge.guacamole.GuacamoleSecurityException; import org.glyptodon.guacamole.GuacamoleSecurityException;
import net.sourceforge.guacamole.net.InetGuacamoleSocket; import org.glyptodon.guacamole.net.InetGuacamoleSocket;
import net.sourceforge.guacamole.protocol.GuacamoleConfiguration; import org.glyptodon.guacamole.protocol.GuacamoleConfiguration;
import net.sourceforge.guacamole.properties.GuacamoleProperties; import org.glyptodon.guacamole.properties.GuacamoleProperties;
import net.sourceforge.guacamole.net.GuacamoleSocket; import org.glyptodon.guacamole.net.GuacamoleSocket;
import net.sourceforge.guacamole.net.GuacamoleTunnel; import org.glyptodon.guacamole.net.GuacamoleTunnel;
import net.sourceforge.guacamole.net.auth.Credentials; import org.glyptodon.guacamole.net.auth.Credentials;
import net.sourceforge.guacamole.net.basic.event.SessionListenerCollection; import org.glyptodon.guacamole.net.basic.event.SessionListenerCollection;
import net.sourceforge.guacamole.net.event.TunnelCloseEvent; import org.glyptodon.guacamole.net.event.TunnelCloseEvent;
import net.sourceforge.guacamole.net.event.TunnelConnectEvent; import org.glyptodon.guacamole.net.event.TunnelConnectEvent;
import net.sourceforge.guacamole.net.event.listener.TunnelCloseListener; import org.glyptodon.guacamole.net.event.listener.TunnelCloseListener;
import net.sourceforge.guacamole.net.event.listener.TunnelConnectListener; import org.glyptodon.guacamole.net.event.listener.TunnelConnectListener;
import net.sourceforge.guacamole.protocol.ConfiguredGuacamoleSocket; import org.glyptodon.guacamole.protocol.ConfiguredGuacamoleSocket;
import net.sourceforge.guacamole.servlet.GuacamoleHTTPTunnelServlet; import org.glyptodon.guacamole.servlet.GuacamoleHTTPTunnelServlet;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;

4
guacamole/src/main/java/net/sourceforge/guacamole/net/basic/BasicLogin.java → guacamole/src/main/java/org/glyptodon/guacamole/net/basic/BasicLogin.java
View File

@@ -1,4 +1,4 @@
package net.sourceforge.guacamole.net.basic; package org.glyptodon.guacamole.net.basic;
/* /*
* Guacamole - Clientless Remote Desktop * Guacamole - Clientless Remote Desktop
@@ -22,7 +22,7 @@ import java.io.IOException;
import java.util.Map; import java.util.Map;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import net.sourceforge.guacamole.protocol.GuacamoleConfiguration; import org.glyptodon.guacamole.protocol.GuacamoleConfiguration;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;

2
guacamole/src/main/java/net/sourceforge/guacamole/net/basic/BasicLogout.java → guacamole/src/main/java/org/glyptodon/guacamole/net/basic/BasicLogout.java
View File

@@ -1,4 +1,4 @@
package net.sourceforge.guacamole.net.basic; package org.glyptodon.guacamole.net.basic;
/* /*
* Guacamole - Clientless Remote Desktop * Guacamole - Clientless Remote Desktop

4
guacamole/src/main/java/net/sourceforge/guacamole/net/basic/ConfigurationList.java → guacamole/src/main/java/org/glyptodon/guacamole/net/basic/ConfigurationList.java
View File

@@ -1,4 +1,4 @@
package net.sourceforge.guacamole.net.basic; package org.glyptodon.guacamole.net.basic;
/* /*
* Guacamole - Clientless Remote Desktop * Guacamole - Clientless Remote Desktop
@@ -26,7 +26,7 @@ import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession; import javax.servlet.http.HttpSession;
import net.sourceforge.guacamole.protocol.GuacamoleConfiguration; import org.glyptodon.guacamole.protocol.GuacamoleConfiguration;
/** /**
* Simple HttpServlet which outputs XML containing a list of all authorized * Simple HttpServlet which outputs XML containing a list of all authorized

8
guacamole/src/main/java/net/sourceforge/guacamole/net/basic/GuacamoleClassLoader.java → guacamole/src/main/java/org/glyptodon/guacamole/net/basic/GuacamoleClassLoader.java
View File

@@ -1,5 +1,5 @@
package net.sourceforge.guacamole.net.basic; package org.glyptodon.guacamole.net.basic;
/* ***** BEGIN LICENSE BLOCK ***** /* ***** BEGIN LICENSE BLOCK *****
* Version: MPL 1.1/GPL 2.0/LGPL 2.1 * Version: MPL 1.1/GPL 2.0/LGPL 2.1
@@ -47,9 +47,9 @@ import java.security.PrivilegedActionException;
import java.security.PrivilegedExceptionAction; import java.security.PrivilegedExceptionAction;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collection; import java.util.Collection;
import net.sourceforge.guacamole.GuacamoleException; import org.glyptodon.guacamole.GuacamoleException;
import net.sourceforge.guacamole.net.basic.properties.BasicGuacamoleProperties; import org.glyptodon.guacamole.net.basic.properties.BasicGuacamoleProperties;
import net.sourceforge.guacamole.properties.GuacamoleProperties; import org.glyptodon.guacamole.properties.GuacamoleProperties;
/** /**
* A ClassLoader implementation which finds classes within a configurable * A ClassLoader implementation which finds classes within a configurable

6
guacamole/src/main/java/net/sourceforge/guacamole/net/basic/WebSocketSupportLoader.java → guacamole/src/main/java/org/glyptodon/guacamole/net/basic/WebSocketSupportLoader.java
View File

@@ -1,4 +1,4 @@
package net.sourceforge.guacamole.net.basic; package org.glyptodon.guacamole.net.basic;
/* /*
* Guacamole - Clientless Remote Desktop * Guacamole - Clientless Remote Desktop
@@ -24,7 +24,7 @@ import javax.servlet.Servlet;
import javax.servlet.ServletContext; import javax.servlet.ServletContext;
import javax.servlet.ServletContextEvent; import javax.servlet.ServletContextEvent;
import javax.servlet.ServletContextListener; import javax.servlet.ServletContextListener;
import net.sourceforge.guacamole.GuacamoleException; import org.glyptodon.guacamole.GuacamoleException;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
@@ -54,7 +54,7 @@ public class WebSocketSupportLoader implements ServletContextListener {
// Attempt to find WebSocket servlet // Attempt to find WebSocket servlet
Class<Servlet> servlet = (Class<Servlet>) GuacamoleClassLoader.getInstance().findClass( Class<Servlet> servlet = (Class<Servlet>) GuacamoleClassLoader.getInstance().findClass(
"net.sourceforge.guacamole.net.basic.BasicGuacamoleWebSocketTunnelServlet" "org.glyptodon.guacamole.net.basic.BasicGuacamoleWebSocketTunnelServlet"
); );
// Dynamically add servlet IF SERVLET 3.0 API AVAILABLE! // Dynamically add servlet IF SERVLET 3.0 API AVAILABLE!

8
guacamole/src/main/java/net/sourceforge/guacamole/net/basic/event/SessionListenerCollection.java → guacamole/src/main/java/org/glyptodon/guacamole/net/basic/event/SessionListenerCollection.java
View File

@@ -1,4 +1,4 @@
package net.sourceforge.guacamole.net.basic.event; package org.glyptodon.guacamole.net.basic.event;
import java.lang.reflect.InvocationTargetException; import java.lang.reflect.InvocationTargetException;
import java.util.AbstractCollection; import java.util.AbstractCollection;
@@ -6,9 +6,9 @@ import java.util.ArrayList;
import java.util.Collection; import java.util.Collection;
import java.util.Iterator; import java.util.Iterator;
import javax.servlet.http.HttpSession; import javax.servlet.http.HttpSession;
import net.sourceforge.guacamole.GuacamoleException; import org.glyptodon.guacamole.GuacamoleException;
import net.sourceforge.guacamole.net.basic.properties.BasicGuacamoleProperties; import org.glyptodon.guacamole.net.basic.properties.BasicGuacamoleProperties;
import net.sourceforge.guacamole.properties.GuacamoleProperties; import org.glyptodon.guacamole.properties.GuacamoleProperties;
/** /**
* A collection which iterates over instances of all listeners defined in * A collection which iterates over instances of all listeners defined in

10
guacamole/src/main/java/net/sourceforge/guacamole/net/basic/properties/AuthenticationProviderProperty.java → guacamole/src/main/java/org/glyptodon/guacamole/net/basic/properties/AuthenticationProviderProperty.java
View File

@@ -1,4 +1,4 @@
package net.sourceforge.guacamole.net.basic.properties; package org.glyptodon.guacamole.net.basic.properties;
/* /*
* Guacamole - Clientless Remote Desktop * Guacamole - Clientless Remote Desktop
@@ -19,10 +19,10 @@ package net.sourceforge.guacamole.net.basic.properties;
*/ */
import java.lang.reflect.InvocationTargetException; import java.lang.reflect.InvocationTargetException;
import net.sourceforge.guacamole.GuacamoleException; import org.glyptodon.guacamole.GuacamoleException;
import net.sourceforge.guacamole.net.auth.AuthenticationProvider; import org.glyptodon.guacamole.net.auth.AuthenticationProvider;
import net.sourceforge.guacamole.net.basic.GuacamoleClassLoader; import org.glyptodon.guacamole.net.basic.GuacamoleClassLoader;
import net.sourceforge.guacamole.properties.GuacamoleProperty; import org.glyptodon.guacamole.properties.GuacamoleProperty;
/** /**
* A GuacamoleProperty whose value is the name of a class to use to * A GuacamoleProperty whose value is the name of a class to use to

4
guacamole/src/main/java/net/sourceforge/guacamole/net/basic/properties/BasicGuacamoleProperties.java → guacamole/src/main/java/org/glyptodon/guacamole/net/basic/properties/BasicGuacamoleProperties.java
View File

@@ -1,5 +1,5 @@
package net.sourceforge.guacamole.net.basic.properties; package org.glyptodon.guacamole.net.basic.properties;
/* /*
* Guacamole - Clientless Remote Desktop * Guacamole - Clientless Remote Desktop
@@ -19,7 +19,7 @@ package net.sourceforge.guacamole.net.basic.properties;
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
import net.sourceforge.guacamole.properties.FileGuacamoleProperty; import org.glyptodon.guacamole.properties.FileGuacamoleProperty;
/** /**
* Properties used by the default Guacamole web application. * Properties used by the default Guacamole web application.

8
guacamole/src/main/java/net/sourceforge/guacamole/net/basic/properties/EventListenersProperty.java → guacamole/src/main/java/org/glyptodon/guacamole/net/basic/properties/EventListenersProperty.java
View File

@@ -1,4 +1,4 @@
package net.sourceforge.guacamole.net.basic.properties; package org.glyptodon.guacamole.net.basic.properties;
/* /*
* Guacamole - Clientless Remote Desktop * Guacamole - Clientless Remote Desktop
@@ -20,9 +20,9 @@ package net.sourceforge.guacamole.net.basic.properties;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collection; import java.util.Collection;
import net.sourceforge.guacamole.GuacamoleException; import org.glyptodon.guacamole.GuacamoleException;
import net.sourceforge.guacamole.net.basic.GuacamoleClassLoader; import org.glyptodon.guacamole.net.basic.GuacamoleClassLoader;
import net.sourceforge.guacamole.properties.GuacamoleProperty; import org.glyptodon.guacamole.properties.GuacamoleProperty;
/** /**
* A GuacamoleProperty whose value is a comma-separated list of class names, * A GuacamoleProperty whose value is a comma-separated list of class names,

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

@@ -30,14 +30,14 @@
<!-- Automatically detect and load WebSocket support --> <!-- Automatically detect and load WebSocket support -->
<listener> <listener>
<listener-class>net.sourceforge.guacamole.net.basic.WebSocketSupportLoader</listener-class> <listener-class>org.glyptodon.guacamole.net.basic.WebSocketSupportLoader</listener-class>
</listener> </listener>
<!-- Basic Login Servlet --> <!-- Basic Login Servlet -->
<servlet> <servlet>
<description>Login servlet.</description> <description>Login servlet.</description>
<servlet-name>Login</servlet-name> <servlet-name>Login</servlet-name>
<servlet-class>net.sourceforge.guacamole.net.basic.BasicLogin</servlet-class> <servlet-class>org.glyptodon.guacamole.net.basic.BasicLogin</servlet-class>
</servlet> </servlet>
<servlet-mapping> <servlet-mapping>
<servlet-name>Login</servlet-name> <servlet-name>Login</servlet-name>
@@ -48,7 +48,7 @@
<servlet> <servlet>
<description>Logout servlet.</description> <description>Logout servlet.</description>
<servlet-name>Logout</servlet-name> <servlet-name>Logout</servlet-name>
<servlet-class>net.sourceforge.guacamole.net.basic.BasicLogout</servlet-class> <servlet-class>org.glyptodon.guacamole.net.basic.BasicLogout</servlet-class>
</servlet> </servlet>
<servlet-mapping> <servlet-mapping>
<servlet-name>Logout</servlet-name> <servlet-name>Logout</servlet-name>
@@ -59,7 +59,7 @@
<servlet> <servlet>
<description>Configuration list servlet.</description> <description>Configuration list servlet.</description>
<servlet-name>Configs</servlet-name> <servlet-name>Configs</servlet-name>
<servlet-class>net.sourceforge.guacamole.net.basic.ConfigurationList</servlet-class> <servlet-class>org.glyptodon.guacamole.net.basic.ConfigurationList</servlet-class>
</servlet> </servlet>
<servlet-mapping> <servlet-mapping>
<servlet-name>Configs</servlet-name> <servlet-name>Configs</servlet-name>
@@ -70,7 +70,7 @@
<servlet> <servlet>
<description>Tunnel servlet.</description> <description>Tunnel servlet.</description>
<servlet-name>Tunnel</servlet-name> <servlet-name>Tunnel</servlet-name>
<servlet-class>net.sourceforge.guacamole.net.basic.BasicGuacamoleTunnelServlet</servlet-class> <servlet-class>org.glyptodon.guacamole.net.basic.BasicGuacamoleTunnelServlet</servlet-class>
</servlet> </servlet>
<servlet-mapping> <servlet-mapping>
<servlet-name>Tunnel</servlet-name> <servlet-name>Tunnel</servlet-name>