Ticket #269: Changed password hash column to binary(32) and added a database script to create a default admin user

extensions/guacamole-auth-mysql/README

@@ -63,6 +63,10 @@ guacamole.properties such that the authentication provider is available.
     A schema file is provided in the schema directory for creating
     the guacamole authentication tables in your MySQL database.
 
+    Additionally, a script is provided to create a default admin user
+    with username 'guacadmin' and password 'guacadmin'. This user can 
+    be used to set up any other connections and users.
+
 4) Configure guacamole.properties for MySQL
 
     There are additional properties required by the MySQL JDBC driver

extensions/guacamole-auth-mysql/pom.xml

@@ -94,11 +94,14 @@
             <version>3.2</version>
         </dependency>
         
+        <!-- Google Collections -->
         <dependency>
             <groupId>com.google.collections</groupId>
             <artifactId>google-collections</artifactId>
             <version>1.0</version>
         </dependency>
+        
+        <!-- Guacamole -->
         <dependency>
             <groupId>net.sourceforge.guacamole</groupId>
             <artifactId>guacamole-auth-mysql</artifactId>

extensions/guacamole-auth-mysql/schema/guacamole-auth-mysql-create-default-user.sql

@@ -0,0 +1,4 @@
+insert into guacamole_user values(1, 'guacadmin', x'AE97B20D5B24B2F18BE7921E3C0CF6109696391D7D5A6BE24BD267E49F0D7E42', x'FE24ADC5E11E2B25288D1704ABE67A79E342ECC26064CE69C5B3177795A82264');
+
+insert into guacamole_system_permission values(1, 'CREATE_CONFIGURATION');
+insert into guacamole_system_permission values(1, 'CREATE_USER');

extensions/guacamole-auth-mysql/schema/guacamole-auth-mysql-schema.sql

