GUAC-1101: Reorganize everything into org.glyptodon.guacamole.auth.mysql packages based on related guacamole-ext type.

extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/MySQLAuthenticationProvider.java

@@ -23,33 +23,43 @@
 package net.sourceforge.guacamole.net.auth.mysql;
 
 
+import org.glyptodon.guacamole.auth.mysql.user.MySQLUserContext;
+import org.glyptodon.guacamole.auth.mysql.connectiongroup.MySQLRootConnectionGroup;
+import org.glyptodon.guacamole.auth.mysql.connectiongroup.MySQLConnectionGroup;
+import org.glyptodon.guacamole.auth.mysql.connectiongroup.ConnectionGroupDirectory;
+import org.glyptodon.guacamole.auth.mysql.connection.ConnectionDirectory;
+import org.glyptodon.guacamole.auth.mysql.connection.MySQLGuacamoleConfiguration;
+import org.glyptodon.guacamole.auth.mysql.connection.MySQLConnection;
+import org.glyptodon.guacamole.auth.mysql.permission.MySQLSystemPermissionSet;
+import org.glyptodon.guacamole.auth.mysql.user.MySQLUser;
+import org.glyptodon.guacamole.auth.mysql.user.UserDirectory;
 import com.google.inject.Binder;
 import com.google.inject.Guice;
 import com.google.inject.Injector;
 import com.google.inject.Module;
 import com.google.inject.name.Names;
 import java.util.Properties;
-import net.sourceforge.guacamole.net.auth.mysql.dao.ConnectionGroupMapper;
+import org.glyptodon.guacamole.auth.mysql.connectiongroup.ConnectionGroupMapper;
-import net.sourceforge.guacamole.net.auth.mysql.dao.ConnectionMapper;
+import org.glyptodon.guacamole.auth.mysql.connection.ConnectionMapper;
-import net.sourceforge.guacamole.net.auth.mysql.dao.ConnectionRecordMapper;
+import org.glyptodon.guacamole.auth.mysql.connection.ConnectionRecordMapper;
-import net.sourceforge.guacamole.net.auth.mysql.dao.ParameterMapper;
+import org.glyptodon.guacamole.auth.mysql.connection.ParameterMapper;
-import net.sourceforge.guacamole.net.auth.mysql.dao.SystemPermissionMapper;
+import org.glyptodon.guacamole.auth.mysql.permission.SystemPermissionMapper;
 import org.glyptodon.guacamole.GuacamoleException;
 import org.glyptodon.guacamole.net.auth.AuthenticationProvider;
 import org.glyptodon.guacamole.net.auth.Credentials;
 import org.glyptodon.guacamole.net.auth.UserContext;
-import net.sourceforge.guacamole.net.auth.mysql.dao.UserMapper;
+import org.glyptodon.guacamole.auth.mysql.user.UserMapper;
-import net.sourceforge.guacamole.net.auth.mysql.properties.MySQLGuacamoleProperties;
+import org.glyptodon.guacamole.auth.mysql.conf.MySQLGuacamoleProperties;
-import net.sourceforge.guacamole.net.auth.mysql.service.ConnectionGroupService;
+import org.glyptodon.guacamole.auth.mysql.connectiongroup.ConnectionGroupService;
-import net.sourceforge.guacamole.net.auth.mysql.service.ConnectionService;
+import org.glyptodon.guacamole.auth.mysql.connection.ConnectionService;
-import net.sourceforge.guacamole.net.auth.mysql.service.GuacamoleSocketService;
+import org.glyptodon.guacamole.auth.mysql.socket.GuacamoleSocketService;
-import net.sourceforge.guacamole.net.auth.mysql.service.PasswordEncryptionService;
+import org.glyptodon.guacamole.auth.mysql.security.PasswordEncryptionService;
-import net.sourceforge.guacamole.net.auth.mysql.service.SHA256PasswordEncryptionService;
+import org.glyptodon.guacamole.auth.mysql.security.SHA256PasswordEncryptionService;
-import net.sourceforge.guacamole.net.auth.mysql.service.SaltService;
+import org.glyptodon.guacamole.auth.mysql.security.SaltService;
-import net.sourceforge.guacamole.net.auth.mysql.service.SecureRandomSaltService;
+import org.glyptodon.guacamole.auth.mysql.security.SecureRandomSaltService;
-import net.sourceforge.guacamole.net.auth.mysql.service.SystemPermissionService;
+import org.glyptodon.guacamole.auth.mysql.permission.SystemPermissionService;
-import net.sourceforge.guacamole.net.auth.mysql.service.UnrestrictedGuacamoleSocketService;
+import org.glyptodon.guacamole.auth.mysql.socket.UnrestrictedGuacamoleSocketService;
-import net.sourceforge.guacamole.net.auth.mysql.service.UserService;
+import org.glyptodon.guacamole.auth.mysql.user.UserService;
 import org.apache.ibatis.transaction.jdbc.JdbcTransactionFactory;
 import org.glyptodon.guacamole.environment.Environment;
 import org.glyptodon.guacamole.environment.LocalEnvironment;

extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/package-info.java

@@ -21,8 +21,8 @@
  */
 
 /**
- * Base classes which support the MySQL authentication provider, including
+ * The MySQL authentication provider. This package exists purely for backwards-
- * the authentication provider itself.
+ * compatibility. All other classes have been moved to packages within
+ * org.glyptodon.guacamole.auth.mysql.
  */
 package net.sourceforge.guacamole.net.auth.mysql;
-

extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/base/DirectoryObject.java

@@ -20,9 +20,8 @@
  * THE SOFTWARE.
  */
 
-package net.sourceforge.guacamole.net.auth.mysql;
+package org.glyptodon.guacamole.auth.mysql.base;
 
-import net.sourceforge.guacamole.net.auth.mysql.model.ObjectModel;
 import org.glyptodon.guacamole.net.auth.Identifiable;
 
 /**

extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/base/DirectoryObjectMapper.java

@@ -20,11 +20,11 @@
  * THE SOFTWARE.
  */
 
-package net.sourceforge.guacamole.net.auth.mysql.dao;
+package org.glyptodon.guacamole.auth.mysql.base;
 
 import java.util.Collection;
 import java.util.Set;
