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

guacamole-ext/pom.xml

@@ -2,7 +2,7 @@
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
     <modelVersion>4.0.0</modelVersion>
-    <groupId>org.glyptodon.guacamole</groupId>
+    <groupId>org.apache.guacamole</groupId>
     <artifactId>guacamole-ext</artifactId>
     <packaging>jar</packaging>
     <version>0.9.9</version>
@@ -114,7 +114,7 @@
 
         <!-- Guacamole Java API -->
         <dependency>
-            <groupId>org.glyptodon.guacamole</groupId>
+            <groupId>org.apache.guacamole</groupId>
             <artifactId>guacamole-common</artifactId>
             <version>0.9.9</version>
             <scope>compile</scope>

guacamole-ext/src/main/java/org/apache/guacamole/environment/Environment.java

@@ -20,16 +20,16 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.environment;
+package org.apache.guacamole.environment;
 
 import java.io.File;
 import java.util.Map;
-import org.glyptodon.guacamole.GuacamoleException;
-import org.glyptodon.guacamole.properties.BooleanGuacamoleProperty;
-import org.glyptodon.guacamole.properties.GuacamoleProperty;
-import org.glyptodon.guacamole.properties.IntegerGuacamoleProperty;
-import org.glyptodon.guacamole.properties.StringGuacamoleProperty;
-import org.glyptodon.guacamole.protocols.ProtocolInfo;
+import org.apache.guacamole.GuacamoleException;
+import org.apache.guacamole.properties.BooleanGuacamoleProperty;
+import org.apache.guacamole.properties.GuacamoleProperty;
+import org.apache.guacamole.properties.IntegerGuacamoleProperty;
+import org.apache.guacamole.properties.StringGuacamoleProperty;
+import org.apache.guacamole.protocols.ProtocolInfo;
 
 /**
  * The environment of an arbitrary Guacamole instance, describing available

guacamole-ext/src/main/java/org/apache/guacamole/environment/LocalEnvironment.java

@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.environment;
+package org.apache.guacamole.environment;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -31,10 +31,10 @@ import java.util.HashMap;
 import java.util.Map;
 import java.util.Properties;
 import org.codehaus.jackson.map.ObjectMapper;
-import org.glyptodon.guacamole.GuacamoleException;
-import org.glyptodon.guacamole.GuacamoleServerException;
-import org.glyptodon.guacamole.properties.GuacamoleProperty;
-import org.glyptodon.guacamole.protocols.ProtocolInfo;
+import org.apache.guacamole.GuacamoleException;
+import org.apache.guacamole.GuacamoleServerException;
+import org.apache.guacamole.properties.GuacamoleProperty;
+import org.apache.guacamole.protocols.ProtocolInfo;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -251,7 +251,7 @@ public class LocalEnvironment implements Environment {
             if (!protocols.containsKey(protocol)) {
 
                 InputStream stream = LocalEnvironment.class.getResourceAsStream(
-                        "/org/glyptodon/guacamole/protocols/"
+                        "/org/apache/guacamole/protocols/"
                         + protocol + ".json");
 
                 // Parse JSON if available

guacamole-ext/src/main/java/org/apache/guacamole/form/BooleanField.java

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

guacamole-ext/src/main/java/org/apache/guacamole/form/DateField.java

@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.form;
+package org.apache.guacamole.form;
 
 import java.text.DateFormat;
 import java.text.ParseException;

guacamole-ext/src/main/java/org/apache/guacamole/form/EnumField.java

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

guacamole-ext/src/main/java/org/apache/guacamole/form/Field.java

@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.form;
+package org.apache.guacamole.form;
 
 import java.util.Collection;
 import org.codehaus.jackson.map.annotate.JsonSerialize;

guacamole-ext/src/main/java/org/apache/guacamole/form/FieldOption.java

@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.form;
+package org.apache.guacamole.form;
 
 import org.codehaus.jackson.map.annotate.JsonSerialize;
 

guacamole-ext/src/main/java/org/apache/guacamole/form/Form.java

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

guacamole-ext/src/main/java/org/apache/guacamole/form/MultilineField.java

@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.form;
+package org.apache.guacamole.form;
 
 /**
  * Represents a field which can contain multiple lines of text.

guacamole-ext/src/main/java/org/apache/guacamole/form/NumericField.java

@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.form;
+package org.apache.guacamole.form;
 
 /**
  * Represents a field which may contain only integer values.

guacamole-ext/src/main/java/org/apache/guacamole/form/PasswordField.java

@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.form;
+package org.apache.guacamole.form;
 
 /**
  * Represents a field which contains sensitive text information related to

guacamole-ext/src/main/java/org/apache/guacamole/form/TextField.java

@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.form;
+package org.apache.guacamole.form;
 
 /**
  * Represents a basic text field. The field may generally contain any data, but

guacamole-ext/src/main/java/org/apache/guacamole/form/TimeField.java

@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.form;
+package org.apache.guacamole.form;
 
 import java.text.DateFormat;
 import java.text.ParseException;

guacamole-ext/src/main/java/org/apache/guacamole/form/TimeZoneField.java

@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.form;
+package org.apache.guacamole.form;
 
 /**
  * Represents a time zone field. The field may contain only valid time zone IDs,

guacamole-ext/src/main/java/org/apache/guacamole/form/UsernameField.java

@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.form;
+package org.apache.guacamole.form;
 
 /**
  * Represents a text field which will contain the uniquely-identifying name of

guacamole-ext/src/main/java/org/apache/guacamole/form/package-info.java

@@ -24,4 +24,4 @@
  * Provides classes which describe the contents and semantics of forms which
  * may be presented to the user.
  */
