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

GUACAMOLE-1: Refactor org.glyptodon package/groupId to org.apache.

Browse Source
This commit is contained in:
Michael Jumper
2016-03-22 14:05:53 -07:00
parent 2358d88683
commit 6990344697
402 changed files with 1536 additions and 1536 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
guacamole-common/src/main/java/org/glyptodon/guacamole/GuacamoleClientBadTypeException.java → guacamole-common/src/main/java/org/apache/guacamole/GuacamoleClientBadTypeException.java
View File

@@ -20,9 +20,9 @@
* THE SOFTWARE.
*/
package org.glyptodon.guacamole;
package org.apache.guacamole;
import org.glyptodon.guacamole.protocol.GuacamoleStatus;
import org.apache.guacamole.protocol.GuacamoleStatus;
/**

4
guacamole-common/src/main/java/org/glyptodon/guacamole/GuacamoleClientException.java → guacamole-common/src/main/java/org/apache/guacamole/GuacamoleClientException.java
View File

@@ -20,9 +20,9 @@
* THE SOFTWARE.
*/
package org.glyptodon.guacamole;
package org.apache.guacamole;
import org.glyptodon.guacamole.protocol.GuacamoleStatus;
import org.apache.guacamole.protocol.GuacamoleStatus;
/**

4
guacamole-common/src/main/java/org/glyptodon/guacamole/GuacamoleClientOverrunException.java → guacamole-common/src/main/java/org/apache/guacamole/GuacamoleClientOverrunException.java
View File

@@ -20,9 +20,9 @@
* THE SOFTWARE.
*/
package org.glyptodon.guacamole;
package org.apache.guacamole;
import org.glyptodon.guacamole.protocol.GuacamoleStatus;
import org.apache.guacamole.protocol.GuacamoleStatus;
/**

4
guacamole-common/src/main/java/org/glyptodon/guacamole/GuacamoleClientTimeoutException.java → guacamole-common/src/main/java/org/apache/guacamole/GuacamoleClientTimeoutException.java
View File

@@ -20,9 +20,9 @@
* THE SOFTWARE.
*/
package org.glyptodon.guacamole;
package org.apache.guacamole;
import org.glyptodon.guacamole.protocol.GuacamoleStatus;
import org.apache.guacamole.protocol.GuacamoleStatus;
/**

4
guacamole-common/src/main/java/org/glyptodon/guacamole/GuacamoleClientTooManyException.java → guacamole-common/src/main/java/org/apache/guacamole/GuacamoleClientTooManyException.java
View File

@@ -20,9 +20,9 @@
* THE SOFTWARE.
*/
package org.glyptodon.guacamole;
package org.apache.guacamole;
import org.glyptodon.guacamole.protocol.GuacamoleStatus;
import org.apache.guacamole.protocol.GuacamoleStatus;
/**

4
guacamole-common/src/main/java/org/glyptodon/guacamole/GuacamoleConnectionClosedException.java → guacamole-common/src/main/java/org/apache/guacamole/GuacamoleConnectionClosedException.java
View File

@@ -20,9 +20,9 @@
* THE SOFTWARE.
*/
package org.glyptodon.guacamole;
package org.apache.guacamole;
import org.glyptodon.guacamole.protocol.GuacamoleStatus;
import org.apache.guacamole.protocol.GuacamoleStatus;
/**

4
guacamole-common/src/main/java/org/glyptodon/guacamole/GuacamoleException.java → guacamole-common/src/main/java/org/apache/guacamole/GuacamoleException.java
View File

@@ -20,9 +20,9 @@
* THE SOFTWARE.
*/
package org.glyptodon.guacamole;
package org.apache.guacamole;
import org.glyptodon.guacamole.protocol.GuacamoleStatus;
import org.apache.guacamole.protocol.GuacamoleStatus;
/**

4
guacamole-common/src/main/java/org/glyptodon/guacamole/GuacamoleResourceConflictException.java → guacamole-common/src/main/java/org/apache/guacamole/GuacamoleResourceConflictException.java
View File

@@ -20,9 +20,9 @@
* THE SOFTWARE.
*/
package org.glyptodon.guacamole;
package org.apache.guacamole;
import org.glyptodon.guacamole.protocol.GuacamoleStatus;
import org.apache.guacamole.protocol.GuacamoleStatus;
/**

4
guacamole-common/src/main/java/org/glyptodon/guacamole/GuacamoleResourceNotFoundException.java → guacamole-common/src/main/java/org/apache/guacamole/GuacamoleResourceNotFoundException.java
View File

@@ -20,9 +20,9 @@
* THE SOFTWARE.
*/
package org.glyptodon.guacamole;
package org.apache.guacamole;
import org.glyptodon.guacamole.protocol.GuacamoleStatus;
import org.apache.guacamole.protocol.GuacamoleStatus;
/**

4
guacamole-common/src/main/java/org/glyptodon/guacamole/GuacamoleSecurityException.java → guacamole-common/src/main/java/org/apache/guacamole/GuacamoleSecurityException.java
View File

@@ -20,9 +20,9 @@
* THE SOFTWARE.
*/
package org.glyptodon.guacamole;
package org.apache.guacamole;
import org.glyptodon.guacamole.protocol.GuacamoleStatus;
import org.apache.guacamole.protocol.GuacamoleStatus;
/**

4
guacamole-common/src/main/java/org/glyptodon/guacamole/GuacamoleServerBusyException.java → guacamole-common/src/main/java/org/apache/guacamole/GuacamoleServerBusyException.java
View File

@@ -20,9 +20,9 @@
* THE SOFTWARE.
*/
package org.glyptodon.guacamole;
package org.apache.guacamole;
import org.glyptodon.guacamole.protocol.GuacamoleStatus;
import org.apache.guacamole.protocol.GuacamoleStatus;
/**

4
guacamole-common/src/main/java/org/glyptodon/guacamole/GuacamoleServerException.java → guacamole-common/src/main/java/org/apache/guacamole/GuacamoleServerException.java
View File

@@ -20,9 +20,9 @@
* THE SOFTWARE.
*/
package org.glyptodon.guacamole;
package org.apache.guacamole;
import org.glyptodon.guacamole.protocol.GuacamoleStatus;
import org.apache.guacamole.protocol.GuacamoleStatus;
/**

4
guacamole-common/src/main/java/org/glyptodon/guacamole/GuacamoleUnauthorizedException.java → guacamole-common/src/main/java/org/apache/guacamole/GuacamoleUnauthorizedException.java
View File

@@ -20,9 +20,9 @@
* THE SOFTWARE.
*/
package org.glyptodon.guacamole;
package org.apache.guacamole;
import org.glyptodon.guacamole.protocol.GuacamoleStatus;
import org.apache.guacamole.protocol.GuacamoleStatus;
/**

4
guacamole-common/src/main/java/org/glyptodon/guacamole/GuacamoleUnsupportedException.java → guacamole-common/src/main/java/org/apache/guacamole/GuacamoleUnsupportedException.java
View File

@@ -20,9 +20,9 @@
* THE SOFTWARE.
*/
package org.glyptodon.guacamole;
package org.apache.guacamole;
import org.glyptodon.guacamole.protocol.GuacamoleStatus;
import org.apache.guacamole.protocol.GuacamoleStatus;
/**

4
guacamole-common/src/main/java/org/glyptodon/guacamole/GuacamoleUpstreamException.java → guacamole-common/src/main/java/org/apache/guacamole/GuacamoleUpstreamException.java
View File

@@ -20,9 +20,9 @@
* THE SOFTWARE.
*/
package org.glyptodon.guacamole;
package org.apache.guacamole;
import org.glyptodon.guacamole.protocol.GuacamoleStatus;
import org.apache.guacamole.protocol.GuacamoleStatus;
/**

4
guacamole-common/src/main/java/org/glyptodon/guacamole/GuacamoleUpstreamTimeoutException.java → guacamole-common/src/main/java/org/apache/guacamole/GuacamoleUpstreamTimeoutException.java
View File

@@ -20,9 +20,9 @@
* THE SOFTWARE.
*/
package org.glyptodon.guacamole;
package org.apache.guacamole;
import org.glyptodon.guacamole.protocol.GuacamoleStatus;
import org.apache.guacamole.protocol.GuacamoleStatus;
/**

6
guacamole-common/src/main/java/org/glyptodon/guacamole/io/GuacamoleReader.java → guacamole-common/src/main/java/org/apache/guacamole/io/GuacamoleReader.java
View File

@@ -20,11 +20,11 @@
* THE SOFTWARE.
*/
package org.glyptodon.guacamole.io;
package org.apache.guacamole.io;
import org.glyptodon.guacamole.GuacamoleException;
import org.glyptodon.guacamole.protocol.GuacamoleInstruction;
import org.apache.guacamole.GuacamoleException;
import org.apache.guacamole.protocol.GuacamoleInstruction;
/**
* Provides abstract and raw character read access to a stream of Guacamole

6
guacamole-common/src/main/java/org/glyptodon/guacamole/io/GuacamoleWriter.java → guacamole-common/src/main/java/org/apache/guacamole/io/GuacamoleWriter.java
View File

@@ -20,11 +20,11 @@
* THE SOFTWARE.
*/
package org.glyptodon.guacamole.io;
package org.apache.guacamole.io;
import org.glyptodon.guacamole.GuacamoleException;
import org.glyptodon.guacamole.protocol.GuacamoleInstruction;
import org.apache.guacamole.GuacamoleException;
import org.apache.guacamole.protocol.GuacamoleInstruction;
/**
* Provides abstract and raw character write access to a stream of Guacamole

12
guacamole-common/src/main/java/org/glyptodon/guacamole/io/ReaderGuacamoleReader.java → guacamole-common/src/main/java/org/apache/guacamole/io/ReaderGuacamoleReader.java
View File

@@ -20,7 +20,7 @@
* THE SOFTWARE.
*/
package org.glyptodon.guacamole.io;
package org.apache.guacamole.io;
import java.io.IOException;
@@ -29,11 +29,11 @@ import java.net.SocketException;
import java.net.SocketTimeoutException;
import java.util.Deque;
import java.util.LinkedList;
import org.glyptodon.guacamole.GuacamoleConnectionClosedException;
import org.glyptodon.guacamole.GuacamoleException;
import org.glyptodon.guacamole.GuacamoleServerException;
import org.glyptodon.guacamole.GuacamoleUpstreamTimeoutException;
import org.glyptodon.guacamole.protocol.GuacamoleInstruction;
import org.apache.guacamole.GuacamoleConnectionClosedException;
import org.apache.guacamole.GuacamoleException;
import org.apache.guacamole.GuacamoleServerException;
import org.apache.guacamole.GuacamoleUpstreamTimeoutException;
import org.apache.guacamole.protocol.GuacamoleInstruction;
/**
* A GuacamoleReader which wraps a standard Java Reader, using that Reader as

12
guacamole-common/src/main/java/org/glyptodon/guacamole/io/WriterGuacamoleWriter.java → guacamole-common/src/main/java/org/apache/guacamole/io/WriterGuacamoleWriter.java
View File

@@ -20,18 +20,18 @@
* THE SOFTWARE.
*/
package org.glyptodon.guacamole.io;
package org.apache.guacamole.io;
import java.io.IOException;
import java.io.Writer;
import java.net.SocketException;
import java.net.SocketTimeoutException;
import org.glyptodon.guacamole.GuacamoleConnectionClosedException;
import org.glyptodon.guacamole.GuacamoleException;
import org.glyptodon.guacamole.GuacamoleServerException;
import org.glyptodon.guacamole.GuacamoleUpstreamTimeoutException;
import org.glyptodon.guacamole.protocol.GuacamoleInstruction;
import org.apache.guacamole.GuacamoleConnectionClosedException;
import org.apache.guacamole.GuacamoleException;
import org.apache.guacamole.GuacamoleServerException;
import org.apache.guacamole.GuacamoleUpstreamTimeoutException;
import org.apache.guacamole.protocol.GuacamoleInstruction;
/**
* A GuacamoleWriter which wraps a standard Java Writer, using that Writer as

2
guacamole-common/src/main/java/org/glyptodon/guacamole/io/package-info.java → guacamole-common/src/main/java/org/apache/guacamole/io/package-info.java
View File

@@ -23,5 +23,5 @@
/**
* All classes relating directly to data input or output.
*/
package org.glyptodon.guacamole.io;
package org.apache.guacamole.io;

