GUACAMOLE-1: Remove useless .net.basic subpackage, now that everything is being renamed.

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

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

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

@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.apache.guacamole.net.basic;
+package org.apache.guacamole;
 
 import com.google.inject.Guice;
 import com.google.inject.Injector;
@@ -30,11 +30,11 @@ import javax.servlet.ServletContextEvent;
 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.apache.guacamole.extension.ExtensionModule;
+import org.apache.guacamole.log.LogModule;
+import org.apache.guacamole.rest.RESTServiceModule;
+import org.apache.guacamole.rest.auth.BasicTokenSessionMap;
+import org.apache.guacamole.rest.auth.TokenSessionMap;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

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

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

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

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

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

@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.apache.guacamole.net.basic;
+package org.apache.guacamole;
 
 import java.io.File;
 import java.io.FilenameFilter;
@@ -35,7 +35,7 @@ import java.util.Collection;
 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;
+import org.apache.guacamole.properties.BasicGuacamoleProperties;
 
 /**
  * A ClassLoader implementation which finds classes within a configurable

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

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

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

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

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

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

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

@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.apache.guacamole.net.basic;
+package org.apache.guacamole;
 
 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.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"
+        "org.apache.guacamole.websocket.WebSocketTunnelModule",
+        "org.apache.guacamole.websocket.jetty8.WebSocketTunnelModule",
+        "org.apache.guacamole.websocket.jetty9.WebSocketTunnelModule",
+        "org.apache.guacamole.websocket.tomcat.WebSocketTunnelModule"
     };
 
     private boolean loadWebSocketModule(String classname) {

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

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

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

@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.apache.guacamole.net.basic;
+package org.apache.guacamole;
 
 import com.google.inject.Inject;
 import com.google.inject.Singleton;
@@ -34,8 +34,8 @@ 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.rest.ObjectRetrievalService;
+import org.apache.guacamole.rest.auth.AuthenticationService;
 import org.apache.guacamole.protocol.GuacamoleClientInformation;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

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

@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.apache.guacamole.net.basic.auth;
+package org.apache.guacamole.auth;
 
 import java.io.UnsupportedEncodingException;
 import java.security.MessageDigest;

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

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

guacamole/src/main/java/org/apache/guacamole/auth/basic/AuthorizeTagHandler.java

@@ -20,10 +20,10 @@
  * THE SOFTWARE.
  */
 
-package org.apache.guacamole.net.basic.xml.usermapping;
+package org.apache.guacamole.auth.basic;
 
-import org.apache.guacamole.net.basic.auth.Authorization;
-import org.apache.guacamole.net.basic.auth.UserMapping;
+import org.apache.guacamole.auth.Authorization;
+import org.apache.guacamole.auth.UserMapping;
 import org.apache.guacamole.xml.TagHandler;
 import org.apache.guacamole.protocol.GuacamoleConfiguration;
 import org.xml.sax.Attributes;

guacamole/src/main/java/org/apache/guacamole/auth/basic/BasicFileAuthenticationProvider.java

@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.apache.guacamole.net.basic;
+package org.apache.guacamole.auth.basic;
 
 import java.io.BufferedInputStream;
 import java.io.File;
@@ -29,14 +29,14 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.util.Map;
 import org.apache.guacamole.GuacamoleException;
+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.auth.Authorization;
+import org.apache.guacamole.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;

guacamole/src/main/java/org/apache/guacamole/auth/basic/ConnectionTagHandler.java

@@ -20,9 +20,9 @@
  * THE SOFTWARE.
  */
 
-package org.apache.guacamole.net.basic.xml.usermapping;
+package org.apache.guacamole.auth.basic;
 
-import org.apache.guacamole.net.basic.auth.Authorization;
+import org.apache.guacamole.auth.Authorization;
 import org.apache.guacamole.xml.TagHandler;
 import org.apache.guacamole.protocol.GuacamoleConfiguration;
 import org.xml.sax.Attributes;

guacamole/src/main/java/org/apache/guacamole/auth/basic/ParamTagHandler.java

