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

guacamole/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</artifactId>
     <packaging>war</packaging>
     <version>0.9.9</version>
@@ -87,7 +87,7 @@
                     <!-- Add files from guacamole-common-js -->
                     <overlays>
                         <overlay>
-                            <groupId>org.glyptodon.guacamole</groupId>
+                            <groupId>org.apache.guacamole</groupId>
                             <artifactId>guacamole-common-js</artifactId>
                             <type>zip</type>
                         </overlay>
@@ -219,21 +219,21 @@
         
         <!-- Guacamole Java API -->
         <dependency>
-            <groupId>org.glyptodon.guacamole</groupId>
+            <groupId>org.apache.guacamole</groupId>
             <artifactId>guacamole-common</artifactId>
             <version>0.9.9</version>
         </dependency>
 
         <!-- Guacamole Extension API -->
         <dependency>
-            <groupId>org.glyptodon.guacamole</groupId>
+            <groupId>org.apache.guacamole</groupId>
             <artifactId>guacamole-ext</artifactId>
             <version>0.9.9</version>
         </dependency>
 
         <!-- Guacamole JavaScript API -->
         <dependency>
-            <groupId>org.glyptodon.guacamole</groupId>
+            <groupId>org.apache.guacamole</groupId>
             <artifactId>guacamole-common-js</artifactId>
             <version>0.9.9</version>
             <type>zip</type>

guacamole/src/main/java/net/sourceforge/guacamole/net/basic/BasicFileAuthenticationProvider.java

@@ -28,17 +28,17 @@ import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 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.auth.Credentials;
-import org.glyptodon.guacamole.net.auth.simple.SimpleAuthenticationProvider;
-import org.glyptodon.guacamole.net.basic.auth.Authorization;
-import org.glyptodon.guacamole.net.basic.auth.UserMapping;
-import org.glyptodon.guacamole.xml.DocumentHandler;
-import org.glyptodon.guacamole.net.basic.xml.usermapping.UserMappingTagHandler;
-import org.glyptodon.guacamole.properties.FileGuacamoleProperty;
-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.auth.Credentials;
+import org.apache.guacamole.net.auth.simple.SimpleAuthenticationProvider;
+import org.apache.guacamole.net.basic.auth.Authorization;
+import org.apache.guacamole.net.basic.auth.UserMapping;
+import org.apache.guacamole.xml.DocumentHandler;
+import org.apache.guacamole.net.basic.xml.usermapping.UserMappingTagHandler;
+import org.apache.guacamole.properties.FileGuacamoleProperty;
+import org.apache.guacamole.protocol.GuacamoleConfiguration;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.xml.sax.InputSource;

guacamole/src/main/java/org/apache/guacamole/net/basic/BasicGuacamoleTunnelServlet.java

@@ -20,14 +20,14 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.net.basic;
+package org.apache.guacamole.net.basic;
 
 import com.google.inject.Inject;
 import com.google.inject.Singleton;
 import javax.servlet.http.HttpServletRequest;
-import org.glyptodon.guacamole.GuacamoleException;
-import org.glyptodon.guacamole.net.GuacamoleTunnel;
-import org.glyptodon.guacamole.servlet.GuacamoleHTTPTunnelServlet;
+import org.apache.guacamole.GuacamoleException;
+import org.apache.guacamole.net.GuacamoleTunnel;
+import org.apache.guacamole.servlet.GuacamoleHTTPTunnelServlet;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

guacamole/src/main/java/org/apache/guacamole/net/basic/BasicServletContextListener.java

@@ -20,21 +20,21 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.net.basic;
+package org.apache.guacamole.net.basic;
 
 import com.google.inject.Guice;
 import com.google.inject.Injector;
 import com.google.inject.Stage;
 import com.google.inject.servlet.GuiceServletContextListener;
 import javax.servlet.ServletContextEvent;
-import org.glyptodon.guacamole.GuacamoleException;
-import org.glyptodon.guacamole.environment.Environment;
-import org.glyptodon.guacamole.environment.LocalEnvironment;
-import org.glyptodon.guacamole.net.basic.extension.ExtensionModule;
-import org.glyptodon.guacamole.net.basic.log.LogModule;
-import org.glyptodon.guacamole.net.basic.rest.RESTServiceModule;
-import org.glyptodon.guacamole.net.basic.rest.auth.BasicTokenSessionMap;
-import org.glyptodon.guacamole.net.basic.rest.auth.TokenSessionMap;
+import org.apache.guacamole.GuacamoleException;
+import org.apache.guacamole.environment.Environment;
+import org.apache.guacamole.environment.LocalEnvironment;
+import org.apache.guacamole.net.basic.extension.ExtensionModule;
+import org.apache.guacamole.net.basic.log.LogModule;
+import org.apache.guacamole.net.basic.rest.RESTServiceModule;
+import org.apache.guacamole.net.basic.rest.auth.BasicTokenSessionMap;
+import org.apache.guacamole.net.basic.rest.auth.TokenSessionMap;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

guacamole/src/main/java/org/apache/guacamole/net/basic/ClipboardState.java