8
guacamole-common/src/main/java/org/glyptodon/guacamole/net/AbstractGuacamoleTunnel.java → guacamole-common/src/main/java/org/apache/guacamole/net/AbstractGuacamoleTunnel.java
View File

@@ -20,13 +20,13 @@
* THE SOFTWARE.
*/
package org.glyptodon.guacamole.net;
package org.apache.guacamole.net;
import java.util.concurrent.locks.ReentrantLock;
import org.glyptodon.guacamole.GuacamoleException;
import org.glyptodon.guacamole.io.GuacamoleReader;
import org.glyptodon.guacamole.io.GuacamoleWriter;
import org.apache.guacamole.GuacamoleException;
import org.apache.guacamole.io.GuacamoleReader;
import org.apache.guacamole.io.GuacamoleWriter;
/**
* Base GuacamoleTunnel implementation which synchronizes access to the

8
guacamole-common/src/main/java/org/glyptodon/guacamole/net/DelegatingGuacamoleTunnel.java → guacamole-common/src/main/java/org/apache/guacamole/net/DelegatingGuacamoleTunnel.java
View File

@@ -20,12 +20,12 @@
* THE SOFTWARE.
*/
package org.glyptodon.guacamole.net;
package org.apache.guacamole.net;
import java.util.UUID;
import org.glyptodon.guacamole.GuacamoleException;
import org.glyptodon.guacamole.io.GuacamoleReader;
import org.glyptodon.guacamole.io.GuacamoleWriter;
import org.apache.guacamole.GuacamoleException;
import org.apache.guacamole.io.GuacamoleReader;
import org.apache.guacamole.io.GuacamoleWriter;
/**
* GuacamoleTunnel implementation which simply delegates all function calls to

8
guacamole-common/src/main/java/org/glyptodon/guacamole/net/GuacamoleSocket.java → guacamole-common/src/main/java/org/apache/guacamole/net/GuacamoleSocket.java
View File

@@ -20,12 +20,12 @@
* THE SOFTWARE.
*/
package org.glyptodon.guacamole.net;
package org.apache.guacamole.net;
import org.glyptodon.guacamole.GuacamoleException;
import org.glyptodon.guacamole.io.GuacamoleReader;
import org.glyptodon.guacamole.io.GuacamoleWriter;
import org.apache.guacamole.GuacamoleException;
import org.apache.guacamole.io.GuacamoleReader;
import org.apache.guacamole.io.GuacamoleWriter;
/**
* Provides abstract socket-like access to a Guacamole connection.

8
guacamole-common/src/main/java/org/glyptodon/guacamole/net/GuacamoleTunnel.java → guacamole-common/src/main/java/org/apache/guacamole/net/GuacamoleTunnel.java
View File

@@ -20,13 +20,13 @@
* THE SOFTWARE.
*/
package org.glyptodon.guacamole.net;
package org.apache.guacamole.net;
import java.util.UUID;
import org.glyptodon.guacamole.GuacamoleException;
import org.glyptodon.guacamole.io.GuacamoleReader;
import org.glyptodon.guacamole.io.GuacamoleWriter;
import org.apache.guacamole.GuacamoleException;
import org.apache.guacamole.io.GuacamoleReader;
import org.apache.guacamole.io.GuacamoleWriter;
/**
* Provides a unique identifier and synchronized access to the GuacamoleReader

16
guacamole-common/src/main/java/org/glyptodon/guacamole/net/InetGuacamoleSocket.java → guacamole-common/src/main/java/org/apache/guacamole/net/InetGuacamoleSocket.java
View File

@@ -20,13 +20,13 @@
* THE SOFTWARE.
*/
package org.glyptodon.guacamole.net;
package org.apache.guacamole.net;
import org.glyptodon.guacamole.io.GuacamoleReader;
import org.glyptodon.guacamole.io.ReaderGuacamoleReader;
import org.glyptodon.guacamole.io.WriterGuacamoleWriter;
import org.glyptodon.guacamole.io.GuacamoleWriter;
import org.apache.guacamole.io.GuacamoleReader;
import org.apache.guacamole.io.ReaderGuacamoleReader;
import org.apache.guacamole.io.WriterGuacamoleWriter;
import org.apache.guacamole.io.GuacamoleWriter;
import java.io.IOException;
import java.net.InetAddress;
import java.net.Socket;
@@ -37,9 +37,9 @@ import java.io.OutputStreamWriter;
import java.net.InetSocketAddress;
import java.net.SocketAddress;
import java.net.SocketTimeoutException;
import org.glyptodon.guacamole.GuacamoleException;
import org.glyptodon.guacamole.GuacamoleServerException;
import org.glyptodon.guacamole.GuacamoleUpstreamTimeoutException;
import org.apache.guacamole.GuacamoleException;
import org.apache.guacamole.GuacamoleServerException;
import org.apache.guacamole.GuacamoleUpstreamTimeoutException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