@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.apache.guacamole.net.basic.xml.usermapping;
+package org.apache.guacamole.auth.basic;
 
 import org.apache.guacamole.xml.TagHandler;
 import org.apache.guacamole.protocol.GuacamoleConfiguration;

guacamole/src/main/java/org/apache/guacamole/auth/basic/ProtocolTagHandler.java

@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.apache.guacamole.net.basic.xml.usermapping;
+package org.apache.guacamole.auth.basic;
 
 import org.apache.guacamole.xml.TagHandler;
 import org.apache.guacamole.protocol.GuacamoleConfiguration;

guacamole/src/main/java/org/apache/guacamole/auth/basic/UserMappingTagHandler.java

@@ -20,9 +20,9 @@
  * THE SOFTWARE.
  */
 
-package org.apache.guacamole.net.basic.xml.usermapping;
+package org.apache.guacamole.auth.basic;
 
-import org.apache.guacamole.net.basic.auth.UserMapping;
+import org.apache.guacamole.auth.UserMapping;
 import org.apache.guacamole.xml.TagHandler;
 import org.xml.sax.Attributes;
 import org.xml.sax.SAXException;

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

@@ -23,5 +23,5 @@
 /**
  * Classes related to parsing the user-mapping.xml file.
  */
-package org.apache.guacamole.net.basic.xml.usermapping;
+package org.apache.guacamole.auth.basic;
 

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

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

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

@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.apache.guacamole.net.basic.extension;
+package org.apache.guacamole.extension;
 
 import java.lang.reflect.InvocationTargetException;
 import java.util.UUID;

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

@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.apache.guacamole.net.basic.extension;
+package org.apache.guacamole.extension;
 
 import java.io.File;
 import java.io.FilenameFilter;

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

@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.apache.guacamole.net.basic.extension;
+package org.apache.guacamole.extension;
 
 import java.io.File;
 import java.io.IOException;
@@ -43,8 +43,8 @@ import org.codehaus.jackson.map.ObjectMapper;
 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;