-import net.sourceforge.guacamole.net.auth.mysql.model.UserModel;
+import org.glyptodon.guacamole.auth.mysql.user.UserModel;
 import org.apache.ibatis.annotations.Param;
 
 /**

extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/base/DirectoryObjectService.java

@@ -20,16 +20,13 @@
  * THE SOFTWARE.
  */
 
-package net.sourceforge.guacamole.net.auth.mysql.service;
+package org.glyptodon.guacamole.auth.mysql.base;
 
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Set;
-import net.sourceforge.guacamole.net.auth.mysql.AuthenticatedUser;
+import org.glyptodon.guacamole.auth.mysql.user.AuthenticatedUser;
-import net.sourceforge.guacamole.net.auth.mysql.DirectoryObject;
-import net.sourceforge.guacamole.net.auth.mysql.dao.DirectoryObjectMapper;
-import net.sourceforge.guacamole.net.auth.mysql.model.ObjectModel;
 import org.glyptodon.guacamole.GuacamoleException;
 import org.glyptodon.guacamole.GuacamoleSecurityException;
 import org.glyptodon.guacamole.net.auth.permission.ObjectPermission;

extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/base/ObjectModel.java

@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package net.sourceforge.guacamole.net.auth.mysql.model;
+package org.glyptodon.guacamole.auth.mysql.base;
 
 /**
  * Object representation of a Guacamole object, such as a user or connection,

extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/base/RestrictedObject.java

@@ -20,7 +20,9 @@
  * THE SOFTWARE.
  */
 
-package net.sourceforge.guacamole.net.auth.mysql;
+package org.glyptodon.guacamole.auth.mysql.base;
+
+import org.glyptodon.guacamole.auth.mysql.user.AuthenticatedUser;
 
 /**
  * Common base class for objects that are associated with the users that

extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/base/package-info.java

@@ -0,0 +1,28 @@
+/*
+ * Copyright (C) 2015 Glyptodon LLC
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+/**
+ * Base classes supporting the MySQL authentication provider and defining the
+ * relationships between the model and the implementations of guacamole-ext
+ * classes.
+ */
+package org.glyptodon.guacamole.auth.mysql.base;

extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/conf/MySQLGuacamoleProperties.java

@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package net.sourceforge.guacamole.net.auth.mysql.properties;
+package org.glyptodon.guacamole.auth.mysql.conf;
 
 import org.glyptodon.guacamole.properties.BooleanGuacamoleProperty;
 import org.glyptodon.guacamole.properties.IntegerGuacamoleProperty;

extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/conf/package-info.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013 Glyptodon LLC
+ * Copyright (C) 2015 Glyptodon LLC
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -21,8 +21,6 @@
  */
 
 /**
- * Service classes which help fill the needs of the MySQL authentication
+ * Classes related to the configuration of the MySQL authentication provider.
- * provider.
  */
-package net.sourceforge.guacamole.net.auth.mysql.service;
+package org.glyptodon.guacamole.auth.mysql.conf;
-

extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/connection/ConnectionDirectory.java

@@ -20,14 +20,14 @@
  * THE SOFTWARE.
  */
 
-package net.sourceforge.guacamole.net.auth.mysql;
+package org.glyptodon.guacamole.auth.mysql.connection;
 
 
 import com.google.inject.Inject;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Set;
-import net.sourceforge.guacamole.net.auth.mysql.service.ConnectionService;
+import org.glyptodon.guacamole.auth.mysql.user.AuthenticatedUser;
 import org.glyptodon.guacamole.GuacamoleException;
 import org.glyptodon.guacamole.net.auth.Connection;
 import org.glyptodon.guacamole.net.auth.Directory;

extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/connection/ConnectionMapper.java

@@ -20,11 +20,11 @@
  * THE SOFTWARE.
  */
 
-package net.sourceforge.guacamole.net.auth.mysql.dao;
+package org.glyptodon.guacamole.auth.mysql.connection;
 
 import java.util.Set;
-import net.sourceforge.guacamole.net.auth.mysql.model.ConnectionModel;
+import org.glyptodon.guacamole.auth.mysql.base.DirectoryObjectMapper;
-import net.sourceforge.guacamole.net.auth.mysql.model.UserModel;
+import org.glyptodon.guacamole.auth.mysql.user.UserModel;
 import org.apache.ibatis.annotations.Param;
 
 /**

extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/connection/ConnectionModel.java

@@ -20,7 +20,9 @@
  * THE SOFTWARE.
  */
 
-package net.sourceforge.guacamole.net.auth.mysql.model;
+package org.glyptodon.guacamole.auth.mysql.connection;
+
+import org.glyptodon.guacamole.auth.mysql.base.ObjectModel;
 
 /**
  * Object representation of a Guacamole connection, as represented in the

extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/connection/ConnectionRecordMapper.java

@@ -20,10 +20,9 @@
  * THE SOFTWARE.
  */
 
-package net.sourceforge.guacamole.net.auth.mysql.dao;
+package org.glyptodon.guacamole.auth.mysql.connection;
 
 import java.util.List;
-import net.sourceforge.guacamole.net.auth.mysql.model.ConnectionRecordModel;
 import org.apache.ibatis.annotations.Param;
 
 /**

extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/connection/ConnectionRecordModel.java

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

extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/connection/ConnectionService.java

@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package net.sourceforge.guacamole.net.auth.mysql.service;
+package org.glyptodon.guacamole.auth.mysql.connection;
 
 import com.google.inject.Inject;
 import com.google.inject.Provider;
@@ -30,16 +30,10 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-import net.sourceforge.guacamole.net.auth.mysql.AuthenticatedUser;
+import org.glyptodon.guacamole.auth.mysql.user.AuthenticatedUser;
-import net.sourceforge.guacamole.net.auth.mysql.MySQLConnection;
+import org.glyptodon.guacamole.auth.mysql.base.DirectoryObjectMapper;
-import net.sourceforge.guacamole.net.auth.mysql.MySQLConnectionRecord;
+import org.glyptodon.guacamole.auth.mysql.base.DirectoryObjectService;
-import net.sourceforge.guacamole.net.auth.mysql.dao.ConnectionMapper;
+import org.glyptodon.guacamole.auth.mysql.socket.GuacamoleSocketService;
-import net.sourceforge.guacamole.net.auth.mysql.dao.ConnectionRecordMapper;
-import net.sourceforge.guacamole.net.auth.mysql.dao.DirectoryObjectMapper;
-import net.sourceforge.guacamole.net.auth.mysql.dao.ParameterMapper;
-import net.sourceforge.guacamole.net.auth.mysql.model.ConnectionModel;
-import net.sourceforge.guacamole.net.auth.mysql.model.ConnectionRecordModel;
-import net.sourceforge.guacamole.net.auth.mysql.model.ParameterModel;
 import org.glyptodon.guacamole.GuacamoleClientException;
 import org.glyptodon.guacamole.GuacamoleException;
 import org.glyptodon.guacamole.GuacamoleSecurityException;

extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/connection/MySQLConnection.java

@@ -20,14 +20,14 @@
  * THE SOFTWARE.
  */
 