14
guacamole-common/src/main/java/org/glyptodon/guacamole/net/SSLGuacamoleSocket.java → guacamole-common/src/main/java/org/apache/guacamole/net/SSLGuacamoleSocket.java
View File

@@ -20,7 +20,7 @@
* THE SOFTWARE.
*/
package org.glyptodon.guacamole.net;
package org.apache.guacamole.net;
import java.io.IOException;
@@ -32,12 +32,12 @@ import java.net.Socket;
import java.net.SocketAddress;
import javax.net.SocketFactory;
import javax.net.ssl.SSLSocketFactory;
import org.glyptodon.guacamole.GuacamoleException;
import org.glyptodon.guacamole.GuacamoleServerException;
import org.glyptodon.guacamole.io.GuacamoleReader;
import org.glyptodon.guacamole.io.GuacamoleWriter;
import org.glyptodon.guacamole.io.ReaderGuacamoleReader;
import org.glyptodon.guacamole.io.WriterGuacamoleWriter;
import org.apache.guacamole.GuacamoleException;
import org.apache.guacamole.GuacamoleServerException;
import org.apache.guacamole.io.GuacamoleReader;
import org.apache.guacamole.io.GuacamoleWriter;
import org.apache.guacamole.io.ReaderGuacamoleReader;
import org.apache.guacamole.io.WriterGuacamoleWriter;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