+import org.apache.guacamole.resource.ClassPathResource;
+import org.apache.guacamole.resource.Resource;
 
 /**
  * A Guacamole extension, which may provide custom authentication, static

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

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

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

@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.apache.guacamole.net.basic.extension;
+package org.apache.guacamole.extension;
 
 import com.google.inject.Provides;
 import com.google.inject.servlet.ServletModule;
@@ -32,16 +32,16 @@ import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
-import org.apache.guacamole.net.basic.BasicFileAuthenticationProvider;
+import org.apache.guacamole.auth.basic.BasicFileAuthenticationProvider;
 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.apache.guacamole.properties.BasicGuacamoleProperties;
+import org.apache.guacamole.resource.Resource;
+import org.apache.guacamole.resource.ResourceServlet;
+import org.apache.guacamole.resource.SequenceResource;
+import org.apache.guacamole.resource.WebApplicationResource;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

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

@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.apache.guacamole.net.basic.extension;
+package org.apache.guacamole.extension;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -38,10 +38,10 @@ import org.codehaus.jackson.node.JsonNodeFactory;
 import org.codehaus.jackson.node.ObjectNode;
 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.apache.guacamole.properties.BasicGuacamoleProperties;
+import org.apache.guacamole.resource.ByteArrayResource;
+import org.apache.guacamole.resource.Resource;
+import org.apache.guacamole.resource.WebApplicationResource;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

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

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

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

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

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

@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.apache.guacamole.net.basic.log;
+package org.apache.guacamole.log;
 
 import ch.qos.logback.classic.LoggerContext;
 import ch.qos.logback.classic.joran.JoranConfigurator;

guacamole/src/main/java/org/apache/guacamole/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.apache.guacamole.net.basic;
+package org.apache.guacamole;
 

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

@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.apache.guacamole.net.basic.properties;
+package org.apache.guacamole.properties;
 
 import org.apache.guacamole.GuacamoleException;
 import org.apache.guacamole.net.auth.AuthenticationProvider;
@@ -49,7 +49,7 @@ public abstract class AuthenticationProviderProperty implements GuacamolePropert
         try {
 
             // Get authentication provider class
-            Class<?> authProviderClass = org.apache.guacamole.net.basic.GuacamoleClassLoader.getInstance().loadClass(authProviderClassName);
+            Class<?> authProviderClass = org.apache.guacamole.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/properties/BasicGuacamoleProperties.java

@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.apache.guacamole.net.basic.properties;
+package org.apache.guacamole.properties;
 
 import org.apache.guacamole.properties.FileGuacamoleProperty;
 import org.apache.guacamole.properties.IntegerGuacamoleProperty;

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

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

guacamole/src/main/java/org/apache/guacamole/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.apache.guacamole.net.basic.properties;
+package org.apache.guacamole.properties;
 

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

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

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

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

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

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

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

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

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

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

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

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

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

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

guacamole/src/main/java/org/apache/guacamole/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.apache.guacamole.net.basic.resource;
+package org.apache.guacamole.resource;

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

@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.apache.guacamole.net.basic.rest;
+package org.apache.guacamole.rest;
 
 import java.util.Collection;
 import javax.ws.rs.core.Response;

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

@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.apache.guacamole.net.basic.rest;
+package org.apache.guacamole.rest;
 
 import java.util.Collection;
 import javax.ws.rs.WebApplicationException;

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

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

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

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

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

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

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

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

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

@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.apache.guacamole.net.basic.rest;
+package org.apache.guacamole.rest;
 
 import com.google.inject.Inject;
 import java.lang.annotation.Annotation;
@@ -36,7 +36,7 @@ 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.apache.guacamole.rest.auth.AuthenticationService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

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

@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.apache.guacamole.net.basic.rest;
+package org.apache.guacamole.rest;
 
 import com.google.inject.matcher.AbstractMatcher;
 import java.lang.annotation.Annotation;

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

@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.apache.guacamole.net.basic.rest;
+package org.apache.guacamole.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.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;
+import org.apache.guacamole.rest.auth.TokenRESTService;
+import org.apache.guacamole.rest.connection.ConnectionRESTService;
+import org.apache.guacamole.rest.connectiongroup.ConnectionGroupRESTService;
+import org.apache.guacamole.rest.activeconnection.ActiveConnectionRESTService;
+import org.apache.guacamole.rest.auth.AuthTokenGenerator;
+import org.apache.guacamole.rest.auth.AuthenticationService;
+import org.apache.guacamole.rest.auth.SecureRandomAuthTokenGenerator;
+import org.apache.guacamole.rest.auth.TokenSessionMap;
+import org.apache.guacamole.rest.history.HistoryRESTService;
+import org.apache.guacamole.rest.language.LanguageRESTService;
+import org.apache.guacamole.rest.patch.PatchRESTService;
+import org.apache.guacamole.rest.schema.SchemaRESTService;
+import org.apache.guacamole.rest.user.UserRESTService;
 
 /**
  * A Guice Module to set up the servlet mappings and authentication-specific

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

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

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

@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.apache.guacamole.net.basic.rest.activeconnection;
+package org.apache.guacamole.rest.activeconnection;
 
 import com.google.inject.Inject;
 import java.util.Collection;
@@ -45,11 +45,11 @@ 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.apache.guacamole.GuacamoleSession;
+import org.apache.guacamole.rest.APIPatch;
+import org.apache.guacamole.rest.ObjectRetrievalService;
+import org.apache.guacamole.rest.PATCH;
+import org.apache.guacamole.rest.auth.AuthenticationService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

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

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

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

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

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

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

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

@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.apache.guacamole.net.basic.rest.auth;
+package org.apache.guacamole.rest.auth;
 
 import com.google.inject.Inject;
 import java.util.ArrayList;
@@ -38,7 +38,7 @@ 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.apache.guacamole.GuacamoleSession;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

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

@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.apache.guacamole.net.basic.rest.auth;
+package org.apache.guacamole.rest.auth;
 
 import java.util.Iterator;
 import java.util.Map;
@@ -31,8 +31,8 @@ import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeUnit;
 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.apache.guacamole.GuacamoleSession;
+import org.apache.guacamole.properties.BasicGuacamoleProperties;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

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

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

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

@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.apache.guacamole.net.basic.rest.auth;
+package org.apache.guacamole.rest.auth;
 
 import com.google.inject.Inject;
 import java.io.UnsupportedEncodingException;
@@ -42,8 +42,8 @@ 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.apache.guacamole.GuacamoleSession;
+import org.apache.guacamole.rest.APIRequest;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

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

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

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

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

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

@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.apache.guacamole.net.basic.rest.connection;
+package org.apache.guacamole.rest.connection;
 
 import java.util.Map;
 import org.codehaus.jackson.annotate.JsonIgnoreProperties;

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

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

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

@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.apache.guacamole.net.basic.rest.connection;
+package org.apache.guacamole.rest.connection;
 
 import com.google.inject.Inject;
 import java.util.ArrayList;
@@ -48,10 +48,10 @@ 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.GuacamoleSession;
+import org.apache.guacamole.rest.ObjectRetrievalService;
+import org.apache.guacamole.rest.auth.AuthenticationService;
+import org.apache.guacamole.rest.history.APIConnectionRecord;
 import org.apache.guacamole.protocol.GuacamoleConfiguration;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

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

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

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

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

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

@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.apache.guacamole.net.basic.rest.connectiongroup;
+package org.apache.guacamole.rest.connectiongroup;
 
 import java.util.Map;
 import java.util.Set;

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

@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.apache.guacamole.net.basic.rest.connectiongroup;
+package org.apache.guacamole.rest.connectiongroup;
 
 import com.google.inject.Inject;
 import java.util.List;
@@ -40,9 +40,9 @@ 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.apache.guacamole.GuacamoleSession;
+import org.apache.guacamole.rest.ObjectRetrievalService;
+import org.apache.guacamole.rest.auth.AuthenticationService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

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

@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.apache.guacamole.net.basic.rest.connectiongroup;
+package org.apache.guacamole.rest.connectiongroup;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -34,7 +34,7 @@ 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.apache.guacamole.rest.connection.APIConnection;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

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

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

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

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

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

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

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

@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.apache.guacamole.net.basic.rest.history;
+package org.apache.guacamole.rest.history;
 
 import com.google.inject.Inject;
 import java.util.ArrayList;
@@ -36,9 +36,9 @@ 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.apache.guacamole.GuacamoleSession;
+import org.apache.guacamole.rest.ObjectRetrievalService;
+import org.apache.guacamole.rest.auth.AuthenticationService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

guacamole/src/main/java/org/apache/guacamole/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.apache.guacamole.net.basic.rest.history;
+package org.apache.guacamole.rest.history;
 

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

@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.apache.guacamole.net.basic.rest.language;
+package org.apache.guacamole.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.apache.guacamole.net.basic.extension.LanguageResourceService;
+import org.apache.guacamole.extension.LanguageResourceService;
 
 
 /**

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

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

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

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

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

@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.apache.guacamole.net.basic.rest.patch;
+package org.apache.guacamole.rest.patch;
 
 import com.google.inject.Inject;
 import java.io.IOException;
@@ -34,8 +34,8 @@ import javax.ws.rs.Produces;
 import javax.ws.rs.core.MediaType;
 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;
+import org.apache.guacamole.extension.PatchResourceService;
+import org.apache.guacamole.resource.Resource;
 
 /**
  * A REST Service for handling the listing of HTML patches.

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

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

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

@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.apache.guacamole.net.basic.rest.permission;
+package org.apache.guacamole.rest.permission;
 
 import java.util.EnumSet;
 import java.util.HashMap;

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

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

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

@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.apache.guacamole.net.basic.rest.schema;
+package org.apache.guacamole.rest.schema;
 
 import com.google.inject.Inject;
 import java.util.Collection;
@@ -37,9 +37,9 @@ 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.GuacamoleSession;
+import org.apache.guacamole.rest.ObjectRetrievalService;
+import org.apache.guacamole.rest.auth.AuthenticationService;
 import org.apache.guacamole.protocols.ProtocolInfo;
 
 /**

guacamole/src/main/java/org/apache/guacamole/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.apache.guacamole.net.basic.rest.schema;
+package org.apache.guacamole.rest.schema;

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

@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.apache.guacamole.net.basic.rest.user;
+package org.apache.guacamole.rest.user;
 
 import java.util.Map;
 import org.codehaus.jackson.annotate.JsonIgnoreProperties;

guacamole/src/main/java/org/apache/guacamole/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.apache.guacamole.net.basic.rest.user;
+package org.apache.guacamole.rest.user;
 
 /**
  * All the information necessary for the password update operation on a user.

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

@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.apache.guacamole.net.basic.rest.user;
+package org.apache.guacamole.rest.user;
 
 import java.util.Map;
 import org.apache.guacamole.GuacamoleException;

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

@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.apache.guacamole.net.basic.rest.user;
+package org.apache.guacamole.rest.user;
 
 import java.util.HashSet;
 import java.util.Set;

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

@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.apache.guacamole.net.basic.rest.user;
+package org.apache.guacamole.rest.user;
 
 import com.google.inject.Inject;
 import java.util.ArrayList;
@@ -54,14 +54,14 @@ 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.apache.guacamole.GuacamoleSession;
+import org.apache.guacamole.rest.APIPatch;
+import static org.apache.guacamole.rest.APIPatch.Operation.add;
+import static org.apache.guacamole.rest.APIPatch.Operation.remove;
+import org.apache.guacamole.rest.ObjectRetrievalService;
+import org.apache.guacamole.rest.PATCH;
+import org.apache.guacamole.rest.auth.AuthenticationService;
+import org.apache.guacamole.rest.permission.APIPermissionSet;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

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

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

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

@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.apache.guacamole.net.basic.websocket;
+package org.apache.guacamole.websocket;
 
 import com.google.inject.Provider;
 import java.util.Map;
@@ -31,8 +31,8 @@ import javax.websocket.server.HandshakeRequest;
 import javax.websocket.server.ServerEndpointConfig;
 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.TunnelRequest;
+import org.apache.guacamole.TunnelRequestService;
 import org.apache.guacamole.websocket.GuacamoleWebSocketTunnelEndpoint;
 
 /**

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

@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.apache.guacamole.net.basic.websocket;
+package org.apache.guacamole.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.apache.guacamole.net.basic.TunnelLoader;
-import org.apache.guacamole.net.basic.TunnelRequestService;
+import org.apache.guacamole.TunnelLoader;
+import org.apache.guacamole.TunnelRequestService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

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

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

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

@@ -20,14 +20,14 @@
  * THE SOFTWARE.
  */
 