-package net.sourceforge.guacamole.net.auth.mysql;
+package org.glyptodon.guacamole.auth.mysql.connection;
 
 import com.google.inject.Inject;
 import com.google.inject.Provider;
 import java.util.List;
-import net.sourceforge.guacamole.net.auth.mysql.model.ConnectionModel;
+import org.glyptodon.guacamole.auth.mysql.base.DirectoryObject;
-import net.sourceforge.guacamole.net.auth.mysql.service.ConnectionService;
+import org.glyptodon.guacamole.auth.mysql.connectiongroup.MySQLRootConnectionGroup;
-import net.sourceforge.guacamole.net.auth.mysql.service.GuacamoleSocketService;
+import org.glyptodon.guacamole.auth.mysql.socket.GuacamoleSocketService;
 import org.glyptodon.guacamole.GuacamoleException;
 import org.glyptodon.guacamole.net.GuacamoleSocket;
 import org.glyptodon.guacamole.net.auth.Connection;

extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/connection/MySQLConnectionRecord.java

@@ -20,11 +20,10 @@
  * THE SOFTWARE.
  */
 
-package net.sourceforge.guacamole.net.auth.mysql;
+package org.glyptodon.guacamole.auth.mysql.connection;
 
 
 import java.util.Date;
-import net.sourceforge.guacamole.net.auth.mysql.model.ConnectionRecordModel;
 import org.glyptodon.guacamole.net.auth.ConnectionRecord;
 
 /**

extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/connection/MySQLGuacamoleConfiguration.java

@@ -20,12 +20,11 @@
  * THE SOFTWARE.
  */
 
-package net.sourceforge.guacamole.net.auth.mysql;
+package org.glyptodon.guacamole.auth.mysql.connection;
 
 import com.google.inject.Inject;
 import java.util.Map;
-import net.sourceforge.guacamole.net.auth.mysql.model.ConnectionModel;
+import org.glyptodon.guacamole.auth.mysql.user.AuthenticatedUser;
-import net.sourceforge.guacamole.net.auth.mysql.service.ConnectionService;
 import org.glyptodon.guacamole.protocol.GuacamoleConfiguration;
 
 /**

extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/connection/ParameterMapper.java

@@ -20,10 +20,9 @@
  * THE SOFTWARE.
  */
 
-package net.sourceforge.guacamole.net.auth.mysql.dao;
+package org.glyptodon.guacamole.auth.mysql.connection;
 
 import java.util.Collection;
-import net.sourceforge.guacamole.net.auth.mysql.model.ParameterModel;
 import org.apache.ibatis.annotations.Param;
 
 /**

extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/connection/ParameterModel.java

@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package net.sourceforge.guacamole.net.auth.mysql.model;
+package org.glyptodon.guacamole.auth.mysql.connection;
 
 /**
  * A single parameter name/value pair belonging to a connection.

extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/connection/package-info.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013 Glyptodon LLC
+ * Copyright (C) 2015 Glyptodon LLC
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -21,8 +21,6 @@
  */
 
 /**
- * Properties which control the configuration of the MySQL authentication
+ * Classes related to connections and their parameters and history.
- * provider.
  */
-package net.sourceforge.guacamole.net.auth.mysql.properties;
+package org.glyptodon.guacamole.auth.mysql.connection;
-

extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/connectiongroup/ConnectionGroupDirectory.java

@@ -20,14 +20,14 @@
  * THE SOFTWARE.
  */
 
-package net.sourceforge.guacamole.net.auth.mysql;
+package org.glyptodon.guacamole.auth.mysql.connectiongroup;
 
 
 import com.google.inject.Inject;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Set;
-import net.sourceforge.guacamole.net.auth.mysql.service.ConnectionGroupService;
+import org.glyptodon.guacamole.auth.mysql.user.AuthenticatedUser;
 import org.glyptodon.guacamole.GuacamoleException;
 import org.glyptodon.guacamole.net.auth.ConnectionGroup;
 import org.glyptodon.guacamole.net.auth.Directory;

extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/connectiongroup/ConnectionGroupMapper.java

@@ -20,11 +20,11 @@
  * THE SOFTWARE.
  */
 
-package net.sourceforge.guacamole.net.auth.mysql.dao;
+package org.glyptodon.guacamole.auth.mysql.connectiongroup;
 
 import java.util.Set;
-import net.sourceforge.guacamole.net.auth.mysql.model.ConnectionGroupModel;
+import org.glyptodon.guacamole.auth.mysql.base.DirectoryObjectMapper;
-import net.sourceforge.guacamole.net.auth.mysql.model.UserModel;
+import org.glyptodon.guacamole.auth.mysql.user.UserModel;
 import org.apache.ibatis.annotations.Param;
 
 /**

extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/connectiongroup/ConnectionGroupModel.java

@@ -20,8 +20,9 @@
  * THE SOFTWARE.
  */
 
-package net.sourceforge.guacamole.net.auth.mysql.model;
+package org.glyptodon.guacamole.auth.mysql.connectiongroup;
 
+import org.glyptodon.guacamole.auth.mysql.base.ObjectModel;
 import org.glyptodon.guacamole.net.auth.ConnectionGroup;
 
 /**

extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/connectiongroup/ConnectionGroupService.java

@@ -20,16 +20,15 @@
  * THE SOFTWARE.
  */
 
-package net.sourceforge.guacamole.net.auth.mysql.service;
+package org.glyptodon.guacamole.auth.mysql.connectiongroup;
 
 import com.google.inject.Inject;
 import com.google.inject.Provider;
 import java.util.Set;