2
guacamole-common/src/main/java/org/glyptodon/guacamole/net/SimpleGuacamoleTunnel.java → guacamole-common/src/main/java/org/apache/guacamole/net/SimpleGuacamoleTunnel.java
View File

@@ -20,7 +20,7 @@
* THE SOFTWARE.
*/
package org.glyptodon.guacamole.net;
package org.apache.guacamole.net;
import java.util.UUID;

2
guacamole-common/src/main/java/org/glyptodon/guacamole/net/package-info.java → guacamole-common/src/main/java/org/apache/guacamole/net/package-info.java
View File

@@ -24,5 +24,5 @@
* Classes which apply to network-specific concepts, such as low-level sockets
* and tunnels.
*/
package org.glyptodon.guacamole.net;
package org.apache.guacamole.net;

2
guacamole-common/src/main/java/org/glyptodon/guacamole/package-info.java → guacamole-common/src/main/java/org/apache/guacamole/package-info.java
View File

@@ -25,5 +25,5 @@
* and all other web applications which use the API provided by the
* Guacamole project.
*/
package org.glyptodon.guacamole;
package org.apache.guacamole;

12
guacamole-common/src/main/java/org/glyptodon/guacamole/protocol/ConfiguredGuacamoleSocket.java → guacamole-common/src/main/java/org/apache/guacamole/protocol/ConfiguredGuacamoleSocket.java
View File