@@ -18,7 +18,7 @@ CREATE TABLE `guacamole_user` (
   `user_id` int(11) NOT NULL AUTO_INCREMENT,
   `username` varchar(128) NOT NULL,
   `password_hash` binary(32) NOT NULL,
-  `password_salt` varchar(100) NOT NULL,
+  `password_salt` binary(32) NOT NULL,
   PRIMARY KEY (`user_id`),
   UNIQUE KEY `username` (`username`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;

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

@@ -45,12 +45,12 @@ import net.sourceforge.guacamole.GuacamoleException;
 import net.sourceforge.guacamole.net.auth.AuthenticationProvider;
 import net.sourceforge.guacamole.net.auth.Credentials;
 import net.sourceforge.guacamole.net.auth.UserContext;
-import net.sourceforge.guacamole.net.auth.mysql.dao.guacamole.ConnectionMapper;
+import net.sourceforge.guacamole.net.auth.mysql.dao.ConnectionMapper;
-import net.sourceforge.guacamole.net.auth.mysql.dao.guacamole.ConnectionParameterMapper;
+import net.sourceforge.guacamole.net.auth.mysql.dao.ConnectionParameterMapper;
-import net.sourceforge.guacamole.net.auth.mysql.dao.guacamole.ConnectionPermissionMapper;
+import net.sourceforge.guacamole.net.auth.mysql.dao.ConnectionPermissionMapper;
-import net.sourceforge.guacamole.net.auth.mysql.dao.guacamole.SystemPermissionMapper;
+import net.sourceforge.guacamole.net.auth.mysql.dao.SystemPermissionMapper;
-import net.sourceforge.guacamole.net.auth.mysql.dao.guacamole.UserMapper;
+import net.sourceforge.guacamole.net.auth.mysql.dao.UserMapper;
-import net.sourceforge.guacamole.net.auth.mysql.dao.guacamole.UserPermissionMapper;
+import net.sourceforge.guacamole.net.auth.mysql.dao.UserPermissionMapper;
 import net.sourceforge.guacamole.net.auth.mysql.properties.MySQLGuacamoleProperties;
 import net.sourceforge.guacamole.net.auth.mysql.utility.PasswordEncryptionUtility;
 import net.sourceforge.guacamole.net.auth.mysql.utility.SaltUtility;

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

@@ -43,8 +43,9 @@ import java.util.Set;
 import net.sourceforge.guacamole.GuacamoleException;
 import net.sourceforge.guacamole.net.auth.Credentials;
 import net.sourceforge.guacamole.net.auth.User;
-import net.sourceforge.guacamole.net.auth.mysql.dao.guacamole.UserMapper;
+import net.sourceforge.guacamole.net.auth.mysql.dao.UserMapper;
-import net.sourceforge.guacamole.net.auth.mysql.model.guacamole.UserExample;
+import net.sourceforge.guacamole.net.auth.mysql.model.UserExample;
+import net.sourceforge.guacamole.net.auth.mysql.model.UserWithBLOBs;
 import net.sourceforge.guacamole.net.auth.mysql.utility.PasswordEncryptionUtility;
 import net.sourceforge.guacamole.net.auth.mysql.utility.SaltUtility;
 import net.sourceforge.guacamole.net.auth.permission.Permission;
@@ -55,7 +56,7 @@ import net.sourceforge.guacamole.net.auth.permission.Permission;
  */
 public class MySQLUser implements User {
 
-    private net.sourceforge.guacamole.net.auth.mysql.model.guacamole.User user;
+    private UserWithBLOBs user;
     
     @Inject
     UserMapper userDao;
@@ -69,7 +70,7 @@ public class MySQLUser implements User {
     Set<Permission> permissions;
     
     MySQLUser() {
-        user = new net.sourceforge.guacamole.net.auth.mysql.model.guacamole.User();
+        user = new UserWithBLOBs();
         permissions = new HashSet<Permission>();
     }
     
@@ -81,7 +82,7 @@ public class MySQLUser implements User {
     void init (Credentials credentials) throws GuacamoleException {
         UserExample userExample = new UserExample();
         userExample.createCriteria().andUsernameEqualTo(credentials.getUsername());
-        List<net.sourceforge.guacamole.net.auth.mysql.model.guacamole.User> users = userDao.selectByExample(userExample);
+        List<UserWithBLOBs> users = userDao.selectByExampleWithBLOBs(userExample);
         if(users.size() > 1)  // the unique constraint on the table should prevent this
             throw new GuacamoleException("Multiple users found with the same username: " + credentials.getUsername());
         if(users.isEmpty())
@@ -97,7 +98,7 @@ public class MySQLUser implements User {
         this.setUsername(user.getUsername());
     }
     
-    public net.sourceforge.guacamole.net.auth.mysql.model.guacamole.User getUser() {
+    public UserWithBLOBs getUser() {
         return user;
     }
     
@@ -122,7 +123,7 @@ public class MySQLUser implements User {
 
     @Override
     public void setPassword(String password) {
-        String salt = saltUtility.generateSalt();
+        byte[] salt = saltUtility.generateSalt();
         user.setPassword_salt(salt);
         byte[] hash = passwordUtility.createPasswordHash(password, salt);
         user.setPassword_hash(hash);

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

@@ -12,7 +12,7 @@ import java.util.Set;
 import net.sourceforge.guacamole.GuacamoleException;
 import net.sourceforge.guacamole.net.auth.Directory;
 import net.sourceforge.guacamole.net.auth.User;
-import net.sourceforge.guacamole.net.auth.mysql.dao.guacamole.UserMapper;
+import net.sourceforge.guacamole.net.auth.mysql.dao.UserMapper;
 
 /**
  * A MySQL based implementation of the User Directory.

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

@@ -1,8 +1,8 @@
-package net.sourceforge.guacamole.net.auth.mysql.dao.guacamole;
+package net.sourceforge.guacamole.net.auth.mysql.dao;
 
 import java.util.List;
-import net.sourceforge.guacamole.net.auth.mysql.model.guacamole.Connection;
+import net.sourceforge.guacamole.net.auth.mysql.model.Connection;
-import net.sourceforge.guacamole.net.auth.mysql.model.guacamole.ConnectionExample;
+import net.sourceforge.guacamole.net.auth.mysql.model.ConnectionExample;
 import org.apache.ibatis.annotations.Param;
 
 public interface ConnectionMapper {
@@ -10,7 +10,7 @@ public interface ConnectionMapper {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table guacamole..guacamole_connection
      *
-     * @mbggenerated Tue Feb 05 15:45:11 PST 2013
+     * @mbggenerated Tue Feb 12 10:51:12 PST 2013
      */
     int countByExample(ConnectionExample example);
 
@@ -18,7 +18,7 @@ public interface ConnectionMapper {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table guacamole..guacamole_connection
      *
-     * @mbggenerated Tue Feb 05 15:45:11 PST 2013
+     * @mbggenerated Tue Feb 12 10:51:12 PST 2013
      */
     int deleteByExample(ConnectionExample example);
 
@@ -26,7 +26,7 @@ public interface ConnectionMapper {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table guacamole..guacamole_connection
      *
-     * @mbggenerated Tue Feb 05 15:45:11 PST 2013
+     * @mbggenerated Tue Feb 12 10:51:12 PST 2013
      */
     int deleteByPrimaryKey(Integer connection_id);
 
@@ -34,7 +34,7 @@ public interface ConnectionMapper {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table guacamole..guacamole_connection
      *
-     * @mbggenerated Tue Feb 05 15:45:11 PST 2013
+     * @mbggenerated Tue Feb 12 10:51:12 PST 2013
      */
     int insert(Connection record);
 
@@ -42,7 +42,7 @@ public interface ConnectionMapper {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table guacamole..guacamole_connection
      *
-     * @mbggenerated Tue Feb 05 15:45:11 PST 2013
+     * @mbggenerated Tue Feb 12 10:51:12 PST 2013
      */
     int insertSelective(Connection record);
 
@@ -50,7 +50,7 @@ public interface ConnectionMapper {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table guacamole..guacamole_connection
      *
-     * @mbggenerated Tue Feb 05 15:45:11 PST 2013
+     * @mbggenerated Tue Feb 12 10:51:12 PST 2013
      */
     List<Connection> selectByExample(ConnectionExample example);
 
@@ -58,7 +58,7 @@ public interface ConnectionMapper {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table guacamole..guacamole_connection
      *
-     * @mbggenerated Tue Feb 05 15:45:11 PST 2013
+     * @mbggenerated Tue Feb 12 10:51:12 PST 2013
      */
     Connection selectByPrimaryKey(Integer connection_id);
 
@@ -66,7 +66,7 @@ public interface ConnectionMapper {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table guacamole..guacamole_connection
      *
-     * @mbggenerated Tue Feb 05 15:45:11 PST 2013
+     * @mbggenerated Tue Feb 12 10:51:12 PST 2013
      */
     int updateByExampleSelective(@Param("record") Connection record, @Param("example") ConnectionExample example);
 
@@ -74,7 +74,7 @@ public interface ConnectionMapper {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table guacamole..guacamole_connection
      *
-     * @mbggenerated Tue Feb 05 15:45:11 PST 2013
+     * @mbggenerated Tue Feb 12 10:51:12 PST 2013
      */
     int updateByExample(@Param("record") Connection record, @Param("example") ConnectionExample example);
 
@@ -82,7 +82,7 @@ public interface ConnectionMapper {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table guacamole..guacamole_connection
      *
-     * @mbggenerated Tue Feb 05 15:45:11 PST 2013
+     * @mbggenerated Tue Feb 12 10:51:12 PST 2013
      */
     int updateByPrimaryKeySelective(Connection record);
 
@@ -90,7 +90,7 @@ public interface ConnectionMapper {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table guacamole..guacamole_connection
      *
-     * @mbggenerated Tue Feb 05 15:45:11 PST 2013
+     * @mbggenerated Tue Feb 12 10:51:12 PST 2013
      */
     int updateByPrimaryKey(Connection record);
 }

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

@@ -1,9 +1,9 @@
-package net.sourceforge.guacamole.net.auth.mysql.dao.guacamole;
+package net.sourceforge.guacamole.net.auth.mysql.dao;
 
 import java.util.List;
-import net.sourceforge.guacamole.net.auth.mysql.model.guacamole.ConnectionParameter;
+import net.sourceforge.guacamole.net.auth.mysql.model.ConnectionParameter;
-import net.sourceforge.guacamole.net.auth.mysql.model.guacamole.ConnectionParameterExample;
+import net.sourceforge.guacamole.net.auth.mysql.model.ConnectionParameterExample;
-import net.sourceforge.guacamole.net.auth.mysql.model.guacamole.ConnectionParameterKey;
+import net.sourceforge.guacamole.net.auth.mysql.model.ConnectionParameterKey;
 import org.apache.ibatis.annotations.Param;
 
 public interface ConnectionParameterMapper {
@@ -11,7 +11,7 @@ public interface ConnectionParameterMapper {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table guacamole..guacamole_connection_parameter
      *
-     * @mbggenerated Tue Feb 05 15:45:11 PST 2013
+     * @mbggenerated Tue Feb 12 10:51:12 PST 2013
      */
     int countByExample(ConnectionParameterExample example);
 
@@ -19,7 +19,7 @@ public interface ConnectionParameterMapper {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table guacamole..guacamole_connection_parameter
      *
-     * @mbggenerated Tue Feb 05 15:45:11 PST 2013
+     * @mbggenerated Tue Feb 12 10:51:12 PST 2013
      */
     int deleteByExample(ConnectionParameterExample example);
 
@@ -27,7 +27,7 @@ public interface ConnectionParameterMapper {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table guacamole..guacamole_connection_parameter
      *
-     * @mbggenerated Tue Feb 05 15:45:11 PST 2013
+     * @mbggenerated Tue Feb 12 10:51:12 PST 2013
      */
     int deleteByPrimaryKey(ConnectionParameterKey key);
 
@@ -35,7 +35,7 @@ public interface ConnectionParameterMapper {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table guacamole..guacamole_connection_parameter
      *
-     * @mbggenerated Tue Feb 05 15:45:11 PST 2013
+     * @mbggenerated Tue Feb 12 10:51:12 PST 2013
      */
     int insert(ConnectionParameter record);
 
@@ -43,7 +43,7 @@ public interface ConnectionParameterMapper {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table guacamole..guacamole_connection_parameter
      *
-     * @mbggenerated Tue Feb 05 15:45:11 PST 2013
+     * @mbggenerated Tue Feb 12 10:51:12 PST 2013
      */
     int insertSelective(ConnectionParameter record);
 
@@ -51,7 +51,7 @@ public interface ConnectionParameterMapper {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table guacamole..guacamole_connection_parameter
      *
-     * @mbggenerated Tue Feb 05 15:45:11 PST 2013
+     * @mbggenerated Tue Feb 12 10:51:12 PST 2013
      */
     List<ConnectionParameter> selectByExample(ConnectionParameterExample example);
 
@@ -59,7 +59,7 @@ public interface ConnectionParameterMapper {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table guacamole..guacamole_connection_parameter
      *
-     * @mbggenerated Tue Feb 05 15:45:11 PST 2013
+     * @mbggenerated Tue Feb 12 10:51:12 PST 2013
      */
     ConnectionParameter selectByPrimaryKey(ConnectionParameterKey key);
 
@@ -67,7 +67,7 @@ public interface ConnectionParameterMapper {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table guacamole..guacamole_connection_parameter
      *
-     * @mbggenerated Tue Feb 05 15:45:11 PST 2013
+     * @mbggenerated Tue Feb 12 10:51:12 PST 2013
      */
     int updateByExampleSelective(@Param("record") ConnectionParameter record, @Param("example") ConnectionParameterExample example);
 
@@ -75,7 +75,7 @@ public interface ConnectionParameterMapper {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table guacamole..guacamole_connection_parameter
      *
-     * @mbggenerated Tue Feb 05 15:45:11 PST 2013
+     * @mbggenerated Tue Feb 12 10:51:12 PST 2013
      */
     int updateByExample(@Param("record") ConnectionParameter record, @Param("example") ConnectionParameterExample example);
 
@@ -83,7 +83,7 @@ public interface ConnectionParameterMapper {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table guacamole..guacamole_connection_parameter
      *
-     * @mbggenerated Tue Feb 05 15:45:11 PST 2013
+     * @mbggenerated Tue Feb 12 10:51:12 PST 2013
      */
     int updateByPrimaryKeySelective(ConnectionParameter record);
 
@@ -91,7 +91,7 @@ public interface ConnectionParameterMapper {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table guacamole..guacamole_connection_parameter
      *
-     * @mbggenerated Tue Feb 05 15:45:11 PST 2013
+     * @mbggenerated Tue Feb 12 10:51:12 PST 2013
      */
     int updateByPrimaryKey(ConnectionParameter record);
 }

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

@@ -1,8 +1,8 @@
-package net.sourceforge.guacamole.net.auth.mysql.dao.guacamole;
+package net.sourceforge.guacamole.net.auth.mysql.dao;
 
 import java.util.List;
-import net.sourceforge.guacamole.net.auth.mysql.model.guacamole.ConnectionPermissionExample;
+import net.sourceforge.guacamole.net.auth.mysql.model.ConnectionPermissionExample;
-import net.sourceforge.guacamole.net.auth.mysql.model.guacamole.ConnectionPermissionKey;
+import net.sourceforge.guacamole.net.auth.mysql.model.ConnectionPermissionKey;
 import org.apache.ibatis.annotations.Param;
 
 public interface ConnectionPermissionMapper {
@@ -10,7 +10,7 @@ public interface ConnectionPermissionMapper {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table guacamole..guacamole_connection_permission
      *
-     * @mbggenerated Tue Feb 05 15:45:11 PST 2013
+     * @mbggenerated Tue Feb 12 10:51:12 PST 2013
      */
     int countByExample(ConnectionPermissionExample example);
 
@@ -18,7 +18,7 @@ public interface ConnectionPermissionMapper {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table guacamole..guacamole_connection_permission
      *
-     * @mbggenerated Tue Feb 05 15:45:11 PST 2013
+     * @mbggenerated Tue Feb 12 10:51:12 PST 2013
      */
     int deleteByExample(ConnectionPermissionExample example);
 
@@ -26,7 +26,7 @@ public interface ConnectionPermissionMapper {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table guacamole..guacamole_connection_permission
      *
-     * @mbggenerated Tue Feb 05 15:45:11 PST 2013
+     * @mbggenerated Tue Feb 12 10:51:12 PST 2013
      */
     int deleteByPrimaryKey(ConnectionPermissionKey key);
 
@@ -34,7 +34,7 @@ public interface ConnectionPermissionMapper {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table guacamole..guacamole_connection_permission
      *
-     * @mbggenerated Tue Feb 05 15:45:11 PST 2013
+     * @mbggenerated Tue Feb 12 10:51:12 PST 2013
      */
     int insert(ConnectionPermissionKey record);
 
@@ -42,7 +42,7 @@ public interface ConnectionPermissionMapper {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table guacamole..guacamole_connection_permission
      *
-     * @mbggenerated Tue Feb 05 15:45:11 PST 2013
+     * @mbggenerated Tue Feb 12 10:51:12 PST 2013
      */
     int insertSelective(ConnectionPermissionKey record);
 
@@ -50,7 +50,7 @@ public interface ConnectionPermissionMapper {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table guacamole..guacamole_connection_permission
      *
-     * @mbggenerated Tue Feb 05 15:45:11 PST 2013
+     * @mbggenerated Tue Feb 12 10:51:12 PST 2013
      */
     List<ConnectionPermissionKey> selectByExample(ConnectionPermissionExample example);
 
@@ -58,7 +58,7 @@ public interface ConnectionPermissionMapper {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table guacamole..guacamole_connection_permission
      *
-     * @mbggenerated Tue Feb 05 15:45:11 PST 2013
+     * @mbggenerated Tue Feb 12 10:51:12 PST 2013
      */
     int updateByExampleSelective(@Param("record") ConnectionPermissionKey record, @Param("example") ConnectionPermissionExample example);
 
@@ -66,7 +66,7 @@ public interface ConnectionPermissionMapper {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table guacamole..guacamole_connection_permission
      *
-     * @mbggenerated Tue Feb 05 15:45:11 PST 2013
+     * @mbggenerated Tue Feb 12 10:51:12 PST 2013
      */
     int updateByExample(@Param("record") ConnectionPermissionKey record, @Param("example") ConnectionPermissionExample example);
 }

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

@@ -1,8 +1,8 @@
-package net.sourceforge.guacamole.net.auth.mysql.dao.guacamole;
+package net.sourceforge.guacamole.net.auth.mysql.dao;
 
 import java.util.List;
-import net.sourceforge.guacamole.net.auth.mysql.model.guacamole.SystemPermissionExample;
+import net.sourceforge.guacamole.net.auth.mysql.model.SystemPermissionExample;
-import net.sourceforge.guacamole.net.auth.mysql.model.guacamole.SystemPermissionKey;
+import net.sourceforge.guacamole.net.auth.mysql.model.SystemPermissionKey;
 import org.apache.ibatis.annotations.Param;
 
 public interface SystemPermissionMapper {
@@ -10,7 +10,7 @@ public interface SystemPermissionMapper {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table guacamole..guacamole_system_permission
      *
-     * @mbggenerated Tue Feb 05 15:45:11 PST 2013
+     * @mbggenerated Tue Feb 12 10:51:12 PST 2013
      */
     int countByExample(SystemPermissionExample example);
 
@@ -18,7 +18,7 @@ public interface SystemPermissionMapper {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table guacamole..guacamole_system_permission
      *
-     * @mbggenerated Tue Feb 05 15:45:11 PST 2013
+     * @mbggenerated Tue Feb 12 10:51:12 PST 2013
      */
     int deleteByExample(SystemPermissionExample example);
 
@@ -26,7 +26,7 @@ public interface SystemPermissionMapper {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table guacamole..guacamole_system_permission
      *
-     * @mbggenerated Tue Feb 05 15:45:11 PST 2013
+     * @mbggenerated Tue Feb 12 10:51:12 PST 2013
      */
     int deleteByPrimaryKey(SystemPermissionKey key);
 
@@ -34,7 +34,7 @@ public interface SystemPermissionMapper {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table guacamole..guacamole_system_permission
      *
-     * @mbggenerated Tue Feb 05 15:45:11 PST 2013
+     * @mbggenerated Tue Feb 12 10:51:12 PST 2013
      */
     int insert(SystemPermissionKey record);
 
@@ -42,7 +42,7 @@ public interface SystemPermissionMapper {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table guacamole..guacamole_system_permission
      *
-     * @mbggenerated Tue Feb 05 15:45:11 PST 2013
+     * @mbggenerated Tue Feb 12 10:51:12 PST 2013
      */
     int insertSelective(SystemPermissionKey record);
 
@@ -50,7 +50,7 @@ public interface SystemPermissionMapper {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table guacamole..guacamole_system_permission
      *
-     * @mbggenerated Tue Feb 05 15:45:11 PST 2013
+     * @mbggenerated Tue Feb 12 10:51:12 PST 2013
      */
     List<SystemPermissionKey> selectByExample(SystemPermissionExample example);
 
@@ -58,7 +58,7 @@ public interface SystemPermissionMapper {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table guacamole..guacamole_system_permission
      *
-     * @mbggenerated Tue Feb 05 15:45:11 PST 2013
+     * @mbggenerated Tue Feb 12 10:51:12 PST 2013
      */
     int updateByExampleSelective(@Param("record") SystemPermissionKey record, @Param("example") SystemPermissionExample example);
 
@@ -66,7 +66,7 @@ public interface SystemPermissionMapper {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table guacamole..guacamole_system_permission
      *
-     * @mbggenerated Tue Feb 05 15:45:11 PST 2013
+     * @mbggenerated Tue Feb 12 10:51:12 PST 2013
      */
     int updateByExample(@Param("record") SystemPermissionKey record, @Param("example") SystemPermissionExample example);
 }

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

@@ -1,8 +1,9 @@
-package net.sourceforge.guacamole.net.auth.mysql.dao.guacamole;
+package net.sourceforge.guacamole.net.auth.mysql.dao;
 
 import java.util.List;
-import net.sourceforge.guacamole.net.auth.mysql.model.guacamole.User;
+import net.sourceforge.guacamole.net.auth.mysql.model.User;
-import net.sourceforge.guacamole.net.auth.mysql.model.guacamole.UserExample;
+import net.sourceforge.guacamole.net.auth.mysql.model.UserExample;
+import net.sourceforge.guacamole.net.auth.mysql.model.UserWithBLOBs;
 import org.apache.ibatis.annotations.Param;
 
 public interface UserMapper {
@@ -10,7 +11,7 @@ public interface UserMapper {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table guacamole..guacamole_user
      *
-     * @mbggenerated Tue Feb 05 15:45:11 PST 2013
+     * @mbggenerated Tue Feb 12 10:51:12 PST 2013
      */
     int countByExample(UserExample example);
 
@@ -18,7 +19,7 @@ public interface UserMapper {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table guacamole..guacamole_user
      *
-     * @mbggenerated Tue Feb 05 15:45:11 PST 2013
+     * @mbggenerated Tue Feb 12 10:51:12 PST 2013
      */
     int deleteByExample(UserExample example);
 
@@ -26,7 +27,7 @@ public interface UserMapper {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table guacamole..guacamole_user
      *
-     * @mbggenerated Tue Feb 05 15:45:11 PST 2013
+     * @mbggenerated Tue Feb 12 10:51:12 PST 2013
      */
     int deleteByPrimaryKey(Integer user_id);
 
@@ -34,31 +35,31 @@ public interface UserMapper {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table guacamole..guacamole_user
      *
-     * @mbggenerated Tue Feb 05 15:45:11 PST 2013
+     * @mbggenerated Tue Feb 12 10:51:12 PST 2013
      */
-    int insert(User record);
+    int insert(UserWithBLOBs record);
 
     /**
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table guacamole..guacamole_user
      *
-     * @mbggenerated Tue Feb 05 15:45:11 PST 2013
+     * @mbggenerated Tue Feb 12 10:51:12 PST 2013
      */
-    int insertSelective(User record);
+    int insertSelective(UserWithBLOBs record);
 
     /**
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table guacamole..guacamole_user
      *
-     * @mbggenerated Tue Feb 05 15:45:11 PST 2013
+     * @mbggenerated Tue Feb 12 10:51:12 PST 2013
      */
-    List<User> selectByExampleWithBLOBs(UserExample example);
+    List<UserWithBLOBs> selectByExampleWithBLOBs(UserExample example);
 
     /**
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table guacamole..guacamole_user
      *
-     * @mbggenerated Tue Feb 05 15:45:11 PST 2013
+     * @mbggenerated Tue Feb 12 10:51:12 PST 2013
      */
     List<User> selectByExample(UserExample example);
 
@@ -66,31 +67,31 @@ public interface UserMapper {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table guacamole..guacamole_user
      *
-     * @mbggenerated Tue Feb 05 15:45:11 PST 2013
+     * @mbggenerated Tue Feb 12 10:51:12 PST 2013
      */
-    User selectByPrimaryKey(Integer user_id);
+    UserWithBLOBs selectByPrimaryKey(Integer user_id);
 
     /**
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table guacamole..guacamole_user
      *
-     * @mbggenerated Tue Feb 05 15:45:11 PST 2013
+     * @mbggenerated Tue Feb 12 10:51:12 PST 2013
      */
-    int updateByExampleSelective(@Param("record") User record, @Param("example") UserExample example);
+    int updateByExampleSelective(@Param("record") UserWithBLOBs record, @Param("example") UserExample example);
 
     /**
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table guacamole..guacamole_user
      *
-     * @mbggenerated Tue Feb 05 15:45:11 PST 2013
+     * @mbggenerated Tue Feb 12 10:51:12 PST 2013
      */
-    int updateByExampleWithBLOBs(@Param("record") User record, @Param("example") UserExample example);
+    int updateByExampleWithBLOBs(@Param("record") UserWithBLOBs record, @Param("example") UserExample example);
 
     /**
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table guacamole..guacamole_user
      *
-     * @mbggenerated Tue Feb 05 15:45:11 PST 2013
+     * @mbggenerated Tue Feb 12 10:51:12 PST 2013
      */
     int updateByExample(@Param("record") User record, @Param("example") UserExample example);
 
@@ -98,23 +99,23 @@ public interface UserMapper {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table guacamole..guacamole_user
      *
-     * @mbggenerated Tue Feb 05 15:45:11 PST 2013
+     * @mbggenerated Tue Feb 12 10:51:12 PST 2013
      */
-    int updateByPrimaryKeySelective(User record);
+    int updateByPrimaryKeySelective(UserWithBLOBs record);
 
     /**
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table guacamole..guacamole_user
      *
-     * @mbggenerated Tue Feb 05 15:45:11 PST 2013
+     * @mbggenerated Tue Feb 12 10:51:12 PST 2013
      */
-    int updateByPrimaryKeyWithBLOBs(User record);
+    int updateByPrimaryKeyWithBLOBs(UserWithBLOBs record);
 
     /**
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table guacamole..guacamole_user
      *
-     * @mbggenerated Tue Feb 05 15:45:11 PST 2013
+     * @mbggenerated Tue Feb 12 10:51:12 PST 2013
      */
     int updateByPrimaryKey(User record);
 }

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

@@ -1,8 +1,8 @@
-package net.sourceforge.guacamole.net.auth.mysql.dao.guacamole;
+package net.sourceforge.guacamole.net.auth.mysql.dao;
 
 import java.util.List;
-import net.sourceforge.guacamole.net.auth.mysql.model.guacamole.UserPermissionExample;
+import net.sourceforge.guacamole.net.auth.mysql.model.UserPermissionExample;
-import net.sourceforge.guacamole.net.auth.mysql.model.guacamole.UserPermissionKey;
+import net.sourceforge.guacamole.net.auth.mysql.model.UserPermissionKey;
 import org.apache.ibatis.annotations.Param;
 
 public interface UserPermissionMapper {
@@ -10,7 +10,7 @@ public interface UserPermissionMapper {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table guacamole..guacamole_user_permission
      *
-     * @mbggenerated Tue Feb 05 15:45:11 PST 2013
+     * @mbggenerated Tue Feb 12 10:51:12 PST 2013
      */
     int countByExample(UserPermissionExample example);
 
@@ -18,7 +18,7 @@ public interface UserPermissionMapper {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table guacamole..guacamole_user_permission
      *
-     * @mbggenerated Tue Feb 05 15:45:11 PST 2013
+     * @mbggenerated Tue Feb 12 10:51:12 PST 2013
      */
     int deleteByExample(UserPermissionExample example);
 
@@ -26,7 +26,7 @@ public interface UserPermissionMapper {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table guacamole..guacamole_user_permission
      *
-     * @mbggenerated Tue Feb 05 15:45:11 PST 2013
+     * @mbggenerated Tue Feb 12 10:51:12 PST 2013
      */
     int deleteByPrimaryKey(UserPermissionKey key);
 
@@ -34,7 +34,7 @@ public interface UserPermissionMapper {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table guacamole..guacamole_user_permission
      *
-     * @mbggenerated Tue Feb 05 15:45:11 PST 2013
+     * @mbggenerated Tue Feb 12 10:51:12 PST 2013
      */
     int insert(UserPermissionKey record);
 
@@ -42,7 +42,7 @@ public interface UserPermissionMapper {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table guacamole..guacamole_user_permission
      *
-     * @mbggenerated Tue Feb 05 15:45:11 PST 2013
+     * @mbggenerated Tue Feb 12 10:51:12 PST 2013
      */
     int insertSelective(UserPermissionKey record);
 
@@ -50,7 +50,7 @@ public interface UserPermissionMapper {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table guacamole..guacamole_user_permission
      *
-     * @mbggenerated Tue Feb 05 15:45:11 PST 2013
+     * @mbggenerated Tue Feb 12 10:51:12 PST 2013
      */
     List<UserPermissionKey> selectByExample(UserPermissionExample example);
 
@@ -58,7 +58,7 @@ public interface UserPermissionMapper {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table guacamole..guacamole_user_permission
      *
-     * @mbggenerated Tue Feb 05 15:45:11 PST 2013
+     * @mbggenerated Tue Feb 12 10:51:12 PST 2013
      */
     int updateByExampleSelective(@Param("record") UserPermissionKey record, @Param("example") UserPermissionExample example);
 
@@ -66,7 +66,7 @@ public interface UserPermissionMapper {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table guacamole..guacamole_user_permission
      *
-     * @mbggenerated Tue Feb 05 15:45:11 PST 2013
+     * @mbggenerated Tue Feb 12 10:51:12 PST 2013
      */
     int updateByExample(@Param("record") UserPermissionKey record, @Param("example") UserPermissionExample example);
 }

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

@@ -1,11 +1,11 @@
-package net.sourceforge.guacamole.net.auth.mysql.model.guacamole;
+package net.sourceforge.guacamole.net.auth.mysql.model;
 
 public class Connection {
     /**
      * This field was generated by MyBatis Generator.
      * This field corresponds to the database column guacamole..guacamole_connection.connection_id
      *
-     * @mbggenerated Tue Feb 05 15:45:11 PST 2013
+     * @mbggenerated Tue Feb 12 10:51:12 PST 2013
      */
     private Integer connection_id;
 
@@ -13,7 +13,7 @@ public class Connection {
      * This field was generated by MyBatis Generator.
      * This field corresponds to the database column guacamole..guacamole_connection.connection_name
      *
-     * @mbggenerated Tue Feb 05 15:45:11 PST 2013
+     * @mbggenerated Tue Feb 12 10:51:12 PST 2013
      */
     private String connection_name;
 
@@ -21,7 +21,7 @@ public class Connection {
      * This field was generated by MyBatis Generator.
      * This field corresponds to the database column guacamole..guacamole_connection.protocol
      *
-     * @mbggenerated Tue Feb 05 15:45:11 PST 2013
+     * @mbggenerated Tue Feb 12 10:51:12 PST 2013
      */
     private String protocol;
 
@@ -31,7 +31,7 @@ public class Connection {
      *
      * @return the value of guacamole..guacamole_connection.connection_id
      *
-     * @mbggenerated Tue Feb 05 15:45:11 PST 2013
+     * @mbggenerated Tue Feb 12 10:51:12 PST 2013
      */
     public Integer getConnection_id() {
         return connection_id;
@@ -43,7 +43,7 @@ public class Connection {
      *
      * @param connection_id the value for guacamole..guacamole_connection.connection_id
      *
-     * @mbggenerated Tue Feb 05 15:45:11 PST 2013
+     * @mbggenerated Tue Feb 12 10:51:12 PST 2013
      */
     public void setConnection_id(Integer connection_id) {
         this.connection_id = connection_id;
@@ -55,7 +55,7 @@ public class Connection {
      *
      * @return the value of guacamole..guacamole_connection.connection_name
      *
-     * @mbggenerated Tue Feb 05 15:45:11 PST 2013
+     * @mbggenerated Tue Feb 12 10:51:12 PST 2013
      */
     public String getConnection_name() {
         return connection_name;
@@ -67,10 +67,10 @@ public class Connection {
      *
      * @param connection_name the value for guacamole..guacamole_connection.connection_name
      *
-     * @mbggenerated Tue Feb 05 15:45:11 PST 2013
+     * @mbggenerated Tue Feb 12 10:51:12 PST 2013
      */
     public void setConnection_name(String connection_name) {
-        this.connection_name = connection_name == null ? null : connection_name.trim();
+        this.connection_name = connection_name;
     }
 
     /**
@@ -79,7 +79,7 @@ public class Connection {
      *
      * @return the value of guacamole..guacamole_connection.protocol
      *
-     * @mbggenerated Tue Feb 05 15:45:11 PST 2013
+     * @mbggenerated Tue Feb 12 10:51:12 PST 2013
      */
     public String getProtocol() {
         return protocol;
@@ -91,9 +91,9 @@ public class Connection {
      *
      * @param protocol the value for guacamole..guacamole_connection.protocol
      *
-     * @mbggenerated Tue Feb 05 15:45:11 PST 2013
+     * @mbggenerated Tue Feb 12 10:51:12 PST 2013
      */
     public void setProtocol(String protocol) {
-        this.protocol = protocol == null ? null : protocol.trim();
+        this.protocol = protocol;
     }
 }

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

@@ -1,4 +1,4 @@
-package net.sourceforge.guacamole.net.auth.mysql.model.guacamole;
+package net.sourceforge.guacamole.net.auth.mysql.model;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -8,7 +8,7 @@ public class ConnectionExample {
      * This field was generated by MyBatis Generator.
      * This field corresponds to the database table guacamole..guacamole_connection
      *
-     * @mbggenerated Tue Feb 05 15:45:11 PST 2013
+     * @mbggenerated Tue Feb 12 10:51:12 PST 2013
      */
     protected String orderByClause;
 
@@ -16,7 +16,7 @@ public class ConnectionExample {
      * This field was generated by MyBatis Generator.
      * This field corresponds to the database table guacamole..guacamole_connection
      *
-     * @mbggenerated Tue Feb 05 15:45:11 PST 2013
+     * @mbggenerated Tue Feb 12 10:51:12 PST 2013
      */
     protected boolean distinct;
 
@@ -24,7 +24,7 @@ public class ConnectionExample {
      * This field was generated by MyBatis Generator.
      * This field corresponds to the database table guacamole..guacamole_connection
      *
-     * @mbggenerated Tue Feb 05 15:45:11 PST 2013
+     * @mbggenerated Tue Feb 12 10:51:12 PST 2013
      */
     protected List<Criteria> oredCriteria;
 
@@ -32,7 +32,7 @@ public class ConnectionExample {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table guacamole..guacamole_connection
      *
-     * @mbggenerated Tue Feb 05 15:45:11 PST 2013
+     * @mbggenerated Tue Feb 12 10:51:12 PST 2013
      */
     public ConnectionExample() {
         oredCriteria = new ArrayList<Criteria>();
@@ -42,7 +42,7 @@ public class ConnectionExample {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table guacamole..guacamole_connection
      *
-     * @mbggenerated Tue Feb 05 15:45:11 PST 2013
+     * @mbggenerated Tue Feb 12 10:51:12 PST 2013
      */
     public void setOrderByClause(String orderByClause) {
         this.orderByClause = orderByClause;
@@ -52,7 +52,7 @@ public class ConnectionExample {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table guacamole..guacamole_connection
      *
-     * @mbggenerated Tue Feb 05 15:45:11 PST 2013
+     * @mbggenerated Tue Feb 12 10:51:12 PST 2013
      */
     public String getOrderByClause() {
         return orderByClause;
@@ -62,7 +62,7 @@ public class ConnectionExample {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table guacamole..guacamole_connection
      *
-     * @mbggenerated Tue Feb 05 15:45:11 PST 2013
+     * @mbggenerated Tue Feb 12 10:51:12 PST 2013
      */
     public void setDistinct(boolean distinct) {
         this.distinct = distinct;
@@ -72,7 +72,7 @@ public class ConnectionExample {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table guacamole..guacamole_connection
      *
-     * @mbggenerated Tue Feb 05 15:45:11 PST 2013
+     * @mbggenerated Tue Feb 12 10:51:12 PST 2013
      */
     public boolean isDistinct() {
         return distinct;
@@ -82,7 +82,7 @@ public class ConnectionExample {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table guacamole..guacamole_connection
      *
-     * @mbggenerated Tue Feb 05 15:45:11 PST 2013
+     * @mbggenerated Tue Feb 12 10:51:12 PST 2013
      */
     public List<Criteria> getOredCriteria() {
         return oredCriteria;
@@ -92,7 +92,7 @@ public class ConnectionExample {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table guacamole..guacamole_connection
      *
-     * @mbggenerated Tue Feb 05 15:45:11 PST 2013
+     * @mbggenerated Tue Feb 12 10:51:12 PST 2013
      */
     public void or(Criteria criteria) {
         oredCriteria.add(criteria);
@@ -102,7 +102,7 @@ public class ConnectionExample {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table guacamole..guacamole_connection
      *
-     * @mbggenerated Tue Feb 05 15:45:11 PST 2013
+     * @mbggenerated Tue Feb 12 10:51:12 PST 2013
      */
     public Criteria or() {
         Criteria criteria = createCriteriaInternal();
@@ -114,7 +114,7 @@ public class ConnectionExample {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table guacamole..guacamole_connection
      *
-     * @mbggenerated Tue Feb 05 15:45:11 PST 2013
+     * @mbggenerated Tue Feb 12 10:51:12 PST 2013
      */
     public Criteria createCriteria() {
         Criteria criteria = createCriteriaInternal();
@@ -128,7 +128,7 @@ public class ConnectionExample {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table guacamole..guacamole_connection
      *
-     * @mbggenerated Tue Feb 05 15:45:11 PST 2013
+     * @mbggenerated Tue Feb 12 10:51:12 PST 2013
      */
     protected Criteria createCriteriaInternal() {
         Criteria criteria = new Criteria();
@@ -139,7 +139,7 @@ public class ConnectionExample {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table guacamole..guacamole_connection
      *
-     * @mbggenerated Tue Feb 05 15:45:11 PST 2013
+     * @mbggenerated Tue Feb 12 10:51:12 PST 2013
      */
     public void clear() {
         oredCriteria.clear();
@@ -151,7 +151,7 @@ public class ConnectionExample {
      * This class was generated by MyBatis Generator.
      * This class corresponds to the database table guacamole..guacamole_connection
      *
-     * @mbggenerated Tue Feb 05 15:45:11 PST 2013
+     * @mbggenerated Tue Feb 12 10:51:12 PST 2013
      */
     protected abstract static class GeneratedCriteria {
         protected List<Criterion> criteria;
@@ -399,7 +399,7 @@ public class ConnectionExample {
      * This class was generated by MyBatis Generator.
      * This class corresponds to the database table guacamole..guacamole_connection
      *
-     * @mbggenerated do_not_delete_during_merge Tue Feb 05 15:45:11 PST 2013
+     * @mbggenerated do_not_delete_during_merge Tue Feb 12 10:51:12 PST 2013
      */
     public static class Criteria extends GeneratedCriteria {
 
@@ -412,7 +412,7 @@ public class ConnectionExample {
      * This class was generated by MyBatis Generator.
      * This class corresponds to the database table guacamole..guacamole_connection
      *
-     * @mbggenerated Tue Feb 05 15:45:11 PST 2013
+     * @mbggenerated Tue Feb 12 10:51:12 PST 2013
      */
     public static class Criterion {
         private String condition;

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

@@ -1,11 +1,11 @@
-package net.sourceforge.guacamole.net.auth.mysql.model.guacamole;
+package net.sourceforge.guacamole.net.auth.mysql.model;
 
 public class ConnectionParameter extends ConnectionParameterKey {
     /**
      * This field was generated by MyBatis Generator.
      * This field corresponds to the database column guacamole..guacamole_connection_parameter.parameter_value
      *
-     * @mbggenerated Tue Feb 05 15:45:11 PST 2013
+     * @mbggenerated Tue Feb 12 10:51:12 PST 2013
      */
     private String parameter_value;
 
@@ -15,7 +15,7 @@ public class ConnectionParameter extends ConnectionParameterKey {
      *
      * @return the value of guacamole..guacamole_connection_parameter.parameter_value
      *
-     * @mbggenerated Tue Feb 05 15:45:11 PST 2013
+     * @mbggenerated Tue Feb 12 10:51:12 PST 2013
      */
     public String getParameter_value() {
         return parameter_value;
@@ -27,9 +27,9 @@ public class ConnectionParameter extends ConnectionParameterKey {
      *
      * @param parameter_value the value for guacamole..guacamole_connection_parameter.parameter_value
      *
-     * @mbggenerated Tue Feb 05 15:45:11 PST 2013
+     * @mbggenerated Tue Feb 12 10:51:12 PST 2013
      */
     public void setParameter_value(String parameter_value) {
-        this.parameter_value = parameter_value == null ? null : parameter_value.trim();
+        this.parameter_value = parameter_value;
     }
 }

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

@@ -1,4 +1,4 @@
-package net.sourceforge.guacamole.net.auth.mysql.model.guacamole;
+package net.sourceforge.guacamole.net.auth.mysql.model;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -8,7 +8,7 @@ public class ConnectionParameterExample {
      * This field was generated by MyBatis Generator.
      * This field corresponds to the database table guacamole..guacamole_connection_parameter
      *
-     * @mbggenerated Tue Feb 05 15:45:11 PST 2013
+     * @mbggenerated Tue Feb 12 10:51:12 PST 2013
      */
     protected String orderByClause;
 
@@ -16,7 +16,7 @@ public class ConnectionParameterExample {
      * This field was generated by MyBatis Generator.
      * This field corresponds to the database table guacamole..guacamole_connection_parameter
      *
-     * @mbggenerated Tue Feb 05 15:45:11 PST 2013
+     * @mbggenerated Tue Feb 12 10:51:12 PST 2013
      */
     protected boolean distinct;
 
@@ -24,7 +24,7 @@ public class ConnectionParameterExample {
      * This field was generated by MyBatis Generator.
      * This field corresponds to the database table guacamole..guacamole_connection_parameter
      *
-     * @mbggenerated Tue Feb 05 15:45:11 PST 2013
+     * @mbggenerated Tue Feb 12 10:51:12 PST 2013
      */
     protected List<Criteria> oredCriteria;
 
@@ -32,7 +32,7 @@ public class ConnectionParameterExample {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table guacamole..guacamole_connection_parameter
      *
-     * @mbggenerated Tue Feb 05 15:45:11 PST 2013
+     * @mbggenerated Tue Feb 12 10:51:12 PST 2013
      */
     public ConnectionParameterExample() {
         oredCriteria = new ArrayList<Criteria>();
@@ -42,7 +42,7 @@ public class ConnectionParameterExample {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table guacamole..guacamole_connection_parameter
      *
-     * @mbggenerated Tue Feb 05 15:45:11 PST 2013
+     * @mbggenerated Tue Feb 12 10:51:12 PST 2013
      */
     public void setOrderByClause(String orderByClause) {
         this.orderByClause = orderByClause;
@@ -52,7 +52,7 @@ public class ConnectionParameterExample {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table guacamole..guacamole_connection_parameter
      *
-     * @mbggenerated Tue Feb 05 15:45:11 PST 2013
+     * @mbggenerated Tue Feb 12 10:51:12 PST 2013
      */
     public String getOrderByClause() {
         return orderByClause;
@@ -62,7 +62,7 @@ public class ConnectionParameterExample {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table guacamole..guacamole_connection_parameter
      *
-     * @mbggenerated Tue Feb 05 15:45:11 PST 2013
+     * @mbggenerated Tue Feb 12 10:51:12 PST 2013
      */
     public void setDistinct(boolean distinct) {
         this.distinct = distinct;
@@ -72,7 +72,7 @@ public class ConnectionParameterExample {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table guacamole..guacamole_connection_parameter
      *
-     * @mbggenerated Tue Feb 05 15:45:11 PST 2013
+     * @mbggenerated Tue Feb 12 10:51:12 PST 2013
      */
     public boolean isDistinct() {
         return distinct;
@@ -82,7 +82,7 @@ public class ConnectionParameterExample {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table guacamole..guacamole_connection_parameter
      *
-     * @mbggenerated Tue Feb 05 15:45:11 PST 2013
+     * @mbggenerated Tue Feb 12 10:51:12 PST 2013
      */
     public List<Criteria> getOredCriteria() {
         return oredCriteria;
@@ -92,7 +92,7 @@ public class ConnectionParameterExample {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table guacamole..guacamole_connection_parameter
      *
-     * @mbggenerated Tue Feb 05 15:45:11 PST 2013
+     * @mbggenerated Tue Feb 12 10:51:12 PST 2013
      */
     public void or(Criteria criteria) {
         oredCriteria.add(criteria);
@@ -102,7 +102,7 @@ public class ConnectionParameterExample {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table guacamole..guacamole_connection_parameter
      *
-     * @mbggenerated Tue Feb 05 15:45:11 PST 2013
+     * @mbggenerated Tue Feb 12 10:51:12 PST 2013
      */
     public Criteria or() {
         Criteria criteria = createCriteriaInternal();
@@ -114,7 +114,7 @@ public class ConnectionParameterExample {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table guacamole..guacamole_connection_parameter
      *
-     * @mbggenerated Tue Feb 05 15:45:11 PST 2013
+     * @mbggenerated Tue Feb 12 10:51:12 PST 2013
      */
     public Criteria createCriteria() {
         Criteria criteria = createCriteriaInternal();
@@ -128,7 +128,7 @@ public class ConnectionParameterExample {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table guacamole..guacamole_connection_parameter
      *
-     * @mbggenerated Tue Feb 05 15:45:11 PST 2013
+     * @mbggenerated Tue Feb 12 10:51:12 PST 2013
      */
     protected Criteria createCriteriaInternal() {
         Criteria criteria = new Criteria();
@@ -139,7 +139,7 @@ public class ConnectionParameterExample {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table guacamole..guacamole_connection_parameter
      *
-     * @mbggenerated Tue Feb 05 15:45:11 PST 2013
+     * @mbggenerated Tue Feb 12 10:51:12 PST 2013
      */
     public void clear() {
         oredCriteria.clear();
@@ -151,7 +151,7 @@ public class ConnectionParameterExample {
      * This class was generated by MyBatis Generator.
      * This class corresponds to the database table guacamole..guacamole_connection_parameter
      *
-     * @mbggenerated Tue Feb 05 15:45:11 PST 2013
+     * @mbggenerated Tue Feb 12 10:51:12 PST 2013
      */
     protected abstract static class GeneratedCriteria {
         protected List<Criterion> criteria;
@@ -399,7 +399,7 @@ public class ConnectionParameterExample {
      * This class was generated by MyBatis Generator.
      * This class corresponds to the database table guacamole..guacamole_connection_parameter
      *
-     * @mbggenerated do_not_delete_during_merge Tue Feb 05 15:45:11 PST 2013
+     * @mbggenerated do_not_delete_during_merge Tue Feb 12 10:51:12 PST 2013
      */
     public static class Criteria extends GeneratedCriteria {
 
@@ -412,7 +412,7 @@ public class ConnectionParameterExample {
      * This class was generated by MyBatis Generator.
      * This class corresponds to the database table guacamole..guacamole_connection_parameter
      *
-     * @mbggenerated Tue Feb 05 15:45:11 PST 2013
+     * @mbggenerated Tue Feb 12 10:51:12 PST 2013
      */
     public static class Criterion {
         private String condition;

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

@@ -1,11 +1,11 @@
-package net.sourceforge.guacamole.net.auth.mysql.model.guacamole;
+package net.sourceforge.guacamole.net.auth.mysql.model;
 
 public class ConnectionParameterKey {
     /**
      * This field was generated by MyBatis Generator.
      * This field corresponds to the database column guacamole..guacamole_connection_parameter.connection_id
      *
-     * @mbggenerated Tue Feb 05 15:45:11 PST 2013
+     * @mbggenerated Tue Feb 12 10:51:12 PST 2013
      */
     private Integer connection_id;
 
@@ -13,7 +13,7 @@ public class ConnectionParameterKey {
      * This field was generated by MyBatis Generator.
      * This field corresponds to the database column guacamole..guacamole_connection_parameter.parameter_name
      *
-     * @mbggenerated Tue Feb 05 15:45:11 PST 2013
+     * @mbggenerated Tue Feb 12 10:51:12 PST 2013
      */
     private String parameter_name;
 
@@ -23,7 +23,7 @@ public class ConnectionParameterKey {
      *
      * @return the value of guacamole..guacamole_connection_parameter.connection_id
      *
-     * @mbggenerated Tue Feb 05 15:45:11 PST 2013
+     * @mbggenerated Tue Feb 12 10:51:12 PST 2013
      */
     public Integer getConnection_id() {
         return connection_id;
@@ -35,7 +35,7 @@ public class ConnectionParameterKey {
      *
      * @param connection_id the value for guacamole..guacamole_connection_parameter.connection_id
      *
-     * @mbggenerated Tue Feb 05 15:45:11 PST 2013
+     * @mbggenerated Tue Feb 12 10:51:12 PST 2013
      */
     public void setConnection_id(Integer connection_id) {
         this.connection_id = connection_id;
@@ -47,7 +47,7 @@ public class ConnectionParameterKey {
      *
      * @return the value of guacamole..guacamole_connection_parameter.parameter_name
      *
-     * @mbggenerated Tue Feb 05 15:45:11 PST 2013
+     * @mbggenerated Tue Feb 12 10:51:12 PST 2013
      */
     public String getParameter_name() {
         return parameter_name;
@@ -59,9 +59,9 @@ public class ConnectionParameterKey {
      *
      * @param parameter_name the value for guacamole..guacamole_connection_parameter.parameter_name
      *
-     * @mbggenerated Tue Feb 05 15:45:11 PST 2013
+     * @mbggenerated Tue Feb 12 10:51:12 PST 2013
      */
     public void setParameter_name(String parameter_name) {
-        this.parameter_name = parameter_name == null ? null : parameter_name.trim();
+        this.parameter_name = parameter_name;
     }
 }

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

@@ -1,4 +1,4 @@
-package net.sourceforge.guacamole.net.auth.mysql.model.guacamole;
+package net.sourceforge.guacamole.net.auth.mysql.model;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -8,7 +8,7 @@ public class ConnectionPermissionExample {
      * This field was generated by MyBatis Generator.
      * This field corresponds to the database table guacamole..guacamole_connection_permission
      *
-     * @mbggenerated Tue Feb 05 15:45:11 PST 2013
+     * @mbggenerated Tue Feb 12 10:51:12 PST 2013
      */
     protected String orderByClause;
 
@@ -16,7 +16,7 @@ public class ConnectionPermissionExample {
      * This field was generated by MyBatis Generator.
      * This field corresponds to the database table guacamole..guacamole_connection_permission
      *
-     * @mbggenerated Tue Feb 05 15:45:11 PST 2013
+     * @mbggenerated Tue Feb 12 10:51:12 PST 2013
      */
     protected boolean distinct;
 
@@ -24,7 +24,7 @@ public class ConnectionPermissionExample {
      * This field was generated by MyBatis Generator.
      * This field corresponds to the database table guacamole..guacamole_connection_permission
      *
-     * @mbggenerated Tue Feb 05 15:45:11 PST 2013
+     * @mbggenerated Tue Feb 12 10:51:12 PST 2013
      */
     protected List<Criteria> oredCriteria;
 
@@ -32,7 +32,7 @@ public class ConnectionPermissionExample {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table guacamole..guacamole_connection_permission
      *
-     * @mbggenerated Tue Feb 05 15:45:11 PST 2013
+     * @mbggenerated Tue Feb 12 10:51:12 PST 2013
      */
     public ConnectionPermissionExample() {
         oredCriteria = new ArrayList<Criteria>();
@@ -42,7 +42,7 @@ public class ConnectionPermissionExample {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table guacamole..guacamole_connection_permission
      *
-     * @mbggenerated Tue Feb 05 15:45:11 PST 2013
+     * @mbggenerated Tue Feb 12 10:51:12 PST 2013
      */
     public void setOrderByClause(String orderByClause) {
         this.orderByClause = orderByClause;
@@ -52,7 +52,7 @@ public class ConnectionPermissionExample {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table guacamole..guacamole_connection_permission
      *
-     * @mbggenerated Tue Feb 05 15:45:11 PST 2013
+     * @mbggenerated Tue Feb 12 10:51:12 PST 2013
      */
     public String getOrderByClause() {
         return orderByClause;
@@ -62,7 +62,7 @@ public class ConnectionPermissionExample {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table guacamole..guacamole_connection_permission
      *
-     * @mbggenerated Tue Feb 05 15:45:11 PST 2013
+     * @mbggenerated Tue Feb 12 10:51:12 PST 2013
      */
     public void setDistinct(boolean distinct) {
         this.distinct = distinct;
@@ -72,7 +72,7 @@ public class ConnectionPermissionExample {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table guacamole..guacamole_connection_permission
      *
-     * @mbggenerated Tue Feb 05 15:45:11 PST 2013
+     * @mbggenerated Tue Feb 12 10:51:12 PST 2013
      */
     public boolean isDistinct() {
         return distinct;
@@ -82,7 +82,7 @@ public class ConnectionPermissionExample {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table guacamole..guacamole_connection_permission
      *
-     * @mbggenerated Tue Feb 05 15:45:11 PST 2013
+     * @mbggenerated Tue Feb 12 10:51:12 PST 2013
      */
     public List<Criteria> getOredCriteria() {
         return oredCriteria;
@@ -92,7 +92,7 @@ public class ConnectionPermissionExample {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table guacamole..guacamole_connection_permission
      *
-     * @mbggenerated Tue Feb 05 15:45:11 PST 2013
+     * @mbggenerated Tue Feb 12 10:51:12 PST 2013
      */
     public void or(Criteria criteria) {
         oredCriteria.add(criteria);
@@ -102,7 +102,7 @@ public class ConnectionPermissionExample {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table guacamole..guacamole_connection_permission
      *
-     * @mbggenerated Tue Feb 05 15:45:11 PST 2013
+     * @mbggenerated Tue Feb 12 10:51:12 PST 2013
      */
     public Criteria or() {
         Criteria criteria = createCriteriaInternal();
@@ -114,7 +114,7 @@ public class ConnectionPermissionExample {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table guacamole..guacamole_connection_permission
      *
-     * @mbggenerated Tue Feb 05 15:45:11 PST 2013
+     * @mbggenerated Tue Feb 12 10:51:12 PST 2013
      */
     public Criteria createCriteria() {
         Criteria criteria = createCriteriaInternal();
@@ -128,7 +128,7 @@ public class ConnectionPermissionExample {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table guacamole..guacamole_connection_permission
      *
-     * @mbggenerated Tue Feb 05 15:45:11 PST 2013
+     * @mbggenerated Tue Feb 12 10:51:12 PST 2013
      */
     protected Criteria createCriteriaInternal() {
         Criteria criteria = new Criteria();
@@ -139,7 +139,7 @@ public class ConnectionPermissionExample {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table guacamole..guacamole_connection_permission
      *
-     * @mbggenerated Tue Feb 05 15:45:11 PST 2013
+     * @mbggenerated Tue Feb 12 10:51:12 PST 2013
      */
     public void clear() {
         oredCriteria.clear();
@@ -151,7 +151,7 @@ public class ConnectionPermissionExample {
      * This class was generated by MyBatis Generator.
      * This class corresponds to the database table guacamole..guacamole_connection_permission
      *
-     * @mbggenerated Tue Feb 05 15:45:11 PST 2013
+     * @mbggenerated Tue Feb 12 10:51:12 PST 2013
      */
     protected abstract static class GeneratedCriteria {
         protected List<Criterion> criteria;
@@ -389,7 +389,7 @@ public class ConnectionPermissionExample {
      * This class was generated by MyBatis Generator.
      * This class corresponds to the database table guacamole..guacamole_connection_permission
      *
-     * @mbggenerated do_not_delete_during_merge Tue Feb 05 15:45:11 PST 2013
+     * @mbggenerated do_not_delete_during_merge Tue Feb 12 10:51:12 PST 2013
      */
     public static class Criteria extends GeneratedCriteria {
 
@@ -402,7 +402,7 @@ public class ConnectionPermissionExample {
      * This class was generated by MyBatis Generator.
      * This class corresponds to the database table guacamole..guacamole_connection_permission
      *
-     * @mbggenerated Tue Feb 05 15:45:11 PST 2013
+     * @mbggenerated Tue Feb 12 10:51:12 PST 2013
      */
     public static class Criterion {
         private String condition;

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

@@ -1,11 +1,11 @@
-package net.sourceforge.guacamole.net.auth.mysql.model.guacamole;
+package net.sourceforge.guacamole.net.auth.mysql.model;
 
 public class ConnectionPermissionKey {
     /**
      * This field was generated by MyBatis Generator.
      * This field corresponds to the database column guacamole..guacamole_connection_permission.user_id
      *
-     * @mbggenerated Tue Feb 05 15:45:11 PST 2013
+     * @mbggenerated Tue Feb 12 10:51:12 PST 2013
      */
     private Integer user_id;
 
@@ -13,7 +13,7 @@ public class ConnectionPermissionKey {
      * This field was generated by MyBatis Generator.
      * This field corresponds to the database column guacamole..guacamole_connection_permission.connection_id
      *
-     * @mbggenerated Tue Feb 05 15:45:11 PST 2013
+     * @mbggenerated Tue Feb 12 10:51:12 PST 2013
      */
     private Integer connection_id;
 
@@ -21,7 +21,7 @@ public class ConnectionPermissionKey {
      * This field was generated by MyBatis Generator.
      * This field corresponds to the database column guacamole..guacamole_connection_permission.permission
      *
-     * @mbggenerated Tue Feb 05 15:45:11 PST 2013
+     * @mbggenerated Tue Feb 12 10:51:12 PST 2013
      */
     private String permission;
 
@@ -31,7 +31,7 @@ public class ConnectionPermissionKey {
      *
      * @return the value of guacamole..guacamole_connection_permission.user_id
      *
-     * @mbggenerated Tue Feb 05 15:45:11 PST 2013
+     * @mbggenerated Tue Feb 12 10:51:12 PST 2013
      */
     public Integer getUser_id() {
         return user_id;
@@ -43,7 +43,7 @@ public class ConnectionPermissionKey {
      *
      * @param user_id the value for guacamole..guacamole_connection_permission.user_id
      *
-     * @mbggenerated Tue Feb 05 15:45:11 PST 2013
+     * @mbggenerated Tue Feb 12 10:51:12 PST 2013
      */
     public void setUser_id(Integer user_id) {
         this.user_id = user_id;
@@ -55,7 +55,7 @@ public class ConnectionPermissionKey {
      *
      * @return the value of guacamole..guacamole_connection_permission.connection_id
      *
-     * @mbggenerated Tue Feb 05 15:45:11 PST 2013
+     * @mbggenerated Tue Feb 12 10:51:12 PST 2013
      */
     public Integer getConnection_id() {
         return connection_id;
@@ -67,7 +67,7 @@ public class ConnectionPermissionKey {
      *
      * @param connection_id the value for guacamole..guacamole_connection_permission.connection_id
      *
-     * @mbggenerated Tue Feb 05 15:45:11 PST 2013
+     * @mbggenerated Tue Feb 12 10:51:12 PST 2013
      */
     public void setConnection_id(Integer connection_id) {
         this.connection_id = connection_id;
@@ -79,7 +79,7 @@ public class ConnectionPermissionKey {
      *
      * @return the value of guacamole..guacamole_connection_permission.permission
      *
-     * @mbggenerated Tue Feb 05 15:45:11 PST 2013
+     * @mbggenerated Tue Feb 12 10:51:12 PST 2013
      */
     public String getPermission() {
         return permission;
@@ -91,9 +91,9 @@ public class ConnectionPermissionKey {
      *
      * @param permission the value for guacamole..guacamole_connection_permission.permission
      *
-     * @mbggenerated Tue Feb 05 15:45:11 PST 2013
+     * @mbggenerated Tue Feb 12 10:51:12 PST 2013
      */
     public void setPermission(String permission) {
-        this.permission = permission == null ? null : permission.trim();
+        this.permission = permission;
     }
 }

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

@@ -1,4 +1,4 @@
-package net.sourceforge.guacamole.net.auth.mysql.model.guacamole;
+package net.sourceforge.guacamole.net.auth.mysql.model;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -8,7 +8,7 @@ public class SystemPermissionExample {
      * This field was generated by MyBatis Generator.
      * This field corresponds to the database table guacamole..guacamole_system_permission
      *
-     * @mbggenerated Tue Feb 05 15:45:11 PST 2013
+     * @mbggenerated Tue Feb 12 10:51:12 PST 2013
      */
     protected String orderByClause;
 
@@ -16,7 +16,7 @@ public class SystemPermissionExample {
      * This field was generated by MyBatis Generator.
      * This field corresponds to the database table guacamole..guacamole_system_permission
      *
-     * @mbggenerated Tue Feb 05 15:45:11 PST 2013
+     * @mbggenerated Tue Feb 12 10:51:12 PST 2013
      */
     protected boolean distinct;
 
@@ -24,7 +24,7 @@ public class SystemPermissionExample {
      * This field was generated by MyBatis Generator.
      * This field corresponds to the database table guacamole..guacamole_system_permission
      *
-     * @mbggenerated Tue Feb 05 15:45:11 PST 2013
+     * @mbggenerated Tue Feb 12 10:51:12 PST 2013
      */
     protected List<Criteria> oredCriteria;
 
@@ -32,7 +32,7 @@ public class SystemPermissionExample {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table guacamole..guacamole_system_permission
      *
-     * @mbggenerated Tue Feb 05 15:45:11 PST 2013
+     * @mbggenerated Tue Feb 12 10:51:12 PST 2013
      */
     public SystemPermissionExample() {
         oredCriteria = new ArrayList<Criteria>();
@@ -42,7 +42,7 @@ public class SystemPermissionExample {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table guacamole..guacamole_system_permission
      *
-     * @mbggenerated Tue Feb 05 15:45:11 PST 2013
+     * @mbggenerated Tue Feb 12 10:51:12 PST 2013
      */
     public void setOrderByClause(String orderByClause) {
         this.orderByClause = orderByClause;
@@ -52,7 +52,7 @@ public class SystemPermissionExample {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table guacamole..guacamole_system_permission
      *
-     * @mbggenerated Tue Feb 05 15:45:11 PST 2013
+     * @mbggenerated Tue Feb 12 10:51:12 PST 2013
      */
     public String getOrderByClause() {
         return orderByClause;
@@ -62,7 +62,7 @@ public class SystemPermissionExample {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table guacamole..guacamole_system_permission
      *
-     * @mbggenerated Tue Feb 05 15:45:11 PST 2013
+     * @mbggenerated Tue Feb 12 10:51:12 PST 2013
      */
     public void setDistinct(boolean distinct) {
         this.distinct = distinct;
@@ -72,7 +72,7 @@ public class SystemPermissionExample {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table guacamole..guacamole_system_permission
      *
-     * @mbggenerated Tue Feb 05 15:45:11 PST 2013
+     * @mbggenerated Tue Feb 12 10:51:12 PST 2013
      */
     public boolean isDistinct() {
         return distinct;
@@ -82,7 +82,7 @@ public class SystemPermissionExample {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table guacamole..guacamole_system_permission
      *
-     * @mbggenerated Tue Feb 05 15:45:11 PST 2013
+     * @mbggenerated Tue Feb 12 10:51:12 PST 2013
      */
     public List<Criteria> getOredCriteria() {
         return oredCriteria;
@@ -92,7 +92,7 @@ public class SystemPermissionExample {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table guacamole..guacamole_system_permission
      *
-     * @mbggenerated Tue Feb 05 15:45:11 PST 2013
+     * @mbggenerated Tue Feb 12 10:51:12 PST 2013
      */
     public void or(Criteria criteria) {
         oredCriteria.add(criteria);
@@ -102,7 +102,7 @@ public class SystemPermissionExample {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table guacamole..guacamole_system_permission
      *
-     * @mbggenerated Tue Feb 05 15:45:11 PST 2013
+     * @mbggenerated Tue Feb 12 10:51:12 PST 2013
      */
     public Criteria or() {
         Criteria criteria = createCriteriaInternal();
@@ -114,7 +114,7 @@ public class SystemPermissionExample {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table guacamole..guacamole_system_permission
      *
-     * @mbggenerated Tue Feb 05 15:45:11 PST 2013
+     * @mbggenerated Tue Feb 12 10:51:12 PST 2013
      */
     public Criteria createCriteria() {
         Criteria criteria = createCriteriaInternal();
@@ -128,7 +128,7 @@ public class SystemPermissionExample {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table guacamole..guacamole_system_permission
      *
-     * @mbggenerated Tue Feb 05 15:45:11 PST 2013
+     * @mbggenerated Tue Feb 12 10:51:12 PST 2013
      */
     protected Criteria createCriteriaInternal() {
         Criteria criteria = new Criteria();
@@ -139,7 +139,7 @@ public class SystemPermissionExample {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table guacamole..guacamole_system_permission
      *
-     * @mbggenerated Tue Feb 05 15:45:11 PST 2013
+     * @mbggenerated Tue Feb 12 10:51:12 PST 2013
      */
     public void clear() {
         oredCriteria.clear();
@@ -151,7 +151,7 @@ public class SystemPermissionExample {
      * This class was generated by MyBatis Generator.
      * This class corresponds to the database table guacamole..guacamole_system_permission
      *
-     * @mbggenerated Tue Feb 05 15:45:11 PST 2013
+     * @mbggenerated Tue Feb 12 10:51:12 PST 2013
      */
     protected abstract static class GeneratedCriteria {
         protected List<Criterion> criteria;
@@ -329,7 +329,7 @@ public class SystemPermissionExample {
      * This class was generated by MyBatis Generator.
      * This class corresponds to the database table guacamole..guacamole_system_permission
      *
-     * @mbggenerated do_not_delete_during_merge Tue Feb 05 15:45:11 PST 2013
+     * @mbggenerated do_not_delete_during_merge Tue Feb 12 10:51:12 PST 2013
      */
     public static class Criteria extends GeneratedCriteria {
 
@@ -342,7 +342,7 @@ public class SystemPermissionExample {
      * This class was generated by MyBatis Generator.
      * This class corresponds to the database table guacamole..guacamole_system_permission
      *
-     * @mbggenerated Tue Feb 05 15:45:11 PST 2013
+     * @mbggenerated Tue Feb 12 10:51:12 PST 2013
      */
     public static class Criterion {
         private String condition;

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

@@ -1,11 +1,11 @@
-package net.sourceforge.guacamole.net.auth.mysql.model.guacamole;
+package net.sourceforge.guacamole.net.auth.mysql.model;
 
 public class SystemPermissionKey {
     /**
      * This field was generated by MyBatis Generator.
      * This field corresponds to the database column guacamole..guacamole_system_permission.user_id
      *
-     * @mbggenerated Tue Feb 05 15:45:11 PST 2013
+     * @mbggenerated Tue Feb 12 10:51:12 PST 2013
      */
     private Integer user_id;
 
@@ -13,7 +13,7 @@ public class SystemPermissionKey {
      * This field was generated by MyBatis Generator.
      * This field corresponds to the database column guacamole..guacamole_system_permission.permission
      *
-     * @mbggenerated Tue Feb 05 15:45:11 PST 2013
+     * @mbggenerated Tue Feb 12 10:51:12 PST 2013
      */
     private String permission;
 
@@ -23,7 +23,7 @@ public class SystemPermissionKey {
      *
      * @return the value of guacamole..guacamole_system_permission.user_id
      *
-     * @mbggenerated Tue Feb 05 15:45:11 PST 2013
+     * @mbggenerated Tue Feb 12 10:51:12 PST 2013
      */
     public Integer getUser_id() {
         return user_id;
@@ -35,7 +35,7 @@ public class SystemPermissionKey {
      *
      * @param user_id the value for guacamole..guacamole_system_permission.user_id
      *
-     * @mbggenerated Tue Feb 05 15:45:11 PST 2013
+     * @mbggenerated Tue Feb 12 10:51:12 PST 2013
      */
     public void setUser_id(Integer user_id) {
         this.user_id = user_id;
@@ -47,7 +47,7 @@ public class SystemPermissionKey {
      *
      * @return the value of guacamole..guacamole_system_permission.permission
      *
-     * @mbggenerated Tue Feb 05 15:45:11 PST 2013
+     * @mbggenerated Tue Feb 12 10:51:12 PST 2013
      */
     public String getPermission() {
         return permission;
@@ -59,9 +59,9 @@ public class SystemPermissionKey {
      *
      * @param permission the value for guacamole..guacamole_system_permission.permission
      *
-     * @mbggenerated Tue Feb 05 15:45:11 PST 2013
+     * @mbggenerated Tue Feb 12 10:51:12 PST 2013
      */
     public void setPermission(String permission) {
-        this.permission = permission == null ? null : permission.trim();
+        this.permission = permission;
     }
 }

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

@@ -0,0 +1,67 @@
+package net.sourceforge.guacamole.net.auth.mysql.model;
+
+public class User {
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column guacamole..guacamole_user.user_id
+     *
+     * @mbggenerated Tue Feb 12 10:51:12 PST 2013
+     */
+    private Integer user_id;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column guacamole..guacamole_user.username
+     *
+     * @mbggenerated Tue Feb 12 10:51:12 PST 2013
+     */
+    private String username;
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column guacamole..guacamole_user.user_id
+     *
+     * @return the value of guacamole..guacamole_user.user_id
+     *
+     * @mbggenerated Tue Feb 12 10:51:12 PST 2013
+     */
+    public Integer getUser_id() {
+        return user_id;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column guacamole..guacamole_user.user_id
+     *
+     * @param user_id the value for guacamole..guacamole_user.user_id
+     *
+     * @mbggenerated Tue Feb 12 10:51:12 PST 2013
+     */
+    public void setUser_id(Integer user_id) {
+        this.user_id = user_id;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column guacamole..guacamole_user.username
+     *
+     * @return the value of guacamole..guacamole_user.username
+     *
+     * @mbggenerated Tue Feb 12 10:51:12 PST 2013
+     */
+    public String getUsername() {
+        return username;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column guacamole..guacamole_user.username
+     *
+     * @param username the value for guacamole..guacamole_user.username
+     *
+     * @mbggenerated Tue Feb 12 10:51:12 PST 2013
+     */
+    public void setUsername(String username) {
+        this.username = username;
+    }
+}

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

@@ -1,4 +1,4 @@
-package net.sourceforge.guacamole.net.auth.mysql.model.guacamole;
+package net.sourceforge.guacamole.net.auth.mysql.model;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -8,7 +8,7 @@ public class UserExample {
      * This field was generated by MyBatis Generator.
      * This field corresponds to the database table guacamole..guacamole_user
      *
-     * @mbggenerated Tue Feb 05 15:45:11 PST 2013
+     * @mbggenerated Tue Feb 12 10:51:12 PST 2013
      */
     protected String orderByClause;
 
@@ -16,7 +16,7 @@ public class UserExample {
      * This field was generated by MyBatis Generator.
      * This field corresponds to the database table guacamole..guacamole_user
      *
-     * @mbggenerated Tue Feb 05 15:45:11 PST 2013
+     * @mbggenerated Tue Feb 12 10:51:12 PST 2013
      */
     protected boolean distinct;
 
@@ -24,7 +24,7 @@ public class UserExample {
      * This field was generated by MyBatis Generator.
      * This field corresponds to the database table guacamole..guacamole_user
      *
-     * @mbggenerated Tue Feb 05 15:45:11 PST 2013
+     * @mbggenerated Tue Feb 12 10:51:12 PST 2013
      */
     protected List<Criteria> oredCriteria;
 
@@ -32,7 +32,7 @@ public class UserExample {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table guacamole..guacamole_user
      *
-     * @mbggenerated Tue Feb 05 15:45:11 PST 2013
+     * @mbggenerated Tue Feb 12 10:51:12 PST 2013
      */
     public UserExample() {
         oredCriteria = new ArrayList<Criteria>();
@@ -42,7 +42,7 @@ public class UserExample {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table guacamole..guacamole_user
      *
-     * @mbggenerated Tue Feb 05 15:45:11 PST 2013
+     * @mbggenerated Tue Feb 12 10:51:12 PST 2013
      */
     public void setOrderByClause(String orderByClause) {
         this.orderByClause = orderByClause;
@@ -52,7 +52,7 @@ public class UserExample {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table guacamole..guacamole_user
      *
-     * @mbggenerated Tue Feb 05 15:45:11 PST 2013
+     * @mbggenerated Tue Feb 12 10:51:12 PST 2013
      */
     public String getOrderByClause() {
         return orderByClause;
@@ -62,7 +62,7 @@ public class UserExample {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table guacamole..guacamole_user
      *
-     * @mbggenerated Tue Feb 05 15:45:11 PST 2013
+     * @mbggenerated Tue Feb 12 10:51:12 PST 2013
      */
     public void setDistinct(boolean distinct) {
         this.distinct = distinct;
@@ -72,7 +72,7 @@ public class UserExample {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table guacamole..guacamole_user
      *
-     * @mbggenerated Tue Feb 05 15:45:11 PST 2013
+     * @mbggenerated Tue Feb 12 10:51:12 PST 2013
      */
     public boolean isDistinct() {
         return distinct;
@@ -82,7 +82,7 @@ public class UserExample {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table guacamole..guacamole_user
      *
-     * @mbggenerated Tue Feb 05 15:45:11 PST 2013
+     * @mbggenerated Tue Feb 12 10:51:12 PST 2013
      */
     public List<Criteria> getOredCriteria() {
         return oredCriteria;
@@ -92,7 +92,7 @@ public class UserExample {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table guacamole..guacamole_user
      *
-     * @mbggenerated Tue Feb 05 15:45:11 PST 2013
+     * @mbggenerated Tue Feb 12 10:51:12 PST 2013
      */
     public void or(Criteria criteria) {
         oredCriteria.add(criteria);
@@ -102,7 +102,7 @@ public class UserExample {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table guacamole..guacamole_user
      *
-     * @mbggenerated Tue Feb 05 15:45:11 PST 2013
+     * @mbggenerated Tue Feb 12 10:51:12 PST 2013
      */
     public Criteria or() {
         Criteria criteria = createCriteriaInternal();
@@ -114,7 +114,7 @@ public class UserExample {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table guacamole..guacamole_user
      *
-     * @mbggenerated Tue Feb 05 15:45:11 PST 2013
+     * @mbggenerated Tue Feb 12 10:51:12 PST 2013
      */
     public Criteria createCriteria() {
         Criteria criteria = createCriteriaInternal();
@@ -128,7 +128,7 @@ public class UserExample {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table guacamole..guacamole_user
      *
-     * @mbggenerated Tue Feb 05 15:45:11 PST 2013
+     * @mbggenerated Tue Feb 12 10:51:12 PST 2013
      */
     protected Criteria createCriteriaInternal() {
         Criteria criteria = new Criteria();
@@ -139,7 +139,7 @@ public class UserExample {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table guacamole..guacamole_user
      *
-     * @mbggenerated Tue Feb 05 15:45:11 PST 2013
+     * @mbggenerated Tue Feb 12 10:51:12 PST 2013
      */
     public void clear() {
         oredCriteria.clear();
@@ -151,7 +151,7 @@ public class UserExample {
      * This class was generated by MyBatis Generator.
      * This class corresponds to the database table guacamole..guacamole_user
      *
-     * @mbggenerated Tue Feb 05 15:45:11 PST 2013
+     * @mbggenerated Tue Feb 12 10:51:12 PST 2013
      */
     protected abstract static class GeneratedCriteria {
         protected List<Criterion> criteria;
@@ -323,83 +323,13 @@ public class UserExample {
             addCriterion("username not between", value1, value2, "username");
             return (Criteria) this;
         }
-
-        public Criteria andPassword_saltIsNull() {
-            addCriterion("password_salt is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andPassword_saltIsNotNull() {
-            addCriterion("password_salt is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andPassword_saltEqualTo(String value) {
-            addCriterion("password_salt =", value, "password_salt");
-            return (Criteria) this;
-        }
-
-        public Criteria andPassword_saltNotEqualTo(String value) {
-            addCriterion("password_salt <>", value, "password_salt");
-            return (Criteria) this;
-        }
-
-        public Criteria andPassword_saltGreaterThan(String value) {
-            addCriterion("password_salt >", value, "password_salt");
-            return (Criteria) this;
-        }
-
-        public Criteria andPassword_saltGreaterThanOrEqualTo(String value) {
-            addCriterion("password_salt >=", value, "password_salt");
-            return (Criteria) this;
-        }
-
-        public Criteria andPassword_saltLessThan(String value) {
-            addCriterion("password_salt <", value, "password_salt");
-            return (Criteria) this;
-        }
-
-        public Criteria andPassword_saltLessThanOrEqualTo(String value) {
-            addCriterion("password_salt <=", value, "password_salt");
-            return (Criteria) this;
-        }
-
-        public Criteria andPassword_saltLike(String value) {
-            addCriterion("password_salt like", value, "password_salt");
-            return (Criteria) this;
-        }
-
-        public Criteria andPassword_saltNotLike(String value) {
-            addCriterion("password_salt not like", value, "password_salt");
-            return (Criteria) this;
-        }
-
-        public Criteria andPassword_saltIn(List<String> values) {
-            addCriterion("password_salt in", values, "password_salt");
-            return (Criteria) this;
-        }
-
-        public Criteria andPassword_saltNotIn(List<String> values) {
-            addCriterion("password_salt not in", values, "password_salt");
-            return (Criteria) this;
-        }
-
-        public Criteria andPassword_saltBetween(String value1, String value2) {
-            addCriterion("password_salt between", value1, value2, "password_salt");
-            return (Criteria) this;
-        }
-
-        public Criteria andPassword_saltNotBetween(String value1, String value2) {
-            addCriterion("password_salt not between", value1, value2, "password_salt");
-            return (Criteria) this;
-        }
     }
 
     /**
      * This class was generated by MyBatis Generator.
      * This class corresponds to the database table guacamole..guacamole_user
      *
-     * @mbggenerated do_not_delete_during_merge Tue Feb 05 15:45:11 PST 2013
+     * @mbggenerated do_not_delete_during_merge Tue Feb 12 10:51:12 PST 2013
      */
     public static class Criteria extends GeneratedCriteria {
 
@@ -412,7 +342,7 @@ public class UserExample {
      * This class was generated by MyBatis Generator.
      * This class corresponds to the database table guacamole..guacamole_user
      *
-     * @mbggenerated Tue Feb 05 15:45:11 PST 2013
+     * @mbggenerated Tue Feb 12 10:51:12 PST 2013
      */
     public static class Criterion {
         private String condition;

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

@@ -1,4 +1,4 @@
-package net.sourceforge.guacamole.net.auth.mysql.model.guacamole;
+package net.sourceforge.guacamole.net.auth.mysql.model;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -8,7 +8,7 @@ public class UserPermissionExample {
      * This field was generated by MyBatis Generator.
      * This field corresponds to the database table guacamole..guacamole_user_permission
      *
-     * @mbggenerated Tue Feb 05 15:45:11 PST 2013
+     * @mbggenerated Tue Feb 12 10:51:12 PST 2013
      */
     protected String orderByClause;
 
@@ -16,7 +16,7 @@ public class UserPermissionExample {
      * This field was generated by MyBatis Generator.
      * This field corresponds to the database table guacamole..guacamole_user_permission
      *
-     * @mbggenerated Tue Feb 05 15:45:11 PST 2013
+     * @mbggenerated Tue Feb 12 10:51:12 PST 2013
      */
     protected boolean distinct;
 
@@ -24,7 +24,7 @@ public class UserPermissionExample {
      * This field was generated by MyBatis Generator.
      * This field corresponds to the database table guacamole..guacamole_user_permission
      *
-     * @mbggenerated Tue Feb 05 15:45:11 PST 2013
+     * @mbggenerated Tue Feb 12 10:51:12 PST 2013
      */
     protected List<Criteria> oredCriteria;
 
@@ -32,7 +32,7 @@ public class UserPermissionExample {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table guacamole..guacamole_user_permission
      *
-     * @mbggenerated Tue Feb 05 15:45:11 PST 2013
+     * @mbggenerated Tue Feb 12 10:51:12 PST 2013
      */
     public UserPermissionExample() {
         oredCriteria = new ArrayList<Criteria>();
@@ -42,7 +42,7 @@ public class UserPermissionExample {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table guacamole..guacamole_user_permission
      *
-     * @mbggenerated Tue Feb 05 15:45:11 PST 2013
+     * @mbggenerated Tue Feb 12 10:51:12 PST 2013
      */
     public void setOrderByClause(String orderByClause) {
         this.orderByClause = orderByClause;
@@ -52,7 +52,7 @@ public class UserPermissionExample {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table guacamole..guacamole_user_permission
      *
-     * @mbggenerated Tue Feb 05 15:45:11 PST 2013
+     * @mbggenerated Tue Feb 12 10:51:12 PST 2013
      */
     public String getOrderByClause() {
         return orderByClause;
@@ -62,7 +62,7 @@ public class UserPermissionExample {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table guacamole..guacamole_user_permission
      *
-     * @mbggenerated Tue Feb 05 15:45:11 PST 2013
+     * @mbggenerated Tue Feb 12 10:51:12 PST 2013
      */
     public void setDistinct(boolean distinct) {
         this.distinct = distinct;
@@ -72,7 +72,7 @@ public class UserPermissionExample {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table guacamole..guacamole_user_permission
      *
-     * @mbggenerated Tue Feb 05 15:45:11 PST 2013
+     * @mbggenerated Tue Feb 12 10:51:12 PST 2013
      */
     public boolean isDistinct() {
         return distinct;
@@ -82,7 +82,7 @@ public class UserPermissionExample {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table guacamole..guacamole_user_permission
      *
-     * @mbggenerated Tue Feb 05 15:45:11 PST 2013
+     * @mbggenerated Tue Feb 12 10:51:12 PST 2013
      */
     public List<Criteria> getOredCriteria() {
         return oredCriteria;
@@ -92,7 +92,7 @@ public class UserPermissionExample {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table guacamole..guacamole_user_permission
      *
-     * @mbggenerated Tue Feb 05 15:45:11 PST 2013
+     * @mbggenerated Tue Feb 12 10:51:12 PST 2013
      */
     public void or(Criteria criteria) {
         oredCriteria.add(criteria);
@@ -102,7 +102,7 @@ public class UserPermissionExample {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table guacamole..guacamole_user_permission
      *
-     * @mbggenerated Tue Feb 05 15:45:11 PST 2013
+     * @mbggenerated Tue Feb 12 10:51:12 PST 2013
      */
     public Criteria or() {
         Criteria criteria = createCriteriaInternal();
@@ -114,7 +114,7 @@ public class UserPermissionExample {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table guacamole..guacamole_user_permission
      *
-     * @mbggenerated Tue Feb 05 15:45:11 PST 2013
+     * @mbggenerated Tue Feb 12 10:51:12 PST 2013
      */
     public Criteria createCriteria() {
         Criteria criteria = createCriteriaInternal();
@@ -128,7 +128,7 @@ public class UserPermissionExample {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table guacamole..guacamole_user_permission
      *
-     * @mbggenerated Tue Feb 05 15:45:11 PST 2013
+     * @mbggenerated Tue Feb 12 10:51:12 PST 2013
      */
     protected Criteria createCriteriaInternal() {
         Criteria criteria = new Criteria();
@@ -139,7 +139,7 @@ public class UserPermissionExample {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table guacamole..guacamole_user_permission
      *
-     * @mbggenerated Tue Feb 05 15:45:11 PST 2013
+     * @mbggenerated Tue Feb 12 10:51:12 PST 2013
      */
     public void clear() {
         oredCriteria.clear();
@@ -151,7 +151,7 @@ public class UserPermissionExample {
      * This class was generated by MyBatis Generator.
      * This class corresponds to the database table guacamole..guacamole_user_permission
      *
-     * @mbggenerated Tue Feb 05 15:45:11 PST 2013
+     * @mbggenerated Tue Feb 12 10:51:12 PST 2013
      */
     protected abstract static class GeneratedCriteria {
         protected List<Criterion> criteria;
@@ -389,7 +389,7 @@ public class UserPermissionExample {
      * This class was generated by MyBatis Generator.
      * This class corresponds to the database table guacamole..guacamole_user_permission
      *
-     * @mbggenerated do_not_delete_during_merge Tue Feb 05 15:45:11 PST 2013
+     * @mbggenerated do_not_delete_during_merge Tue Feb 12 10:51:12 PST 2013
      */
     public static class Criteria extends GeneratedCriteria {
 
@@ -402,7 +402,7 @@ public class UserPermissionExample {
      * This class was generated by MyBatis Generator.
      * This class corresponds to the database table guacamole..guacamole_user_permission
      *
-     * @mbggenerated Tue Feb 05 15:45:11 PST 2013
+     * @mbggenerated Tue Feb 12 10:51:12 PST 2013
      */
     public static class Criterion {
         private String condition;

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

@@ -1,11 +1,11 @@
-package net.sourceforge.guacamole.net.auth.mysql.model.guacamole;
+package net.sourceforge.guacamole.net.auth.mysql.model;
 
 public class UserPermissionKey {
     /**
      * This field was generated by MyBatis Generator.
      * This field corresponds to the database column guacamole..guacamole_user_permission.user_id
      *
-     * @mbggenerated Tue Feb 05 15:45:11 PST 2013
+     * @mbggenerated Tue Feb 12 10:51:12 PST 2013
      */
     private Integer user_id;
 
@@ -13,7 +13,7 @@ public class UserPermissionKey {
      * This field was generated by MyBatis Generator.
      * This field corresponds to the database column guacamole..guacamole_user_permission.affected_user_id
      *
-     * @mbggenerated Tue Feb 05 15:45:11 PST 2013
+     * @mbggenerated Tue Feb 12 10:51:12 PST 2013
      */
     private Integer affected_user_id;
 
@@ -21,7 +21,7 @@ public class UserPermissionKey {
      * This field was generated by MyBatis Generator.
      * This field corresponds to the database column guacamole..guacamole_user_permission.permission
      *
-     * @mbggenerated Tue Feb 05 15:45:11 PST 2013
+     * @mbggenerated Tue Feb 12 10:51:12 PST 2013
      */
     private String permission;
 
@@ -31,7 +31,7 @@ public class UserPermissionKey {
      *
      * @return the value of guacamole..guacamole_user_permission.user_id
      *
-     * @mbggenerated Tue Feb 05 15:45:11 PST 2013
+     * @mbggenerated Tue Feb 12 10:51:12 PST 2013
      */
     public Integer getUser_id() {
         return user_id;
@@ -43,7 +43,7 @@ public class UserPermissionKey {
      *
      * @param user_id the value for guacamole..guacamole_user_permission.user_id
      *
-     * @mbggenerated Tue Feb 05 15:45:11 PST 2013
+     * @mbggenerated Tue Feb 12 10:51:12 PST 2013
      */
     public void setUser_id(Integer user_id) {
         this.user_id = user_id;
@@ -55,7 +55,7 @@ public class UserPermissionKey {
      *
      * @return the value of guacamole..guacamole_user_permission.affected_user_id
      *
-     * @mbggenerated Tue Feb 05 15:45:11 PST 2013
+     * @mbggenerated Tue Feb 12 10:51:12 PST 2013
      */
     public Integer getAffected_user_id() {
         return affected_user_id;
@@ -67,7 +67,7 @@ public class UserPermissionKey {
      *
      * @param affected_user_id the value for guacamole..guacamole_user_permission.affected_user_id
      *
-     * @mbggenerated Tue Feb 05 15:45:11 PST 2013
+     * @mbggenerated Tue Feb 12 10:51:12 PST 2013
      */
     public void setAffected_user_id(Integer affected_user_id) {
         this.affected_user_id = affected_user_id;
@@ -79,7 +79,7 @@ public class UserPermissionKey {
      *
      * @return the value of guacamole..guacamole_user_permission.permission
      *
-     * @mbggenerated Tue Feb 05 15:45:11 PST 2013
+     * @mbggenerated Tue Feb 12 10:51:12 PST 2013
      */
     public String getPermission() {
         return permission;
@@ -91,9 +91,9 @@ public class UserPermissionKey {
      *
      * @param permission the value for guacamole..guacamole_user_permission.permission
      *
-     * @mbggenerated Tue Feb 05 15:45:11 PST 2013
+     * @mbggenerated Tue Feb 12 10:51:12 PST 2013
      */
     public void setPermission(String permission) {
-        this.permission = permission == null ? null : permission.trim();
+        this.permission = permission;
     }
 }

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

@@ -0,0 +1,67 @@
+package net.sourceforge.guacamole.net.auth.mysql.model;
+
+public class UserWithBLOBs extends User {
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column guacamole..guacamole_user.password_hash
+     *
+     * @mbggenerated Tue Feb 12 10:51:12 PST 2013
+     */
+    private byte[] password_hash;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column guacamole..guacamole_user.password_salt
+     *
+     * @mbggenerated Tue Feb 12 10:51:12 PST 2013
+     */
+    private byte[] password_salt;
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column guacamole..guacamole_user.password_hash
+     *
+     * @return the value of guacamole..guacamole_user.password_hash
+     *
+     * @mbggenerated Tue Feb 12 10:51:12 PST 2013
+     */
+    public byte[] getPassword_hash() {
+        return password_hash;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column guacamole..guacamole_user.password_hash
+     *
+     * @param password_hash the value for guacamole..guacamole_user.password_hash
+     *
+     * @mbggenerated Tue Feb 12 10:51:12 PST 2013
+     */
+    public void setPassword_hash(byte[] password_hash) {
+        this.password_hash = password_hash;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column guacamole..guacamole_user.password_salt
+     *
+     * @return the value of guacamole..guacamole_user.password_salt
+     *
+     * @mbggenerated Tue Feb 12 10:51:12 PST 2013
+     */
+    public byte[] getPassword_salt() {
+        return password_salt;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column guacamole..guacamole_user.password_salt
+     *
+     * @param password_salt the value for guacamole..guacamole_user.password_salt
+     *
+     * @mbggenerated Tue Feb 12 10:51:12 PST 2013
+     */
+    public void setPassword_salt(byte[] password_salt) {
+        this.password_salt = password_salt;
+    }
+}

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

@@ -1,131 +0,0 @@
-package net.sourceforge.guacamole.net.auth.mysql.model.guacamole;
-
-public class User {
-    /**
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column guacamole..guacamole_user.user_id
-     *
-     * @mbggenerated Tue Feb 05 15:45:11 PST 2013
-     */
-    private Integer user_id;
-
-    /**
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column guacamole..guacamole_user.username
-     *
-     * @mbggenerated Tue Feb 05 15:45:11 PST 2013
-     */
-    private String username;
-
-    /**
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column guacamole..guacamole_user.password_salt
-     *
-     * @mbggenerated Tue Feb 05 15:45:11 PST 2013
-     */
-    private String password_salt;
-
-    /**
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column guacamole..guacamole_user.password_hash
-     *
-     * @mbggenerated Tue Feb 05 15:45:11 PST 2013
-     */
-    private byte[] password_hash;
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column guacamole..guacamole_user.user_id
-     *
-     * @return the value of guacamole..guacamole_user.user_id
-     *
-     * @mbggenerated Tue Feb 05 15:45:11 PST 2013
-     */
-    public Integer getUser_id() {
-        return user_id;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column guacamole..guacamole_user.user_id
-     *
-     * @param user_id the value for guacamole..guacamole_user.user_id
-     *
-     * @mbggenerated Tue Feb 05 15:45:11 PST 2013
-     */
-    public void setUser_id(Integer user_id) {
-        this.user_id = user_id;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column guacamole..guacamole_user.username
-     *
-     * @return the value of guacamole..guacamole_user.username
-     *
-     * @mbggenerated Tue Feb 05 15:45:11 PST 2013
-     */
-    public String getUsername() {
-        return username;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column guacamole..guacamole_user.username
-     *
-     * @param username the value for guacamole..guacamole_user.username
-     *
-     * @mbggenerated Tue Feb 05 15:45:11 PST 2013
-     */
-    public void setUsername(String username) {
-        this.username = username == null ? null : username.trim();
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column guacamole..guacamole_user.password_salt
-     *
-     * @return the value of guacamole..guacamole_user.password_salt
-     *
-     * @mbggenerated Tue Feb 05 15:45:11 PST 2013
-     */
-    public String getPassword_salt() {
-        return password_salt;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column guacamole..guacamole_user.password_salt
-     *
-     * @param password_salt the value for guacamole..guacamole_user.password_salt
-     *
-     * @mbggenerated Tue Feb 05 15:45:11 PST 2013
-     */
-    public void setPassword_salt(String password_salt) {
-        this.password_salt = password_salt == null ? null : password_salt.trim();
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column guacamole..guacamole_user.password_hash
-     *
-     * @return the value of guacamole..guacamole_user.password_hash
-     *
-     * @mbggenerated Tue Feb 05 15:45:11 PST 2013
-     */
-    public byte[] getPassword_hash() {
-        return password_hash;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column guacamole..guacamole_user.password_hash
-     *
-     * @param password_hash the value for guacamole..guacamole_user.password_hash
-     *
-     * @mbggenerated Tue Feb 05 15:45:11 PST 2013
-     */
-    public void setPassword_hash(byte[] password_hash) {
-        this.password_hash = password_hash;
-    }
-}

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

@@ -51,7 +51,7 @@ public interface PasswordEncryptionUtility {
      * @param dbSalt
      * @return true if the provided credentials match what's in the database for that user.
      */
-    public boolean checkCredentials(Credentials credentials, byte[] dbPasswordHash, String dbUsername, String dbSalt);
+    public boolean checkCredentials(Credentials credentials, byte[] dbPasswordHash, String dbUsername, byte[] dbSalt);
     
     /**
      * Creates a password hash based on the provided username, password, and salt.
@@ -60,5 +60,5 @@ public interface PasswordEncryptionUtility {
      * @param salt
      * @return the generated password hash.
      */
-    public byte[] createPasswordHash(String password, String salt);
+    public byte[] createPasswordHash(String password, byte[] salt);
 }

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

@@ -35,8 +35,6 @@
  * ***** END LICENSE BLOCK ***** */
 package net.sourceforge.guacamole.net.auth.mysql.utility;
 
-import net.sourceforge.guacamole.GuacamoleException;
-
 /**
  *
  * @author James Muehlner
@@ -46,5 +44,5 @@ public interface SaltUtility {
      * Generates a new String that can be used as a password salt.
      * @return a new salt for password encryption.
      */
-    public String generateSalt();
+    public byte[] generateSalt();
 }

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

@@ -35,7 +35,6 @@
  * ***** END LICENSE BLOCK ***** */
 package net.sourceforge.guacamole.net.auth.mysql.utility;
 
-import java.io.UnsupportedEncodingException;
 import java.security.SecureRandom;
 
 /**
@@ -47,13 +46,9 @@ public class SecureRandomSaltUtility implements SaltUtility {
     SecureRandom secureRandom = new SecureRandom();
     
     @Override
-    public String generateSalt() {
+    public byte[] generateSalt() {
         byte[] salt = new byte[32];
         secureRandom.nextBytes(salt);
-        try {
+        return salt;
-            return new String(salt, "UTF-8");
-        } catch (UnsupportedEncodingException ex) { // should not happen
-            throw new RuntimeException(ex);
-        }
     }
 }

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

@@ -40,6 +40,7 @@ import java.io.UnsupportedEncodingException;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
 import java.util.Arrays;
+import javax.xml.bind.DatatypeConverter;
 import net.sourceforge.guacamole.net.auth.Credentials;
 
 /**
@@ -49,7 +50,7 @@ import net.sourceforge.guacamole.net.auth.Credentials;
 public class Sha256PasswordEncryptionUtility implements PasswordEncryptionUtility {
 
     @Override
-    public boolean checkCredentials(Credentials credentials, byte[] dbPasswordHash, String dbUsername, String dbSalt) {
+    public boolean checkCredentials(Credentials credentials, byte[] dbPasswordHash, String dbUsername, byte[] dbSalt) {
         Preconditions.checkNotNull(credentials);
         Preconditions.checkNotNull(dbPasswordHash);
         Preconditions.checkNotNull(dbUsername);
@@ -59,7 +60,7 @@ public class Sha256PasswordEncryptionUtility implements PasswordEncryptionUtilit
     }
 
     @Override
-    public byte[] createPasswordHash(String password, String salt) {
+    public byte[] createPasswordHash(String password, byte[] salt) {
         Preconditions.checkNotNull(password);
         Preconditions.checkNotNull(salt);
         try {
@@ -67,7 +68,7 @@ public class Sha256PasswordEncryptionUtility implements PasswordEncryptionUtilit
 
             StringBuilder builder = new StringBuilder();
             builder.append(password);
-            builder.append(salt);
+            builder.append(DatatypeConverter.printHexBinary(salt));
             md.update(builder.toString().getBytes("UTF-8"));
             return md.digest();
         } catch (UnsupportedEncodingException ex) { // should not happen

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

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
-<mapper namespace="net.sourceforge.guacamole.net.auth.mysql.dao.guacamole.ConnectionMapper" >
+<mapper namespace="net.sourceforge.guacamole.net.auth.mysql.dao.ConnectionMapper" >
-  <resultMap id="BaseResultMap" type="net.sourceforge.guacamole.net.auth.mysql.model.guacamole.Connection" >
+  <resultMap id="BaseResultMap" type="net.sourceforge.guacamole.net.auth.mysql.model.Connection" >
     <!--
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Feb 05 15:45:11 PST 2013.
+      This element was generated on Tue Feb 12 10:51:12 PST 2013.
     -->
     <id column="connection_id" property="connection_id" jdbcType="INTEGER" />
     <result column="connection_name" property="connection_name" jdbcType="VARCHAR" />
@@ -15,7 +15,7 @@
     <!--
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Feb 05 15:45:11 PST 2013.
+      This element was generated on Tue Feb 12 10:51:12 PST 2013.
     -->
     <where >
       <foreach collection="oredCriteria" item="criteria" separator="or" >
@@ -49,7 +49,7 @@
     <!--
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Feb 05 15:45:11 PST 2013.
+      This element was generated on Tue Feb 12 10:51:12 PST 2013.
     -->
     <where >
       <foreach collection="example.oredCriteria" item="criteria" separator="or" >
@@ -83,15 +83,15 @@
     <!--
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Feb 05 15:45:11 PST 2013.
+      This element was generated on Tue Feb 12 10:51:12 PST 2013.
     -->
     connection_id, connection_name, protocol
   </sql>
-  <select id="selectByExample" resultMap="BaseResultMap" parameterType="net.sourceforge.guacamole.net.auth.mysql.model.guacamole.ConnectionExample" >
+  <select id="selectByExample" resultMap="BaseResultMap" parameterType="net.sourceforge.guacamole.net.auth.mysql.model.ConnectionExample" >
     <!--
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Feb 05 15:45:11 PST 2013.
+      This element was generated on Tue Feb 12 10:51:12 PST 2013.
     -->
     select
     <if test="distinct" >
@@ -110,7 +110,7 @@
     <!--
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Feb 05 15:45:11 PST 2013.
+      This element was generated on Tue Feb 12 10:51:12 PST 2013.
     -->
     select 
     <include refid="Base_Column_List" />
@@ -121,38 +121,38 @@
     <!--
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Feb 05 15:45:11 PST 2013.
+      This element was generated on Tue Feb 12 10:51:12 PST 2013.
     -->
     delete from guacamole..guacamole_connection
     where connection_id = #{connection_id,jdbcType=INTEGER}
   </delete>
-  <delete id="deleteByExample" parameterType="net.sourceforge.guacamole.net.auth.mysql.model.guacamole.ConnectionExample" >
+  <delete id="deleteByExample" parameterType="net.sourceforge.guacamole.net.auth.mysql.model.ConnectionExample" >
     <!--
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Feb 05 15:45:11 PST 2013.
+      This element was generated on Tue Feb 12 10:51:12 PST 2013.
     -->
     delete from guacamole..guacamole_connection
     <if test="_parameter != null" >
       <include refid="Example_Where_Clause" />
     </if>
   </delete>
-  <insert id="insert" parameterType="net.sourceforge.guacamole.net.auth.mysql.model.guacamole.Connection" >
+  <insert id="insert" parameterType="net.sourceforge.guacamole.net.auth.mysql.model.Connection" >
     <!--
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Feb 05 15:45:11 PST 2013.
+      This element was generated on Tue Feb 12 10:51:12 PST 2013.
     -->
     insert into guacamole..guacamole_connection (connection_id, connection_name, protocol
       )
     values (#{connection_id,jdbcType=INTEGER}, #{connection_name,jdbcType=VARCHAR}, #{protocol,jdbcType=VARCHAR}
       )
   </insert>
-  <insert id="insertSelective" parameterType="net.sourceforge.guacamole.net.auth.mysql.model.guacamole.Connection" >
+  <insert id="insertSelective" parameterType="net.sourceforge.guacamole.net.auth.mysql.model.Connection" >
     <!--
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Feb 05 15:45:11 PST 2013.
+      This element was generated on Tue Feb 12 10:51:12 PST 2013.
     -->
     insert into guacamole..guacamole_connection
     <trim prefix="(" suffix=")" suffixOverrides="," >
@@ -178,11 +178,11 @@
       </if>
     </trim>
   </insert>
-  <select id="countByExample" parameterType="net.sourceforge.guacamole.net.auth.mysql.model.guacamole.ConnectionExample" resultType="java.lang.Integer" >
+  <select id="countByExample" parameterType="net.sourceforge.guacamole.net.auth.mysql.model.ConnectionExample" resultType="java.lang.Integer" >
     <!--
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Feb 05 15:45:11 PST 2013.
+      This element was generated on Tue Feb 12 10:51:12 PST 2013.
     -->
     select count(*) from guacamole..guacamole_connection
     <if test="_parameter != null" >
@@ -193,7 +193,7 @@
     <!--
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Feb 05 15:45:11 PST 2013.
+      This element was generated on Tue Feb 12 10:51:12 PST 2013.
     -->
     update guacamole..guacamole_connection
     <set >
@@ -215,7 +215,7 @@
     <!--
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Feb 05 15:45:11 PST 2013.
+      This element was generated on Tue Feb 12 10:51:12 PST 2013.
     -->
     update guacamole..guacamole_connection
     set connection_id = #{record.connection_id,jdbcType=INTEGER},
@@ -225,11 +225,11 @@
       <include refid="Update_By_Example_Where_Clause" />
     </if>
   </update>
-  <update id="updateByPrimaryKeySelective" parameterType="net.sourceforge.guacamole.net.auth.mysql.model.guacamole.Connection" >
+  <update id="updateByPrimaryKeySelective" parameterType="net.sourceforge.guacamole.net.auth.mysql.model.Connection" >
     <!--
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Feb 05 15:45:11 PST 2013.
+      This element was generated on Tue Feb 12 10:51:12 PST 2013.
     -->
     update guacamole..guacamole_connection
     <set >
@@ -242,11 +242,11 @@
     </set>
     where connection_id = #{connection_id,jdbcType=INTEGER}
   </update>
-  <update id="updateByPrimaryKey" parameterType="net.sourceforge.guacamole.net.auth.mysql.model.guacamole.Connection" >
+  <update id="updateByPrimaryKey" parameterType="net.sourceforge.guacamole.net.auth.mysql.model.Connection" >
     <!--
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Feb 05 15:45:11 PST 2013.
+      This element was generated on Tue Feb 12 10:51:12 PST 2013.
     -->
     update guacamole..guacamole_connection
     set connection_name = #{connection_name,jdbcType=VARCHAR},

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

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
-<mapper namespace="net.sourceforge.guacamole.net.auth.mysql.dao.guacamole.ConnectionParameterMapper" >
+<mapper namespace="net.sourceforge.guacamole.net.auth.mysql.dao.ConnectionParameterMapper" >
-  <resultMap id="BaseResultMap" type="net.sourceforge.guacamole.net.auth.mysql.model.guacamole.ConnectionParameter" >
+  <resultMap id="BaseResultMap" type="net.sourceforge.guacamole.net.auth.mysql.model.ConnectionParameter" >
     <!--
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Feb 05 15:45:11 PST 2013.
+      This element was generated on Tue Feb 12 10:51:12 PST 2013.
     -->
     <id column="connection_id" property="connection_id" jdbcType="INTEGER" />
     <id column="parameter_name" property="parameter_name" jdbcType="VARCHAR" />
@@ -15,7 +15,7 @@
     <!--
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Feb 05 15:45:11 PST 2013.
+      This element was generated on Tue Feb 12 10:51:12 PST 2013.
     -->
     <where >
       <foreach collection="oredCriteria" item="criteria" separator="or" >
@@ -49,7 +49,7 @@
     <!--
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Feb 05 15:45:11 PST 2013.
+      This element was generated on Tue Feb 12 10:51:12 PST 2013.
     -->
     <where >
       <foreach collection="example.oredCriteria" item="criteria" separator="or" >
@@ -83,15 +83,15 @@
     <!--
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Feb 05 15:45:11 PST 2013.
+      This element was generated on Tue Feb 12 10:51:12 PST 2013.
     -->
     connection_id, parameter_name, parameter_value
   </sql>
-  <select id="selectByExample" resultMap="BaseResultMap" parameterType="net.sourceforge.guacamole.net.auth.mysql.model.guacamole.ConnectionParameterExample" >
+  <select id="selectByExample" resultMap="BaseResultMap" parameterType="net.sourceforge.guacamole.net.auth.mysql.model.ConnectionParameterExample" >
     <!--
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Feb 05 15:45:11 PST 2013.
+      This element was generated on Tue Feb 12 10:51:12 PST 2013.
     -->
     select
     <if test="distinct" >
@@ -106,11 +106,11 @@
       order by ${orderByClause}
     </if>
   </select>
-  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="net.sourceforge.guacamole.net.auth.mysql.model.guacamole.ConnectionParameterKey" >
+  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="net.sourceforge.guacamole.net.auth.mysql.model.ConnectionParameterKey" >
     <!--
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Feb 05 15:45:11 PST 2013.
+      This element was generated on Tue Feb 12 10:51:12 PST 2013.
     -->
     select 
     <include refid="Base_Column_List" />
@@ -118,43 +118,43 @@
     where connection_id = #{connection_id,jdbcType=INTEGER}
       and parameter_name = #{parameter_name,jdbcType=VARCHAR}
   </select>
-  <delete id="deleteByPrimaryKey" parameterType="net.sourceforge.guacamole.net.auth.mysql.model.guacamole.ConnectionParameterKey" >
+  <delete id="deleteByPrimaryKey" parameterType="net.sourceforge.guacamole.net.auth.mysql.model.ConnectionParameterKey" >
     <!--
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Feb 05 15:45:11 PST 2013.
+      This element was generated on Tue Feb 12 10:51:12 PST 2013.
     -->
     delete from guacamole..guacamole_connection_parameter
     where connection_id = #{connection_id,jdbcType=INTEGER}
       and parameter_name = #{parameter_name,jdbcType=VARCHAR}
   </delete>
-  <delete id="deleteByExample" parameterType="net.sourceforge.guacamole.net.auth.mysql.model.guacamole.ConnectionParameterExample" >
+  <delete id="deleteByExample" parameterType="net.sourceforge.guacamole.net.auth.mysql.model.ConnectionParameterExample" >
     <!--
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Feb 05 15:45:11 PST 2013.
+      This element was generated on Tue Feb 12 10:51:12 PST 2013.
     -->
     delete from guacamole..guacamole_connection_parameter
     <if test="_parameter != null" >
       <include refid="Example_Where_Clause" />
     </if>
   </delete>
-  <insert id="insert" parameterType="net.sourceforge.guacamole.net.auth.mysql.model.guacamole.ConnectionParameter" >
+  <insert id="insert" parameterType="net.sourceforge.guacamole.net.auth.mysql.model.ConnectionParameter" >
     <!--
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Feb 05 15:45:11 PST 2013.
+      This element was generated on Tue Feb 12 10:51:12 PST 2013.
     -->
     insert into guacamole..guacamole_connection_parameter (connection_id, parameter_name, parameter_value
       )
     values (#{connection_id,jdbcType=INTEGER}, #{parameter_name,jdbcType=VARCHAR}, #{parameter_value,jdbcType=VARCHAR}
       )
   </insert>
-  <insert id="insertSelective" parameterType="net.sourceforge.guacamole.net.auth.mysql.model.guacamole.ConnectionParameter" >
+  <insert id="insertSelective" parameterType="net.sourceforge.guacamole.net.auth.mysql.model.ConnectionParameter" >
     <!--
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Feb 05 15:45:11 PST 2013.
+      This element was generated on Tue Feb 12 10:51:12 PST 2013.
     -->
     insert into guacamole..guacamole_connection_parameter
     <trim prefix="(" suffix=")" suffixOverrides="," >
@@ -180,11 +180,11 @@
       </if>
     </trim>
   </insert>
-  <select id="countByExample" parameterType="net.sourceforge.guacamole.net.auth.mysql.model.guacamole.ConnectionParameterExample" resultType="java.lang.Integer" >
+  <select id="countByExample" parameterType="net.sourceforge.guacamole.net.auth.mysql.model.ConnectionParameterExample" resultType="java.lang.Integer" >
     <!--
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Feb 05 15:45:11 PST 2013.
+      This element was generated on Tue Feb 12 10:51:12 PST 2013.
     -->
     select count(*) from guacamole..guacamole_connection_parameter
     <if test="_parameter != null" >
@@ -195,7 +195,7 @@
     <!--
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Feb 05 15:45:11 PST 2013.
+      This element was generated on Tue Feb 12 10:51:12 PST 2013.
     -->
     update guacamole..guacamole_connection_parameter
     <set >
@@ -217,7 +217,7 @@
     <!--
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Feb 05 15:45:11 PST 2013.
+      This element was generated on Tue Feb 12 10:51:12 PST 2013.
     -->
     update guacamole..guacamole_connection_parameter
     set connection_id = #{record.connection_id,jdbcType=INTEGER},
@@ -227,11 +227,11 @@
       <include refid="Update_By_Example_Where_Clause" />
     </if>
   </update>
-  <update id="updateByPrimaryKeySelective" parameterType="net.sourceforge.guacamole.net.auth.mysql.model.guacamole.ConnectionParameter" >
+  <update id="updateByPrimaryKeySelective" parameterType="net.sourceforge.guacamole.net.auth.mysql.model.ConnectionParameter" >
     <!--
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Feb 05 15:45:11 PST 2013.
+      This element was generated on Tue Feb 12 10:51:12 PST 2013.
     -->
     update guacamole..guacamole_connection_parameter
     <set >
@@ -242,11 +242,11 @@
     where connection_id = #{connection_id,jdbcType=INTEGER}
       and parameter_name = #{parameter_name,jdbcType=VARCHAR}
   </update>
-  <update id="updateByPrimaryKey" parameterType="net.sourceforge.guacamole.net.auth.mysql.model.guacamole.ConnectionParameter" >
+  <update id="updateByPrimaryKey" parameterType="net.sourceforge.guacamole.net.auth.mysql.model.ConnectionParameter" >
     <!--
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Feb 05 15:45:11 PST 2013.
+      This element was generated on Tue Feb 12 10:51:12 PST 2013.
     -->
     update guacamole..guacamole_connection_parameter
     set parameter_value = #{parameter_value,jdbcType=VARCHAR}

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

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
-<mapper namespace="net.sourceforge.guacamole.net.auth.mysql.dao.guacamole.ConnectionPermissionMapper" >
+<mapper namespace="net.sourceforge.guacamole.net.auth.mysql.dao.ConnectionPermissionMapper" >
-  <resultMap id="BaseResultMap" type="net.sourceforge.guacamole.net.auth.mysql.model.guacamole.ConnectionPermissionKey" >
+  <resultMap id="BaseResultMap" type="net.sourceforge.guacamole.net.auth.mysql.model.ConnectionPermissionKey" >
     <!--
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Feb 05 15:45:11 PST 2013.
+      This element was generated on Tue Feb 12 10:51:12 PST 2013.
     -->
     <id column="user_id" property="user_id" jdbcType="INTEGER" />
     <id column="connection_id" property="connection_id" jdbcType="INTEGER" />
@@ -15,7 +15,7 @@
     <!--
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Feb 05 15:45:11 PST 2013.
+      This element was generated on Tue Feb 12 10:51:12 PST 2013.
     -->
     <where >
       <foreach collection="oredCriteria" item="criteria" separator="or" >
@@ -49,7 +49,7 @@
     <!--
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Feb 05 15:45:11 PST 2013.
+      This element was generated on Tue Feb 12 10:51:12 PST 2013.
     -->
     <where >
       <foreach collection="example.oredCriteria" item="criteria" separator="or" >
@@ -83,15 +83,15 @@
     <!--
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Feb 05 15:45:11 PST 2013.
+      This element was generated on Tue Feb 12 10:51:12 PST 2013.
     -->
     user_id, connection_id, permission
   </sql>
-  <select id="selectByExample" resultMap="BaseResultMap" parameterType="net.sourceforge.guacamole.net.auth.mysql.model.guacamole.ConnectionPermissionExample" >
+  <select id="selectByExample" resultMap="BaseResultMap" parameterType="net.sourceforge.guacamole.net.auth.mysql.model.ConnectionPermissionExample" >
     <!--
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Feb 05 15:45:11 PST 2013.
+      This element was generated on Tue Feb 12 10:51:12 PST 2013.
     -->
     select
     <if test="distinct" >
@@ -106,44 +106,44 @@
       order by ${orderByClause}
     </if>
   </select>
-  <delete id="deleteByPrimaryKey" parameterType="net.sourceforge.guacamole.net.auth.mysql.model.guacamole.ConnectionPermissionKey" >
+  <delete id="deleteByPrimaryKey" parameterType="net.sourceforge.guacamole.net.auth.mysql.model.ConnectionPermissionKey" >
     <!--
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Feb 05 15:45:11 PST 2013.
+      This element was generated on Tue Feb 12 10:51:12 PST 2013.
     -->
     delete from guacamole..guacamole_connection_permission
     where user_id = #{user_id,jdbcType=INTEGER}
       and connection_id = #{connection_id,jdbcType=INTEGER}
       and permission = #{permission,jdbcType=CHAR}
   </delete>
-  <delete id="deleteByExample" parameterType="net.sourceforge.guacamole.net.auth.mysql.model.guacamole.ConnectionPermissionExample" >
+  <delete id="deleteByExample" parameterType="net.sourceforge.guacamole.net.auth.mysql.model.ConnectionPermissionExample" >
     <!--
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Feb 05 15:45:11 PST 2013.
+      This element was generated on Tue Feb 12 10:51:12 PST 2013.
     -->
     delete from guacamole..guacamole_connection_permission
     <if test="_parameter != null" >
       <include refid="Example_Where_Clause" />
     </if>
   </delete>
-  <insert id="insert" parameterType="net.sourceforge.guacamole.net.auth.mysql.model.guacamole.ConnectionPermissionKey" >
+  <insert id="insert" parameterType="net.sourceforge.guacamole.net.auth.mysql.model.ConnectionPermissionKey" >
     <!--
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Feb 05 15:45:11 PST 2013.
+      This element was generated on Tue Feb 12 10:51:12 PST 2013.
     -->
     insert into guacamole..guacamole_connection_permission (user_id, connection_id, permission
       )
     values (#{user_id,jdbcType=INTEGER}, #{connection_id,jdbcType=INTEGER}, #{permission,jdbcType=CHAR}
       )
   </insert>
-  <insert id="insertSelective" parameterType="net.sourceforge.guacamole.net.auth.mysql.model.guacamole.ConnectionPermissionKey" >
+  <insert id="insertSelective" parameterType="net.sourceforge.guacamole.net.auth.mysql.model.ConnectionPermissionKey" >
     <!--
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Feb 05 15:45:11 PST 2013.
+      This element was generated on Tue Feb 12 10:51:12 PST 2013.
     -->
     insert into guacamole..guacamole_connection_permission
     <trim prefix="(" suffix=")" suffixOverrides="," >
@@ -169,11 +169,11 @@
       </if>
     </trim>
   </insert>
-  <select id="countByExample" parameterType="net.sourceforge.guacamole.net.auth.mysql.model.guacamole.ConnectionPermissionExample" resultType="java.lang.Integer" >
+  <select id="countByExample" parameterType="net.sourceforge.guacamole.net.auth.mysql.model.ConnectionPermissionExample" resultType="java.lang.Integer" >
     <!--
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Feb 05 15:45:11 PST 2013.
+      This element was generated on Tue Feb 12 10:51:12 PST 2013.
     -->
     select count(*) from guacamole..guacamole_connection_permission
     <if test="_parameter != null" >
@@ -184,7 +184,7 @@
     <!--
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Feb 05 15:45:11 PST 2013.
+      This element was generated on Tue Feb 12 10:51:12 PST 2013.
     -->
     update guacamole..guacamole_connection_permission
     <set >
@@ -206,7 +206,7 @@
     <!--
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Feb 05 15:45:11 PST 2013.
+      This element was generated on Tue Feb 12 10:51:12 PST 2013.
     -->
     update guacamole..guacamole_connection_permission
     set user_id = #{record.user_id,jdbcType=INTEGER},

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

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
-<mapper namespace="net.sourceforge.guacamole.net.auth.mysql.dao.guacamole.SystemPermissionMapper" >
+<mapper namespace="net.sourceforge.guacamole.net.auth.mysql.dao.SystemPermissionMapper" >
-  <resultMap id="BaseResultMap" type="net.sourceforge.guacamole.net.auth.mysql.model.guacamole.SystemPermissionKey" >
+  <resultMap id="BaseResultMap" type="net.sourceforge.guacamole.net.auth.mysql.model.SystemPermissionKey" >
     <!--
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Feb 05 15:45:11 PST 2013.
+      This element was generated on Tue Feb 12 10:51:12 PST 2013.
     -->
     <id column="user_id" property="user_id" jdbcType="INTEGER" />
     <id column="permission" property="permission" jdbcType="CHAR" />
@@ -14,7 +14,7 @@
     <!--
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Feb 05 15:45:11 PST 2013.
+      This element was generated on Tue Feb 12 10:51:12 PST 2013.
     -->
     <where >
       <foreach collection="oredCriteria" item="criteria" separator="or" >
@@ -48,7 +48,7 @@
     <!--
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Feb 05 15:45:11 PST 2013.
+      This element was generated on Tue Feb 12 10:51:12 PST 2013.
     -->
     <where >
       <foreach collection="example.oredCriteria" item="criteria" separator="or" >
@@ -82,15 +82,15 @@
     <!--
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Feb 05 15:45:11 PST 2013.
+      This element was generated on Tue Feb 12 10:51:12 PST 2013.
     -->
     user_id, permission
   </sql>
-  <select id="selectByExample" resultMap="BaseResultMap" parameterType="net.sourceforge.guacamole.net.auth.mysql.model.guacamole.SystemPermissionExample" >
+  <select id="selectByExample" resultMap="BaseResultMap" parameterType="net.sourceforge.guacamole.net.auth.mysql.model.SystemPermissionExample" >
     <!--
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Feb 05 15:45:11 PST 2013.
+      This element was generated on Tue Feb 12 10:51:12 PST 2013.
     -->
     select
     <if test="distinct" >
@@ -105,41 +105,41 @@
       order by ${orderByClause}
     </if>
   </select>
-  <delete id="deleteByPrimaryKey" parameterType="net.sourceforge.guacamole.net.auth.mysql.model.guacamole.SystemPermissionKey" >
+  <delete id="deleteByPrimaryKey" parameterType="net.sourceforge.guacamole.net.auth.mysql.model.SystemPermissionKey" >
     <!--
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Feb 05 15:45:11 PST 2013.
+      This element was generated on Tue Feb 12 10:51:12 PST 2013.
     -->
     delete from guacamole..guacamole_system_permission
     where user_id = #{user_id,jdbcType=INTEGER}
       and permission = #{permission,jdbcType=CHAR}
   </delete>
-  <delete id="deleteByExample" parameterType="net.sourceforge.guacamole.net.auth.mysql.model.guacamole.SystemPermissionExample" >
+  <delete id="deleteByExample" parameterType="net.sourceforge.guacamole.net.auth.mysql.model.SystemPermissionExample" >
     <!--
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Feb 05 15:45:11 PST 2013.
+      This element was generated on Tue Feb 12 10:51:12 PST 2013.
     -->
     delete from guacamole..guacamole_system_permission
     <if test="_parameter != null" >
       <include refid="Example_Where_Clause" />
     </if>
   </delete>
-  <insert id="insert" parameterType="net.sourceforge.guacamole.net.auth.mysql.model.guacamole.SystemPermissionKey" >
+  <insert id="insert" parameterType="net.sourceforge.guacamole.net.auth.mysql.model.SystemPermissionKey" >
     <!--
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Feb 05 15:45:11 PST 2013.
+      This element was generated on Tue Feb 12 10:51:12 PST 2013.
     -->
     insert into guacamole..guacamole_system_permission (user_id, permission)
     values (#{user_id,jdbcType=INTEGER}, #{permission,jdbcType=CHAR})
   </insert>
-  <insert id="insertSelective" parameterType="net.sourceforge.guacamole.net.auth.mysql.model.guacamole.SystemPermissionKey" >
+  <insert id="insertSelective" parameterType="net.sourceforge.guacamole.net.auth.mysql.model.SystemPermissionKey" >
     <!--
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Feb 05 15:45:11 PST 2013.
+      This element was generated on Tue Feb 12 10:51:12 PST 2013.
     -->
     insert into guacamole..guacamole_system_permission
     <trim prefix="(" suffix=")" suffixOverrides="," >
@@ -159,11 +159,11 @@
       </if>
     </trim>
   </insert>
-  <select id="countByExample" parameterType="net.sourceforge.guacamole.net.auth.mysql.model.guacamole.SystemPermissionExample" resultType="java.lang.Integer" >
+  <select id="countByExample" parameterType="net.sourceforge.guacamole.net.auth.mysql.model.SystemPermissionExample" resultType="java.lang.Integer" >
     <!--
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Feb 05 15:45:11 PST 2013.
+      This element was generated on Tue Feb 12 10:51:12 PST 2013.
     -->
     select count(*) from guacamole..guacamole_system_permission
     <if test="_parameter != null" >
@@ -174,7 +174,7 @@
     <!--
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Feb 05 15:45:11 PST 2013.
+      This element was generated on Tue Feb 12 10:51:12 PST 2013.
     -->
     update guacamole..guacamole_system_permission
     <set >
@@ -193,7 +193,7 @@
     <!--
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Feb 05 15:45:11 PST 2013.
+      This element was generated on Tue Feb 12 10:51:12 PST 2013.
     -->
     update guacamole..guacamole_system_permission
     set user_id = #{record.user_id,jdbcType=INTEGER},

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

@@ -1,29 +1,29 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
-<mapper namespace="net.sourceforge.guacamole.net.auth.mysql.dao.guacamole.UserMapper" >
+<mapper namespace="net.sourceforge.guacamole.net.auth.mysql.dao.UserMapper" >
-  <resultMap id="BaseResultMap" type="net.sourceforge.guacamole.net.auth.mysql.model.guacamole.User" >
+  <resultMap id="BaseResultMap" type="net.sourceforge.guacamole.net.auth.mysql.model.User" >
     <!--
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Feb 05 15:45:11 PST 2013.
+      This element was generated on Tue Feb 12 10:51:12 PST 2013.
     -->
     <id column="user_id" property="user_id" jdbcType="INTEGER" />
     <result column="username" property="username" jdbcType="VARCHAR" />
-    <result column="password_salt" property="password_salt" jdbcType="VARCHAR" />
   </resultMap>
-  <resultMap id="ResultMapWithBLOBs" type="net.sourceforge.guacamole.net.auth.mysql.model.guacamole.User" extends="BaseResultMap" >
+  <resultMap id="ResultMapWithBLOBs" type="net.sourceforge.guacamole.net.auth.mysql.model.UserWithBLOBs" extends="BaseResultMap" >
     <!--
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Feb 05 15:45:11 PST 2013.
+      This element was generated on Tue Feb 12 10:51:12 PST 2013.
     -->
     <result column="password_hash" property="password_hash" jdbcType="BINARY" />
+    <result column="password_salt" property="password_salt" jdbcType="BINARY" />
   </resultMap>
   <sql id="Example_Where_Clause" >
     <!--
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Feb 05 15:45:11 PST 2013.
+      This element was generated on Tue Feb 12 10:51:12 PST 2013.
     -->
     <where >
       <foreach collection="oredCriteria" item="criteria" separator="or" >
@@ -57,7 +57,7 @@
     <!--
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Feb 05 15:45:11 PST 2013.
+      This element was generated on Tue Feb 12 10:51:12 PST 2013.
     -->
     <where >
       <foreach collection="example.oredCriteria" item="criteria" separator="or" >
@@ -91,23 +91,23 @@
     <!--
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Feb 05 15:45:11 PST 2013.
+      This element was generated on Tue Feb 12 10:51:12 PST 2013.
     -->
-    user_id, username, password_salt
+    user_id, username
   </sql>
   <sql id="Blob_Column_List" >
     <!--
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Feb 05 15:45:11 PST 2013.
+      This element was generated on Tue Feb 12 10:51:12 PST 2013.
     -->
-    password_hash
+    password_hash, password_salt
   </sql>
-  <select id="selectByExampleWithBLOBs" resultMap="ResultMapWithBLOBs" parameterType="net.sourceforge.guacamole.net.auth.mysql.model.guacamole.UserExample" >
+  <select id="selectByExampleWithBLOBs" resultMap="ResultMapWithBLOBs" parameterType="net.sourceforge.guacamole.net.auth.mysql.model.UserExample" >
     <!--
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Feb 05 15:45:11 PST 2013.
+      This element was generated on Tue Feb 12 10:51:12 PST 2013.
     -->
     select
     <if test="distinct" >
@@ -124,11 +124,11 @@
       order by ${orderByClause}
     </if>
   </select>
-  <select id="selectByExample" resultMap="BaseResultMap" parameterType="net.sourceforge.guacamole.net.auth.mysql.model.guacamole.UserExample" >
+  <select id="selectByExample" resultMap="BaseResultMap" parameterType="net.sourceforge.guacamole.net.auth.mysql.model.UserExample" >
     <!--
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Feb 05 15:45:11 PST 2013.
+      This element was generated on Tue Feb 12 10:51:12 PST 2013.
     -->
     select
     <if test="distinct" >
@@ -147,7 +147,7 @@
     <!--
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Feb 05 15:45:11 PST 2013.
+      This element was generated on Tue Feb 12 10:51:12 PST 2013.
     -->
     select 
     <include refid="Base_Column_List" />
@@ -160,38 +160,38 @@
     <!--
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Feb 05 15:45:11 PST 2013.
+      This element was generated on Tue Feb 12 10:51:12 PST 2013.
     -->
     delete from guacamole..guacamole_user
     where user_id = #{user_id,jdbcType=INTEGER}
   </delete>
-  <delete id="deleteByExample" parameterType="net.sourceforge.guacamole.net.auth.mysql.model.guacamole.UserExample" >
+  <delete id="deleteByExample" parameterType="net.sourceforge.guacamole.net.auth.mysql.model.UserExample" >
     <!--
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Feb 05 15:45:11 PST 2013.
+      This element was generated on Tue Feb 12 10:51:12 PST 2013.
     -->
     delete from guacamole..guacamole_user
     <if test="_parameter != null" >
       <include refid="Example_Where_Clause" />
     </if>
   </delete>
-  <insert id="insert" parameterType="net.sourceforge.guacamole.net.auth.mysql.model.guacamole.User" >
+  <insert id="insert" parameterType="net.sourceforge.guacamole.net.auth.mysql.model.UserWithBLOBs" >
     <!--
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Feb 05 15:45:11 PST 2013.
+      This element was generated on Tue Feb 12 10:51:12 PST 2013.
     -->
-    insert into guacamole..guacamole_user (user_id, username, password_salt, 
+    insert into guacamole..guacamole_user (user_id, username, password_hash, 
-      password_hash)
+      password_salt)
-    values (#{user_id,jdbcType=INTEGER}, #{username,jdbcType=VARCHAR}, #{password_salt,jdbcType=VARCHAR}, 
+    values (#{user_id,jdbcType=INTEGER}, #{username,jdbcType=VARCHAR}, #{password_hash,jdbcType=BINARY}, 
-      #{password_hash,jdbcType=BINARY})
+      #{password_salt,jdbcType=BINARY})
   </insert>
-  <insert id="insertSelective" parameterType="net.sourceforge.guacamole.net.auth.mysql.model.guacamole.User" >
+  <insert id="insertSelective" parameterType="net.sourceforge.guacamole.net.auth.mysql.model.UserWithBLOBs" >
     <!--
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Feb 05 15:45:11 PST 2013.
+      This element was generated on Tue Feb 12 10:51:12 PST 2013.
     -->
     insert into guacamole..guacamole_user
     <trim prefix="(" suffix=")" suffixOverrides="," >
@@ -201,12 +201,12 @@
       <if test="username != null" >
         username,
       </if>
-      <if test="password_salt != null" >
-        password_salt,
-      </if>
       <if test="password_hash != null" >
         password_hash,
       </if>
+      <if test="password_salt != null" >
+        password_salt,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides="," >
       <if test="user_id != null" >
@@ -215,19 +215,19 @@
       <if test="username != null" >
         #{username,jdbcType=VARCHAR},
       </if>
-      <if test="password_salt != null" >
-        #{password_salt,jdbcType=VARCHAR},
-      </if>
       <if test="password_hash != null" >
         #{password_hash,jdbcType=BINARY},
       </if>
+      <if test="password_salt != null" >
+        #{password_salt,jdbcType=BINARY},
+      </if>
     </trim>
   </insert>
-  <select id="countByExample" parameterType="net.sourceforge.guacamole.net.auth.mysql.model.guacamole.UserExample" resultType="java.lang.Integer" >
+  <select id="countByExample" parameterType="net.sourceforge.guacamole.net.auth.mysql.model.UserExample" resultType="java.lang.Integer" >
     <!--
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Feb 05 15:45:11 PST 2013.
+      This element was generated on Tue Feb 12 10:51:12 PST 2013.
     -->
     select count(*) from guacamole..guacamole_user
     <if test="_parameter != null" >
@@ -238,7 +238,7 @@
     <!--
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Feb 05 15:45:11 PST 2013.
+      This element was generated on Tue Feb 12 10:51:12 PST 2013.
     -->
     update guacamole..guacamole_user
     <set >
@@ -248,12 +248,12 @@
       <if test="record.username != null" >
         username = #{record.username,jdbcType=VARCHAR},
       </if>
-      <if test="record.password_salt != null" >
-        password_salt = #{record.password_salt,jdbcType=VARCHAR},
-      </if>
       <if test="record.password_hash != null" >
         password_hash = #{record.password_hash,jdbcType=BINARY},
       </if>
+      <if test="record.password_salt != null" >
+        password_salt = #{record.password_salt,jdbcType=BINARY},
+      </if>
     </set>
     <if test="_parameter != null" >
       <include refid="Update_By_Example_Where_Clause" />
@@ -263,13 +263,13 @@
     <!--
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Feb 05 15:45:11 PST 2013.
+      This element was generated on Tue Feb 12 10:51:12 PST 2013.
     -->
     update guacamole..guacamole_user
     set user_id = #{record.user_id,jdbcType=INTEGER},
       username = #{record.username,jdbcType=VARCHAR},
-      password_salt = #{record.password_salt,jdbcType=VARCHAR},
+      password_hash = #{record.password_hash,jdbcType=BINARY},
-      password_hash = #{record.password_hash,jdbcType=BINARY}
+      password_salt = #{record.password_salt,jdbcType=BINARY}
     <if test="_parameter != null" >
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -278,57 +278,55 @@
     <!--
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Feb 05 15:45:11 PST 2013.
+      This element was generated on Tue Feb 12 10:51:12 PST 2013.
     -->
     update guacamole..guacamole_user
     set user_id = #{record.user_id,jdbcType=INTEGER},
-      username = #{record.username,jdbcType=VARCHAR},
+      username = #{record.username,jdbcType=VARCHAR}
-      password_salt = #{record.password_salt,jdbcType=VARCHAR}
     <if test="_parameter != null" >
       <include refid="Update_By_Example_Where_Clause" />
     </if>
   </update>
-  <update id="updateByPrimaryKeySelective" parameterType="net.sourceforge.guacamole.net.auth.mysql.model.guacamole.User" >
+  <update id="updateByPrimaryKeySelective" parameterType="net.sourceforge.guacamole.net.auth.mysql.model.UserWithBLOBs" >
     <!--
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Feb 05 15:45:11 PST 2013.
+      This element was generated on Tue Feb 12 10:51:12 PST 2013.
     -->
     update guacamole..guacamole_user
     <set >
       <if test="username != null" >
         username = #{username,jdbcType=VARCHAR},
       </if>
-      <if test="password_salt != null" >
-        password_salt = #{password_salt,jdbcType=VARCHAR},
-      </if>
       <if test="password_hash != null" >
         password_hash = #{password_hash,jdbcType=BINARY},
       </if>
+      <if test="password_salt != null" >
+        password_salt = #{password_salt,jdbcType=BINARY},
+      </if>
     </set>
     where user_id = #{user_id,jdbcType=INTEGER}
   </update>
-  <update id="updateByPrimaryKeyWithBLOBs" parameterType="net.sourceforge.guacamole.net.auth.mysql.model.guacamole.User" >
+  <update id="updateByPrimaryKeyWithBLOBs" parameterType="net.sourceforge.guacamole.net.auth.mysql.model.UserWithBLOBs" >
     <!--
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Feb 05 15:45:11 PST 2013.
+      This element was generated on Tue Feb 12 10:51:12 PST 2013.
     -->
     update guacamole..guacamole_user
     set username = #{username,jdbcType=VARCHAR},
-      password_salt = #{password_salt,jdbcType=VARCHAR},
+      password_hash = #{password_hash,jdbcType=BINARY},
-      password_hash = #{password_hash,jdbcType=BINARY}
+      password_salt = #{password_salt,jdbcType=BINARY}
     where user_id = #{user_id,jdbcType=INTEGER}
   </update>
-  <update id="updateByPrimaryKey" parameterType="net.sourceforge.guacamole.net.auth.mysql.model.guacamole.User" >
+  <update id="updateByPrimaryKey" parameterType="net.sourceforge.guacamole.net.auth.mysql.model.User" >
     <!--
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Feb 05 15:45:11 PST 2013.
+      This element was generated on Tue Feb 12 10:51:12 PST 2013.
     -->
     update guacamole..guacamole_user
-    set username = #{username,jdbcType=VARCHAR},
+    set username = #{username,jdbcType=VARCHAR}
-      password_salt = #{password_salt,jdbcType=VARCHAR}
     where user_id = #{user_id,jdbcType=INTEGER}
   </update>
 </mapper>

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

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
-<mapper namespace="net.sourceforge.guacamole.net.auth.mysql.dao.guacamole.UserPermissionMapper" >
+<mapper namespace="net.sourceforge.guacamole.net.auth.mysql.dao.UserPermissionMapper" >
-  <resultMap id="BaseResultMap" type="net.sourceforge.guacamole.net.auth.mysql.model.guacamole.UserPermissionKey" >
+  <resultMap id="BaseResultMap" type="net.sourceforge.guacamole.net.auth.mysql.model.UserPermissionKey" >
     <!--
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Feb 05 15:45:11 PST 2013.
+      This element was generated on Tue Feb 12 10:51:12 PST 2013.
     -->
     <id column="user_id" property="user_id" jdbcType="INTEGER" />
     <id column="affected_user_id" property="affected_user_id" jdbcType="INTEGER" />
@@ -15,7 +15,7 @@
     <!--
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Feb 05 15:45:11 PST 2013.
+      This element was generated on Tue Feb 12 10:51:12 PST 2013.
     -->
     <where >
       <foreach collection="oredCriteria" item="criteria" separator="or" >
@@ -49,7 +49,7 @@
     <!--
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Feb 05 15:45:11 PST 2013.
+      This element was generated on Tue Feb 12 10:51:12 PST 2013.
     -->
     <where >
       <foreach collection="example.oredCriteria" item="criteria" separator="or" >
@@ -83,15 +83,15 @@
     <!--
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Feb 05 15:45:11 PST 2013.
+      This element was generated on Tue Feb 12 10:51:12 PST 2013.
     -->
     user_id, affected_user_id, permission
   </sql>
-  <select id="selectByExample" resultMap="BaseResultMap" parameterType="net.sourceforge.guacamole.net.auth.mysql.model.guacamole.UserPermissionExample" >
+  <select id="selectByExample" resultMap="BaseResultMap" parameterType="net.sourceforge.guacamole.net.auth.mysql.model.UserPermissionExample" >
     <!--
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Feb 05 15:45:11 PST 2013.
+      This element was generated on Tue Feb 12 10:51:12 PST 2013.
     -->
     select
     <if test="distinct" >
@@ -106,44 +106,44 @@
       order by ${orderByClause}
     </if>
   </select>
-  <delete id="deleteByPrimaryKey" parameterType="net.sourceforge.guacamole.net.auth.mysql.model.guacamole.UserPermissionKey" >
+  <delete id="deleteByPrimaryKey" parameterType="net.sourceforge.guacamole.net.auth.mysql.model.UserPermissionKey" >
     <!--
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Feb 05 15:45:11 PST 2013.
+      This element was generated on Tue Feb 12 10:51:12 PST 2013.
     -->
     delete from guacamole..guacamole_user_permission
     where user_id = #{user_id,jdbcType=INTEGER}
       and affected_user_id = #{affected_user_id,jdbcType=INTEGER}
       and permission = #{permission,jdbcType=CHAR}
   </delete>
-  <delete id="deleteByExample" parameterType="net.sourceforge.guacamole.net.auth.mysql.model.guacamole.UserPermissionExample" >
+  <delete id="deleteByExample" parameterType="net.sourceforge.guacamole.net.auth.mysql.model.UserPermissionExample" >
     <!--
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Feb 05 15:45:11 PST 2013.
+      This element was generated on Tue Feb 12 10:51:12 PST 2013.
     -->
     delete from guacamole..guacamole_user_permission
     <if test="_parameter != null" >
       <include refid="Example_Where_Clause" />
     </if>
   </delete>
-  <insert id="insert" parameterType="net.sourceforge.guacamole.net.auth.mysql.model.guacamole.UserPermissionKey" >
+  <insert id="insert" parameterType="net.sourceforge.guacamole.net.auth.mysql.model.UserPermissionKey" >
     <!--
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Feb 05 15:45:11 PST 2013.
+      This element was generated on Tue Feb 12 10:51:12 PST 2013.
     -->
     insert into guacamole..guacamole_user_permission (user_id, affected_user_id, permission
       )
     values (#{user_id,jdbcType=INTEGER}, #{affected_user_id,jdbcType=INTEGER}, #{permission,jdbcType=CHAR}
       )
   </insert>
-  <insert id="insertSelective" parameterType="net.sourceforge.guacamole.net.auth.mysql.model.guacamole.UserPermissionKey" >
+  <insert id="insertSelective" parameterType="net.sourceforge.guacamole.net.auth.mysql.model.UserPermissionKey" >
     <!--
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Feb 05 15:45:11 PST 2013.
+      This element was generated on Tue Feb 12 10:51:12 PST 2013.
     -->
     insert into guacamole..guacamole_user_permission
     <trim prefix="(" suffix=")" suffixOverrides="," >
@@ -169,11 +169,11 @@
       </if>
     </trim>
   </insert>
-  <select id="countByExample" parameterType="net.sourceforge.guacamole.net.auth.mysql.model.guacamole.UserPermissionExample" resultType="java.lang.Integer" >
+  <select id="countByExample" parameterType="net.sourceforge.guacamole.net.auth.mysql.model.UserPermissionExample" resultType="java.lang.Integer" >
     <!--
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Feb 05 15:45:11 PST 2013.
+      This element was generated on Tue Feb 12 10:51:12 PST 2013.
     -->
     select count(*) from guacamole..guacamole_user_permission
     <if test="_parameter != null" >
@@ -184,7 +184,7 @@
     <!--
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Feb 05 15:45:11 PST 2013.
+      This element was generated on Tue Feb 12 10:51:12 PST 2013.
     -->
     update guacamole..guacamole_user_permission
     <set >
@@ -206,7 +206,7 @@
     <!--
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Feb 05 15:45:11 PST 2013.
+      This element was generated on Tue Feb 12 10:51:12 PST 2013.
     -->
     update guacamole..guacamole_user_permission
     set user_id = #{record.user_id,jdbcType=INTEGER},