-import net.sourceforge.guacamole.net.auth.mysql.AuthenticatedUser;
+import org.glyptodon.guacamole.auth.mysql.user.AuthenticatedUser;
-import net.sourceforge.guacamole.net.auth.mysql.MySQLConnectionGroup;
+import org.glyptodon.guacamole.auth.mysql.base.DirectoryObjectMapper;
-import net.sourceforge.guacamole.net.auth.mysql.dao.ConnectionGroupMapper;
+import org.glyptodon.guacamole.auth.mysql.base.DirectoryObjectService;
-import net.sourceforge.guacamole.net.auth.mysql.dao.DirectoryObjectMapper;
+import org.glyptodon.guacamole.auth.mysql.socket.GuacamoleSocketService;
-import net.sourceforge.guacamole.net.auth.mysql.model.ConnectionGroupModel;
 import org.glyptodon.guacamole.GuacamoleClientException;
 import org.glyptodon.guacamole.GuacamoleException;
 import org.glyptodon.guacamole.GuacamoleSecurityException;

extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/connectiongroup/MySQLConnectionGroup.java

@@ -20,14 +20,13 @@
  * THE SOFTWARE.
  */
 
-package net.sourceforge.guacamole.net.auth.mysql;
+package org.glyptodon.guacamole.auth.mysql.connectiongroup;
 
 import com.google.inject.Inject;
 import java.util.Set;
-import net.sourceforge.guacamole.net.auth.mysql.model.ConnectionGroupModel;
+import org.glyptodon.guacamole.auth.mysql.base.DirectoryObject;
-import net.sourceforge.guacamole.net.auth.mysql.service.ConnectionGroupService;
+import org.glyptodon.guacamole.auth.mysql.connection.ConnectionService;
-import net.sourceforge.guacamole.net.auth.mysql.service.ConnectionService;
+import org.glyptodon.guacamole.auth.mysql.socket.GuacamoleSocketService;
-import net.sourceforge.guacamole.net.auth.mysql.service.GuacamoleSocketService;
 import org.glyptodon.guacamole.GuacamoleException;
 import org.glyptodon.guacamole.net.GuacamoleSocket;
 import org.glyptodon.guacamole.net.auth.ConnectionGroup;

extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/connectiongroup/MySQLRootConnectionGroup.java

@@ -20,12 +20,12 @@
  * THE SOFTWARE.
  */
 
-package net.sourceforge.guacamole.net.auth.mysql;
+package org.glyptodon.guacamole.auth.mysql.connectiongroup;
 
 import com.google.inject.Inject;
 import java.util.Set;
-import net.sourceforge.guacamole.net.auth.mysql.service.ConnectionGroupService;
+import org.glyptodon.guacamole.auth.mysql.user.AuthenticatedUser;
-import net.sourceforge.guacamole.net.auth.mysql.service.ConnectionService;
+import org.glyptodon.guacamole.auth.mysql.connection.ConnectionService;
 import org.glyptodon.guacamole.GuacamoleException;
 import org.glyptodon.guacamole.GuacamoleSecurityException;
 import org.glyptodon.guacamole.net.GuacamoleSocket;

extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/connectiongroup/package-info.java

@@ -0,0 +1,26 @@
+/*
+ * Copyright (C) 2015 Glyptodon LLC
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+/**
+ * Classes related to connection groups.
+ */
+package org.glyptodon.guacamole.auth.mysql.connectiongroup;

extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/permission/MySQLSystemPermissionSet.java

@@ -20,12 +20,13 @@
  * THE SOFTWARE.
  */
 
-package net.sourceforge.guacamole.net.auth.mysql;
+package org.glyptodon.guacamole.auth.mysql.permission;
 
+import org.glyptodon.guacamole.auth.mysql.user.MySQLUser;
 import com.google.inject.Inject;
 import java.util.Collections;
 import java.util.Set;
-import net.sourceforge.guacamole.net.auth.mysql.service.SystemPermissionService;
+import org.glyptodon.guacamole.auth.mysql.user.AuthenticatedUser;
 import org.glyptodon.guacamole.GuacamoleException;
 import org.glyptodon.guacamole.net.auth.permission.SystemPermission;
 import org.glyptodon.guacamole.net.auth.permission.SystemPermissionSet;

extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/permission/ObjectPermissionMapper.java

@@ -20,9 +20,7 @@
  * THE SOFTWARE.
  */
 
-package net.sourceforge.guacamole.net.auth.mysql.dao;
+package org.glyptodon.guacamole.auth.mysql.permission;
-
-import net.sourceforge.guacamole.net.auth.mysql.model.ObjectPermissionModel;
 
 /**
  * Mapper for object-related permissions.

extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/permission/ObjectPermissionModel.java

@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package net.sourceforge.guacamole.net.auth.mysql.model;
+package org.glyptodon.guacamole.auth.mysql.permission;
 
 import org.glyptodon.guacamole.net.auth.permission.ObjectPermission;
 

extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/permission/ObjectPermissionService.java

@@ -20,13 +20,13 @@
  * THE SOFTWARE.
  */
 
-package net.sourceforge.guacamole.net.auth.mysql.service;
+package org.glyptodon.guacamole.auth.mysql.permission;
 
 import java.util.Collection;
 import java.util.Collections;
 import java.util.HashSet;
-import net.sourceforge.guacamole.net.auth.mysql.AuthenticatedUser;
+import org.glyptodon.guacamole.auth.mysql.user.AuthenticatedUser;
-import net.sourceforge.guacamole.net.auth.mysql.MySQLUser;
+import org.glyptodon.guacamole.auth.mysql.user.MySQLUser;
 import org.glyptodon.guacamole.GuacamoleException;
 import org.glyptodon.guacamole.GuacamoleSecurityException;
 import org.glyptodon.guacamole.net.auth.permission.ObjectPermission;

extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/permission/PermissionMapper.java

@@ -20,10 +20,10 @@
  * THE SOFTWARE.
  */
 
-package net.sourceforge.guacamole.net.auth.mysql.dao;
+package org.glyptodon.guacamole.auth.mysql.permission;
 
 import java.util.Collection;