@@ -20,15 +20,15 @@
* THE SOFTWARE.
*/
package org.glyptodon.guacamole.protocol;
package org.apache.guacamole.protocol;
import java.util.List;
import org.glyptodon.guacamole.GuacamoleException;
import org.glyptodon.guacamole.GuacamoleServerException;
import org.glyptodon.guacamole.io.GuacamoleReader;
import org.glyptodon.guacamole.io.GuacamoleWriter;
import org.glyptodon.guacamole.net.GuacamoleSocket;
import org.apache.guacamole.GuacamoleException;
import org.apache.guacamole.GuacamoleServerException;
import org.apache.guacamole.io.GuacamoleReader;
import org.apache.guacamole.io.GuacamoleWriter;
import org.apache.guacamole.net.GuacamoleSocket;
/**
* A GuacamoleSocket which pre-configures the connection based on a given

6
guacamole-common/src/main/java/org/glyptodon/guacamole/protocol/FilteredGuacamoleReader.java → guacamole-common/src/main/java/org/apache/guacamole/protocol/FilteredGuacamoleReader.java
View File

@@ -20,10 +20,10 @@
* THE SOFTWARE.
*/
package org.glyptodon.guacamole.protocol;
package org.apache.guacamole.protocol;
import org.glyptodon.guacamole.GuacamoleException;
import org.glyptodon.guacamole.io.GuacamoleReader;
import org.apache.guacamole.GuacamoleException;
import org.apache.guacamole.io.GuacamoleReader;
/**
* GuacamoleReader which applies a given GuacamoleFilter to observe or alter all

10
guacamole-common/src/main/java/org/glyptodon/guacamole/protocol/FilteredGuacamoleSocket.java → guacamole-common/src/main/java/org/apache/guacamole/protocol/FilteredGuacamoleSocket.java
View File

@@ -20,12 +20,12 @@
* THE SOFTWARE.
*/
package org.glyptodon.guacamole.protocol;
package org.apache.guacamole.protocol;
import org.glyptodon.guacamole.GuacamoleException;
import org.glyptodon.guacamole.io.GuacamoleReader;
import org.glyptodon.guacamole.io.GuacamoleWriter;
import org.glyptodon.guacamole.net.GuacamoleSocket;
import org.apache.guacamole.GuacamoleException;
import org.apache.guacamole.io.GuacamoleReader;
import org.apache.guacamole.io.GuacamoleWriter;
import org.apache.guacamole.net.GuacamoleSocket;
/**
* Implementation of GuacamoleSocket which allows individual instructions to be

8
guacamole-common/src/main/java/org/glyptodon/guacamole/protocol/FilteredGuacamoleWriter.java → guacamole-common/src/main/java/org/apache/guacamole/protocol/FilteredGuacamoleWriter.java
View File

@@ -20,11 +20,11 @@
* THE SOFTWARE.
*/
package org.glyptodon.guacamole.protocol;
package org.apache.guacamole.protocol;
import org.glyptodon.guacamole.GuacamoleException;
import org.glyptodon.guacamole.GuacamoleServerException;
import org.glyptodon.guacamole.io.GuacamoleWriter;
import org.apache.guacamole.GuacamoleException;
import org.apache.guacamole.GuacamoleServerException;
import org.apache.guacamole.io.GuacamoleWriter;
/**
* GuacamoleWriter which applies a given GuacamoleFilter to observe or alter

2
guacamole-common/src/main/java/org/glyptodon/guacamole/protocol/GuacamoleClientInformation.java → guacamole-common/src/main/java/org/apache/guacamole/protocol/GuacamoleClientInformation.java
View File

@@ -20,7 +20,7 @@
* THE SOFTWARE.
*/
package org.glyptodon.guacamole.protocol;
package org.apache.guacamole.protocol;
import java.util.ArrayList;