-package org.apache.guacamole.net.basic.websocket.jetty8;
+package org.apache.guacamole.websocket.jetty8;
 
 import com.google.inject.Inject;
 import com.google.inject.Singleton;
 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;
+import org.apache.guacamole.TunnelRequestService;
+import org.apache.guacamole.TunnelRequest;
 
 /**
  * Tunnel servlet implementation which uses WebSocket as a tunnel backend,

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

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

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

@@ -20,10 +20,10 @@
  * THE SOFTWARE.
  */
 
-package org.apache.guacamole.net.basic.websocket.jetty8;
+package org.apache.guacamole.websocket.jetty8;
 
 import com.google.inject.servlet.ServletModule;
-import org.apache.guacamole.net.basic.TunnelLoader;
+import org.apache.guacamole.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.apache.guacamole.net.basic.websocket.jetty8.BasicGuacamoleWebSocketTunnelServlet");
+            Class.forName("org.apache.guacamole.websocket.jetty8.BasicGuacamoleWebSocketTunnelServlet");
 
             // Support found
             return true;

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

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

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

@@ -20,12 +20,12 @@
  * THE SOFTWARE.
  */
 
-package org.apache.guacamole.net.basic.websocket.jetty9;
+package org.apache.guacamole.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.apache.guacamole.net.basic.TunnelRequestService;
+import org.apache.guacamole.TunnelRequestService;
 
 /**
  * WebSocketCreator which selects the appropriate WebSocketListener

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

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