-import net.sourceforge.guacamole.net.auth.mysql.model.UserModel;
+import org.glyptodon.guacamole.auth.mysql.user.UserModel;
 import org.apache.ibatis.annotations.Param;
 
 /**

extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/permission/PermissionModel.java

@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package net.sourceforge.guacamole.net.auth.mysql.model;
+package org.glyptodon.guacamole.auth.mysql.permission;
 
 /**
  * Generic base permission model which grants a permission of a particular type

extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/permission/PermissionService.java

@@ -20,15 +20,14 @@
  * THE SOFTWARE.
  */
 
-package net.sourceforge.guacamole.net.auth.mysql.service;
+package org.glyptodon.guacamole.auth.mysql.permission;
 
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashSet;
 import java.util.Set;
-import net.sourceforge.guacamole.net.auth.mysql.AuthenticatedUser;
+import org.glyptodon.guacamole.auth.mysql.user.AuthenticatedUser;
-import net.sourceforge.guacamole.net.auth.mysql.MySQLUser;
+import org.glyptodon.guacamole.auth.mysql.user.MySQLUser;
-import net.sourceforge.guacamole.net.auth.mysql.dao.PermissionMapper;
 import org.glyptodon.guacamole.GuacamoleException;
 import org.glyptodon.guacamole.GuacamoleSecurityException;
 import org.glyptodon.guacamole.net.auth.permission.Permission;

extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/permission/SystemPermissionMapper.java

@@ -20,10 +20,9 @@
  * THE SOFTWARE.
  */
 
-package net.sourceforge.guacamole.net.auth.mysql.dao;
+package org.glyptodon.guacamole.auth.mysql.permission;
 
-import net.sourceforge.guacamole.net.auth.mysql.model.SystemPermissionModel;
+import org.glyptodon.guacamole.auth.mysql.user.UserModel;
-import net.sourceforge.guacamole.net.auth.mysql.model.UserModel;
 import org.apache.ibatis.annotations.Param;
 import org.glyptodon.guacamole.net.auth.permission.SystemPermission;
 

extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/permission/SystemPermissionModel.java

@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package net.sourceforge.guacamole.net.auth.mysql.model;
+package org.glyptodon.guacamole.auth.mysql.permission;
 
 import org.glyptodon.guacamole.net.auth.permission.SystemPermission;
 

extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/permission/SystemPermissionService.java

@@ -20,16 +20,13 @@
  * THE SOFTWARE.
  */
 
-package net.sourceforge.guacamole.net.auth.mysql.service;
+package org.glyptodon.guacamole.auth.mysql.permission;
 
 import com.google.inject.Inject;
 import com.google.inject.Provider;
 import java.util.Collection;
-import net.sourceforge.guacamole.net.auth.mysql.AuthenticatedUser;
+import org.glyptodon.guacamole.auth.mysql.user.AuthenticatedUser;
-import net.sourceforge.guacamole.net.auth.mysql.MySQLSystemPermissionSet;
+import org.glyptodon.guacamole.auth.mysql.user.MySQLUser;
-import net.sourceforge.guacamole.net.auth.mysql.MySQLUser;
-import net.sourceforge.guacamole.net.auth.mysql.dao.SystemPermissionMapper;
-import net.sourceforge.guacamole.net.auth.mysql.model.SystemPermissionModel;
 import org.glyptodon.guacamole.GuacamoleException;
 import org.glyptodon.guacamole.GuacamoleSecurityException;
 import org.glyptodon.guacamole.net.auth.permission.SystemPermission;

extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/permission/package-info.java

@@ -0,0 +1,26 @@
+/*
+ * Copyright (C) 2015 Glyptodon LLC
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+/**
+ * Classes related to object- and system-level permissions.
+ */
+package org.glyptodon.guacamole.auth.mysql.permission;

extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/security/PasswordEncryptionService.java

@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package net.sourceforge.guacamole.net.auth.mysql.service;
+package org.glyptodon.guacamole.auth.mysql.security;
 
 /**
  * A service to perform password encryption and checking.

extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/security/SHA256PasswordEncryptionService.java

@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package net.sourceforge.guacamole.net.auth.mysql.service;
+package org.glyptodon.guacamole.auth.mysql.security;
 
 import java.io.UnsupportedEncodingException;
 import java.security.MessageDigest;

extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/security/SaltService.java

@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package net.sourceforge.guacamole.net.auth.mysql.service;
+package org.glyptodon.guacamole.auth.mysql.security;
 
 /**
  * A service to generate password salts.

extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/security/SecureRandomSaltService.java

@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package net.sourceforge.guacamole.net.auth.mysql.service;
+package org.glyptodon.guacamole.auth.mysql.security;
 
 
 import java.security.SecureRandom;

extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/security/package-info.java

@@ -0,0 +1,26 @@
+/*
+ * Copyright (C) 2015 Glyptodon LLC
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+/**
+ * Classes related to hashing or encryption.
+ */
+package org.glyptodon.guacamole.auth.mysql.security;

extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/socket/AbstractGuacamoleSocketService.java

@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package net.sourceforge.guacamole.net.auth.mysql.service;
+package org.glyptodon.guacamole.auth.mysql.socket;
 
 import com.google.inject.Inject;
 import java.util.Collection;
@@ -30,15 +30,15 @@ import java.util.HashMap;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
-import net.sourceforge.guacamole.net.auth.mysql.AuthenticatedUser;
+import org.glyptodon.guacamole.auth.mysql.user.AuthenticatedUser;
-import net.sourceforge.guacamole.net.auth.mysql.MySQLConnection;
+import org.glyptodon.guacamole.auth.mysql.connection.MySQLConnection;
-import net.sourceforge.guacamole.net.auth.mysql.MySQLConnectionGroup;
+import org.glyptodon.guacamole.auth.mysql.connectiongroup.MySQLConnectionGroup;
-import net.sourceforge.guacamole.net.auth.mysql.dao.ConnectionRecordMapper;
+import org.glyptodon.guacamole.auth.mysql.connection.ConnectionRecordMapper;
-import net.sourceforge.guacamole.net.auth.mysql.dao.ParameterMapper;
+import org.glyptodon.guacamole.auth.mysql.connection.ParameterMapper;
-import net.sourceforge.guacamole.net.auth.mysql.model.ConnectionModel;
+import org.glyptodon.guacamole.auth.mysql.connection.ConnectionModel;
-import net.sourceforge.guacamole.net.auth.mysql.model.ConnectionRecordModel;
+import org.glyptodon.guacamole.auth.mysql.connection.ConnectionRecordModel;
-import net.sourceforge.guacamole.net.auth.mysql.model.ParameterModel;
+import org.glyptodon.guacamole.auth.mysql.connection.ParameterModel;
-import net.sourceforge.guacamole.net.auth.mysql.model.UserModel;
+import org.glyptodon.guacamole.auth.mysql.user.UserModel;
 import org.glyptodon.guacamole.GuacamoleException;
 import org.glyptodon.guacamole.environment.Environment;
 import org.glyptodon.guacamole.net.GuacamoleSocket;

extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/socket/ActiveConnectionRecord.java

@@ -20,10 +20,10 @@
  * THE SOFTWARE.
  */
 
-package net.sourceforge.guacamole.net.auth.mysql.service;
+package org.glyptodon.guacamole.auth.mysql.socket;
 
 import java.util.Date;
-import net.sourceforge.guacamole.net.auth.mysql.AuthenticatedUser;
+import org.glyptodon.guacamole.auth.mysql.user.AuthenticatedUser;
 import org.glyptodon.guacamole.net.auth.ConnectionRecord;
 
 

extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/socket/GuacamoleSocketService.java

@@ -20,12 +20,12 @@
  * THE SOFTWARE.
  */
 
-package net.sourceforge.guacamole.net.auth.mysql.service;
+package org.glyptodon.guacamole.auth.mysql.socket;
 
 import java.util.List;
-import net.sourceforge.guacamole.net.auth.mysql.AuthenticatedUser;
+import org.glyptodon.guacamole.auth.mysql.user.AuthenticatedUser;
-import net.sourceforge.guacamole.net.auth.mysql.MySQLConnection;
+import org.glyptodon.guacamole.auth.mysql.connection.MySQLConnection;
-import net.sourceforge.guacamole.net.auth.mysql.MySQLConnectionGroup;
+import org.glyptodon.guacamole.auth.mysql.connectiongroup.MySQLConnectionGroup;
 import org.glyptodon.guacamole.GuacamoleException;
 import org.glyptodon.guacamole.net.GuacamoleSocket;
 import org.glyptodon.guacamole.net.auth.Connection;

extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/socket/UnrestrictedGuacamoleSocketService.java

@@ -20,11 +20,11 @@
  * THE SOFTWARE.
  */
 
-package net.sourceforge.guacamole.net.auth.mysql.service;
+package org.glyptodon.guacamole.auth.mysql.socket;
 
 import com.google.inject.Singleton;
-import net.sourceforge.guacamole.net.auth.mysql.AuthenticatedUser;
+import org.glyptodon.guacamole.auth.mysql.user.AuthenticatedUser;
-import net.sourceforge.guacamole.net.auth.mysql.MySQLConnection;
+import org.glyptodon.guacamole.auth.mysql.connection.MySQLConnection;
 import org.glyptodon.guacamole.GuacamoleException;
 
 

extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/socket/package-info.java

@@ -0,0 +1,27 @@
+/*
+ * Copyright (C) 2015 Glyptodon LLC
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+/**
+ * Classes related to obtaining/configuring Guacamole sockets, and restricting
+ * access to those sockets.
+ */
+package org.glyptodon.guacamole.auth.mysql.socket;

extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/user/AuthenticatedUser.java

@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package net.sourceforge.guacamole.net.auth.mysql;
+package org.glyptodon.guacamole.auth.mysql.user;
 
 import org.glyptodon.guacamole.net.auth.Credentials;
 

extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/user/MySQLUser.java

@@ -20,13 +20,13 @@
  * THE SOFTWARE.
  */
 
-package net.sourceforge.guacamole.net.auth.mysql;
+package org.glyptodon.guacamole.auth.mysql.user;
 
 import com.google.inject.Inject;
-import net.sourceforge.guacamole.net.auth.mysql.model.UserModel;
+import org.glyptodon.guacamole.auth.mysql.base.DirectoryObject;
-import net.sourceforge.guacamole.net.auth.mysql.service.PasswordEncryptionService;
+import org.glyptodon.guacamole.auth.mysql.security.PasswordEncryptionService;
-import net.sourceforge.guacamole.net.auth.mysql.service.SaltService;
+import org.glyptodon.guacamole.auth.mysql.security.SaltService;
-import net.sourceforge.guacamole.net.auth.mysql.service.SystemPermissionService;
+import org.glyptodon.guacamole.auth.mysql.permission.SystemPermissionService;
 import org.glyptodon.guacamole.GuacamoleException;
 import org.glyptodon.guacamole.net.auth.User;
 import org.glyptodon.guacamole.net.auth.permission.ObjectPermissionSet;

extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/user/MySQLUserContext.java

@@ -20,9 +20,12 @@
  * THE SOFTWARE.
  */
 
-package net.sourceforge.guacamole.net.auth.mysql;
+package org.glyptodon.guacamole.auth.mysql.user;
 
 
+import org.glyptodon.guacamole.auth.mysql.connectiongroup.MySQLRootConnectionGroup;
+import org.glyptodon.guacamole.auth.mysql.connectiongroup.ConnectionGroupDirectory;
+import org.glyptodon.guacamole.auth.mysql.connection.ConnectionDirectory;
 import com.google.inject.Inject;
 import com.google.inject.Provider;
 import org.glyptodon.guacamole.GuacamoleException;

extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/user/UserDirectory.java

@@ -20,16 +20,14 @@
  * THE SOFTWARE.
  */
 
-package net.sourceforge.guacamole.net.auth.mysql;
+package org.glyptodon.guacamole.auth.mysql.user;
 
 
 import com.google.inject.Inject;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Set;
-import net.sourceforge.guacamole.net.auth.mysql.service.UserService;
 import org.glyptodon.guacamole.GuacamoleException;
-import org.glyptodon.guacamole.GuacamoleSecurityException;
 import org.glyptodon.guacamole.net.auth.Directory;
 import org.glyptodon.guacamole.net.auth.User;
 import org.mybatis.guice.transactional.Transactional;

extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/user/UserMapper.java

@@ -20,9 +20,9 @@
  * THE SOFTWARE.
  */
 
-package net.sourceforge.guacamole.net.auth.mysql.dao;
+package org.glyptodon.guacamole.auth.mysql.user;
 