2
guacamole-common/src/main/java/org/glyptodon/guacamole/protocol/GuacamoleConfiguration.java → guacamole-common/src/main/java/org/apache/guacamole/protocol/GuacamoleConfiguration.java
View File

@@ -20,7 +20,7 @@
* THE SOFTWARE.
*/
package org.glyptodon.guacamole.protocol;
package org.apache.guacamole.protocol;
import java.io.Serializable;

4
guacamole-common/src/main/java/org/glyptodon/guacamole/protocol/GuacamoleFilter.java → guacamole-common/src/main/java/org/apache/guacamole/protocol/GuacamoleFilter.java
View File

@@ -20,9 +20,9 @@
* THE SOFTWARE.
*/
package org.glyptodon.guacamole.protocol;
package org.apache.guacamole.protocol;
import org.glyptodon.guacamole.GuacamoleException;
import org.apache.guacamole.GuacamoleException;
/**
* Interface which provides for the filtering of individual instructions. Each

2
guacamole-common/src/main/java/org/glyptodon/guacamole/protocol/GuacamoleInstruction.java → guacamole-common/src/main/java/org/apache/guacamole/protocol/GuacamoleInstruction.java
View File

@@ -20,7 +20,7 @@
* THE SOFTWARE.
*/
package org.glyptodon.guacamole.protocol;
package org.apache.guacamole.protocol;
import java.util.Arrays;

6
guacamole-common/src/main/java/org/glyptodon/guacamole/protocol/GuacamoleParser.java → guacamole-common/src/main/java/org/apache/guacamole/protocol/GuacamoleParser.java
View File

@@ -20,13 +20,13 @@
* THE SOFTWARE.
*/
package org.glyptodon.guacamole.protocol;
package org.apache.guacamole.protocol;
import java.util.Arrays;
import java.util.Iterator;
import java.util.List;
import org.glyptodon.guacamole.GuacamoleException;
import org.glyptodon.guacamole.GuacamoleServerException;
import org.apache.guacamole.GuacamoleException;
import org.apache.guacamole.GuacamoleServerException;
/**
* Parser for the Guacamole protocol. Arbitrary instruction data is appended,

2
guacamole-common/src/main/java/org/glyptodon/guacamole/protocol/GuacamoleStatus.java → guacamole-common/src/main/java/org/apache/guacamole/protocol/GuacamoleStatus.java
View File

@@ -20,7 +20,7 @@
* THE SOFTWARE.
*/
package org.glyptodon.guacamole.protocol;
package org.apache.guacamole.protocol;
/**
* All possible statuses returned by various Guacamole instructions, each having

2
guacamole-common/src/main/java/org/glyptodon/guacamole/protocol/package-info.java → guacamole-common/src/main/java/org/apache/guacamole/protocol/package-info.java
View File

@@ -23,5 +23,5 @@
/**
* Classes relating directly to the Guacamole protocol.
*/
package org.glyptodon.guacamole.protocol;
package org.apache.guacamole.protocol;