-package org.glyptodon.guacamole.form;
+package org.apache.guacamole.form;

guacamole-ext/src/main/java/org/apache/guacamole/net/auth/AbstractActiveConnection.java

@@ -20,10 +20,10 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.net.auth;
+package org.apache.guacamole.net.auth;
 
 import java.util.Date;
-import org.glyptodon.guacamole.net.GuacamoleTunnel;
+import org.apache.guacamole.net.GuacamoleTunnel;
 
 public abstract class AbstractActiveConnection implements ActiveConnection {
 

guacamole-ext/src/main/java/org/apache/guacamole/net/auth/AbstractAuthenticatedUser.java

@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.net.auth;
+package org.apache.guacamole.net.auth;
 
 
 /**

guacamole-ext/src/main/java/org/apache/guacamole/net/auth/AbstractConnection.java

@@ -20,9 +20,9 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.net.auth;
+package org.apache.guacamole.net.auth;
 
-import org.glyptodon.guacamole.protocol.GuacamoleConfiguration;
+import org.apache.guacamole.protocol.GuacamoleConfiguration;
 
 /**
  * Basic implementation of a Guacamole connection.

guacamole-ext/src/main/java/org/apache/guacamole/net/auth/AbstractConnectionGroup.java

@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.net.auth;
+package org.apache.guacamole.net.auth;
 
 /**
  * Basic implementation of a Guacamole connection group.

guacamole-ext/src/main/java/org/apache/guacamole/net/auth/AbstractUser.java

@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.net.auth;
+package org.apache.guacamole.net.auth;
 
 
 /**

guacamole-ext/src/main/java/org/apache/guacamole/net/auth/ActiveConnection.java

@@ -20,10 +20,10 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.net.auth;
+package org.apache.guacamole.net.auth;
 
 import java.util.Date;
-import org.glyptodon.guacamole.net.GuacamoleTunnel;
+import org.apache.guacamole.net.GuacamoleTunnel;
 
 /**
  * A pairing of username and GuacamoleTunnel representing an active usage of a

guacamole-ext/src/main/java/org/apache/guacamole/net/auth/AuthenticatedUser.java

@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.net.auth;
+package org.apache.guacamole.net.auth;
 
 
 /**

guacamole-ext/src/main/java/org/apache/guacamole/net/auth/AuthenticationProvider.java

@@ -20,9 +20,9 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.net.auth;
+package org.apache.guacamole.net.auth;
 
-import org.glyptodon.guacamole.GuacamoleException;
+import org.apache.guacamole.GuacamoleException;
 
 /**
  * Provides means of authorizing users and for accessing and managing data

guacamole-ext/src/main/java/org/apache/guacamole/net/auth/Connectable.java

@@ -20,11 +20,11 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.net.auth;
+package org.apache.guacamole.net.auth;
 
-import org.glyptodon.guacamole.GuacamoleException;
-import org.glyptodon.guacamole.net.GuacamoleTunnel;
-import org.glyptodon.guacamole.protocol.GuacamoleClientInformation;
+import org.apache.guacamole.GuacamoleException;
+import org.apache.guacamole.net.GuacamoleTunnel;
+import org.apache.guacamole.protocol.GuacamoleClientInformation;
 
 /**
  * An object which Guacamole can connect to.

guacamole-ext/src/main/java/org/apache/guacamole/net/auth/Connection.java

@@ -20,12 +20,12 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.net.auth;
+package org.apache.guacamole.net.auth;
 
 import java.util.List;
 import java.util.Map;
-import org.glyptodon.guacamole.GuacamoleException;
-import org.glyptodon.guacamole.protocol.GuacamoleConfiguration;
+import org.apache.guacamole.GuacamoleException;
+import org.apache.guacamole.protocol.GuacamoleConfiguration;
 
 /**
  * Represents a pairing of a GuacamoleConfiguration with a unique,

guacamole-ext/src/main/java/org/apache/guacamole/net/auth/ConnectionGroup.java

@@ -20,11 +20,11 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.net.auth;
+package org.apache.guacamole.net.auth;
 
 import java.util.Map;
 import java.util.Set;
-import org.glyptodon.guacamole.GuacamoleException;
+import org.apache.guacamole.GuacamoleException;
 
 /**
  * Represents a connection group, which can contain both other connection groups

guacamole-ext/src/main/java/org/apache/guacamole/net/auth/ConnectionRecord.java

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

guacamole-ext/src/main/java/org/apache/guacamole/net/auth/ConnectionRecordSet.java

@@ -20,10 +20,10 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.net.auth;
+package org.apache.guacamole.net.auth;
 
 import java.util.Collection;
-import org.glyptodon.guacamole.GuacamoleException;
+import org.apache.guacamole.GuacamoleException;
 
 /**
  * The set of all available connection records, or a subset of those records.

guacamole-ext/src/main/java/org/apache/guacamole/net/auth/Credentials.java

@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.net.auth;
+package org.apache.guacamole.net.auth;
 
 import java.io.Serializable;
 import javax.servlet.http.HttpServletRequest;

guacamole-ext/src/main/java/org/apache/guacamole/net/auth/Directory.java

@@ -20,11 +20,11 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.net.auth;
+package org.apache.guacamole.net.auth;
 
 import java.util.Collection;
 import java.util.Set;
-import org.glyptodon.guacamole.GuacamoleException;
+import org.apache.guacamole.GuacamoleException;
 
 /**
  * Provides access to a collection of all objects with associated identifiers,

guacamole-ext/src/main/java/org/apache/guacamole/net/auth/Identifiable.java

@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.net.auth;
+package org.apache.guacamole.net.auth;
 
 /**
  * An object which has a deterministic, unique identifier, which may not be

guacamole-ext/src/main/java/org/apache/guacamole/net/auth/User.java

@@ -20,12 +20,12 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.net.auth;
+package org.apache.guacamole.net.auth;
 
 import java.util.Map;
-import org.glyptodon.guacamole.GuacamoleException;
-import org.glyptodon.guacamole.net.auth.permission.ObjectPermissionSet;
-import org.glyptodon.guacamole.net.auth.permission.SystemPermissionSet;
+import org.apache.guacamole.GuacamoleException;
+import org.apache.guacamole.net.auth.permission.ObjectPermissionSet;
+import org.apache.guacamole.net.auth.permission.SystemPermissionSet;
 
 
 /**

guacamole-ext/src/main/java/org/apache/guacamole/net/auth/UserContext.java

@@ -20,11 +20,11 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.net.auth;
+package org.apache.guacamole.net.auth;
 
 import java.util.Collection;
-import org.glyptodon.guacamole.GuacamoleException;
-import org.glyptodon.guacamole.form.Form;
+import org.apache.guacamole.GuacamoleException;
+import org.apache.guacamole.form.Form;
 
 /**
  * The context of an active user. The functions of this class enforce all

guacamole-ext/src/main/java/org/apache/guacamole/net/auth/credentials/CredentialsInfo.java

@@ -20,14 +20,14 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.net.auth.credentials;
+package org.apache.guacamole.net.auth.credentials;
 
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
-import org.glyptodon.guacamole.form.Field;
-import org.glyptodon.guacamole.form.PasswordField;
-import org.glyptodon.guacamole.form.UsernameField;
+import org.apache.guacamole.form.Field;
+import org.apache.guacamole.form.PasswordField;
+import org.apache.guacamole.form.UsernameField;
 
 /**
  * Information which describes a set of valid credentials.

guacamole-ext/src/main/java/org/apache/guacamole/net/auth/credentials/GuacamoleCredentialsException.java

@@ -20,9 +20,9 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.net.auth.credentials;
+package org.apache.guacamole.net.auth.credentials;
 
-import org.glyptodon.guacamole.GuacamoleUnauthorizedException;
+import org.apache.guacamole.GuacamoleUnauthorizedException;
 
 /**
  * A security-related exception thrown when access is denied to a user because

guacamole-ext/src/main/java/org/apache/guacamole/net/auth/credentials/GuacamoleInsufficientCredentialsException.java

@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.net.auth.credentials;
+package org.apache.guacamole.net.auth.credentials;
 
 /**
  * A security-related exception thrown when access is denied to a user because

guacamole-ext/src/main/java/org/apache/guacamole/net/auth/credentials/GuacamoleInvalidCredentialsException.java

@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.net.auth.credentials;
+package org.apache.guacamole.net.auth.credentials;
 
 /**
  * A security-related exception thrown when access is denied to a user because

guacamole-ext/src/main/java/org/apache/guacamole/net/auth/package-info.java

@@ -24,5 +24,5 @@
  * Provides classes which can be used to extend or replace the authentication
  * functionality of the Guacamole web application.
  */
-package org.glyptodon.guacamole.net.auth;
+package org.apache.guacamole.net.auth;
 

guacamole-ext/src/main/java/org/apache/guacamole/net/auth/permission/ObjectPermission.java

@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.net.auth.permission;
+package org.apache.guacamole.net.auth.permission;
 
 
 /**

guacamole-ext/src/main/java/org/apache/guacamole/net/auth/permission/ObjectPermissionSet.java

@@ -20,11 +20,11 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.net.auth.permission;
+package org.apache.guacamole.net.auth.permission;
 
 import java.util.Collection;
 import java.util.Set;
-import org.glyptodon.guacamole.GuacamoleException;
+import org.apache.guacamole.GuacamoleException;
 
 
 /**

guacamole-ext/src/main/java/org/apache/guacamole/net/auth/permission/Permission.java

@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.net.auth.permission;
+package org.apache.guacamole.net.auth.permission;
 
 
 /**

guacamole-ext/src/main/java/org/apache/guacamole/net/auth/permission/PermissionSet.java

@@ -20,10 +20,10 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.net.auth.permission;
+package org.apache.guacamole.net.auth.permission;
 
 import java.util.Set;
-import org.glyptodon.guacamole.GuacamoleException;
+import org.apache.guacamole.GuacamoleException;
 
 
 /**

guacamole-ext/src/main/java/org/apache/guacamole/net/auth/permission/SystemPermission.java

@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.net.auth.permission;
+package org.apache.guacamole.net.auth.permission;
 
 
 /**

guacamole-ext/src/main/java/org/apache/guacamole/net/auth/permission/SystemPermissionSet.java

@@ -20,10 +20,10 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.net.auth.permission;
+package org.apache.guacamole.net.auth.permission;
 
 import java.util.Set;
-import org.glyptodon.guacamole.GuacamoleException;
+import org.apache.guacamole.GuacamoleException;
 
 
 /**

guacamole-ext/src/main/java/org/apache/guacamole/net/auth/permission/package-info.java

@@ -24,5 +24,5 @@
  * Provides classes which describe the various permissions a Guacamole user
  * can be granted.
  */
-package org.glyptodon.guacamole.net.auth.permission;
+package org.apache.guacamole.net.auth.permission;
 

guacamole-ext/src/main/java/org/apache/guacamole/net/auth/simple/SimpleAuthenticationProvider.java

@@ -20,19 +20,19 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.net.auth.simple;
+package org.apache.guacamole.net.auth.simple;
 
 import java.util.Map;
 import java.util.UUID;
-import org.glyptodon.guacamole.GuacamoleException;
-import org.glyptodon.guacamole.net.auth.AbstractAuthenticatedUser;
-import org.glyptodon.guacamole.net.auth.AuthenticationProvider;
-import org.glyptodon.guacamole.net.auth.AuthenticatedUser;
-import org.glyptodon.guacamole.net.auth.Credentials;
-import org.glyptodon.guacamole.net.auth.UserContext;
-import org.glyptodon.guacamole.protocol.GuacamoleConfiguration;
-import org.glyptodon.guacamole.token.StandardTokens;
-import org.glyptodon.guacamole.token.TokenFilter;
+import org.apache.guacamole.GuacamoleException;
+import org.apache.guacamole.net.auth.AbstractAuthenticatedUser;
+import org.apache.guacamole.net.auth.AuthenticationProvider;
+import org.apache.guacamole.net.auth.AuthenticatedUser;
+import org.apache.guacamole.net.auth.Credentials;
+import org.apache.guacamole.net.auth.UserContext;
+import org.apache.guacamole.protocol.GuacamoleConfiguration;
+import org.apache.guacamole.token.StandardTokens;
+import org.apache.guacamole.token.TokenFilter;
 
 /**
  * Provides means of retrieving a set of named GuacamoleConfigurations for a

guacamole-ext/src/main/java/org/apache/guacamole/net/auth/simple/SimpleConnection.java

@@ -20,24 +20,24 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.net.auth.simple;
+package org.apache.guacamole.net.auth.simple;
 
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
-import org.glyptodon.guacamole.GuacamoleException;
-import org.glyptodon.guacamole.environment.Environment;
-import org.glyptodon.guacamole.environment.LocalEnvironment;
-import org.glyptodon.guacamole.net.GuacamoleSocket;
-import org.glyptodon.guacamole.net.GuacamoleTunnel;
-import org.glyptodon.guacamole.net.InetGuacamoleSocket;
-import org.glyptodon.guacamole.net.SSLGuacamoleSocket;
-import org.glyptodon.guacamole.net.SimpleGuacamoleTunnel;
-import org.glyptodon.guacamole.net.auth.AbstractConnection;
-import org.glyptodon.guacamole.net.auth.ConnectionRecord;
-import org.glyptodon.guacamole.protocol.ConfiguredGuacamoleSocket;
-import org.glyptodon.guacamole.protocol.GuacamoleClientInformation;
-import org.glyptodon.guacamole.protocol.GuacamoleConfiguration;
+import org.apache.guacamole.GuacamoleException;
+import org.apache.guacamole.environment.Environment;
+import org.apache.guacamole.environment.LocalEnvironment;
+import org.apache.guacamole.net.GuacamoleSocket;
+import org.apache.guacamole.net.GuacamoleTunnel;
+import org.apache.guacamole.net.InetGuacamoleSocket;
+import org.apache.guacamole.net.SSLGuacamoleSocket;
+import org.apache.guacamole.net.SimpleGuacamoleTunnel;
+import org.apache.guacamole.net.auth.AbstractConnection;
+import org.apache.guacamole.net.auth.ConnectionRecord;
+import org.apache.guacamole.protocol.ConfiguredGuacamoleSocket;
+import org.apache.guacamole.protocol.GuacamoleClientInformation;
+import org.apache.guacamole.protocol.GuacamoleConfiguration;
 
 /**
  * An extremely basic Connection implementation.

guacamole-ext/src/main/java/org/apache/guacamole/net/auth/simple/SimpleConnectionDirectory.java

@@ -20,12 +20,12 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.net.auth.simple;
+package org.apache.guacamole.net.auth.simple;
 
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.Map;
-import org.glyptodon.guacamole.net.auth.Connection;
+import org.apache.guacamole.net.auth.Connection;
 
 /**
  * An extremely simple read-only implementation of a Directory of

guacamole-ext/src/main/java/org/apache/guacamole/net/auth/simple/SimpleConnectionGroup.java

@@ -20,19 +20,19 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.net.auth.simple;
+package org.apache.guacamole.net.auth.simple;
 
 import java.util.Collection;
 import java.util.Collections;
 import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
-import org.glyptodon.guacamole.GuacamoleException;
-import org.glyptodon.guacamole.GuacamoleSecurityException;
-import org.glyptodon.guacamole.net.GuacamoleTunnel;
-import org.glyptodon.guacamole.net.auth.AbstractConnectionGroup;
-import org.glyptodon.guacamole.net.auth.ConnectionGroup;
-import org.glyptodon.guacamole.protocol.GuacamoleClientInformation;
+import org.apache.guacamole.GuacamoleException;
+import org.apache.guacamole.GuacamoleSecurityException;
+import org.apache.guacamole.net.GuacamoleTunnel;
+import org.apache.guacamole.net.auth.AbstractConnectionGroup;
+import org.apache.guacamole.net.auth.ConnectionGroup;
+import org.apache.guacamole.protocol.GuacamoleClientInformation;
 
 /**
  * An extremely simple read-only implementation of a ConnectionGroup which

guacamole-ext/src/main/java/org/apache/guacamole/net/auth/simple/SimpleConnectionGroupDirectory.java

@@ -20,12 +20,12 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.net.auth.simple;
+package org.apache.guacamole.net.auth.simple;
 
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.Map;
-import org.glyptodon.guacamole.net.auth.ConnectionGroup;
+import org.apache.guacamole.net.auth.ConnectionGroup;
 
 /**
  * An extremely simple read-only implementation of a Directory of

guacamole-ext/src/main/java/org/apache/guacamole/net/auth/simple/SimpleConnectionRecordSet.java

@@ -20,13 +20,13 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.net.auth.simple;
+package org.apache.guacamole.net.auth.simple;
 
 import java.util.Collection;
 import java.util.Collections;
-import org.glyptodon.guacamole.GuacamoleException;
-import org.glyptodon.guacamole.net.auth.ConnectionRecord;
-import org.glyptodon.guacamole.net.auth.ConnectionRecordSet;
+import org.apache.guacamole.GuacamoleException;
+import org.apache.guacamole.net.auth.ConnectionRecord;
+import org.apache.guacamole.net.auth.ConnectionRecordSet;
 
 /**
  * An immutable and empty ConnectionRecordSet.

guacamole-ext/src/main/java/org/apache/guacamole/net/auth/simple/SimpleDirectory.java

@@ -20,17 +20,17 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.net.auth.simple;
+package org.apache.guacamole.net.auth.simple;
 
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Map;
 import java.util.Set;
-import org.glyptodon.guacamole.GuacamoleException;
-import org.glyptodon.guacamole.GuacamoleSecurityException;
-import org.glyptodon.guacamole.net.auth.Directory;
-import org.glyptodon.guacamole.net.auth.Identifiable;
+import org.apache.guacamole.GuacamoleException;
+import org.apache.guacamole.GuacamoleSecurityException;
+import org.apache.guacamole.net.auth.Directory;
+import org.apache.guacamole.net.auth.Identifiable;
 
 /**
  * An extremely simple read-only implementation of a Directory which provides

guacamole-ext/src/main/java/org/apache/guacamole/net/auth/simple/SimpleObjectPermissionSet.java

@@ -20,16 +20,16 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.net.auth.simple;
+package org.apache.guacamole.net.auth.simple;
 
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Set;
-import org.glyptodon.guacamole.GuacamoleException;
-import org.glyptodon.guacamole.GuacamoleSecurityException;
-import org.glyptodon.guacamole.net.auth.permission.ObjectPermission;
-import org.glyptodon.guacamole.net.auth.permission.ObjectPermissionSet;
+import org.apache.guacamole.GuacamoleException;
+import org.apache.guacamole.GuacamoleSecurityException;
+import org.apache.guacamole.net.auth.permission.ObjectPermission;
+import org.apache.guacamole.net.auth.permission.ObjectPermissionSet;
 
 /**
  * A read-only implementation of ObjectPermissionSet which uses a backing Set

guacamole-ext/src/main/java/org/apache/guacamole/net/auth/simple/SimpleSystemPermissionSet.java

@@ -20,14 +20,14 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.net.auth.simple;
+package org.apache.guacamole.net.auth.simple;
 
 import java.util.Collections;
 import java.util.Set;
-import org.glyptodon.guacamole.GuacamoleException;
-import org.glyptodon.guacamole.GuacamoleSecurityException;
-import org.glyptodon.guacamole.net.auth.permission.SystemPermission;
-import org.glyptodon.guacamole.net.auth.permission.SystemPermissionSet;
+import org.apache.guacamole.GuacamoleException;
+import org.apache.guacamole.GuacamoleSecurityException;
+import org.apache.guacamole.net.auth.permission.SystemPermission;
+import org.apache.guacamole.net.auth.permission.SystemPermissionSet;
 
 /**
  * A read-only implementation of SystemPermissionSet which uses a backing Set

guacamole-ext/src/main/java/org/apache/guacamole/net/auth/simple/SimpleUser.java

@@ -20,18 +20,18 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.net.auth.simple;
+package org.apache.guacamole.net.auth.simple;
 
 import java.util.Collection;
 import java.util.Collections;
 import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
-import org.glyptodon.guacamole.GuacamoleException;
-import org.glyptodon.guacamole.net.auth.AbstractUser;
-import org.glyptodon.guacamole.net.auth.permission.ObjectPermission;
-import org.glyptodon.guacamole.net.auth.permission.ObjectPermissionSet;
-import org.glyptodon.guacamole.net.auth.permission.SystemPermissionSet;
+import org.apache.guacamole.GuacamoleException;
+import org.apache.guacamole.net.auth.AbstractUser;
+import org.apache.guacamole.net.auth.permission.ObjectPermission;
+import org.apache.guacamole.net.auth.permission.ObjectPermissionSet;
+import org.apache.guacamole.net.auth.permission.SystemPermissionSet;
 
 /**
  * An extremely basic User implementation.

guacamole-ext/src/main/java/org/apache/guacamole/net/auth/simple/SimpleUserContext.java

@@ -20,24 +20,24 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.net.auth.simple;
+package org.apache.guacamole.net.auth.simple;
 
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Map;
 import java.util.UUID;
-import org.glyptodon.guacamole.GuacamoleException;
-import org.glyptodon.guacamole.form.Form;
-import org.glyptodon.guacamole.net.auth.ActiveConnection;
-import org.glyptodon.guacamole.net.auth.AuthenticationProvider;
-import org.glyptodon.guacamole.net.auth.Connection;
-import org.glyptodon.guacamole.net.auth.ConnectionGroup;
-import org.glyptodon.guacamole.net.auth.ConnectionRecordSet;
-import org.glyptodon.guacamole.net.auth.Directory;
-import org.glyptodon.guacamole.net.auth.User;
-import org.glyptodon.guacamole.net.auth.UserContext;
-import org.glyptodon.guacamole.protocol.GuacamoleConfiguration;
+import org.apache.guacamole.GuacamoleException;
+import org.apache.guacamole.form.Form;
+import org.apache.guacamole.net.auth.ActiveConnection;
+import org.apache.guacamole.net.auth.AuthenticationProvider;
+import org.apache.guacamole.net.auth.Connection;
+import org.apache.guacamole.net.auth.ConnectionGroup;
+import org.apache.guacamole.net.auth.ConnectionRecordSet;
+import org.apache.guacamole.net.auth.Directory;
+import org.apache.guacamole.net.auth.User;
+import org.apache.guacamole.net.auth.UserContext;
+import org.apache.guacamole.protocol.GuacamoleConfiguration;
 
 /**
  * An extremely simple UserContext implementation which provides access to

guacamole-ext/src/main/java/org/apache/guacamole/net/auth/simple/SimpleUserDirectory.java

@@ -20,10 +20,10 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.net.auth.simple;
+package org.apache.guacamole.net.auth.simple;
 
 import java.util.Collections;
-import org.glyptodon.guacamole.net.auth.User;
+import org.apache.guacamole.net.auth.User;
 
 /**
  * An extremely simple read-only implementation of a Directory of Users which

guacamole-ext/src/main/java/org/apache/guacamole/net/auth/simple/package-info.java

@@ -25,5 +25,5 @@
  * simple AuthenticationProviders in the same way allowed by the old
  * authentication API.
  */
-package org.glyptodon.guacamole.net.auth.simple;
+package org.apache.guacamole.net.auth.simple;
 

guacamole-ext/src/main/java/org/apache/guacamole/net/event/AuthenticationFailureEvent.java

@@ -20,9 +20,9 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.net.event;
+package org.apache.guacamole.net.event;
 
-import org.glyptodon.guacamole.net.auth.Credentials;
+import org.apache.guacamole.net.auth.Credentials;
 
 /**
  * An event which is triggered whenever a user's credentials fail to be

guacamole-ext/src/main/java/org/apache/guacamole/net/event/AuthenticationSuccessEvent.java

@@ -20,10 +20,10 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.net.event;
+package org.apache.guacamole.net.event;
 
-import org.glyptodon.guacamole.net.auth.Credentials;
-import org.glyptodon.guacamole.net.auth.UserContext;
+import org.apache.guacamole.net.auth.Credentials;
+import org.apache.guacamole.net.auth.UserContext;
 
 /**
  * An event which is triggered whenever a user's credentials pass

guacamole-ext/src/main/java/org/apache/guacamole/net/event/CredentialEvent.java

@@ -20,9 +20,9 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.net.event;
+package org.apache.guacamole.net.event;
 
-import org.glyptodon.guacamole.net.auth.Credentials;
+import org.apache.guacamole.net.auth.Credentials;
 
 /**
  * Abstract basis for events which may have associated user credentials when

guacamole-ext/src/main/java/org/apache/guacamole/net/event/TunnelCloseEvent.java

@@ -20,11 +20,11 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.net.event;
+package org.apache.guacamole.net.event;
 
-import org.glyptodon.guacamole.net.GuacamoleTunnel;
-import org.glyptodon.guacamole.net.auth.Credentials;
-import org.glyptodon.guacamole.net.auth.UserContext;
+import org.apache.guacamole.net.GuacamoleTunnel;
+import org.apache.guacamole.net.auth.Credentials;
+import org.apache.guacamole.net.auth.UserContext;
 
 /**
  * An event which is triggered whenever a tunnel is being closed. The tunnel

guacamole-ext/src/main/java/org/apache/guacamole/net/event/TunnelConnectEvent.java

@@ -20,11 +20,11 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.net.event;
+package org.apache.guacamole.net.event;
 
-import org.glyptodon.guacamole.net.GuacamoleTunnel;
-import org.glyptodon.guacamole.net.auth.Credentials;
-import org.glyptodon.guacamole.net.auth.UserContext;
+import org.apache.guacamole.net.GuacamoleTunnel;
+import org.apache.guacamole.net.auth.Credentials;
+import org.apache.guacamole.net.auth.UserContext;
 
 /**
  * An event which is triggered whenever a tunnel is being connected. The tunnel

guacamole-ext/src/main/java/org/apache/guacamole/net/event/TunnelEvent.java

@@ -20,9 +20,9 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.net.event;
+package org.apache.guacamole.net.event;
 
-import org.glyptodon.guacamole.net.GuacamoleTunnel;
+import org.apache.guacamole.net.GuacamoleTunnel;
 
 /**
  * Abstract basis for events associated with tunnels.

guacamole-ext/src/main/java/org/apache/guacamole/net/event/UserEvent.java

@@ -20,9 +20,9 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.net.event;
+package org.apache.guacamole.net.event;
 
-import org.glyptodon.guacamole.net.auth.UserContext;
+import org.apache.guacamole.net.auth.UserContext;
 
 /**
  * Abstract basis for events which may have an associated UserContext when

guacamole-ext/src/main/java/org/apache/guacamole/net/event/listener/AuthenticationFailureListener.java

@@ -20,10 +20,10 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.net.event.listener;
+package org.apache.guacamole.net.event.listener;
 
-import org.glyptodon.guacamole.GuacamoleException;
-import org.glyptodon.guacamole.net.event.AuthenticationFailureEvent;
+import org.apache.guacamole.GuacamoleException;
+import org.apache.guacamole.net.event.AuthenticationFailureEvent;
 
 /**
  * A listener whose authenticationFailed() hook will fire immediately

guacamole-ext/src/main/java/org/apache/guacamole/net/event/listener/AuthenticationSuccessListener.java

@@ -20,10 +20,10 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.net.event.listener;
+package org.apache.guacamole.net.event.listener;
 
-import org.glyptodon.guacamole.GuacamoleException;
-import org.glyptodon.guacamole.net.event.AuthenticationSuccessEvent;
+import org.apache.guacamole.GuacamoleException;
+import org.apache.guacamole.net.event.AuthenticationSuccessEvent;
 
 /**
  * A listener whose hooks will fire immediately before and after a user's

guacamole-ext/src/main/java/org/apache/guacamole/net/event/listener/TunnelCloseListener.java

@@ -20,10 +20,10 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.net.event.listener;
+package org.apache.guacamole.net.event.listener;
 
-import org.glyptodon.guacamole.GuacamoleException;
-import org.glyptodon.guacamole.net.event.TunnelCloseEvent;
+import org.apache.guacamole.GuacamoleException;
+import org.apache.guacamole.net.event.TunnelCloseEvent;
 
 /**
  * A listener whose tunnelClosed() hook will fire immediately after an

guacamole-ext/src/main/java/org/apache/guacamole/net/event/listener/TunnelConnectListener.java

@@ -20,10 +20,10 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.net.event.listener;
+package org.apache.guacamole.net.event.listener;
 
-import org.glyptodon.guacamole.GuacamoleException;
-import org.glyptodon.guacamole.net.event.TunnelConnectEvent;
+import org.apache.guacamole.GuacamoleException;
+import org.apache.guacamole.net.event.TunnelConnectEvent;
 
 /**
  * A listener whose tunnelConnected() hook will fire immediately after a new

guacamole-ext/src/main/java/org/apache/guacamole/net/event/listener/package-info.java

@@ -27,5 +27,5 @@
  * in some cases, prevent the web application from allowing the
  * event to continue for the user that triggered it.
  */
-package org.glyptodon.guacamole.net.event.listener;
+package org.apache.guacamole.net.event.listener;
 

guacamole-ext/src/main/java/org/apache/guacamole/net/event/package-info.java

@@ -26,7 +26,7 @@
  * These event classes are most useful when used with hooks implemented
  * using listener classes.
  *
- * @see org.glyptodon.guacamole.net.event.listener
+ * @see org.apache.guacamole.net.event.listener
  */
-package org.glyptodon.guacamole.net.event;
+package org.apache.guacamole.net.event;
 

guacamole-ext/src/main/java/org/apache/guacamole/properties/BooleanGuacamoleProperty.java

@@ -20,10 +20,10 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.properties;
+package org.apache.guacamole.properties;
 
-import org.glyptodon.guacamole.GuacamoleException;
-import org.glyptodon.guacamole.GuacamoleServerException;
+import org.apache.guacamole.GuacamoleException;
+import org.apache.guacamole.GuacamoleServerException;
 
 /**
  * A GuacamoleProperty whose value is an boolean. Legal true values are "true",

guacamole-ext/src/main/java/org/apache/guacamole/properties/FileGuacamoleProperty.java

@@ -20,10 +20,10 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.properties;
+package org.apache.guacamole.properties;
 
 import java.io.File;
-import org.glyptodon.guacamole.GuacamoleException;
+import org.apache.guacamole.GuacamoleException;
 
 /**
  * A GuacamoleProperty whose value is a filename.

guacamole-ext/src/main/java/org/apache/guacamole/properties/GuacamoleHome.java

@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.properties;
+package org.apache.guacamole.properties;
 
 import java.io.File;
 import org.slf4j.Logger;

guacamole-ext/src/main/java/org/apache/guacamole/properties/GuacamoleProperties.java

@@ -20,15 +20,15 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.properties;
+package org.apache.guacamole.properties;
 
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.Properties;
-import org.glyptodon.guacamole.GuacamoleException;
-import org.glyptodon.guacamole.GuacamoleServerException;
+import org.apache.guacamole.GuacamoleException;
+import org.apache.guacamole.GuacamoleServerException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

guacamole-ext/src/main/java/org/apache/guacamole/properties/GuacamoleProperty.java

@@ -20,9 +20,9 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.properties;
+package org.apache.guacamole.properties;
 
-import org.glyptodon.guacamole.GuacamoleException;
+import org.apache.guacamole.GuacamoleException;
 
 /**
  * An abstract representation of a property in the guacamole.properties file,

guacamole-ext/src/main/java/org/apache/guacamole/properties/IntegerGuacamoleProperty.java

@@ -20,10 +20,10 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.properties;
+package org.apache.guacamole.properties;
 
-import org.glyptodon.guacamole.GuacamoleException;
-import org.glyptodon.guacamole.GuacamoleServerException;
+import org.apache.guacamole.GuacamoleException;
+import org.apache.guacamole.GuacamoleServerException;
 
 /**
  * A GuacamoleProperty whose value is an integer.

guacamole-ext/src/main/java/org/apache/guacamole/properties/LongGuacamoleProperty.java

@@ -20,10 +20,10 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.properties;
+package org.apache.guacamole.properties;
 
-import org.glyptodon.guacamole.GuacamoleException;
-import org.glyptodon.guacamole.GuacamoleServerException;
+import org.apache.guacamole.GuacamoleException;
+import org.apache.guacamole.GuacamoleServerException;
 
 /**
  * A GuacamoleProperty whose value is an long.

guacamole-ext/src/main/java/org/apache/guacamole/properties/StringGuacamoleProperty.java

@@ -20,9 +20,9 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.properties;
+package org.apache.guacamole.properties;
 
-import org.glyptodon.guacamole.GuacamoleException;
+import org.apache.guacamole.GuacamoleException;
 
 /**
  * A GuacamoleProperty whose value is a simple string.

guacamole-ext/src/main/java/org/apache/guacamole/properties/package-info.java

@@ -24,5 +24,5 @@
  * Provides classes for reading properties from the web-application-wide
  * guacamole.properties file.
  */
-package org.glyptodon.guacamole.properties;
+package org.apache.guacamole.properties;
 

guacamole-ext/src/main/java/org/apache/guacamole/protocols/ProtocolInfo.java

@@ -20,11 +20,11 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.protocols;
+package org.apache.guacamole.protocols;
 
 import java.util.ArrayList;
 import java.util.Collection;
-import org.glyptodon.guacamole.form.Form;
+import org.apache.guacamole.form.Form;
 
 /**
  * Describes a protocol and all forms associated with it, as required by

guacamole-ext/src/main/java/org/apache/guacamole/token/StandardTokens.java

@@ -20,11 +20,11 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.token;
+package org.apache.guacamole.token;
 
 import java.text.SimpleDateFormat;
 import java.util.Date;
-import org.glyptodon.guacamole.net.auth.Credentials;
+import org.apache.guacamole.net.auth.Credentials;
 
 /**
  * Utility class which provides access to standardized token names, as well as

guacamole-ext/src/main/java/org/apache/guacamole/token/TokenFilter.java

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

guacamole-ext/src/main/java/org/apache/guacamole/xml/DocumentHandler.java

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

guacamole-ext/src/main/java/org/apache/guacamole/xml/TagHandler.java

@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.xml;
+package org.apache.guacamole.xml;
 
 import org.xml.sax.Attributes;
 import org.xml.sax.SAXException;

guacamole-ext/src/main/java/org/apache/guacamole/xml/package-info.java

@@ -24,5 +24,5 @@
  * Classes driving the SAX-based XML parser used by the Guacamole web
  * application.
  */
-package org.glyptodon.guacamole.xml;
+package org.apache.guacamole.xml;
 

guacamole-ext/src/test/java/org/apache/guacamole/token/TokenFilterTest.java

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