-import net.sourceforge.guacamole.net.auth.mysql.model.UserModel;
+import org.glyptodon.guacamole.auth.mysql.base.DirectoryObjectMapper;
 import org.apache.ibatis.annotations.Param;
 
 /**

extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/user/UserModel.java

@@ -20,7 +20,9 @@
  * THE SOFTWARE.
  */
 
-package net.sourceforge.guacamole.net.auth.mysql.model;
+package org.glyptodon.guacamole.auth.mysql.user;
+
+import org.glyptodon.guacamole.auth.mysql.base.ObjectModel;
 
 /**
  * Object representation of a Guacamole user, as represented in the database.

extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/user/UserService.java

@@ -20,18 +20,15 @@
  * THE SOFTWARE.
  */
 
-package net.sourceforge.guacamole.net.auth.mysql.service;
+package org.glyptodon.guacamole.auth.mysql.user;
 
 import com.google.inject.Inject;
 import com.google.inject.Provider;
 import java.util.Collection;
 import java.util.Collections;
-import net.sourceforge.guacamole.net.auth.mysql.AuthenticatedUser;
 import org.glyptodon.guacamole.net.auth.Credentials;
-import net.sourceforge.guacamole.net.auth.mysql.MySQLUser;
+import org.glyptodon.guacamole.auth.mysql.base.DirectoryObjectMapper;
-import net.sourceforge.guacamole.net.auth.mysql.dao.DirectoryObjectMapper;
+import org.glyptodon.guacamole.auth.mysql.base.DirectoryObjectService;
-import net.sourceforge.guacamole.net.auth.mysql.dao.UserMapper;
-import net.sourceforge.guacamole.net.auth.mysql.model.UserModel;
 import org.glyptodon.guacamole.GuacamoleClientException;
 import org.glyptodon.guacamole.GuacamoleException;
 import org.glyptodon.guacamole.net.auth.User;

extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/user/package-info.java

@@ -0,0 +1,26 @@
+/*
+ * Copyright (C) 2015 Glyptodon LLC
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+/**
+ * Classes related to Guacamole users.
+ */
+package org.glyptodon.guacamole.auth.mysql.user;

extensions/guacamole-auth-mysql/src/main/resources/org/glyptodon/guacamole/auth/mysql/connection/ConnectionMapper.xml

@@ -24,10 +24,10 @@
    THE SOFTWARE.
 -->
 
-<mapper namespace="net.sourceforge.guacamole.net.auth.mysql.dao.ConnectionMapper" >
+<mapper namespace="org.glyptodon.guacamole.auth.mysql.connection.ConnectionMapper" >
 
     <!-- Result mapper for connection objects -->
-    <resultMap id="ConnectionResultMap" type="net.sourceforge.guacamole.net.auth.mysql.model.ConnectionModel" >
+    <resultMap id="ConnectionResultMap" type="org.glyptodon.guacamole.auth.mysql.connection.ConnectionModel" >
         <id     column="connection_id"   property="objectID"         jdbcType="INTEGER"/>
         <result column="connection_name" property="name"             jdbcType="VARCHAR"/>
         <result column="parent_id"       property="parentIdentifier" jdbcType="INTEGER"/>
@@ -115,7 +115,7 @@
 
     <!-- Insert single connection -->
     <insert id="insert" useGeneratedKeys="true" keyProperty="object.objectID"