6
guacamole-common/src/main/java/org/glyptodon/guacamole/servlet/GuacamoleHTTPTunnel.java → guacamole-common/src/main/java/org/apache/guacamole/servlet/GuacamoleHTTPTunnel.java
View File

@@ -20,10 +20,10 @@
* THE SOFTWARE.
*/
package org.glyptodon.guacamole.servlet;
package org.apache.guacamole.servlet;
import org.glyptodon.guacamole.net.DelegatingGuacamoleTunnel;
import org.glyptodon.guacamole.net.GuacamoleTunnel;
import org.apache.guacamole.net.DelegatingGuacamoleTunnel;
import org.apache.guacamole.net.GuacamoleTunnel;
/**
* Tracks the last time a particular GuacamoleTunnel was accessed. This

6
guacamole-common/src/main/java/org/glyptodon/guacamole/servlet/GuacamoleHTTPTunnelMap.java → guacamole-common/src/main/java/org/apache/guacamole/servlet/GuacamoleHTTPTunnelMap.java
View File

@@ -20,7 +20,7 @@
* THE SOFTWARE.
*/
package org.glyptodon.guacamole.servlet;
package org.apache.guacamole.servlet;
import java.util.Iterator;
import java.util.Map;
@@ -29,8 +29,8 @@ import java.util.concurrent.ConcurrentMap;
import java.util.concurrent.Executors;
import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.TimeUnit;
import org.glyptodon.guacamole.GuacamoleException;
import org.glyptodon.guacamole.net.GuacamoleTunnel;
import org.apache.guacamole.GuacamoleException;
import org.apache.guacamole.net.GuacamoleTunnel;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

20
guacamole-common/src/main/java/org/glyptodon/guacamole/servlet/GuacamoleHTTPTunnelServlet.java → guacamole-common/src/main/java/org/apache/guacamole/servlet/GuacamoleHTTPTunnelServlet.java
View File

@@ -20,7 +20,7 @@
* THE SOFTWARE.
*/
package org.glyptodon.guacamole.servlet;
package org.apache.guacamole.servlet;
import java.io.BufferedWriter;
import java.io.IOException;
@@ -32,15 +32,15 @@ import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.glyptodon.guacamole.GuacamoleClientException;
import org.glyptodon.guacamole.GuacamoleConnectionClosedException;
import org.glyptodon.guacamole.GuacamoleException;
import org.glyptodon.guacamole.GuacamoleResourceNotFoundException;
import org.glyptodon.guacamole.GuacamoleServerException;
import org.glyptodon.guacamole.io.GuacamoleReader;
import org.glyptodon.guacamole.io.GuacamoleWriter;
import org.glyptodon.guacamole.net.GuacamoleTunnel;
import org.glyptodon.guacamole.protocol.GuacamoleStatus;
import org.apache.guacamole.GuacamoleClientException;
import org.apache.guacamole.GuacamoleConnectionClosedException;
import org.apache.guacamole.GuacamoleException;
import org.apache.guacamole.GuacamoleResourceNotFoundException;
import org.apache.guacamole.GuacamoleServerException;
import org.apache.guacamole.io.GuacamoleReader;
import org.apache.guacamole.io.GuacamoleWriter;
import org.apache.guacamole.net.GuacamoleTunnel;
import org.apache.guacamole.protocol.GuacamoleStatus;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

4
guacamole-common/src/main/java/org/glyptodon/guacamole/servlet/GuacamoleSession.java → guacamole-common/src/main/java/org/apache/guacamole/servlet/GuacamoleSession.java
View File

@@ -20,10 +20,10 @@
* THE SOFTWARE.
*/
package org.glyptodon.guacamole.servlet;
package org.apache.guacamole.servlet;
import javax.servlet.http.HttpSession;
import org.glyptodon.guacamole.net.GuacamoleTunnel;
import org.apache.guacamole.net.GuacamoleTunnel;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

2
guacamole-common/src/main/java/org/glyptodon/guacamole/servlet/package-info.java → guacamole-common/src/main/java/org/apache/guacamole/servlet/package-info.java
View File

@@ -24,5 +24,5 @@
* Classes which build upon the Java Servlet API, providing an HTTP-based
* tunnel and session management.
*/
package org.glyptodon.guacamole.servlet;
package org.apache.guacamole.servlet;