@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.net.basic;
+package org.apache.guacamole.net.basic;
 
 /**
  * Provides central storage for a cross-connection clipboard state. This

guacamole/src/main/java/org/apache/guacamole/net/basic/EnvironmentModule.java

@@ -20,10 +20,10 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.net.basic;
+package org.apache.guacamole.net.basic;
 
 import com.google.inject.AbstractModule;
-import org.glyptodon.guacamole.environment.Environment;
+import org.apache.guacamole.environment.Environment;
 
 /**
  * Guice module which binds the base Guacamole server environment.

guacamole/src/main/java/org/apache/guacamole/net/basic/GuacamoleClassLoader.java

@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.net.basic;
+package org.apache.guacamole.net.basic;
 
 import java.io.File;
 import java.io.FilenameFilter;
@@ -32,10 +32,10 @@ import java.security.PrivilegedActionException;
 import java.security.PrivilegedExceptionAction;
 import java.util.ArrayList;
 import java.util.Collection;
-import org.glyptodon.guacamole.GuacamoleException;
-import org.glyptodon.guacamole.environment.Environment;
-import org.glyptodon.guacamole.environment.LocalEnvironment;
-import org.glyptodon.guacamole.net.basic.properties.BasicGuacamoleProperties;
+import org.apache.guacamole.GuacamoleException;
+import org.apache.guacamole.environment.Environment;
+import org.apache.guacamole.environment.LocalEnvironment;
+import org.apache.guacamole.net.basic.properties.BasicGuacamoleProperties;
 
 /**
  * A ClassLoader implementation which finds classes within a configurable

guacamole/src/main/java/org/apache/guacamole/net/basic/GuacamoleSession.java

@@ -20,17 +20,17 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.net.basic;
+package org.apache.guacamole.net.basic;
 
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
-import org.glyptodon.guacamole.GuacamoleException;
-import org.glyptodon.guacamole.environment.Environment;
-import org.glyptodon.guacamole.net.GuacamoleTunnel;
-import org.glyptodon.guacamole.net.auth.AuthenticatedUser;
-import org.glyptodon.guacamole.net.auth.UserContext;
+import org.apache.guacamole.GuacamoleException;
+import org.apache.guacamole.environment.Environment;
+import org.apache.guacamole.net.GuacamoleTunnel;
+import org.apache.guacamole.net.auth.AuthenticatedUser;
+import org.apache.guacamole.net.auth.UserContext;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

guacamole/src/main/java/org/apache/guacamole/net/basic/HTTPTunnelRequest.java

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

guacamole/src/main/java/org/apache/guacamole/net/basic/TunnelLoader.java

@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.net.basic;
+package org.apache.guacamole.net.basic;
 
 import com.google.inject.Module;
 

guacamole/src/main/java/org/apache/guacamole/net/basic/TunnelModule.java

@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.net.basic;
+package org.apache.guacamole.net.basic;
 
 import com.google.inject.servlet.ServletModule;
 import java.lang.reflect.InvocationTargetException;
@@ -43,10 +43,10 @@ public class TunnelModule extends ServletModule {
      * Classnames of all implementation-specific WebSocket tunnel modules.
      */
     private static final String[] WEBSOCKET_MODULES = {
-        "org.glyptodon.guacamole.net.basic.websocket.WebSocketTunnelModule",
-        "org.glyptodon.guacamole.net.basic.websocket.jetty8.WebSocketTunnelModule",
-        "org.glyptodon.guacamole.net.basic.websocket.jetty9.WebSocketTunnelModule",
-        "org.glyptodon.guacamole.net.basic.websocket.tomcat.WebSocketTunnelModule"
+        "org.apache.guacamole.net.basic.websocket.WebSocketTunnelModule",
+        "org.apache.guacamole.net.basic.websocket.jetty8.WebSocketTunnelModule",
+        "org.apache.guacamole.net.basic.websocket.jetty9.WebSocketTunnelModule",
+        "org.apache.guacamole.net.basic.websocket.tomcat.WebSocketTunnelModule"
     };
 
     private boolean loadWebSocketModule(String classname) {

guacamole/src/main/java/org/apache/guacamole/net/basic/TunnelRequest.java

@@ -20,11 +20,11 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.net.basic;
+package org.apache.guacamole.net.basic;
 
 import java.util.List;
-import org.glyptodon.guacamole.GuacamoleClientException;
-import org.glyptodon.guacamole.GuacamoleException;
+import org.apache.guacamole.GuacamoleClientException;
+import org.apache.guacamole.GuacamoleException;
 
 /**
  * A request object which provides only the functions absolutely required to

guacamole/src/main/java/org/apache/guacamole/net/basic/TunnelRequestService.java

@@ -20,23 +20,23 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.net.basic;
+package org.apache.guacamole.net.basic;
 
 import com.google.inject.Inject;
 import com.google.inject.Singleton;
 import java.util.List;
-import org.glyptodon.guacamole.GuacamoleException;
-import org.glyptodon.guacamole.GuacamoleSecurityException;
-import org.glyptodon.guacamole.GuacamoleUnauthorizedException;
-import org.glyptodon.guacamole.net.DelegatingGuacamoleTunnel;
-import org.glyptodon.guacamole.net.GuacamoleTunnel;
-import org.glyptodon.guacamole.net.auth.Connection;
-import org.glyptodon.guacamole.net.auth.ConnectionGroup;
-import org.glyptodon.guacamole.net.auth.Directory;
-import org.glyptodon.guacamole.net.auth.UserContext;
-import org.glyptodon.guacamole.net.basic.rest.ObjectRetrievalService;
-import org.glyptodon.guacamole.net.basic.rest.auth.AuthenticationService;
-import org.glyptodon.guacamole.protocol.GuacamoleClientInformation;
+import org.apache.guacamole.GuacamoleException;
+import org.apache.guacamole.GuacamoleSecurityException;
+import org.apache.guacamole.GuacamoleUnauthorizedException;
+import org.apache.guacamole.net.DelegatingGuacamoleTunnel;
+import org.apache.guacamole.net.GuacamoleTunnel;
+import org.apache.guacamole.net.auth.Connection;
+import org.apache.guacamole.net.auth.ConnectionGroup;
+import org.apache.guacamole.net.auth.Directory;
+import org.apache.guacamole.net.auth.UserContext;
+import org.apache.guacamole.net.basic.rest.ObjectRetrievalService;
+import org.apache.guacamole.net.basic.rest.auth.AuthenticationService;
+import org.apache.guacamole.protocol.GuacamoleClientInformation;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

guacamole/src/main/java/org/apache/guacamole/net/basic/auth/Authorization.java

@@ -20,14 +20,14 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.net.basic.auth;
+package org.apache.guacamole.net.basic.auth;
 
 import java.io.UnsupportedEncodingException;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
 import java.util.Map;
 import java.util.TreeMap;
-import org.glyptodon.guacamole.protocol.GuacamoleConfiguration;
+import org.apache.guacamole.protocol.GuacamoleConfiguration;
 
 /**
  * Mapping of username/password pair to configuration set. In addition to basic

guacamole/src/main/java/org/apache/guacamole/net/basic/auth/UserMapping.java

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

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

@@ -24,5 +24,5 @@
  * Classes which drive the default, basic authentication of the Guacamole
  * web application.
  */
-package org.glyptodon.guacamole.net.basic.auth;
+package org.apache.guacamole.net.basic.auth;
 

guacamole/src/main/java/org/apache/guacamole/net/basic/extension/AuthenticationProviderFacade.java

@@ -20,17 +20,17 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.net.basic.extension;
+package org.apache.guacamole.net.basic.extension;
 
 import java.lang.reflect.InvocationTargetException;
 import java.util.UUID;
-import org.glyptodon.guacamole.GuacamoleException;
-import org.glyptodon.guacamole.net.auth.AuthenticatedUser;
-import org.glyptodon.guacamole.net.auth.AuthenticationProvider;
-import org.glyptodon.guacamole.net.auth.Credentials;
-import org.glyptodon.guacamole.net.auth.UserContext;
-import org.glyptodon.guacamole.net.auth.credentials.CredentialsInfo;
-import org.glyptodon.guacamole.net.auth.credentials.GuacamoleInvalidCredentialsException;
+import org.apache.guacamole.GuacamoleException;
+import org.apache.guacamole.net.auth.AuthenticatedUser;
+import org.apache.guacamole.net.auth.AuthenticationProvider;
+import org.apache.guacamole.net.auth.Credentials;
+import org.apache.guacamole.net.auth.UserContext;
+import org.apache.guacamole.net.auth.credentials.CredentialsInfo;
+import org.apache.guacamole.net.auth.credentials.GuacamoleInvalidCredentialsException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

guacamole/src/main/java/org/apache/guacamole/net/basic/extension/DirectoryClassLoader.java

@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.net.basic.extension;
+package org.apache.guacamole.net.basic.extension;
 
 import java.io.File;
 import java.io.FilenameFilter;
@@ -32,7 +32,7 @@ import java.security.PrivilegedActionException;
 import java.security.PrivilegedExceptionAction;
 import java.util.ArrayList;
 import java.util.Collection;
-import org.glyptodon.guacamole.GuacamoleException;
+import org.apache.guacamole.GuacamoleException;
 
 /**
  * A ClassLoader implementation which finds classes within .jar files within a

guacamole/src/main/java/org/apache/guacamole/net/basic/extension/Extension.java

@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.net.basic.extension;
+package org.apache.guacamole.net.basic.extension;
 
 import java.io.File;
 import java.io.IOException;
@@ -40,11 +40,11 @@ import java.util.zip.ZipException;
 import java.util.zip.ZipFile;
 import org.codehaus.jackson.JsonParseException;
 import org.codehaus.jackson.map.ObjectMapper;
-import org.glyptodon.guacamole.GuacamoleException;
-import org.glyptodon.guacamole.GuacamoleServerException;
-import org.glyptodon.guacamole.net.auth.AuthenticationProvider;
-import org.glyptodon.guacamole.net.basic.resource.ClassPathResource;
-import org.glyptodon.guacamole.net.basic.resource.Resource;
+import org.apache.guacamole.GuacamoleException;
+import org.apache.guacamole.GuacamoleServerException;
+import org.apache.guacamole.net.auth.AuthenticationProvider;
+import org.apache.guacamole.net.basic.resource.ClassPathResource;
+import org.apache.guacamole.net.basic.resource.Resource;
 
 /**
  * A Guacamole extension, which may provide custom authentication, static

guacamole/src/main/java/org/apache/guacamole/net/basic/extension/ExtensionManifest.java

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

guacamole/src/main/java/org/apache/guacamole/net/basic/extension/ExtensionModule.java

@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.net.basic.extension;
+package org.apache.guacamole.net.basic.extension;
 
 import com.google.inject.Provides;
 import com.google.inject.servlet.ServletModule;
@@ -33,15 +33,15 @@ import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 import net.sourceforge.guacamole.net.basic.BasicFileAuthenticationProvider;
-import org.glyptodon.guacamole.GuacamoleException;
-import org.glyptodon.guacamole.GuacamoleServerException;
-import org.glyptodon.guacamole.environment.Environment;
-import org.glyptodon.guacamole.net.auth.AuthenticationProvider;
-import org.glyptodon.guacamole.net.basic.properties.BasicGuacamoleProperties;
-import org.glyptodon.guacamole.net.basic.resource.Resource;
-import org.glyptodon.guacamole.net.basic.resource.ResourceServlet;
-import org.glyptodon.guacamole.net.basic.resource.SequenceResource;
-import org.glyptodon.guacamole.net.basic.resource.WebApplicationResource;
+import org.apache.guacamole.GuacamoleException;
+import org.apache.guacamole.GuacamoleServerException;
+import org.apache.guacamole.environment.Environment;
+import org.apache.guacamole.net.auth.AuthenticationProvider;
+import org.apache.guacamole.net.basic.properties.BasicGuacamoleProperties;
+import org.apache.guacamole.net.basic.resource.Resource;
+import org.apache.guacamole.net.basic.resource.ResourceServlet;
+import org.apache.guacamole.net.basic.resource.SequenceResource;
+import org.apache.guacamole.net.basic.resource.WebApplicationResource;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

guacamole/src/main/java/org/apache/guacamole/net/basic/extension/LanguageResourceService.java

@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.net.basic.extension;
+package org.apache.guacamole.net.basic.extension;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -36,12 +36,12 @@ import org.codehaus.jackson.JsonNode;
 import org.codehaus.jackson.map.ObjectMapper;
 import org.codehaus.jackson.node.JsonNodeFactory;
 import org.codehaus.jackson.node.ObjectNode;
-import org.glyptodon.guacamole.GuacamoleException;
-import org.glyptodon.guacamole.environment.Environment;
-import org.glyptodon.guacamole.net.basic.properties.BasicGuacamoleProperties;
-import org.glyptodon.guacamole.net.basic.resource.ByteArrayResource;
-import org.glyptodon.guacamole.net.basic.resource.Resource;
-import org.glyptodon.guacamole.net.basic.resource.WebApplicationResource;
+import org.apache.guacamole.GuacamoleException;
+import org.apache.guacamole.environment.Environment;
+import org.apache.guacamole.net.basic.properties.BasicGuacamoleProperties;
+import org.apache.guacamole.net.basic.resource.ByteArrayResource;
+import org.apache.guacamole.net.basic.resource.Resource;
+import org.apache.guacamole.net.basic.resource.WebApplicationResource;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

guacamole/src/main/java/org/apache/guacamole/net/basic/extension/PatchResourceService.java

@@ -20,13 +20,13 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.net.basic.extension;
+package org.apache.guacamole.net.basic.extension;
 
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
-import org.glyptodon.guacamole.net.basic.resource.Resource;
+import org.apache.guacamole.net.basic.resource.Resource;
 
 /**
  * Service which provides access to all HTML patches as resources, and allows

guacamole/src/main/java/org/apache/guacamole/net/basic/extension/package-info.java

@@ -24,4 +24,4 @@
  * Classes which represent and facilitate the loading of extensions to the
  * Guacamole web application.
  */
-package org.glyptodon.guacamole.net.basic.extension;
+package org.apache.guacamole.net.basic.extension;

guacamole/src/main/java/org/apache/guacamole/net/basic/log/LogModule.java

@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.net.basic.log;
+package org.apache.guacamole.net.basic.log;
 
 import ch.qos.logback.classic.LoggerContext;
 import ch.qos.logback.classic.joran.JoranConfigurator;
@@ -28,7 +28,7 @@ import ch.qos.logback.core.joran.spi.JoranException;
 import ch.qos.logback.core.util.StatusPrinter;
 import com.google.inject.AbstractModule;
 import java.io.File;
-import org.glyptodon.guacamole.environment.Environment;
+import org.apache.guacamole.environment.Environment;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

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

@@ -24,5 +24,5 @@
  * Classes specific to the general-purpose web application implemented by
  * the Guacamole project using the Guacamole APIs.
  */
-package org.glyptodon.guacamole.net.basic;
+package org.apache.guacamole.net.basic;
 

guacamole/src/main/java/org/apache/guacamole/net/basic/properties/AuthenticationProviderProperty.java

@@ -20,11 +20,11 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.net.basic.properties;
+package org.apache.guacamole.net.basic.properties;
 
-import org.glyptodon.guacamole.GuacamoleException;
-import org.glyptodon.guacamole.net.auth.AuthenticationProvider;
-import org.glyptodon.guacamole.properties.GuacamoleProperty;
+import org.apache.guacamole.GuacamoleException;
+import org.apache.guacamole.net.auth.AuthenticationProvider;
+import org.apache.guacamole.properties.GuacamoleProperty;
 
 /**
  * A GuacamoleProperty whose value is the name of a class to use to
@@ -49,7 +49,7 @@ public abstract class AuthenticationProviderProperty implements GuacamolePropert
         try {
 
             // Get authentication provider class
-            Class<?> authProviderClass = org.glyptodon.guacamole.net.basic.GuacamoleClassLoader.getInstance().loadClass(authProviderClassName);
+            Class<?> authProviderClass = org.apache.guacamole.net.basic.GuacamoleClassLoader.getInstance().loadClass(authProviderClassName);
 
             // Verify the located class is actually a subclass of AuthenticationProvider
             if (!AuthenticationProvider.class.isAssignableFrom(authProviderClass))

guacamole/src/main/java/org/apache/guacamole/net/basic/properties/BasicGuacamoleProperties.java

@@ -20,11 +20,11 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.net.basic.properties;
+package org.apache.guacamole.net.basic.properties;
 
-import org.glyptodon.guacamole.properties.FileGuacamoleProperty;
-import org.glyptodon.guacamole.properties.IntegerGuacamoleProperty;
-import org.glyptodon.guacamole.properties.StringGuacamoleProperty;
+import org.apache.guacamole.properties.FileGuacamoleProperty;
+import org.apache.guacamole.properties.IntegerGuacamoleProperty;
+import org.apache.guacamole.properties.StringGuacamoleProperty;
 
 /**
  * Properties used by the default Guacamole web application.

guacamole/src/main/java/org/apache/guacamole/net/basic/properties/StringSetProperty.java

@@ -20,15 +20,15 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.net.basic.properties;
+package org.apache.guacamole.net.basic.properties;
 
 import java.util.Arrays;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 import java.util.regex.Pattern;
-import org.glyptodon.guacamole.GuacamoleException;
-import org.glyptodon.guacamole.properties.GuacamoleProperty;
+import org.apache.guacamole.GuacamoleException;
+import org.apache.guacamole.properties.GuacamoleProperty;
 
 /**
  * A GuacamoleProperty whose value is a Set of unique Strings. The string value

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

@@ -24,5 +24,5 @@
  * Classes related to the properties which the Guacamole web application
  * (and stock parts of it) read from guacamole.properties.
  */
-package org.glyptodon.guacamole.net.basic.properties;
+package org.apache.guacamole.net.basic.properties;
 

guacamole/src/main/java/org/apache/guacamole/net/basic/resource/AbstractResource.java

@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.net.basic.resource;
+package org.apache.guacamole.net.basic.resource;
 
 /**
  * Base abstract resource implementation which provides an associated mimetype,

guacamole/src/main/java/org/apache/guacamole/net/basic/resource/ByteArrayResource.java

@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.net.basic.resource;
+package org.apache.guacamole.net.basic.resource;
 
 import java.io.ByteArrayInputStream;
 import java.io.InputStream;

guacamole/src/main/java/org/apache/guacamole/net/basic/resource/ClassPathResource.java

@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.net.basic.resource;
+package org.apache.guacamole.net.basic.resource;
 
 import java.io.InputStream;
 

guacamole/src/main/java/org/apache/guacamole/net/basic/resource/Resource.java

@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.net.basic.resource;
+package org.apache.guacamole.net.basic.resource;
 
 import java.io.InputStream;
 

guacamole/src/main/java/org/apache/guacamole/net/basic/resource/ResourceServlet.java

@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.net.basic.resource;
+package org.apache.guacamole.net.basic.resource;
 
 import java.io.IOException;
 import java.io.InputStream;

guacamole/src/main/java/org/apache/guacamole/net/basic/resource/SequenceResource.java

@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.net.basic.resource;
+package org.apache.guacamole.net.basic.resource;
 
 import java.io.InputStream;
 import java.io.SequenceInputStream;

guacamole/src/main/java/org/apache/guacamole/net/basic/resource/WebApplicationResource.java

@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.net.basic.resource;
+package org.apache.guacamole.net.basic.resource;
 
 import java.io.InputStream;
 import javax.servlet.ServletContext;

guacamole/src/main/java/org/apache/guacamole/net/basic/resource/package-info.java

@@ -25,4 +25,4 @@
  * the contents of the classpath of a classloader, or files within the web
  * application itself.
  */
-package org.glyptodon.guacamole.net.basic.resource;
+package org.apache.guacamole.net.basic.resource;

guacamole/src/main/java/org/apache/guacamole/net/basic/rest/APIError.java

@@ -20,11 +20,11 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.net.basic.rest;
+package org.apache.guacamole.net.basic.rest;
 
 import java.util.Collection;
 import javax.ws.rs.core.Response;
-import org.glyptodon.guacamole.form.Field;
+import org.apache.guacamole.form.Field;
 
 /**
  * Describes an error that occurred within a REST endpoint.

guacamole/src/main/java/org/apache/guacamole/net/basic/rest/APIException.java

@@ -20,12 +20,12 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.net.basic.rest;
+package org.apache.guacamole.net.basic.rest;
 
 import java.util.Collection;
 import javax.ws.rs.WebApplicationException;
 import javax.ws.rs.core.Response;
-import org.glyptodon.guacamole.form.Field;
+import org.apache.guacamole.form.Field;
 
 /**
  * An exception that will result in the given error error information being

guacamole/src/main/java/org/apache/guacamole/net/basic/rest/APIPatch.java

@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.net.basic.rest;
+package org.apache.guacamole.net.basic.rest;
 
 /**
  * An object for representing the body of a HTTP PATCH method.

guacamole/src/main/java/org/apache/guacamole/net/basic/rest/APIRequest.java

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

guacamole/src/main/java/org/apache/guacamole/net/basic/rest/ObjectRetrievalService.java

@@ -20,19 +20,19 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.net.basic.rest;
+package org.apache.guacamole.net.basic.rest;
 
 import java.util.List;
-import org.glyptodon.guacamole.GuacamoleException;
-import org.glyptodon.guacamole.GuacamoleResourceNotFoundException;
-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.Directory;
-import org.glyptodon.guacamole.net.auth.User;
-import org.glyptodon.guacamole.net.auth.UserContext;
-import org.glyptodon.guacamole.net.basic.GuacamoleSession;
-import org.glyptodon.guacamole.net.basic.rest.connectiongroup.APIConnectionGroup;
+import org.apache.guacamole.GuacamoleException;
+import org.apache.guacamole.GuacamoleResourceNotFoundException;
+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.Directory;
+import org.apache.guacamole.net.auth.User;
+import org.apache.guacamole.net.auth.UserContext;
+import org.apache.guacamole.net.basic.GuacamoleSession;
+import org.apache.guacamole.net.basic.rest.connectiongroup.APIConnectionGroup;
 
 /**
  * Provides easy access and automatic error handling for retrieval of objects,

guacamole/src/main/java/org/apache/guacamole/net/basic/rest/PATCH.java

@@ -21,7 +21,7 @@
  */
 
 
-package org.glyptodon.guacamole.net.basic.rest;
+package org.apache.guacamole.net.basic.rest;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

guacamole/src/main/java/org/apache/guacamole/net/basic/rest/RESTExceptionWrapper.java

@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.net.basic.rest;
+package org.apache.guacamole.net.basic.rest;
 
 import com.google.inject.Inject;
 import java.lang.annotation.Annotation;
@@ -29,14 +29,14 @@ import javax.ws.rs.FormParam;
 import javax.ws.rs.QueryParam;
 import org.aopalliance.intercept.MethodInterceptor;
 import org.aopalliance.intercept.MethodInvocation;
-import org.glyptodon.guacamole.GuacamoleClientException;
-import org.glyptodon.guacamole.GuacamoleException;
-import org.glyptodon.guacamole.GuacamoleResourceNotFoundException;
-import org.glyptodon.guacamole.GuacamoleSecurityException;
-import org.glyptodon.guacamole.GuacamoleUnauthorizedException;
-import org.glyptodon.guacamole.net.auth.credentials.GuacamoleInsufficientCredentialsException;
-import org.glyptodon.guacamole.net.auth.credentials.GuacamoleInvalidCredentialsException;
-import org.glyptodon.guacamole.net.basic.rest.auth.AuthenticationService;
+import org.apache.guacamole.GuacamoleClientException;
+import org.apache.guacamole.GuacamoleException;
+import org.apache.guacamole.GuacamoleResourceNotFoundException;
+import org.apache.guacamole.GuacamoleSecurityException;
+import org.apache.guacamole.GuacamoleUnauthorizedException;
+import org.apache.guacamole.net.auth.credentials.GuacamoleInsufficientCredentialsException;
+import org.apache.guacamole.net.auth.credentials.GuacamoleInvalidCredentialsException;
+import org.apache.guacamole.net.basic.rest.auth.AuthenticationService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

guacamole/src/main/java/org/apache/guacamole/net/basic/rest/RESTMethodMatcher.java

@@ -20,13 +20,13 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.net.basic.rest;
+package org.apache.guacamole.net.basic.rest;
 
 import com.google.inject.matcher.AbstractMatcher;
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Method;
 import javax.ws.rs.HttpMethod;
-import org.glyptodon.guacamole.GuacamoleException;
+import org.apache.guacamole.GuacamoleException;
 
 /**
  * A Guice Matcher which matches only methods which throw GuacamoleException

guacamole/src/main/java/org/apache/guacamole/net/basic/rest/RESTServiceModule.java

@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.net.basic.rest;
+package org.apache.guacamole.net.basic.rest;
 
 import com.google.inject.Scopes;
 import com.google.inject.matcher.Matchers;
@@ -28,19 +28,19 @@ import com.google.inject.servlet.ServletModule;
 import com.sun.jersey.guice.spi.container.servlet.GuiceContainer;
 import org.aopalliance.intercept.MethodInterceptor;
 import org.codehaus.jackson.jaxrs.JacksonJsonProvider;
-import org.glyptodon.guacamole.net.basic.rest.auth.TokenRESTService;
-import org.glyptodon.guacamole.net.basic.rest.connection.ConnectionRESTService;
-import org.glyptodon.guacamole.net.basic.rest.connectiongroup.ConnectionGroupRESTService;
-import org.glyptodon.guacamole.net.basic.rest.activeconnection.ActiveConnectionRESTService;
-import org.glyptodon.guacamole.net.basic.rest.auth.AuthTokenGenerator;
-import org.glyptodon.guacamole.net.basic.rest.auth.AuthenticationService;
-import org.glyptodon.guacamole.net.basic.rest.auth.SecureRandomAuthTokenGenerator;
-import org.glyptodon.guacamole.net.basic.rest.auth.TokenSessionMap;
-import org.glyptodon.guacamole.net.basic.rest.history.HistoryRESTService;
-import org.glyptodon.guacamole.net.basic.rest.language.LanguageRESTService;
-import org.glyptodon.guacamole.net.basic.rest.patch.PatchRESTService;
-import org.glyptodon.guacamole.net.basic.rest.schema.SchemaRESTService;
-import org.glyptodon.guacamole.net.basic.rest.user.UserRESTService;
+import org.apache.guacamole.net.basic.rest.auth.TokenRESTService;
+import org.apache.guacamole.net.basic.rest.connection.ConnectionRESTService;
+import org.apache.guacamole.net.basic.rest.connectiongroup.ConnectionGroupRESTService;
+import org.apache.guacamole.net.basic.rest.activeconnection.ActiveConnectionRESTService;
+import org.apache.guacamole.net.basic.rest.auth.AuthTokenGenerator;
+import org.apache.guacamole.net.basic.rest.auth.AuthenticationService;
+import org.apache.guacamole.net.basic.rest.auth.SecureRandomAuthTokenGenerator;
+import org.apache.guacamole.net.basic.rest.auth.TokenSessionMap;
+import org.apache.guacamole.net.basic.rest.history.HistoryRESTService;
+import org.apache.guacamole.net.basic.rest.language.LanguageRESTService;
+import org.apache.guacamole.net.basic.rest.patch.PatchRESTService;
+import org.apache.guacamole.net.basic.rest.schema.SchemaRESTService;
+import org.apache.guacamole.net.basic.rest.user.UserRESTService;
 
 /**
  * A Guice Module to set up the servlet mappings and authentication-specific

guacamole/src/main/java/org/apache/guacamole/net/basic/rest/activeconnection/APIActiveConnection.java

@@ -20,10 +20,10 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.net.basic.rest.activeconnection;
+package org.apache.guacamole.net.basic.rest.activeconnection;
 
 import java.util.Date;
-import org.glyptodon.guacamole.net.auth.ActiveConnection;
+import org.apache.guacamole.net.auth.ActiveConnection;
 
 /**
  * Information related to active connections which may be exposed through the

guacamole/src/main/java/org/apache/guacamole/net/basic/rest/activeconnection/ActiveConnectionRESTService.java

@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.net.basic.rest.activeconnection;
+package org.apache.guacamole.net.basic.rest.activeconnection;
 
 import com.google.inject.Inject;
 import java.util.Collection;
@@ -34,22 +34,22 @@ import javax.ws.rs.PathParam;
 import javax.ws.rs.Produces;
 import javax.ws.rs.QueryParam;
 import javax.ws.rs.core.MediaType;
-import org.glyptodon.guacamole.GuacamoleClientException;
-import org.glyptodon.guacamole.GuacamoleException;
-import org.glyptodon.guacamole.GuacamoleUnsupportedException;
-import org.glyptodon.guacamole.net.auth.ActiveConnection;
-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.net.auth.permission.ObjectPermission;
-import org.glyptodon.guacamole.net.auth.permission.ObjectPermissionSet;
-import org.glyptodon.guacamole.net.auth.permission.SystemPermission;
-import org.glyptodon.guacamole.net.auth.permission.SystemPermissionSet;
-import org.glyptodon.guacamole.net.basic.GuacamoleSession;
-import org.glyptodon.guacamole.net.basic.rest.APIPatch;
-import org.glyptodon.guacamole.net.basic.rest.ObjectRetrievalService;
-import org.glyptodon.guacamole.net.basic.rest.PATCH;
-import org.glyptodon.guacamole.net.basic.rest.auth.AuthenticationService;
+import org.apache.guacamole.GuacamoleClientException;
+import org.apache.guacamole.GuacamoleException;
+import org.apache.guacamole.GuacamoleUnsupportedException;
+import org.apache.guacamole.net.auth.ActiveConnection;
+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.net.auth.permission.ObjectPermission;
+import org.apache.guacamole.net.auth.permission.ObjectPermissionSet;
+import org.apache.guacamole.net.auth.permission.SystemPermission;
+import org.apache.guacamole.net.auth.permission.SystemPermissionSet;
+import org.apache.guacamole.net.basic.GuacamoleSession;
+import org.apache.guacamole.net.basic.rest.APIPatch;
+import org.apache.guacamole.net.basic.rest.ObjectRetrievalService;
+import org.apache.guacamole.net.basic.rest.PATCH;
+import org.apache.guacamole.net.basic.rest.auth.AuthenticationService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

guacamole/src/main/java/org/apache/guacamole/net/basic/rest/auth/APIAuthenticationResponse.java

@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.net.basic.rest.auth;
+package org.apache.guacamole.net.basic.rest.auth;
 
 /**
  * A simple object to represent an auth token/username pair in the API.

guacamole/src/main/java/org/apache/guacamole/net/basic/rest/auth/APIAuthenticationResult.java

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

guacamole/src/main/java/org/apache/guacamole/net/basic/rest/auth/AuthTokenGenerator.java

@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.net.basic.rest.auth;
+package org.apache.guacamole.net.basic.rest.auth;
 
 /**
  * Generates an auth token for an authenticated user.

guacamole/src/main/java/org/apache/guacamole/net/basic/rest/auth/AuthenticationService.java

@@ -20,25 +20,25 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.net.basic.rest.auth;
+package org.apache.guacamole.net.basic.rest.auth;
 
 import com.google.inject.Inject;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.regex.Pattern;
 import javax.servlet.http.HttpServletRequest;
-import org.glyptodon.guacamole.GuacamoleException;
-import org.glyptodon.guacamole.GuacamoleSecurityException;
-import org.glyptodon.guacamole.GuacamoleUnauthorizedException;
-import org.glyptodon.guacamole.environment.Environment;
-import org.glyptodon.guacamole.net.auth.AuthenticatedUser;
-import org.glyptodon.guacamole.net.auth.AuthenticationProvider;
-import org.glyptodon.guacamole.net.auth.Credentials;
-import org.glyptodon.guacamole.net.auth.UserContext;
-import org.glyptodon.guacamole.net.auth.credentials.CredentialsInfo;
-import org.glyptodon.guacamole.net.auth.credentials.GuacamoleCredentialsException;
-import org.glyptodon.guacamole.net.auth.credentials.GuacamoleInvalidCredentialsException;
-import org.glyptodon.guacamole.net.basic.GuacamoleSession;
+import org.apache.guacamole.GuacamoleException;
+import org.apache.guacamole.GuacamoleSecurityException;
+import org.apache.guacamole.GuacamoleUnauthorizedException;
+import org.apache.guacamole.environment.Environment;
+import org.apache.guacamole.net.auth.AuthenticatedUser;
+import org.apache.guacamole.net.auth.AuthenticationProvider;
+import org.apache.guacamole.net.auth.Credentials;
+import org.apache.guacamole.net.auth.UserContext;
+import org.apache.guacamole.net.auth.credentials.CredentialsInfo;
+import org.apache.guacamole.net.auth.credentials.GuacamoleCredentialsException;
+import org.apache.guacamole.net.auth.credentials.GuacamoleInvalidCredentialsException;
+import org.apache.guacamole.net.basic.GuacamoleSession;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

guacamole/src/main/java/org/apache/guacamole/net/basic/rest/auth/BasicTokenSessionMap.java

@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.net.basic.rest.auth;
+package org.apache.guacamole.net.basic.rest.auth;
 
 import java.util.Iterator;
 import java.util.Map;
@@ -29,10 +29,10 @@ 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.environment.Environment;
-import org.glyptodon.guacamole.net.basic.GuacamoleSession;
-import org.glyptodon.guacamole.net.basic.properties.BasicGuacamoleProperties;
+import org.apache.guacamole.GuacamoleException;
+import org.apache.guacamole.environment.Environment;
+import org.apache.guacamole.net.basic.GuacamoleSession;
+import org.apache.guacamole.net.basic.properties.BasicGuacamoleProperties;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

guacamole/src/main/java/org/apache/guacamole/net/basic/rest/auth/SecureRandomAuthTokenGenerator.java

@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.net.basic.rest.auth;
+package org.apache.guacamole.net.basic.rest.auth;
 
 import java.security.SecureRandom;
 import org.apache.commons.codec.binary.Hex;

guacamole/src/main/java/org/apache/guacamole/net/basic/rest/auth/TokenRESTService.java

@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.net.basic.rest.auth;
+package org.apache.guacamole.net.basic.rest.auth;
 
 import com.google.inject.Inject;
 import java.io.UnsupportedEncodingException;
@@ -37,13 +37,13 @@ import javax.ws.rs.core.Context;
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.MultivaluedMap;
 import javax.xml.bind.DatatypeConverter;
-import org.glyptodon.guacamole.GuacamoleException;
-import org.glyptodon.guacamole.GuacamoleResourceNotFoundException;
-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.net.basic.GuacamoleSession;
-import org.glyptodon.guacamole.net.basic.rest.APIRequest;
+import org.apache.guacamole.GuacamoleException;
+import org.apache.guacamole.GuacamoleResourceNotFoundException;
+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.net.basic.GuacamoleSession;
+import org.apache.guacamole.net.basic.rest.APIRequest;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

guacamole/src/main/java/org/apache/guacamole/net/basic/rest/auth/TokenSessionMap.java

@@ -20,9 +20,9 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.net.basic.rest.auth;
+package org.apache.guacamole.net.basic.rest.auth;
 
-import org.glyptodon.guacamole.net.basic.GuacamoleSession;
+import org.apache.guacamole.net.basic.GuacamoleSession;
 
 /**
  * Represents a mapping of auth token to Guacamole session for the REST 

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

@@ -23,5 +23,5 @@
 /**
  * Classes related to the authentication aspect of the Guacamole REST API.
  */
-package org.glyptodon.guacamole.net.basic.rest.auth;
+package org.apache.guacamole.net.basic.rest.auth;
 

guacamole/src/main/java/org/apache/guacamole/net/basic/rest/connection/APIConnection.java

@@ -20,14 +20,14 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.net.basic.rest.connection;
+package org.apache.guacamole.net.basic.rest.connection;
 
 import java.util.Map;
 import org.codehaus.jackson.annotate.JsonIgnoreProperties;
 import org.codehaus.jackson.map.annotate.JsonSerialize;
-import org.glyptodon.guacamole.GuacamoleException;
-import org.glyptodon.guacamole.net.auth.Connection;
-import org.glyptodon.guacamole.protocol.GuacamoleConfiguration;
+import org.apache.guacamole.GuacamoleException;
+import org.apache.guacamole.net.auth.Connection;
+import org.apache.guacamole.protocol.GuacamoleConfiguration;
 
 /**
  * A simple connection to expose through the REST endpoints.

guacamole/src/main/java/org/apache/guacamole/net/basic/rest/connection/APIConnectionWrapper.java

@@ -20,21 +20,21 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.net.basic.rest.connection;
+package org.apache.guacamole.net.basic.rest.connection;
 
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
-import org.glyptodon.guacamole.GuacamoleException;
-import org.glyptodon.guacamole.net.GuacamoleTunnel;
-import org.glyptodon.guacamole.net.auth.Connection;
-import org.glyptodon.guacamole.net.auth.ConnectionRecord;
-import org.glyptodon.guacamole.protocol.GuacamoleClientInformation;
-import org.glyptodon.guacamole.protocol.GuacamoleConfiguration;
+import org.apache.guacamole.GuacamoleException;
+import org.apache.guacamole.net.GuacamoleTunnel;
+import org.apache.guacamole.net.auth.Connection;
+import org.apache.guacamole.net.auth.ConnectionRecord;
+import org.apache.guacamole.protocol.GuacamoleClientInformation;
+import org.apache.guacamole.protocol.GuacamoleConfiguration;
 
 /**
  * A wrapper to make an APIConnection look like a Connection. Useful where a
- * org.glyptodon.guacamole.net.auth.Connection is required.
+ * org.apache.guacamole.net.auth.Connection is required.
  * 
  * @author James Muehlner
  */

guacamole/src/main/java/org/apache/guacamole/net/basic/rest/connection/ConnectionRESTService.java

@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.net.basic.rest.connection;
+package org.apache.guacamole.net.basic.rest.connection;
 
 import com.google.inject.Inject;
 import java.util.ArrayList;
@@ -36,23 +36,23 @@ import javax.ws.rs.PathParam;
 import javax.ws.rs.Produces;
 import javax.ws.rs.QueryParam;
 import javax.ws.rs.core.MediaType;
-import org.glyptodon.guacamole.GuacamoleClientException;
-import org.glyptodon.guacamole.GuacamoleException;
-import org.glyptodon.guacamole.GuacamoleSecurityException;
-import org.glyptodon.guacamole.net.auth.Connection;
-import org.glyptodon.guacamole.net.auth.ConnectionRecord;
-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.net.auth.permission.ObjectPermission;
-import org.glyptodon.guacamole.net.auth.permission.ObjectPermissionSet;
-import org.glyptodon.guacamole.net.auth.permission.SystemPermission;
-import org.glyptodon.guacamole.net.auth.permission.SystemPermissionSet;
-import org.glyptodon.guacamole.net.basic.GuacamoleSession;
-import org.glyptodon.guacamole.net.basic.rest.ObjectRetrievalService;
-import org.glyptodon.guacamole.net.basic.rest.auth.AuthenticationService;
-import org.glyptodon.guacamole.net.basic.rest.history.APIConnectionRecord;
-import org.glyptodon.guacamole.protocol.GuacamoleConfiguration;
+import org.apache.guacamole.GuacamoleClientException;
+import org.apache.guacamole.GuacamoleException;
+import org.apache.guacamole.GuacamoleSecurityException;
+import org.apache.guacamole.net.auth.Connection;
+import org.apache.guacamole.net.auth.ConnectionRecord;
+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.net.auth.permission.ObjectPermission;
+import org.apache.guacamole.net.auth.permission.ObjectPermissionSet;
+import org.apache.guacamole.net.auth.permission.SystemPermission;
+import org.apache.guacamole.net.auth.permission.SystemPermissionSet;
+import org.apache.guacamole.net.basic.GuacamoleSession;
+import org.apache.guacamole.net.basic.rest.ObjectRetrievalService;
+import org.apache.guacamole.net.basic.rest.auth.AuthenticationService;
+import org.apache.guacamole.net.basic.rest.history.APIConnectionRecord;
+import org.apache.guacamole.protocol.GuacamoleConfiguration;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

guacamole/src/main/java/org/apache/guacamole/net/basic/rest/connection/package-info.java

@@ -23,5 +23,5 @@
 /**
  * Classes related to the connection manipulation aspect of the Guacamole REST API.
  */
-package org.glyptodon.guacamole.net.basic.rest.connection;
+package org.apache.guacamole.net.basic.rest.connection;
 

guacamole/src/main/java/org/apache/guacamole/net/basic/rest/connectiongroup/APIConnectionGroup.java

@@ -20,15 +20,15 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.net.basic.rest.connectiongroup;
+package org.apache.guacamole.net.basic.rest.connectiongroup;
 
 import java.util.Collection;
 import java.util.Map;
 import org.codehaus.jackson.annotate.JsonIgnoreProperties;
 import org.codehaus.jackson.map.annotate.JsonSerialize;
-import org.glyptodon.guacamole.net.auth.ConnectionGroup;
-import org.glyptodon.guacamole.net.auth.ConnectionGroup.Type;
-import org.glyptodon.guacamole.net.basic.rest.connection.APIConnection;
+import org.apache.guacamole.net.auth.ConnectionGroup;
+import org.apache.guacamole.net.auth.ConnectionGroup.Type;
+import org.apache.guacamole.net.basic.rest.connection.APIConnection;
 
 /**
  * A simple connection group to expose through the REST endpoints.

guacamole/src/main/java/org/apache/guacamole/net/basic/rest/connectiongroup/APIConnectionGroupWrapper.java

@@ -20,18 +20,18 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.net.basic.rest.connectiongroup;
+package org.apache.guacamole.net.basic.rest.connectiongroup;
 
 import java.util.Map;
 import java.util.Set;
-import org.glyptodon.guacamole.GuacamoleException;
-import org.glyptodon.guacamole.net.GuacamoleTunnel;
-import org.glyptodon.guacamole.net.auth.ConnectionGroup;
-import org.glyptodon.guacamole.protocol.GuacamoleClientInformation;
+import org.apache.guacamole.GuacamoleException;
+import org.apache.guacamole.net.GuacamoleTunnel;
+import org.apache.guacamole.net.auth.ConnectionGroup;
+import org.apache.guacamole.protocol.GuacamoleClientInformation;
 
 /**
  * A wrapper to make an APIConnection look like a ConnectionGroup.
- * Useful where a org.glyptodon.guacamole.net.auth.ConnectionGroup is required.
+ * Useful where a org.apache.guacamole.net.auth.ConnectionGroup is required.
  * 
  * @author James Muehlner
  */

guacamole/src/main/java/org/apache/guacamole/net/basic/rest/connectiongroup/ConnectionGroupRESTService.java

@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.net.basic.rest.connectiongroup;
+package org.apache.guacamole.net.basic.rest.connectiongroup;
 
 import com.google.inject.Inject;
 import java.util.List;
@@ -34,15 +34,15 @@ import javax.ws.rs.PathParam;
 import javax.ws.rs.Produces;
 import javax.ws.rs.QueryParam;
 import javax.ws.rs.core.MediaType;
-import org.glyptodon.guacamole.GuacamoleClientException;
-import org.glyptodon.guacamole.GuacamoleException;
-import org.glyptodon.guacamole.net.auth.ConnectionGroup;
-import org.glyptodon.guacamole.net.auth.Directory;
-import org.glyptodon.guacamole.net.auth.UserContext;
-import org.glyptodon.guacamole.net.auth.permission.ObjectPermission;
-import org.glyptodon.guacamole.net.basic.GuacamoleSession;
-import org.glyptodon.guacamole.net.basic.rest.ObjectRetrievalService;
-import org.glyptodon.guacamole.net.basic.rest.auth.AuthenticationService;
+import org.apache.guacamole.GuacamoleClientException;
+import org.apache.guacamole.GuacamoleException;
+import org.apache.guacamole.net.auth.ConnectionGroup;
+import org.apache.guacamole.net.auth.Directory;
+import org.apache.guacamole.net.auth.UserContext;
+import org.apache.guacamole.net.auth.permission.ObjectPermission;
+import org.apache.guacamole.net.basic.GuacamoleSession;
+import org.apache.guacamole.net.basic.rest.ObjectRetrievalService;
+import org.apache.guacamole.net.basic.rest.auth.AuthenticationService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

guacamole/src/main/java/org/apache/guacamole/net/basic/rest/connectiongroup/ConnectionGroupTree.java

@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.net.basic.rest.connectiongroup;
+package org.apache.guacamole.net.basic.rest.connectiongroup;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -28,13 +28,13 @@ import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import org.glyptodon.guacamole.GuacamoleException;
-import org.glyptodon.guacamole.net.auth.Connection;
-import org.glyptodon.guacamole.net.auth.ConnectionGroup;
-import org.glyptodon.guacamole.net.auth.UserContext;
-import org.glyptodon.guacamole.net.auth.permission.ObjectPermission;
-import org.glyptodon.guacamole.net.auth.permission.ObjectPermissionSet;
-import org.glyptodon.guacamole.net.basic.rest.connection.APIConnection;
+import org.apache.guacamole.GuacamoleException;
+import org.apache.guacamole.net.auth.Connection;
+import org.apache.guacamole.net.auth.ConnectionGroup;
+import org.apache.guacamole.net.auth.UserContext;
+import org.apache.guacamole.net.auth.permission.ObjectPermission;
+import org.apache.guacamole.net.auth.permission.ObjectPermissionSet;
+import org.apache.guacamole.net.basic.rest.connection.APIConnection;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

guacamole/src/main/java/org/apache/guacamole/net/basic/rest/connectiongroup/package-info.java

@@ -24,5 +24,5 @@
  * Classes related to the connection group manipulation aspect
  * of the Guacamole REST API.
  */
-package org.glyptodon.guacamole.net.basic.rest.connectiongroup;
+package org.apache.guacamole.net.basic.rest.connectiongroup;
 

guacamole/src/main/java/org/apache/guacamole/net/basic/rest/history/APIConnectionRecord.java

@@ -20,10 +20,10 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.net.basic.rest.history;
+package org.apache.guacamole.net.basic.rest.history;
 
 import java.util.Date;
-import org.glyptodon.guacamole.net.auth.ConnectionRecord;
+import org.apache.guacamole.net.auth.ConnectionRecord;
 
 /**
  * A connection record which may be exposed through the REST endpoints.

guacamole/src/main/java/org/apache/guacamole/net/basic/rest/history/APIConnectionRecordSortPredicate.java

@@ -20,11 +20,11 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.net.basic.rest.history;
+package org.apache.guacamole.net.basic.rest.history;
 
-import org.glyptodon.guacamole.net.auth.ConnectionRecordSet;
-import org.glyptodon.guacamole.net.basic.rest.APIError;
-import org.glyptodon.guacamole.net.basic.rest.APIException;
+import org.apache.guacamole.net.auth.ConnectionRecordSet;
+import org.apache.guacamole.net.basic.rest.APIError;
+import org.apache.guacamole.net.basic.rest.APIException;
 
 /**
  * A sort predicate which species the property to use when sorting connection

guacamole/src/main/java/org/apache/guacamole/net/basic/rest/history/HistoryRESTService.java

@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.net.basic.rest.history;
+package org.apache.guacamole.net.basic.rest.history;
 
 import com.google.inject.Inject;
 import java.util.ArrayList;
@@ -32,13 +32,13 @@ import javax.ws.rs.PathParam;
 import javax.ws.rs.Produces;
 import javax.ws.rs.QueryParam;
 import javax.ws.rs.core.MediaType;
-import org.glyptodon.guacamole.GuacamoleException;
-import org.glyptodon.guacamole.net.auth.ConnectionRecord;
-import org.glyptodon.guacamole.net.auth.ConnectionRecordSet;
-import org.glyptodon.guacamole.net.auth.UserContext;
-import org.glyptodon.guacamole.net.basic.GuacamoleSession;
-import org.glyptodon.guacamole.net.basic.rest.ObjectRetrievalService;
-import org.glyptodon.guacamole.net.basic.rest.auth.AuthenticationService;
+import org.apache.guacamole.GuacamoleException;
+import org.apache.guacamole.net.auth.ConnectionRecord;
+import org.apache.guacamole.net.auth.ConnectionRecordSet;
+import org.apache.guacamole.net.auth.UserContext;
+import org.apache.guacamole.net.basic.GuacamoleSession;
+import org.apache.guacamole.net.basic.rest.ObjectRetrievalService;
+import org.apache.guacamole.net.basic.rest.auth.AuthenticationService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

guacamole/src/main/java/org/apache/guacamole/net/basic/rest/history/package-info.java

@@ -24,5 +24,5 @@
  * Classes related to retrieval or maintenance of history records using the
  * Guacamole REST API.
  */
-package org.glyptodon.guacamole.net.basic.rest.history;
+package org.apache.guacamole.net.basic.rest.history;
 

guacamole/src/main/java/org/apache/guacamole/net/basic/rest/language/LanguageRESTService.java

@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.net.basic.rest.language;
+package org.apache.guacamole.net.basic.rest.language;
 
 import com.google.inject.Inject;
 import java.util.Map;
@@ -28,7 +28,7 @@ import javax.ws.rs.GET;
 import javax.ws.rs.Path;
 import javax.ws.rs.Produces;
 import javax.ws.rs.core.MediaType;
-import org.glyptodon.guacamole.net.basic.extension.LanguageResourceService;
+import org.apache.guacamole.net.basic.extension.LanguageResourceService;
 
 
 /**

guacamole/src/main/java/org/apache/guacamole/net/basic/rest/language/package-info.java

@@ -23,5 +23,5 @@
 /**
  * Classes related to the language retrieval aspect of the Guacamole REST API.
  */
-package org.glyptodon.guacamole.net.basic.rest.language;
+package org.apache.guacamole.net.basic.rest.language;
 

guacamole/src/main/java/org/apache/guacamole/net/basic/rest/package-info.java

@@ -23,5 +23,5 @@
 /**
  * Classes related to the basic Guacamole REST API.
  */
-package org.glyptodon.guacamole.net.basic.rest;
+package org.apache.guacamole.net.basic.rest;
 

guacamole/src/main/java/org/apache/guacamole/net/basic/rest/patch/PatchRESTService.java

@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.net.basic.rest.patch;
+package org.apache.guacamole.net.basic.rest.patch;
 
 import com.google.inject.Inject;
 import java.io.IOException;
@@ -32,10 +32,10 @@ import javax.ws.rs.GET;
 import javax.ws.rs.Path;
 import javax.ws.rs.Produces;
 import javax.ws.rs.core.MediaType;
-import org.glyptodon.guacamole.GuacamoleException;
-import org.glyptodon.guacamole.GuacamoleServerException;
-import org.glyptodon.guacamole.net.basic.extension.PatchResourceService;
-import org.glyptodon.guacamole.net.basic.resource.Resource;
+import org.apache.guacamole.GuacamoleException;
+import org.apache.guacamole.GuacamoleServerException;
+import org.apache.guacamole.net.basic.extension.PatchResourceService;
+import org.apache.guacamole.net.basic.resource.Resource;
 
 /**
  * A REST Service for handling the listing of HTML patches.

guacamole/src/main/java/org/apache/guacamole/net/basic/rest/patch/package-info.java

@@ -23,5 +23,5 @@
 /**
  * Classes related to the HTML patch retrieval aspect of the Guacamole REST API.
  */
-package org.glyptodon.guacamole.net.basic.rest.patch;
+package org.apache.guacamole.net.basic.rest.patch;
 

guacamole/src/main/java/org/apache/guacamole/net/basic/rest/permission/APIPermissionSet.java

@@ -20,18 +20,18 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.net.basic.rest.permission;
+package org.apache.guacamole.net.basic.rest.permission;
 
 import java.util.EnumSet;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Set;
-import org.glyptodon.guacamole.GuacamoleException;
-import org.glyptodon.guacamole.net.auth.User;
-import org.glyptodon.guacamole.net.auth.permission.ObjectPermission;
-import org.glyptodon.guacamole.net.auth.permission.ObjectPermissionSet;
-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.net.auth.User;
+import org.apache.guacamole.net.auth.permission.ObjectPermission;
+import org.apache.guacamole.net.auth.permission.ObjectPermissionSet;
+import org.apache.guacamole.net.auth.permission.SystemPermission;
+import org.apache.guacamole.net.auth.permission.SystemPermissionSet;
 
 /**
  * The set of permissions which are granted to a specific user, organized by

guacamole/src/main/java/org/apache/guacamole/net/basic/rest/permission/package-info.java

@@ -23,5 +23,5 @@
 /**
  * Classes related to the permission manipulation aspect of the Guacamole REST API.
  */
-package org.glyptodon.guacamole.net.basic.rest.permission;
+package org.apache.guacamole.net.basic.rest.permission;
 

guacamole/src/main/java/org/apache/guacamole/net/basic/rest/schema/SchemaRESTService.java

@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.net.basic.rest.schema;
+package org.apache.guacamole.net.basic.rest.schema;
 
 import com.google.inject.Inject;
 import java.util.Collection;
@@ -32,15 +32,15 @@ import javax.ws.rs.PathParam;
 import javax.ws.rs.Produces;
 import javax.ws.rs.QueryParam;
 import javax.ws.rs.core.MediaType;
-import org.glyptodon.guacamole.GuacamoleException;
-import org.glyptodon.guacamole.environment.Environment;
-import org.glyptodon.guacamole.environment.LocalEnvironment;
-import org.glyptodon.guacamole.form.Form;
-import org.glyptodon.guacamole.net.auth.UserContext;
-import org.glyptodon.guacamole.net.basic.GuacamoleSession;
-import org.glyptodon.guacamole.net.basic.rest.ObjectRetrievalService;
-import org.glyptodon.guacamole.net.basic.rest.auth.AuthenticationService;
-import org.glyptodon.guacamole.protocols.ProtocolInfo;
+import org.apache.guacamole.GuacamoleException;
+import org.apache.guacamole.environment.Environment;
+import org.apache.guacamole.environment.LocalEnvironment;
+import org.apache.guacamole.form.Form;
+import org.apache.guacamole.net.auth.UserContext;
+import org.apache.guacamole.net.basic.GuacamoleSession;
+import org.apache.guacamole.net.basic.rest.ObjectRetrievalService;
+import org.apache.guacamole.net.basic.rest.auth.AuthenticationService;
+import org.apache.guacamole.protocols.ProtocolInfo;
 
 /**
  * A REST service which provides access to descriptions of the properties,

guacamole/src/main/java/org/apache/guacamole/net/basic/rest/schema/package-info.java

@@ -24,4 +24,4 @@
  * Classes related to the self-description of the Guacamole REST API, such as
  * the attributes or parameters applicable to specific objects.
  */
-package org.glyptodon.guacamole.net.basic.rest.schema;
+package org.apache.guacamole.net.basic.rest.schema;

guacamole/src/main/java/org/apache/guacamole/net/basic/rest/user/APIUser.java

@@ -20,12 +20,12 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.net.basic.rest.user;
+package org.apache.guacamole.net.basic.rest.user;
 
 import java.util.Map;
 import org.codehaus.jackson.annotate.JsonIgnoreProperties;
 import org.codehaus.jackson.map.annotate.JsonSerialize;
-import org.glyptodon.guacamole.net.auth.User;
+import org.apache.guacamole.net.auth.User;
 
 /**
  * A simple User to expose through the REST endpoints.

guacamole/src/main/java/org/apache/guacamole/net/basic/rest/user/APIUserPasswordUpdate.java

@@ -19,7 +19,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.glyptodon.guacamole.net.basic.rest.user;
+package org.apache.guacamole.net.basic.rest.user;
 
 /**
  * All the information necessary for the password update operation on a user.

guacamole/src/main/java/org/apache/guacamole/net/basic/rest/user/APIUserWrapper.java

@@ -20,18 +20,18 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.net.basic.rest.user;
+package org.apache.guacamole.net.basic.rest.user;
 
 import java.util.Map;
-import org.glyptodon.guacamole.GuacamoleException;
-import org.glyptodon.guacamole.GuacamoleUnsupportedException;
-import org.glyptodon.guacamole.net.auth.User;
-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.GuacamoleUnsupportedException;
+import org.apache.guacamole.net.auth.User;
+import org.apache.guacamole.net.auth.permission.ObjectPermissionSet;
+import org.apache.guacamole.net.auth.permission.SystemPermissionSet;
 
 /**
  * A wrapper to make an APIUser look like a User. Useful where an
- * org.glyptodon.guacamole.net.auth.User is required. As a simple wrapper for
+ * org.apache.guacamole.net.auth.User is required. As a simple wrapper for
  * APIUser, access to permissions is not provided. Any attempt to access or
  * manipulate permissions on an APIUserWrapper will result in an exception.
  * 

guacamole/src/main/java/org/apache/guacamole/net/basic/rest/user/PermissionSetPatch.java

@@ -20,13 +20,13 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.net.basic.rest.user;
+package org.apache.guacamole.net.basic.rest.user;
 
 import java.util.HashSet;
 import java.util.Set;
-import org.glyptodon.guacamole.GuacamoleException;
-import org.glyptodon.guacamole.net.auth.permission.Permission;
-import org.glyptodon.guacamole.net.auth.permission.PermissionSet;
+import org.apache.guacamole.GuacamoleException;
+import org.apache.guacamole.net.auth.permission.Permission;
+import org.apache.guacamole.net.auth.permission.PermissionSet;
 
 /**
  * A set of changes to be applied to a PermissionSet, describing the set of

guacamole/src/main/java/org/apache/guacamole/net/basic/rest/user/UserRESTService.java

@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.net.basic.rest.user;
+package org.apache.guacamole.net.basic.rest.user;
 
 import com.google.inject.Inject;
 import java.util.ArrayList;
@@ -39,29 +39,29 @@ import javax.ws.rs.Produces;
 import javax.ws.rs.QueryParam;
 import javax.ws.rs.core.Context;
 import javax.ws.rs.core.MediaType;
-import org.glyptodon.guacamole.GuacamoleClientException;
-import org.glyptodon.guacamole.GuacamoleException;
-import org.glyptodon.guacamole.GuacamoleResourceNotFoundException;
-import org.glyptodon.guacamole.GuacamoleSecurityException;
-import org.glyptodon.guacamole.net.auth.AuthenticationProvider;
-import org.glyptodon.guacamole.net.auth.Credentials;
-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.net.auth.credentials.GuacamoleCredentialsException;
-import org.glyptodon.guacamole.net.auth.permission.ObjectPermission;
-import org.glyptodon.guacamole.net.auth.permission.ObjectPermissionSet;
-import org.glyptodon.guacamole.net.auth.permission.Permission;
-import org.glyptodon.guacamole.net.auth.permission.SystemPermission;
-import org.glyptodon.guacamole.net.auth.permission.SystemPermissionSet;
-import org.glyptodon.guacamole.net.basic.GuacamoleSession;
-import org.glyptodon.guacamole.net.basic.rest.APIPatch;
-import static org.glyptodon.guacamole.net.basic.rest.APIPatch.Operation.add;
-import static org.glyptodon.guacamole.net.basic.rest.APIPatch.Operation.remove;
-import org.glyptodon.guacamole.net.basic.rest.ObjectRetrievalService;
-import org.glyptodon.guacamole.net.basic.rest.PATCH;
-import org.glyptodon.guacamole.net.basic.rest.auth.AuthenticationService;
-import org.glyptodon.guacamole.net.basic.rest.permission.APIPermissionSet;
+import org.apache.guacamole.GuacamoleClientException;
+import org.apache.guacamole.GuacamoleException;
+import org.apache.guacamole.GuacamoleResourceNotFoundException;
+import org.apache.guacamole.GuacamoleSecurityException;
+import org.apache.guacamole.net.auth.AuthenticationProvider;
+import org.apache.guacamole.net.auth.Credentials;
+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.net.auth.credentials.GuacamoleCredentialsException;
+import org.apache.guacamole.net.auth.permission.ObjectPermission;
+import org.apache.guacamole.net.auth.permission.ObjectPermissionSet;
+import org.apache.guacamole.net.auth.permission.Permission;
+import org.apache.guacamole.net.auth.permission.SystemPermission;
+import org.apache.guacamole.net.auth.permission.SystemPermissionSet;
+import org.apache.guacamole.net.basic.GuacamoleSession;
+import org.apache.guacamole.net.basic.rest.APIPatch;
+import static org.apache.guacamole.net.basic.rest.APIPatch.Operation.add;
+import static org.apache.guacamole.net.basic.rest.APIPatch.Operation.remove;
+import org.apache.guacamole.net.basic.rest.ObjectRetrievalService;
+import org.apache.guacamole.net.basic.rest.PATCH;
+import org.apache.guacamole.net.basic.rest.auth.AuthenticationService;
+import org.apache.guacamole.net.basic.rest.permission.APIPermissionSet;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

guacamole/src/main/java/org/apache/guacamole/net/basic/rest/user/package-info.java

@@ -23,5 +23,5 @@
 /**
  * Classes related to the user manipulation aspect of the Guacamole REST API.
  */
-package org.glyptodon.guacamole.net.basic.rest.user;
+package org.apache.guacamole.net.basic.rest.user;
 

guacamole/src/main/java/org/apache/guacamole/net/basic/websocket/BasicGuacamoleWebSocketTunnelEndpoint.java

@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.net.basic.websocket;
+package org.apache.guacamole.net.basic.websocket;
 
 import com.google.inject.Provider;
 import java.util.Map;
@@ -29,11 +29,11 @@ import javax.websocket.HandshakeResponse;
 import javax.websocket.Session;
 import javax.websocket.server.HandshakeRequest;
 import javax.websocket.server.ServerEndpointConfig;
-import org.glyptodon.guacamole.GuacamoleException;
-import org.glyptodon.guacamole.net.GuacamoleTunnel;
-import org.glyptodon.guacamole.net.basic.TunnelRequest;
-import org.glyptodon.guacamole.net.basic.TunnelRequestService;
-import org.glyptodon.guacamole.websocket.GuacamoleWebSocketTunnelEndpoint;
+import org.apache.guacamole.GuacamoleException;
+import org.apache.guacamole.net.GuacamoleTunnel;
+import org.apache.guacamole.net.basic.TunnelRequest;
+import org.apache.guacamole.net.basic.TunnelRequestService;
+import org.apache.guacamole.websocket.GuacamoleWebSocketTunnelEndpoint;
 
 /**
  * Tunnel implementation which uses WebSocket as a tunnel backend, rather than

guacamole/src/main/java/org/apache/guacamole/net/basic/websocket/WebSocketTunnelModule.java

@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.net.basic.websocket;
+package org.apache.guacamole.net.basic.websocket;
 
 import com.google.inject.Provider;
 import com.google.inject.servlet.ServletModule;
@@ -28,8 +28,8 @@ import java.util.Arrays;
 import javax.websocket.DeploymentException;
 import javax.websocket.server.ServerContainer;
 import javax.websocket.server.ServerEndpointConfig;
-import org.glyptodon.guacamole.net.basic.TunnelLoader;
-import org.glyptodon.guacamole.net.basic.TunnelRequestService;
+import org.apache.guacamole.net.basic.TunnelLoader;
+import org.apache.guacamole.net.basic.TunnelRequestService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

guacamole/src/main/java/org/apache/guacamole/net/basic/websocket/WebSocketTunnelRequest.java

@@ -20,12 +20,12 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.net.basic.websocket;
+package org.apache.guacamole.net.basic.websocket;
 
 import java.util.List;
 import java.util.Map;
 import javax.websocket.server.HandshakeRequest;
-import org.glyptodon.guacamole.net.basic.TunnelRequest;
+import org.apache.guacamole.net.basic.TunnelRequest;
 
 /**
  * WebSocket-specific implementation of TunnelRequest.

guacamole/src/main/java/org/apache/guacamole/net/basic/websocket/jetty8/BasicGuacamoleWebSocketTunnelServlet.java

@@ -20,14 +20,14 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.net.basic.websocket.jetty8;
+package org.apache.guacamole.net.basic.websocket.jetty8;
 
 import com.google.inject.Inject;
 import com.google.inject.Singleton;
-import org.glyptodon.guacamole.GuacamoleException;
-import org.glyptodon.guacamole.net.GuacamoleTunnel;
-import org.glyptodon.guacamole.net.basic.TunnelRequestService;
-import org.glyptodon.guacamole.net.basic.TunnelRequest;
+import org.apache.guacamole.GuacamoleException;
+import org.apache.guacamole.net.GuacamoleTunnel;
+import org.apache.guacamole.net.basic.TunnelRequestService;
+import org.apache.guacamole.net.basic.TunnelRequest;
 
 /**
  * Tunnel servlet implementation which uses WebSocket as a tunnel backend,

guacamole/src/main/java/org/apache/guacamole/net/basic/websocket/jetty8/GuacamoleWebSocketTunnelServlet.java

@@ -20,22 +20,22 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.net.basic.websocket.jetty8;
+package org.apache.guacamole.net.basic.websocket.jetty8;
 
 import java.io.IOException;
 import javax.servlet.http.HttpServletRequest;
-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.apache.guacamole.GuacamoleException;
+import org.apache.guacamole.io.GuacamoleReader;
+import org.apache.guacamole.io.GuacamoleWriter;
+import org.apache.guacamole.net.GuacamoleTunnel;
 import org.eclipse.jetty.websocket.WebSocket;
 import org.eclipse.jetty.websocket.WebSocket.Connection;
 import org.eclipse.jetty.websocket.WebSocketServlet;
-import org.glyptodon.guacamole.GuacamoleClientException;
-import org.glyptodon.guacamole.GuacamoleConnectionClosedException;
-import org.glyptodon.guacamole.net.basic.HTTPTunnelRequest;
-import org.glyptodon.guacamole.net.basic.TunnelRequest;
-import org.glyptodon.guacamole.protocol.GuacamoleStatus;
+import org.apache.guacamole.GuacamoleClientException;
+import org.apache.guacamole.GuacamoleConnectionClosedException;
+import org.apache.guacamole.net.basic.HTTPTunnelRequest;
+import org.apache.guacamole.net.basic.TunnelRequest;
+import org.apache.guacamole.protocol.GuacamoleStatus;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

guacamole/src/main/java/org/apache/guacamole/net/basic/websocket/jetty8/WebSocketTunnelModule.java

@@ -20,10 +20,10 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.net.basic.websocket.jetty8;
+package org.apache.guacamole.net.basic.websocket.jetty8;
 
 import com.google.inject.servlet.ServletModule;
-import org.glyptodon.guacamole.net.basic.TunnelLoader;
+import org.apache.guacamole.net.basic.TunnelLoader;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -45,7 +45,7 @@ public class WebSocketTunnelModule extends ServletModule implements TunnelLoader
         try {
 
             // Attempt to find WebSocket servlet
-            Class.forName("org.glyptodon.guacamole.net.basic.websocket.jetty8.BasicGuacamoleWebSocketTunnelServlet");
+            Class.forName("org.apache.guacamole.net.basic.websocket.jetty8.BasicGuacamoleWebSocketTunnelServlet");
 
             // Support found
             return true;

guacamole/src/main/java/org/apache/guacamole/net/basic/websocket/jetty8/package-info.java

@@ -23,5 +23,5 @@
 /**
  * Jetty 8 WebSocket tunnel implementation. The classes here require Jetty 8.
  */
-package org.glyptodon.guacamole.net.basic.websocket.jetty8;
+package org.apache.guacamole.net.basic.websocket.jetty8;
 

guacamole/src/main/java/org/apache/guacamole/net/basic/websocket/jetty9/BasicGuacamoleWebSocketCreator.java

@@ -20,12 +20,12 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.net.basic.websocket.jetty9;
+package org.apache.guacamole.net.basic.websocket.jetty9;
 
 import org.eclipse.jetty.websocket.api.UpgradeRequest;
 import org.eclipse.jetty.websocket.api.UpgradeResponse;
 import org.eclipse.jetty.websocket.servlet.WebSocketCreator;
-import org.glyptodon.guacamole.net.basic.TunnelRequestService;
+import org.apache.guacamole.net.basic.TunnelRequestService;
 
 /**
  * WebSocketCreator which selects the appropriate WebSocketListener

guacamole/src/main/java/org/apache/guacamole/net/basic/websocket/jetty9/BasicGuacamoleWebSocketTunnelListener.java

@@ -20,12 +20,12 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.net.basic.websocket.jetty9;
+package org.apache.guacamole.net.basic.websocket.jetty9;
 
 import org.eclipse.jetty.websocket.api.Session;
-import org.glyptodon.guacamole.GuacamoleException;
-import org.glyptodon.guacamole.net.GuacamoleTunnel;
-import org.glyptodon.guacamole.net.basic.TunnelRequestService;
+import org.apache.guacamole.GuacamoleException;
+import org.apache.guacamole.net.GuacamoleTunnel;
+import org.apache.guacamole.net.basic.TunnelRequestService;
 
 /**
  * WebSocket listener implementation which properly parses connection IDs

guacamole/src/main/java/org/apache/guacamole/net/basic/websocket/jetty9/BasicGuacamoleWebSocketTunnelServlet.java

@@ -20,13 +20,13 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.net.basic.websocket.jetty9;
+package org.apache.guacamole.net.basic.websocket.jetty9;
 
 import com.google.inject.Inject;
 import com.google.inject.Singleton;
 import org.eclipse.jetty.websocket.servlet.WebSocketServlet;
 import org.eclipse.jetty.websocket.servlet.WebSocketServletFactory;
-import org.glyptodon.guacamole.net.basic.TunnelRequestService;
+import org.apache.guacamole.net.basic.TunnelRequestService;
 
 /**
  * A WebSocketServlet partial re-implementation of GuacamoleTunnelServlet.

guacamole/src/main/java/org/apache/guacamole/net/basic/websocket/jetty9/GuacamoleWebSocketTunnelListener.java

@@ -20,20 +20,20 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.net.basic.websocket.jetty9;
+package org.apache.guacamole.net.basic.websocket.jetty9;
 
 import java.io.IOException;
 import org.eclipse.jetty.websocket.api.CloseStatus;
 import org.eclipse.jetty.websocket.api.RemoteEndpoint;
 import org.eclipse.jetty.websocket.api.Session;
 import org.eclipse.jetty.websocket.api.WebSocketListener;
-import org.glyptodon.guacamole.GuacamoleClientException;
-import org.glyptodon.guacamole.GuacamoleConnectionClosedException;
-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.protocol.GuacamoleStatus;
+import org.apache.guacamole.GuacamoleClientException;
+import org.apache.guacamole.GuacamoleConnectionClosedException;
+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.protocol.GuacamoleStatus;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

guacamole/src/main/java/org/apache/guacamole/net/basic/websocket/jetty9/WebSocketTunnelModule.java

@@ -20,10 +20,10 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.net.basic.websocket.jetty9;
+package org.apache.guacamole.net.basic.websocket.jetty9;
 
 import com.google.inject.servlet.ServletModule;
-import org.glyptodon.guacamole.net.basic.TunnelLoader;
+import org.apache.guacamole.net.basic.TunnelLoader;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -45,7 +45,7 @@ public class WebSocketTunnelModule extends ServletModule implements TunnelLoader
         try {
 
             // Attempt to find WebSocket servlet
-            Class.forName("org.glyptodon.guacamole.net.basic.websocket.jetty9.BasicGuacamoleWebSocketTunnelServlet");
+            Class.forName("org.apache.guacamole.net.basic.websocket.jetty9.BasicGuacamoleWebSocketTunnelServlet");
 
             // Support found
             return true;

guacamole/src/main/java/org/apache/guacamole/net/basic/websocket/jetty9/WebSocketTunnelRequest.java

@@ -20,13 +20,13 @@
  * THE SOFTWARE.
  */
 
-package org.glyptodon.guacamole.net.basic.websocket.jetty9;
+package org.apache.guacamole.net.basic.websocket.jetty9;
 
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 import org.eclipse.jetty.websocket.api.UpgradeRequest;
-import org.glyptodon.guacamole.net.basic.TunnelRequest;
+import org.apache.guacamole.net.basic.TunnelRequest;
 
 /**
  * Jetty 9 WebSocket-specific implementation of TunnelRequest.

guacamole/src/main/java/org/apache/guacamole/net/basic/websocket/jetty9/package-info.java

@@ -24,5 +24,5 @@
  * Jetty 9 WebSocket tunnel implementation. The classes here require at least
  * Jetty 9, prior to Jetty 9.1 (when support for JSR 356 was implemented).
  */
-package org.glyptodon.guacamole.net.basic.websocket.jetty9;
+package org.apache.guacamole.net.basic.websocket.jetty9;