-            parameterType="net.sourceforge.guacamole.net.auth.mysql.model.ConnectionModel">
+            parameterType="org.glyptodon.guacamole.auth.mysql.connection.ConnectionModel">
 
         INSERT INTO guacamole_connection (
             connection_name,
@@ -131,7 +131,7 @@
     </insert>
 
     <!-- Update single connection -->
-    <update id="update" parameterType="net.sourceforge.guacamole.net.auth.mysql.model.ConnectionModel">
+    <update id="update" parameterType="org.glyptodon.guacamole.auth.mysql.connection.ConnectionModel">
         UPDATE guacamole_connection
         SET connection_name = #{object.name,jdbcType=VARCHAR},
             parent_id       = #{object.parentIdentifier,jdbcType=VARCHAR},

extensions/guacamole-auth-mysql/src/main/resources/org/glyptodon/guacamole/auth/mysql/connection/ConnectionRecordMapper.xml

@@ -24,10 +24,10 @@
    THE SOFTWARE.
 -->
 
-<mapper namespace="net.sourceforge.guacamole.net.auth.mysql.dao.ConnectionRecordMapper" >
+<mapper namespace="org.glyptodon.guacamole.auth.mysql.connection.ConnectionRecordMapper" >
 
     <!-- Result mapper for system permissions -->
-    <resultMap id="ConnectionRecordResultMap" type="net.sourceforge.guacamole.net.auth.mysql.model.ConnectionRecordModel">
+    <resultMap id="ConnectionRecordResultMap" type="org.glyptodon.guacamole.auth.mysql.connection.ConnectionRecordModel">
         <result column="connection_id" property="connectionIdentifier" jdbcType="INTEGER"/>
         <result column="user_id"       property="userID"               jdbcType="INTEGER"/>
         <result column="username"      property="username"             jdbcType="VARCHAR"/>
@@ -55,7 +55,7 @@
     </select>
 
     <!-- Insert the given connection record -->
-    <insert id="insert" parameterType="net.sourceforge.guacamole.net.auth.mysql.model.ConnectionRecordModel">
+    <insert id="insert" parameterType="org.glyptodon.guacamole.auth.mysql.connection.ConnectionRecordModel">
 
         INSERT INTO guacamole_connection_history (
             connection_id,

extensions/guacamole-auth-mysql/src/main/resources/org/glyptodon/guacamole/auth/mysql/connection/ParameterMapper.xml

@@ -24,10 +24,10 @@
    THE SOFTWARE.
 -->
 
-<mapper namespace="net.sourceforge.guacamole.net.auth.mysql.dao.ParameterMapper">
+<mapper namespace="org.glyptodon.guacamole.auth.mysql.connection.ParameterMapper">
 
     <!-- Result mapper for connection parameters -->
-    <resultMap id="ParameterResultMap" type="net.sourceforge.guacamole.net.auth.mysql.model.ParameterModel">
+    <resultMap id="ParameterResultMap" type="org.glyptodon.guacamole.auth.mysql.connection.ParameterModel">
         <result column="connection_id"   property="connectionIdentifier" jdbcType="INTEGER"/>
         <result column="parameter_name"  property="name"                 jdbcType="VARCHAR"/>
         <result column="parameter_value" property="value"                jdbcType="VARCHAR"/>
@@ -51,7 +51,7 @@
     </delete>
 
     <!-- Insert all given parameters -->
-    <insert id="insert" parameterType="net.sourceforge.guacamole.net.auth.mysql.model.ParameterModel">
+    <insert id="insert" parameterType="org.glyptodon.guacamole.auth.mysql.connection.ParameterModel">
 
         INSERT INTO guacamole_connection_parameter (
             connection_id,

extensions/guacamole-auth-mysql/src/main/resources/org/glyptodon/guacamole/auth/mysql/connectiongroup/ConnectionGroupMapper.xml

@@ -24,10 +24,10 @@
    THE SOFTWARE.
 -->
 
-<mapper namespace="net.sourceforge.guacamole.net.auth.mysql.dao.ConnectionGroupMapper" >
+<mapper namespace="org.glyptodon.guacamole.auth.mysql.connectiongroup.ConnectionGroupMapper" >
 
     <!-- Result mapper for connection objects -->
-    <resultMap id="ConnectionGroupResultMap" type="net.sourceforge.guacamole.net.auth.mysql.model.ConnectionGroupModel" >
+    <resultMap id="ConnectionGroupResultMap" type="org.glyptodon.guacamole.auth.mysql.connectiongroup.ConnectionGroupModel" >
         <id     column="connection_group_id"   property="objectID"         jdbcType="INTEGER"/>
         <result column="connection_group_name" property="name"             jdbcType="VARCHAR"/>
         <result column="parent_id"             property="parentIdentifier" jdbcType="INTEGER"/>
@@ -116,7 +116,7 @@
 
     <!-- Insert single connection -->
     <insert id="insert" useGeneratedKeys="true" keyProperty="object.objectID"
-            parameterType="net.sourceforge.guacamole.net.auth.mysql.model.ConnectionGroupModel">
+            parameterType="org.glyptodon.guacamole.auth.mysql.connectiongroup.ConnectionGroupModel">
 
         INSERT INTO guacamole_connection_group (
             connection_group_name,
@@ -132,7 +132,7 @@
     </insert>
 
     <!-- Update single connection group -->
-    <update id="update" parameterType="net.sourceforge.guacamole.net.auth.mysql.model.ConnectionGroupModel">
+    <update id="update" parameterType="org.glyptodon.guacamole.auth.mysql.connectiongroup.ConnectionGroupModel">
         UPDATE guacamole_connection_group
         SET connection_group_name = #{object.name,jdbcType=VARCHAR},
             parent_id             = #{object.parentIdentifier,jdbcType=VARCHAR},

extensions/guacamole-auth-mysql/src/main/resources/org/glyptodon/guacamole/auth/mysql/permission/SystemPermissionMapper.xml

@@ -24,10 +24,10 @@
    THE SOFTWARE.
 -->
 
-<mapper namespace="net.sourceforge.guacamole.net.auth.mysql.dao.SystemPermissionMapper" >
+<mapper namespace="org.glyptodon.guacamole.auth.mysql.permission.SystemPermissionMapper" >
 
     <!-- Result mapper for system permissions -->
-    <resultMap id="SystemPermissionResultMap" type="net.sourceforge.guacamole.net.auth.mysql.model.SystemPermissionModel">
+    <resultMap id="SystemPermissionResultMap" type="org.glyptodon.guacamole.auth.mysql.permission.SystemPermissionModel">
         <result column="user_id"    property="userID"   jdbcType="INTEGER"/>
         <result column="username"   property="username" jdbcType="VARCHAR"/>
         <result column="permission" property="type"     jdbcType="VARCHAR"
@@ -63,7 +63,7 @@
     </select>
 
     <!-- Delete all given permissions -->
-    <delete id="delete" parameterType="net.sourceforge.guacamole.net.auth.mysql.model.SystemPermissionModel">
+    <delete id="delete" parameterType="org.glyptodon.guacamole.auth.mysql.permission.SystemPermissionModel">
 
         DELETE FROM guacamole_system_permission
         WHERE (user_id, permission) IN
@@ -76,7 +76,7 @@
     </delete>
 
     <!-- Insert all given permissions -->
-    <insert id="insert" parameterType="net.sourceforge.guacamole.net.auth.mysql.model.SystemPermissionModel">
+    <insert id="insert" parameterType="org.glyptodon.guacamole.auth.mysql.permission.SystemPermissionModel">
 
         INSERT IGNORE INTO guacamole_system_permission (
             user_id,

extensions/guacamole-auth-mysql/src/main/resources/org/glyptodon/guacamole/auth/mysql/user/UserMapper.xml

@@ -24,10 +24,10 @@
    THE SOFTWARE.
 -->
 
-<mapper namespace="net.sourceforge.guacamole.net.auth.mysql.dao.UserMapper" >
+<mapper namespace="org.glyptodon.guacamole.auth.mysql.user.UserMapper" >
 
     <!-- Result mapper for user objects -->
-    <resultMap id="UserResultMap" type="net.sourceforge.guacamole.net.auth.mysql.model.UserModel" >
+    <resultMap id="UserResultMap" type="org.glyptodon.guacamole.auth.mysql.user.UserModel" >
         <id     column="user_id"       property="objectID"     jdbcType="INTEGER"/>
         <result column="username"      property="identifier"   jdbcType="VARCHAR"/>
         <result column="password_hash" property="passwordHash" jdbcType="BINARY"/>
@@ -108,7 +108,7 @@
 
     <!-- Insert single user -->
     <insert id="insert" useGeneratedKeys="true" keyProperty="object.objectID"
-            parameterType="net.sourceforge.guacamole.net.auth.mysql.model.UserModel">
+            parameterType="org.glyptodon.guacamole.auth.mysql.user.UserModel">
 
         INSERT INTO guacamole_user (
             username,
@@ -124,7 +124,7 @@
     </insert>
 
     <!-- Update single user -->
-    <update id="update" parameterType="net.sourceforge.guacamole.net.auth.mysql.model.UserModel">
+    <update id="update" parameterType="org.glyptodon.guacamole.auth.mysql.user.UserModel">
         UPDATE guacamole_user
         SET password_hash = #{object.passwordHash,jdbcType=BINARY},
             password_salt = #{object.passwordSalt,jdbcType=BINARY}