16
guacamole-common/src/main/java/org/glyptodon/guacamole/websocket/GuacamoleWebSocketTunnelEndpoint.java → guacamole-common/src/main/java/org/apache/guacamole/websocket/GuacamoleWebSocketTunnelEndpoint.java
View File

@@ -20,7 +20,7 @@
* THE SOFTWARE.
*/
package org.glyptodon.guacamole.websocket;
package org.apache.guacamole.websocket;
import java.io.IOException;
import javax.websocket.CloseReason;
@@ -33,13 +33,13 @@ import javax.websocket.OnMessage;
import javax.websocket.OnOpen;
import javax.websocket.RemoteEndpoint;
import javax.websocket.Session;
import org.glyptodon.guacamole.GuacamoleException;
import org.glyptodon.guacamole.io.GuacamoleReader;
import org.glyptodon.guacamole.io.GuacamoleWriter;
import org.glyptodon.guacamole.net.GuacamoleTunnel;
import org.glyptodon.guacamole.GuacamoleClientException;
import org.glyptodon.guacamole.GuacamoleConnectionClosedException;
import org.glyptodon.guacamole.protocol.GuacamoleStatus;
import org.apache.guacamole.GuacamoleException;
import org.apache.guacamole.io.GuacamoleReader;
import org.apache.guacamole.io.GuacamoleWriter;
import org.apache.guacamole.net.GuacamoleTunnel;
import org.apache.guacamole.GuacamoleClientException;
import org.apache.guacamole.GuacamoleConnectionClosedException;
import org.apache.guacamole.protocol.GuacamoleStatus;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

6
guacamole-common/src/test/java/org/glyptodon/guacamole/io/ReaderGuacamoleReaderTest.java → guacamole-common/src/test/java/org/apache/guacamole/io/ReaderGuacamoleReaderTest.java
View File

@@ -20,11 +20,11 @@
* THE SOFTWARE.
*/
package org.glyptodon.guacamole.io;
package org.apache.guacamole.io;
import java.io.StringReader;
import org.glyptodon.guacamole.GuacamoleException;
import org.glyptodon.guacamole.protocol.GuacamoleInstruction;
import org.apache.guacamole.GuacamoleException;
import org.apache.guacamole.protocol.GuacamoleInstruction;
import org.junit.Test;
import static org.junit.Assert.*;

8
guacamole-common/src/test/java/org/glyptodon/guacamole/protocol/FilteredGuacamoleReaderTest.java → guacamole-common/src/test/java/org/apache/guacamole/protocol/FilteredGuacamoleReaderTest.java
View File

@@ -20,12 +20,12 @@
* THE SOFTWARE.
*/
package org.glyptodon.guacamole.protocol;
package org.apache.guacamole.protocol;
import java.io.StringReader;
import org.glyptodon.guacamole.GuacamoleException;
import org.glyptodon.guacamole.io.GuacamoleReader;
import org.glyptodon.guacamole.io.ReaderGuacamoleReader;
import org.apache.guacamole.GuacamoleException;
import org.apache.guacamole.io.GuacamoleReader;
import org.apache.guacamole.io.ReaderGuacamoleReader;
import static org.junit.Assert.*;
import org.junit.Test;

8
guacamole-common/src/test/java/org/glyptodon/guacamole/protocol/FilteredGuacamoleWriterTest.java → guacamole-common/src/test/java/org/apache/guacamole/protocol/FilteredGuacamoleWriterTest.java
View File

@@ -20,12 +20,12 @@
* THE SOFTWARE.
*/
package org.glyptodon.guacamole.protocol;
package org.apache.guacamole.protocol;
import java.io.StringWriter;
import org.glyptodon.guacamole.GuacamoleException;
import org.glyptodon.guacamole.io.GuacamoleWriter;
import org.glyptodon.guacamole.io.WriterGuacamoleWriter;
import org.apache.guacamole.GuacamoleException;
import org.apache.guacamole.io.GuacamoleWriter;
import org.apache.guacamole.io.WriterGuacamoleWriter;
import static org.junit.Assert.*;
import org.junit.Test;

4
guacamole-common/src/test/java/org/glyptodon/guacamole/protocol/GuacamoleParserTest.java → guacamole-common/src/test/java/org/apache/guacamole/protocol/GuacamoleParserTest.java
View File

@@ -20,9 +20,9 @@
* THE SOFTWARE.
*/
package org.glyptodon.guacamole.protocol;
package org.apache.guacamole.protocol;
import org.glyptodon.guacamole.GuacamoleException;
import org.apache.guacamole.GuacamoleException;
import static org.junit.Assert.*;
import org.junit.Test;