Ticket #269: Added a new utility class, and support for reading ConnectionRecord objects.

extensions/guacamole-auth-mysql/doc/examples/mybatisGeneratorConfig.xml

@@ -63,6 +63,11 @@
       <property name="useActualColumnNames" value="true"/>
     </table>
 
+    <!-- Set catalog to the name of the database that contains the guacamole authentication tables. -->
+    <table catalog="guacamole" tableName="guacamole_connection_history" domainObjectName="ConnectionHistory" >
+      <property name="useActualColumnNames" value="true"/>
+    </table>
+
   </context>
 </generatorConfiguration>
 

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

@@ -72,3 +72,20 @@ CREATE TABLE `guacamole_user_permission` (
   CONSTRAINT `guacamole_user_permission_ibfk_2` FOREIGN KEY (`user_id`) REFERENCES `guacamole_user` (`user_id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
+--
+-- Table structure for table `guacamole_connection_history`
+--
+
+CREATE TABLE `guacamole_connection_history` (
+  `history_id` int(11) NOT NULL AUTO_INCREMENT,
+  `user_id` int(11) NOT NULL,
+  `connection_id` int(11) NOT NULL,
+  `start_date` datetime NOT NULL,
+  `end_date` datetime DEFAULT NULL,
+  PRIMARY KEY (`history_id`),
+  KEY `user_id` (`user_id`),
+  KEY `connection_id` (`connection_id`),
+  CONSTRAINT `guacamole_connection_history_ibfk_1` FOREIGN KEY (`user_id`) REFERENCES `guacamole_user` (`user_id`),
+  CONSTRAINT `guacamole_connection_history_ibfk_2` FOREIGN KEY (`connection_id`) REFERENCES `guacamole_connection` (`connection_id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8
+

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

@@ -0,0 +1,172 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is guacamole-auth-mysql.
+ *
+ * The Initial Developer of the Original Code is
+ * James Muehlner.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+package net.sourceforge.guacamole.net.auth.mysql;
+
+import com.google.common.base.Preconditions;
+import com.google.inject.Inject;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import net.sourceforge.guacamole.GuacamoleException;
+import net.sourceforge.guacamole.net.auth.Connection;
+import net.sourceforge.guacamole.net.auth.Directory;
+import net.sourceforge.guacamole.net.auth.mysql.dao.ConnectionMapper;
+import net.sourceforge.guacamole.net.auth.mysql.dao.ConnectionParameterMapper;
+import net.sourceforge.guacamole.net.auth.mysql.dao.ConnectionPermissionMapper;
+import net.sourceforge.guacamole.net.auth.mysql.model.ConnectionParameter;
+import net.sourceforge.guacamole.net.auth.mysql.model.ConnectionParameterExample;
+import net.sourceforge.guacamole.net.auth.mysql.model.ConnectionPermissionKey;
+import net.sourceforge.guacamole.net.auth.mysql.utility.PermissionCheckUtility;
+import net.sourceforge.guacamole.net.auth.mysql.utility.ProviderUtility;
+import net.sourceforge.guacamole.protocol.GuacamoleConfiguration;
+import org.mybatis.guice.transactional.Transactional;
+
+/**
+ *
+ * @author James Muehlner
+ */
+public class ConnectionDirectory implements Directory<String, Connection>{
+
+    /**
+     * The user who this connection directory belongs to.
+     * Access is based on his/her permission settings.
+     */
+    private MySQLUser user;
+    
+    @Inject
+    PermissionCheckUtility permissionCheckUtility;
+    
+    @Inject
+    ProviderUtility providerUtility;
+    
+    @Inject
+    ConnectionMapper connectionDAO;
+    
+    @Inject
+    ConnectionPermissionMapper connectionPermissionDAO;
+    
+    @Inject
+    ConnectionParameterMapper connectionParameterDAO;
+    
+    /**
+     * Set the user for this directory.
+     * @param user 
+     */
+    void init(MySQLUser user) {
+        this.user = user;
+    }
+    
+    @Transactional
+    @Override
+    public Connection get(String identifier) throws GuacamoleException {
+        permissionCheckUtility.verifyConnectionReadAccess(this.user.getUserID(), identifier);
+        return providerUtility.getExistingMySQLConnection(identifier);
+    }
+
+    @Transactional
+    @Override
+    public Set<String> getIdentifiers() throws GuacamoleException {
+        Set<String> connectionNameSet = new HashSet<String>();
+        Set<MySQLConnection> connections = permissionCheckUtility.getReadableConnections(this.user.getUserID());
+        for(MySQLConnection mySQLConnection : connections) {
+            connectionNameSet.add(mySQLConnection.getIdentifier());
+        }
+        return connectionNameSet;
+    }
+
+    @Transactional
+    @Override
+    public void add(Connection object) throws GuacamoleException {
+        Preconditions.checkNotNull(object);
+        permissionCheckUtility.verifyCreateConnectionPermission(this.user.getUserID());
+        
+        MySQLConnection mySQLConnection = providerUtility.getNewMySQLConnection(object);
+        connectionDAO.insert(mySQLConnection.getConnection());
+        
+        updateConfigurationValues(mySQLConnection);
+        
+        //finally, give the current user full access to the newly created connection.
+        ConnectionPermissionKey newConnectionPermission = new ConnectionPermissionKey();
+        newConnectionPermission.setUser_id(this.user.getUserID());
+        newConnectionPermission.setConnection_id(mySQLConnection.getConnectionID());
+        newConnectionPermission.setPermission(MySQLConstants.USER_READ);
+        connectionPermissionDAO.insert(newConnectionPermission);
+        newConnectionPermission.setPermission(MySQLConstants.USER_UPDATE);
+        connectionPermissionDAO.insert(newConnectionPermission);
+        newConnectionPermission.setPermission(MySQLConstants.USER_DELETE);
+        connectionPermissionDAO.insert(newConnectionPermission);
+        newConnectionPermission.setPermission(MySQLConstants.USER_ADMINISTER);
+        connectionPermissionDAO.insert(newConnectionPermission);
+    }
+    
+    /**
+     * Saves the values of the configuration to the database
+     * @param connection 
+     */
+    private void updateConfigurationValues(MySQLConnection mySQLConnection) {
+        GuacamoleConfiguration configuration = mySQLConnection.getConfiguration();
+        Map<String, String> existingConfiguration = new HashMap<String, String>();
+        ConnectionParameterExample example = new ConnectionParameterExample();
+        List<ConnectionParameter> connectionParameters = connectionParameterDAO.selectByExample(example);
+        for(ConnectionParameter parameter : connectionParameters)
+            existingConfiguration.put(parameter.getParameter_name(), parameter.getParameter_value());
+        
+        List<ConnectionParameter> parametersToInsert = new ArrayList<ConnectionParameter>();
+        List<ConnectionParameter> parametersToUpdate = new ArrayList<ConnectionParameter>();
+        
+        Set<String> parameterNames = configuration.getParameterNames();
+        
+        for(String parameterName : parameterNames) {
+            
+        }
+    }
+
+    @Transactional
+    @Override
+    public void update(Connection object) throws GuacamoleException {
+        throw new UnsupportedOperationException("Not supported yet.");
+    }
+
+    @Transactional
+    @Override
+    public void remove(String identifier) throws GuacamoleException {
+        throw new UnsupportedOperationException("Not supported yet.");
+    }
+    
+}

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

@@ -52,8 +52,9 @@ import net.sourceforge.guacamole.net.auth.mysql.dao.SystemPermissionMapper;
 import net.sourceforge.guacamole.net.auth.mysql.dao.UserMapper;
 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.PermissionCheckUtility;
 import net.sourceforge.guacamole.net.auth.mysql.utility.PasswordEncryptionUtility;
+import net.sourceforge.guacamole.net.auth.mysql.utility.PermissionCheckUtility;
+import net.sourceforge.guacamole.net.auth.mysql.utility.ProviderUtility;
 import net.sourceforge.guacamole.net.auth.mysql.utility.SaltUtility;
 import net.sourceforge.guacamole.net.auth.mysql.utility.SecureRandomSaltUtility;
 import net.sourceforge.guacamole.net.auth.mysql.utility.Sha256PasswordEncryptionUtility;
@@ -110,10 +111,12 @@ public class MySQLAuthenticationProvider implements AuthenticationProvider {
                     addMapperClass(UserMapper.class);
                     addMapperClass(UserPermissionMapper.class);
                     bind(MySQLUserContext.class);
+                    bind(UserDirectory.class);
                     bind(MySQLUser.class);
                     bind(SaltUtility.class).to(SecureRandomSaltUtility.class);
                     bind(PasswordEncryptionUtility.class).to(Sha256PasswordEncryptionUtility.class);
                     bind(PermissionCheckUtility.class);
+                    bind(ProviderUtility.class);
                 }
             }
         );

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

@@ -1,7 +1,38 @@
-/*
+/* ***** BEGIN LICENSE BLOCK *****
- * To change this template, choose Tools | Templates
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- * and open the template in the editor.
+ *
- */
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is guacamole-auth-mysql.
+ *
+ * The Initial Developer of the Original Code is
+ * James Muehlner.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
 package net.sourceforge.guacamole.net.auth.mysql;
 
 import com.google.inject.Inject;
@@ -9,8 +40,10 @@ import java.util.List;
 import net.sourceforge.guacamole.GuacamoleException;
 import net.sourceforge.guacamole.net.GuacamoleSocket;
 import net.sourceforge.guacamole.net.auth.Connection;
+import net.sourceforge.guacamole.net.auth.ConnectionRecord;
 import net.sourceforge.guacamole.net.auth.mysql.dao.ConnectionMapper;
 import net.sourceforge.guacamole.net.auth.mysql.model.ConnectionExample;
+import net.sourceforge.guacamole.net.auth.mysql.utility.ProviderUtility;
 import net.sourceforge.guacamole.protocol.GuacamoleClientInformation;
 import net.sourceforge.guacamole.protocol.GuacamoleConfiguration;
 
@@ -23,8 +56,13 @@ public class MySQLConnection implements Connection {
     @Inject
     ConnectionMapper connectionDAO;
     
+    @Inject
+    ProviderUtility providerUtility;
+    
     private net.sourceforge.guacamole.net.auth.mysql.model.Connection connection;
     
+    private GuacamoleConfiguration configuration;
+    
     /**
      * Create a default, empty connection.
      */
@@ -48,11 +86,21 @@ public class MySQLConnection implements Connection {
         return connection;
     }
     
+    /**
+     * Create a new MySQLConnection from this new connection. This is a connection that has not yet been inserted.
+     * @param connection 
+     */
+    public void initNew(Connection connection) {
+        configuration = connection.getConfiguration();
+        this.connection.setConnection_name(connection.getIdentifier());
+        this.configuration = connection.getConfiguration();
+    }
+    
     /**
      * Load an existing connection by name.
      * @param connectionName 
      */
-    public void init(String connectionName) throws GuacamoleException {
+    public void initExisting(String connectionName) throws GuacamoleException {
         ConnectionExample example = new ConnectionExample();
         example.createCriteria().andConnection_nameEqualTo(connectionName);
         List<net.sourceforge.guacamole.net.auth.mysql.model.Connection> connections;
@@ -85,12 +133,12 @@ public class MySQLConnection implements Connection {
 
     @Override
     public GuacamoleConfiguration getConfiguration() {
-        throw new UnsupportedOperationException("Not supported yet.");
+        return configuration;
     }
 
     @Override
     public void setConfiguration(GuacamoleConfiguration config) throws GuacamoleException {
-        throw new UnsupportedOperationException("Not supported yet.");
+        this.configuration = config;
     }
 
     @Override
@@ -104,4 +152,9 @@ public class MySQLConnection implements Connection {
             return false;
         return ((MySQLConnection)other).getConnectionID() == this.getConnectionID();
     }
+    
+    @Override
+    public List<? extends ConnectionRecord> getHistory() throws GuacamoleException {
+        return providerUtility.getExistingMySQLConnectionRecords(connection.getConnection_id());
+    }
 }

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

@@ -0,0 +1,102 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is guacamole-auth-mysql.
+ *
+ * The Initial Developer of the Original Code is
+ * James Muehlner.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+package net.sourceforge.guacamole.net.auth.mysql;
+
+import com.google.inject.Inject;
+import java.util.Date;
+import net.sourceforge.guacamole.net.auth.Connection;
+import net.sourceforge.guacamole.net.auth.ConnectionRecord;
+import net.sourceforge.guacamole.net.auth.User;
+import net.sourceforge.guacamole.net.auth.mysql.dao.ConnectionMapper;
+import net.sourceforge.guacamole.net.auth.mysql.dao.UserMapper;
+import net.sourceforge.guacamole.net.auth.mysql.model.ConnectionHistory;
+import net.sourceforge.guacamole.net.auth.mysql.utility.ProviderUtility;
+
+/**
+ *
+ * @author James Muehlner
+ */
+public class MySQLConnectionRecord implements ConnectionRecord {
+
+    /**
+     * The database record that this ConnectionRecord represents.
+     */
+    private ConnectionHistory connectionHistory;
+    
+    @Inject
+    UserMapper userDAO;
+    
+    @Inject
+    ConnectionMapper connectionDAO;
+    
+    @Inject
+    ProviderUtility providerUtility;
+    
+    /**
+     * Initialize this MySQLConnectionRecord with the database record it represents.
+     * @param connectionHistory 
+     */
+    public void init(ConnectionHistory connectionHistory) {
+        this.connectionHistory = connectionHistory;
+    }
+    
+    @Override
+    public Date getStartDate() {
+        return connectionHistory.getStart_date();
+    }
+
+    @Override
+    public Date getEndDate() {
+        return connectionHistory.getEnd_date();
+    }
+
+    @Override
+    public User getUser() {
+        return providerUtility.getExistingMySQLUser(connectionHistory.getUser_id());
+    }
+
+    @Override
+    public Connection getConnection() {
+        return providerUtility.getExistingMySQLConnection(connectionHistory.getConnection_id());
+    }
+
+    @Override
+    public boolean isActive() {
+        // if the end date hasn't been stored yet, the connection is still open.
+        return connectionHistory.getEnd_date() == null;
+    }
+    
+}

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

@@ -124,7 +124,7 @@ public class MySQLUser implements User {
         List<UserWithBLOBs> userList = userDAO.selectByExampleWithBLOBs(example);
         if(userList.size() > 1) // this should never happen; the unique constraint should prevent it
             throw new GuacamoleException("Multiple users found with username '" + username + "'.");
-        if(userList.size() == 0)
+        if(userList.isEmpty())
             throw new GuacamoleException("No user found with username '" + username + "'.");
         
         this.user = userList.get(0);

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

@@ -46,7 +46,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 /**
- * 
+ * The MySQL representation of a UserContext.
  * @author James Muehlner
  */
 public class MySQLUserContext implements UserContext {
@@ -56,11 +56,16 @@ public class MySQLUserContext implements UserContext {
     @Inject
     private MySQLUser user;
     
-    @Inject UserDirectory userDirectory;
+    @Inject
+    private UserDirectory userDirectory;
+    
+    @Inject
+    private ConnectionDirectory connectionDirectory;
     
     void init(Credentials credentials) throws GuacamoleException {
         user.init(credentials);
         userDirectory.init(user);
+        connectionDirectory.init(user);
     }
 
     @Override
@@ -75,7 +80,7 @@ public class MySQLUserContext implements UserContext {
 
     @Override
     public Directory<String, Connection> getConnectionDirectory() throws GuacamoleException {
-        throw new UnsupportedOperationException("Not supported yet.");
+        return connectionDirectory;
     }
     
 }

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

@@ -37,7 +37,6 @@ package net.sourceforge.guacamole.net.auth.mysql;
 
 import com.google.common.base.Preconditions;
 import com.google.inject.Inject;
-import com.google.inject.Provider;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -61,6 +60,7 @@ import net.sourceforge.guacamole.net.auth.mysql.model.UserExample;
 import net.sourceforge.guacamole.net.auth.mysql.model.UserPermissionExample;
 import net.sourceforge.guacamole.net.auth.mysql.model.UserPermissionKey;
 import net.sourceforge.guacamole.net.auth.mysql.utility.PermissionCheckUtility;
+import net.sourceforge.guacamole.net.auth.mysql.utility.ProviderUtility;
 import net.sourceforge.guacamole.net.auth.permission.ConnectionDirectoryPermission;
 import net.sourceforge.guacamole.net.auth.permission.ConnectionPermission;
 import net.sourceforge.guacamole.net.auth.permission.Permission;
@@ -100,7 +100,7 @@ public class UserDirectory implements Directory<String, User> {
     PermissionCheckUtility permissionCheckUtility;
     
     @Inject
-    Provider<MySQLUser> mySQLUserProvider;
+    ProviderUtility providerUtility;
     
     /**
      * Set the user for this directory.
@@ -110,45 +110,11 @@ public class UserDirectory implements Directory<String, User> {
         this.user = user;
     }
     
-    /**
-     * Create a new user based on the provided object.
-     * @param user
-     * @return
-     * @throws GuacamoleException 
-     */
-    private MySQLUser getNewMySQLUser(User user) throws GuacamoleException {
-        MySQLUser mySQLUser = mySQLUserProvider.get();
-        mySQLUser.initNew(user);
-        return mySQLUser;
-    }
-    
-    /**
-     * Get the user based on the username of the provided object.
-     * @param user
-     * @return
-     * @throws GuacamoleException 
-     */
-    private MySQLUser getExistingMySQLUser(User user) throws GuacamoleException {
-        return getExistingMySQLUser(user.getUsername());
-    }
-    
-    /**
-     * Get the user based on the username of the provided object.
-     * @param user
-     * @return
-     * @throws GuacamoleException 
-     */
-    private MySQLUser getExistingMySQLUser(String name) throws GuacamoleException {
-        MySQLUser mySQLUser = mySQLUserProvider.get();
-        mySQLUser.initExisting(name);
-        return mySQLUser;
-    }
-    
     @Transactional
     @Override
     public User get(String identifier) throws GuacamoleException {
         permissionCheckUtility.verifyUserReadAccess(this.user.getUserID(), identifier);
-        return getExistingMySQLUser(identifier);
+        return providerUtility.getExistingMySQLUser(identifier);
     }
 
     @Transactional
@@ -167,10 +133,9 @@ public class UserDirectory implements Directory<String, User> {
     public void add(User object) throws GuacamoleException {
         permissionCheckUtility.verifyCreateUserPermission(this.user.getUserID());
         Preconditions.checkNotNull(object);
-        permissionCheckUtility.verifyUserUpdateAccess(user.getUserID(), object.getUsername());
         
         //create user in database
-        MySQLUser mySQLUser = getNewMySQLUser(object);
+        MySQLUser mySQLUser = providerUtility.getNewMySQLUser(object);
         userDAO.insert(mySQLUser.getUser());
         
         //create permissions in database
@@ -406,7 +371,7 @@ public class UserDirectory implements Directory<String, User> {
     public void update(User object) throws GuacamoleException {
         permissionCheckUtility.verifyUserUpdateAccess(this.user.getUserID(), object.getUsername());
         //update the user in the database
-        MySQLUser mySQLUser = getExistingMySQLUser(object);
+        MySQLUser mySQLUser = providerUtility.getExistingMySQLUser(object);
         userDAO.updateByPrimaryKey(mySQLUser.getUser());
         
         //update permissions in database
@@ -418,7 +383,7 @@ public class UserDirectory implements Directory<String, User> {
     public void remove(String identifier) throws GuacamoleException {
         permissionCheckUtility.verifyUserDeleteAccess(this.user.getUserID(), identifier);
         
-        MySQLUser mySQLUser = getExistingMySQLUser(identifier);
+        MySQLUser mySQLUser = providerUtility.getExistingMySQLUser(identifier);
         
         //delete all the user permissions in the database
         deleteAllPermissions(mySQLUser);

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

@@ -0,0 +1,96 @@
+package net.sourceforge.guacamole.net.auth.mysql.dao;
+
+import java.util.List;
+import net.sourceforge.guacamole.net.auth.mysql.model.ConnectionHistory;
+import net.sourceforge.guacamole.net.auth.mysql.model.ConnectionHistoryExample;
+import org.apache.ibatis.annotations.Param;
+
+public interface ConnectionHistoryMapper {
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table guacamole..guacamole_connection_history
+     *
+     * @mbggenerated Tue Feb 19 23:09:22 PST 2013
+     */
+    int countByExample(ConnectionHistoryExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table guacamole..guacamole_connection_history
+     *
+     * @mbggenerated Tue Feb 19 23:09:22 PST 2013
+     */
+    int deleteByExample(ConnectionHistoryExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table guacamole..guacamole_connection_history
+     *
+     * @mbggenerated Tue Feb 19 23:09:22 PST 2013
+     */
+    int deleteByPrimaryKey(Integer history_id);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table guacamole..guacamole_connection_history
+     *
+     * @mbggenerated Tue Feb 19 23:09:22 PST 2013
+     */
+    int insert(ConnectionHistory record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table guacamole..guacamole_connection_history
+     *
+     * @mbggenerated Tue Feb 19 23:09:22 PST 2013
+     */
+    int insertSelective(ConnectionHistory record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table guacamole..guacamole_connection_history
+     *
+     * @mbggenerated Tue Feb 19 23:09:22 PST 2013
+     */
+    List<ConnectionHistory> selectByExample(ConnectionHistoryExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table guacamole..guacamole_connection_history
+     *
+     * @mbggenerated Tue Feb 19 23:09:22 PST 2013
+     */
+    ConnectionHistory selectByPrimaryKey(Integer history_id);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table guacamole..guacamole_connection_history
+     *
+     * @mbggenerated Tue Feb 19 23:09:22 PST 2013
+     */
+    int updateByExampleSelective(@Param("record") ConnectionHistory record, @Param("example") ConnectionHistoryExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table guacamole..guacamole_connection_history
+     *
+     * @mbggenerated Tue Feb 19 23:09:22 PST 2013
+     */
+    int updateByExample(@Param("record") ConnectionHistory record, @Param("example") ConnectionHistoryExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table guacamole..guacamole_connection_history
+     *
+     * @mbggenerated Tue Feb 19 23:09:22 PST 2013
+     */
+    int updateByPrimaryKeySelective(ConnectionHistory record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table guacamole..guacamole_connection_history
+     *
+     * @mbggenerated Tue Feb 19 23:09:22 PST 2013
+     */
+    int updateByPrimaryKey(ConnectionHistory record);
+}

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

@@ -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 12 20:35:54 PST 2013
+     * @mbggenerated Tue Feb 19 23:09:22 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 12 20:35:54 PST 2013
+     * @mbggenerated Tue Feb 19 23:09:22 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 12 20:35:54 PST 2013
+     * @mbggenerated Tue Feb 19 23:09:22 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 12 20:35:54 PST 2013
+     * @mbggenerated Tue Feb 19 23:09:22 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 12 20:35:54 PST 2013
+     * @mbggenerated Tue Feb 19 23:09:22 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 12 20:35:54 PST 2013
+     * @mbggenerated Tue Feb 19 23:09:22 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 12 20:35:54 PST 2013
+     * @mbggenerated Tue Feb 19 23:09:22 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 12 20:35:54 PST 2013
+     * @mbggenerated Tue Feb 19 23:09:22 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 12 20:35:54 PST 2013
+     * @mbggenerated Tue Feb 19 23:09:22 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 12 20:35:54 PST 2013
+     * @mbggenerated Tue Feb 19 23:09:22 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 12 20:35:54 PST 2013
+     * @mbggenerated Tue Feb 19 23:09:22 PST 2013
      */
     int updateByPrimaryKey(Connection record);
 }

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

@@ -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 12 20:35:54 PST 2013
+     * @mbggenerated Tue Feb 19 23:09:22 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 12 20:35:54 PST 2013
+     * @mbggenerated Tue Feb 19 23:09:22 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 12 20:35:54 PST 2013
+     * @mbggenerated Tue Feb 19 23:09:22 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 12 20:35:54 PST 2013
+     * @mbggenerated Tue Feb 19 23:09:22 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 12 20:35:54 PST 2013
+     * @mbggenerated Tue Feb 19 23:09:22 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 12 20:35:54 PST 2013
+     * @mbggenerated Tue Feb 19 23:09:22 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 12 20:35:54 PST 2013
+     * @mbggenerated Tue Feb 19 23:09:22 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 12 20:35:54 PST 2013
+     * @mbggenerated Tue Feb 19 23:09:22 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 12 20:35:54 PST 2013
+     * @mbggenerated Tue Feb 19 23:09:22 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 12 20:35:54 PST 2013
+     * @mbggenerated Tue Feb 19 23:09:22 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 12 20:35:54 PST 2013
+     * @mbggenerated Tue Feb 19 23:09:22 PST 2013
      */
     int updateByPrimaryKey(ConnectionParameter record);
 }

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

@@ -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 12 20:35:54 PST 2013
+     * @mbggenerated Tue Feb 19 23:09:22 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 12 20:35:54 PST 2013
+     * @mbggenerated Tue Feb 19 23:09:22 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 12 20:35:54 PST 2013
+     * @mbggenerated Tue Feb 19 23:09:22 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 12 20:35:54 PST 2013
+     * @mbggenerated Tue Feb 19 23:09:22 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 12 20:35:54 PST 2013
+     * @mbggenerated Tue Feb 19 23:09:22 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 12 20:35:54 PST 2013
+     * @mbggenerated Tue Feb 19 23:09:22 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 12 20:35:54 PST 2013
+     * @mbggenerated Tue Feb 19 23:09:22 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 12 20:35:54 PST 2013
+     * @mbggenerated Tue Feb 19 23:09:22 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

@@ -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 12 20:35:54 PST 2013
+     * @mbggenerated Tue Feb 19 23:09:22 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 12 20:35:54 PST 2013
+     * @mbggenerated Tue Feb 19 23:09:22 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 12 20:35:54 PST 2013
+     * @mbggenerated Tue Feb 19 23:09:22 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 12 20:35:54 PST 2013
+     * @mbggenerated Tue Feb 19 23:09:22 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 12 20:35:54 PST 2013
+     * @mbggenerated Tue Feb 19 23:09:22 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 12 20:35:54 PST 2013
+     * @mbggenerated Tue Feb 19 23:09:22 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 12 20:35:54 PST 2013
+     * @mbggenerated Tue Feb 19 23:09:22 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 12 20:35:54 PST 2013
+     * @mbggenerated Tue Feb 19 23:09:22 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

@@ -11,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 12 20:35:54 PST 2013
+     * @mbggenerated Tue Feb 19 23:09:22 PST 2013
      */
     int countByExample(UserExample example);
 
@@ -19,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 12 20:35:54 PST 2013
+     * @mbggenerated Tue Feb 19 23:09:22 PST 2013
      */
     int deleteByExample(UserExample example);
 
@@ -27,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 12 20:35:54 PST 2013
+     * @mbggenerated Tue Feb 19 23:09:22 PST 2013
      */
     int deleteByPrimaryKey(Integer user_id);
 
@@ -35,7 +35,7 @@ public interface UserMapper {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table guacamole..guacamole_user
      *
-     * @mbggenerated Tue Feb 12 20:35:54 PST 2013
+     * @mbggenerated Tue Feb 19 23:09:22 PST 2013
      */
     int insert(UserWithBLOBs record);
 
@@ -43,7 +43,7 @@ public interface UserMapper {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table guacamole..guacamole_user
      *
-     * @mbggenerated Tue Feb 12 20:35:54 PST 2013
+     * @mbggenerated Tue Feb 19 23:09:22 PST 2013
      */
     int insertSelective(UserWithBLOBs record);
 
@@ -51,7 +51,7 @@ public interface UserMapper {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table guacamole..guacamole_user
      *
-     * @mbggenerated Tue Feb 12 20:35:54 PST 2013
+     * @mbggenerated Tue Feb 19 23:09:22 PST 2013
      */
     List<UserWithBLOBs> selectByExampleWithBLOBs(UserExample example);
 
@@ -59,7 +59,7 @@ public interface UserMapper {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table guacamole..guacamole_user
      *
-     * @mbggenerated Tue Feb 12 20:35:54 PST 2013
+     * @mbggenerated Tue Feb 19 23:09:22 PST 2013
      */
     List<User> selectByExample(UserExample example);
 
@@ -67,7 +67,7 @@ public interface UserMapper {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table guacamole..guacamole_user
      *
-     * @mbggenerated Tue Feb 12 20:35:54 PST 2013
+     * @mbggenerated Tue Feb 19 23:09:22 PST 2013
      */
     UserWithBLOBs selectByPrimaryKey(Integer user_id);
 
@@ -75,7 +75,7 @@ public interface UserMapper {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table guacamole..guacamole_user
      *
-     * @mbggenerated Tue Feb 12 20:35:54 PST 2013
+     * @mbggenerated Tue Feb 19 23:09:22 PST 2013
      */
     int updateByExampleSelective(@Param("record") UserWithBLOBs record, @Param("example") UserExample example);
 
@@ -83,7 +83,7 @@ public interface UserMapper {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table guacamole..guacamole_user
      *
-     * @mbggenerated Tue Feb 12 20:35:54 PST 2013
+     * @mbggenerated Tue Feb 19 23:09:22 PST 2013
      */
     int updateByExampleWithBLOBs(@Param("record") UserWithBLOBs record, @Param("example") UserExample example);
 
@@ -91,7 +91,7 @@ public interface UserMapper {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table guacamole..guacamole_user
      *
-     * @mbggenerated Tue Feb 12 20:35:54 PST 2013
+     * @mbggenerated Tue Feb 19 23:09:22 PST 2013
      */
     int updateByExample(@Param("record") User record, @Param("example") UserExample example);
 
@@ -99,7 +99,7 @@ public interface UserMapper {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table guacamole..guacamole_user
      *
-     * @mbggenerated Tue Feb 12 20:35:54 PST 2013
+     * @mbggenerated Tue Feb 19 23:09:22 PST 2013
      */
     int updateByPrimaryKeySelective(UserWithBLOBs record);
 
@@ -107,7 +107,7 @@ public interface UserMapper {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table guacamole..guacamole_user
      *
-     * @mbggenerated Tue Feb 12 20:35:54 PST 2013
+     * @mbggenerated Tue Feb 19 23:09:22 PST 2013
      */
     int updateByPrimaryKeyWithBLOBs(UserWithBLOBs record);
 
@@ -115,7 +115,7 @@ public interface UserMapper {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table guacamole..guacamole_user
      *
-     * @mbggenerated Tue Feb 12 20:35:54 PST 2013
+     * @mbggenerated Tue Feb 19 23:09:22 PST 2013
      */
     int updateByPrimaryKey(User record);
 }

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

@@ -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 12 20:35:54 PST 2013
+     * @mbggenerated Tue Feb 19 23:09:22 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 12 20:35:54 PST 2013
+     * @mbggenerated Tue Feb 19 23:09:22 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 12 20:35:54 PST 2013
+     * @mbggenerated Tue Feb 19 23:09:22 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 12 20:35:54 PST 2013
+     * @mbggenerated Tue Feb 19 23:09:22 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 12 20:35:54 PST 2013
+     * @mbggenerated Tue Feb 19 23:09:22 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 12 20:35:54 PST 2013
+     * @mbggenerated Tue Feb 19 23:09:22 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 12 20:35:54 PST 2013
+     * @mbggenerated Tue Feb 19 23:09:22 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 12 20:35:54 PST 2013
+     * @mbggenerated Tue Feb 19 23:09:22 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

@@ -5,7 +5,7 @@ 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 12 20:35:54 PST 2013
+     * @mbggenerated Tue Feb 19 23:09:22 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 12 20:35:54 PST 2013
+     * @mbggenerated Tue Feb 19 23:09:22 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 12 20:35:54 PST 2013
+     * @mbggenerated Tue Feb 19 23:09:22 PST 2013
      */
     private String protocol;
 
@@ -31,7 +31,7 @@ public class Connection {
      *
      * @return the value of guacamole..guacamole_connection.connection_id
      *
-     * @mbggenerated Tue Feb 12 20:35:54 PST 2013
+     * @mbggenerated Tue Feb 19 23:09:22 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 12 20:35:54 PST 2013
+     * @mbggenerated Tue Feb 19 23:09:22 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 12 20:35:54 PST 2013
+     * @mbggenerated Tue Feb 19 23:09:22 PST 2013
      */
     public String getConnection_name() {
         return connection_name;
@@ -67,7 +67,7 @@ public class Connection {
      *
      * @param connection_name the value for guacamole..guacamole_connection.connection_name
      *
-     * @mbggenerated Tue Feb 12 20:35:54 PST 2013
+     * @mbggenerated Tue Feb 19 23:09:22 PST 2013
      */
     public void setConnection_name(String connection_name) {
         this.connection_name = connection_name;
@@ -79,7 +79,7 @@ public class Connection {
      *
      * @return the value of guacamole..guacamole_connection.protocol
      *
-     * @mbggenerated Tue Feb 12 20:35:54 PST 2013
+     * @mbggenerated Tue Feb 19 23:09:22 PST 2013
      */
     public String getProtocol() {
         return protocol;
@@ -91,7 +91,7 @@ public class Connection {
      *
      * @param protocol the value for guacamole..guacamole_connection.protocol
      *
-     * @mbggenerated Tue Feb 12 20:35:54 PST 2013
+     * @mbggenerated Tue Feb 19 23:09:22 PST 2013
      */
     public void setProtocol(String protocol) {
         this.protocol = protocol;

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

@@ -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 12 20:35:54 PST 2013
+     * @mbggenerated Tue Feb 19 23:09:22 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 12 20:35:54 PST 2013
+     * @mbggenerated Tue Feb 19 23:09:22 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 12 20:35:54 PST 2013
+     * @mbggenerated Tue Feb 19 23:09:22 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 12 20:35:54 PST 2013
+     * @mbggenerated Tue Feb 19 23:09:22 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 12 20:35:54 PST 2013
+     * @mbggenerated Tue Feb 19 23:09:22 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 12 20:35:54 PST 2013
+     * @mbggenerated Tue Feb 19 23:09:22 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 12 20:35:54 PST 2013
+     * @mbggenerated Tue Feb 19 23:09:22 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 12 20:35:54 PST 2013
+     * @mbggenerated Tue Feb 19 23:09:22 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 12 20:35:54 PST 2013
+     * @mbggenerated Tue Feb 19 23:09:22 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 12 20:35:54 PST 2013
+     * @mbggenerated Tue Feb 19 23:09:22 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 12 20:35:54 PST 2013
+     * @mbggenerated Tue Feb 19 23:09:22 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 12 20:35:54 PST 2013
+     * @mbggenerated Tue Feb 19 23:09:22 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 12 20:35:54 PST 2013
+     * @mbggenerated Tue Feb 19 23:09:22 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 12 20:35:54 PST 2013
+     * @mbggenerated Tue Feb 19 23:09:22 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 12 20:35:54 PST 2013
+     * @mbggenerated Tue Feb 19 23:09:22 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 12 20:35:54 PST 2013
+     * @mbggenerated do_not_delete_during_merge Tue Feb 19 23:09:22 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 12 20:35:54 PST 2013
+     * @mbggenerated Tue Feb 19 23:09:22 PST 2013
      */
     public static class Criterion {
         private String condition;

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

@@ -0,0 +1,165 @@
+package net.sourceforge.guacamole.net.auth.mysql.model;
+
+import java.util.Date;
+
+public class ConnectionHistory {
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column guacamole..guacamole_connection_history.history_id
+     *
+     * @mbggenerated Tue Feb 19 23:09:22 PST 2013
+     */
+    private Integer history_id;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column guacamole..guacamole_connection_history.user_id
+     *
+     * @mbggenerated Tue Feb 19 23:09:22 PST 2013
+     */
+    private Integer user_id;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column guacamole..guacamole_connection_history.connection_id
+     *
+     * @mbggenerated Tue Feb 19 23:09:22 PST 2013
+     */
+    private Integer connection_id;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column guacamole..guacamole_connection_history.start_date
+     *
+     * @mbggenerated Tue Feb 19 23:09:22 PST 2013
+     */
+    private Date start_date;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column guacamole..guacamole_connection_history.end_date
+     *
+     * @mbggenerated Tue Feb 19 23:09:22 PST 2013
+     */
+    private Date end_date;
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column guacamole..guacamole_connection_history.history_id
+     *
+     * @return the value of guacamole..guacamole_connection_history.history_id
+     *
+     * @mbggenerated Tue Feb 19 23:09:22 PST 2013
+     */
+    public Integer getHistory_id() {
+        return history_id;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column guacamole..guacamole_connection_history.history_id
+     *
+     * @param history_id the value for guacamole..guacamole_connection_history.history_id
+     *
+     * @mbggenerated Tue Feb 19 23:09:22 PST 2013
+     */
+    public void setHistory_id(Integer history_id) {
+        this.history_id = history_id;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column guacamole..guacamole_connection_history.user_id
+     *
+     * @return the value of guacamole..guacamole_connection_history.user_id
+     *
+     * @mbggenerated Tue Feb 19 23:09:22 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_connection_history.user_id
+     *
+     * @param user_id the value for guacamole..guacamole_connection_history.user_id
+     *
+     * @mbggenerated Tue Feb 19 23:09:22 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_connection_history.connection_id
+     *
+     * @return the value of guacamole..guacamole_connection_history.connection_id
+     *
+     * @mbggenerated Tue Feb 19 23:09:22 PST 2013
+     */
+    public Integer getConnection_id() {
+        return connection_id;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column guacamole..guacamole_connection_history.connection_id
+     *
+     * @param connection_id the value for guacamole..guacamole_connection_history.connection_id
+     *
+     * @mbggenerated Tue Feb 19 23:09:22 PST 2013
+     */
+    public void setConnection_id(Integer connection_id) {
+        this.connection_id = connection_id;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column guacamole..guacamole_connection_history.start_date
+     *
+     * @return the value of guacamole..guacamole_connection_history.start_date
+     *
+     * @mbggenerated Tue Feb 19 23:09:22 PST 2013
+     */
+    public Date getStart_date() {
+        return start_date;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column guacamole..guacamole_connection_history.start_date
+     *
+     * @param start_date the value for guacamole..guacamole_connection_history.start_date
+     *
+     * @mbggenerated Tue Feb 19 23:09:22 PST 2013
+     */
+    public void setStart_date(Date start_date) {
+        this.start_date = start_date;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column guacamole..guacamole_connection_history.end_date
+     *
+     * @return the value of guacamole..guacamole_connection_history.end_date
+     *
+     * @mbggenerated Tue Feb 19 23:09:22 PST 2013
+     */
+    public Date getEnd_date() {
+        return end_date;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column guacamole..guacamole_connection_history.end_date
+     *
+     * @param end_date the value for guacamole..guacamole_connection_history.end_date
+     *
+     * @mbggenerated Tue Feb 19 23:09:22 PST 2013
+     */
+    public void setEnd_date(Date end_date) {
+        this.end_date = end_date;
+    }
+}

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

@@ -0,0 +1,603 @@
+package net.sourceforge.guacamole.net.auth.mysql.model;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+public class ConnectionHistoryExample {
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table guacamole..guacamole_connection_history
+     *
+     * @mbggenerated Tue Feb 19 23:09:22 PST 2013
+     */
+    protected String orderByClause;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table guacamole..guacamole_connection_history
+     *
+     * @mbggenerated Tue Feb 19 23:09:22 PST 2013
+     */
+    protected boolean distinct;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table guacamole..guacamole_connection_history
+     *
+     * @mbggenerated Tue Feb 19 23:09:22 PST 2013
+     */
+    protected List<Criteria> oredCriteria;
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table guacamole..guacamole_connection_history
+     *
+     * @mbggenerated Tue Feb 19 23:09:22 PST 2013
+     */
+    public ConnectionHistoryExample() {
+        oredCriteria = new ArrayList<Criteria>();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table guacamole..guacamole_connection_history
+     *
+     * @mbggenerated Tue Feb 19 23:09:22 PST 2013
+     */
+    public void setOrderByClause(String orderByClause) {
+        this.orderByClause = orderByClause;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table guacamole..guacamole_connection_history
+     *
+     * @mbggenerated Tue Feb 19 23:09:22 PST 2013
+     */
+    public String getOrderByClause() {
+        return orderByClause;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table guacamole..guacamole_connection_history
+     *
+     * @mbggenerated Tue Feb 19 23:09:22 PST 2013
+     */
+    public void setDistinct(boolean distinct) {
+        this.distinct = distinct;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table guacamole..guacamole_connection_history
+     *
+     * @mbggenerated Tue Feb 19 23:09:22 PST 2013
+     */
+    public boolean isDistinct() {
+        return distinct;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table guacamole..guacamole_connection_history
+     *
+     * @mbggenerated Tue Feb 19 23:09:22 PST 2013
+     */
+    public List<Criteria> getOredCriteria() {
+        return oredCriteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table guacamole..guacamole_connection_history
+     *
+     * @mbggenerated Tue Feb 19 23:09:22 PST 2013
+     */
+    public void or(Criteria criteria) {
+        oredCriteria.add(criteria);
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table guacamole..guacamole_connection_history
+     *
+     * @mbggenerated Tue Feb 19 23:09:22 PST 2013
+     */
+    public Criteria or() {
+        Criteria criteria = createCriteriaInternal();
+        oredCriteria.add(criteria);
+        return criteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table guacamole..guacamole_connection_history
+     *
+     * @mbggenerated Tue Feb 19 23:09:22 PST 2013
+     */
+    public Criteria createCriteria() {
+        Criteria criteria = createCriteriaInternal();
+        if (oredCriteria.size() == 0) {
+            oredCriteria.add(criteria);
+        }
+        return criteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table guacamole..guacamole_connection_history
+     *
+     * @mbggenerated Tue Feb 19 23:09:22 PST 2013
+     */
+    protected Criteria createCriteriaInternal() {
+        Criteria criteria = new Criteria();
+        return criteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table guacamole..guacamole_connection_history
+     *
+     * @mbggenerated Tue Feb 19 23:09:22 PST 2013
+     */
+    public void clear() {
+        oredCriteria.clear();
+        orderByClause = null;
+        distinct = false;
+    }
+
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table guacamole..guacamole_connection_history
+     *
+     * @mbggenerated Tue Feb 19 23:09:22 PST 2013
+     */
+    protected abstract static class GeneratedCriteria {
+        protected List<Criterion> criteria;
+
+        protected GeneratedCriteria() {
+            super();
+            criteria = new ArrayList<Criterion>();
+        }
+
+        public boolean isValid() {
+            return criteria.size() > 0;
+        }
+
+        public List<Criterion> getAllCriteria() {
+            return criteria;
+        }
+
+        public List<Criterion> getCriteria() {
+            return criteria;
+        }
+
+        protected void addCriterion(String condition) {
+            if (condition == null) {
+                throw new RuntimeException("Value for condition cannot be null");
+            }
+            criteria.add(new Criterion(condition));
+        }
+
+        protected void addCriterion(String condition, Object value, String property) {
+            if (value == null) {
+                throw new RuntimeException("Value for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value));
+        }
+
+        protected void addCriterion(String condition, Object value1, Object value2, String property) {
+            if (value1 == null || value2 == null) {
+                throw new RuntimeException("Between values for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value1, value2));
+        }
+
+        public Criteria andHistory_idIsNull() {
+            addCriterion("history_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andHistory_idIsNotNull() {
+            addCriterion("history_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andHistory_idEqualTo(Integer value) {
+            addCriterion("history_id =", value, "history_id");
+            return (Criteria) this;
+        }
+
+        public Criteria andHistory_idNotEqualTo(Integer value) {
+            addCriterion("history_id <>", value, "history_id");
+            return (Criteria) this;
+        }
+
+        public Criteria andHistory_idGreaterThan(Integer value) {
+            addCriterion("history_id >", value, "history_id");
+            return (Criteria) this;
+        }
+
+        public Criteria andHistory_idGreaterThanOrEqualTo(Integer value) {
+            addCriterion("history_id >=", value, "history_id");
+            return (Criteria) this;
+        }
+
+        public Criteria andHistory_idLessThan(Integer value) {
+            addCriterion("history_id <", value, "history_id");
+            return (Criteria) this;
+        }
+
+        public Criteria andHistory_idLessThanOrEqualTo(Integer value) {
+            addCriterion("history_id <=", value, "history_id");
+            return (Criteria) this;
+        }
+
+        public Criteria andHistory_idIn(List<Integer> values) {
+            addCriterion("history_id in", values, "history_id");
+            return (Criteria) this;
+        }
+
+        public Criteria andHistory_idNotIn(List<Integer> values) {
+            addCriterion("history_id not in", values, "history_id");
+            return (Criteria) this;
+        }
+
+        public Criteria andHistory_idBetween(Integer value1, Integer value2) {
+            addCriterion("history_id between", value1, value2, "history_id");
+            return (Criteria) this;
+        }
+
+        public Criteria andHistory_idNotBetween(Integer value1, Integer value2) {
+            addCriterion("history_id not between", value1, value2, "history_id");
+            return (Criteria) this;
+        }
+
+        public Criteria andUser_idIsNull() {
+            addCriterion("user_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUser_idIsNotNull() {
+            addCriterion("user_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUser_idEqualTo(Integer value) {
+            addCriterion("user_id =", value, "user_id");
+            return (Criteria) this;
+        }
+
+        public Criteria andUser_idNotEqualTo(Integer value) {
+            addCriterion("user_id <>", value, "user_id");
+            return (Criteria) this;
+        }
+
+        public Criteria andUser_idGreaterThan(Integer value) {
+            addCriterion("user_id >", value, "user_id");
+            return (Criteria) this;
+        }
+
+        public Criteria andUser_idGreaterThanOrEqualTo(Integer value) {
+            addCriterion("user_id >=", value, "user_id");
+            return (Criteria) this;
+        }
+
+        public Criteria andUser_idLessThan(Integer value) {
+            addCriterion("user_id <", value, "user_id");
+            return (Criteria) this;
+        }
+
+        public Criteria andUser_idLessThanOrEqualTo(Integer value) {
+            addCriterion("user_id <=", value, "user_id");
+            return (Criteria) this;
+        }
+
+        public Criteria andUser_idIn(List<Integer> values) {
+            addCriterion("user_id in", values, "user_id");
+            return (Criteria) this;
+        }
+
+        public Criteria andUser_idNotIn(List<Integer> values) {
+            addCriterion("user_id not in", values, "user_id");
+            return (Criteria) this;
+        }
+
+        public Criteria andUser_idBetween(Integer value1, Integer value2) {
+            addCriterion("user_id between", value1, value2, "user_id");
+            return (Criteria) this;
+        }
+
+        public Criteria andUser_idNotBetween(Integer value1, Integer value2) {
+            addCriterion("user_id not between", value1, value2, "user_id");
+            return (Criteria) this;
+        }
+
+        public Criteria andConnection_idIsNull() {
+            addCriterion("connection_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andConnection_idIsNotNull() {
+            addCriterion("connection_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andConnection_idEqualTo(Integer value) {
+            addCriterion("connection_id =", value, "connection_id");
+            return (Criteria) this;
+        }
+
+        public Criteria andConnection_idNotEqualTo(Integer value) {
+            addCriterion("connection_id <>", value, "connection_id");
+            return (Criteria) this;
+        }
+
+        public Criteria andConnection_idGreaterThan(Integer value) {
+            addCriterion("connection_id >", value, "connection_id");
+            return (Criteria) this;
+        }
+
+        public Criteria andConnection_idGreaterThanOrEqualTo(Integer value) {
+            addCriterion("connection_id >=", value, "connection_id");
+            return (Criteria) this;
+        }
+
+        public Criteria andConnection_idLessThan(Integer value) {
+            addCriterion("connection_id <", value, "connection_id");
+            return (Criteria) this;
+        }
+
+        public Criteria andConnection_idLessThanOrEqualTo(Integer value) {
+            addCriterion("connection_id <=", value, "connection_id");
+            return (Criteria) this;
+        }
+
+        public Criteria andConnection_idIn(List<Integer> values) {
+            addCriterion("connection_id in", values, "connection_id");
+            return (Criteria) this;
+        }
+
+        public Criteria andConnection_idNotIn(List<Integer> values) {
+            addCriterion("connection_id not in", values, "connection_id");
+            return (Criteria) this;
+        }
+
+        public Criteria andConnection_idBetween(Integer value1, Integer value2) {
+            addCriterion("connection_id between", value1, value2, "connection_id");
+            return (Criteria) this;
+        }
+
+        public Criteria andConnection_idNotBetween(Integer value1, Integer value2) {
+            addCriterion("connection_id not between", value1, value2, "connection_id");
+            return (Criteria) this;
+        }
+
+        public Criteria andStart_dateIsNull() {
+            addCriterion("start_date is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andStart_dateIsNotNull() {
+            addCriterion("start_date is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andStart_dateEqualTo(Date value) {
+            addCriterion("start_date =", value, "start_date");
+            return (Criteria) this;
+        }
+
+        public Criteria andStart_dateNotEqualTo(Date value) {
+            addCriterion("start_date <>", value, "start_date");
+            return (Criteria) this;
+        }
+
+        public Criteria andStart_dateGreaterThan(Date value) {
+            addCriterion("start_date >", value, "start_date");
+            return (Criteria) this;
+        }
+
+        public Criteria andStart_dateGreaterThanOrEqualTo(Date value) {
+            addCriterion("start_date >=", value, "start_date");
+            return (Criteria) this;
+        }
+
+        public Criteria andStart_dateLessThan(Date value) {
+            addCriterion("start_date <", value, "start_date");
+            return (Criteria) this;
+        }
+
+        public Criteria andStart_dateLessThanOrEqualTo(Date value) {
+            addCriterion("start_date <=", value, "start_date");
+            return (Criteria) this;
+        }
+
+        public Criteria andStart_dateIn(List<Date> values) {
+            addCriterion("start_date in", values, "start_date");
+            return (Criteria) this;
+        }
+
+        public Criteria andStart_dateNotIn(List<Date> values) {
+            addCriterion("start_date not in", values, "start_date");
+            return (Criteria) this;
+        }
+
+        public Criteria andStart_dateBetween(Date value1, Date value2) {
+            addCriterion("start_date between", value1, value2, "start_date");
+            return (Criteria) this;
+        }
+
+        public Criteria andStart_dateNotBetween(Date value1, Date value2) {
+            addCriterion("start_date not between", value1, value2, "start_date");
+            return (Criteria) this;
+        }
+
+        public Criteria andEnd_dateIsNull() {
+            addCriterion("end_date is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andEnd_dateIsNotNull() {
+            addCriterion("end_date is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andEnd_dateEqualTo(Date value) {
+            addCriterion("end_date =", value, "end_date");
+            return (Criteria) this;
+        }
+
+        public Criteria andEnd_dateNotEqualTo(Date value) {
+            addCriterion("end_date <>", value, "end_date");
+            return (Criteria) this;
+        }
+
+        public Criteria andEnd_dateGreaterThan(Date value) {
+            addCriterion("end_date >", value, "end_date");
+            return (Criteria) this;
+        }
+
+        public Criteria andEnd_dateGreaterThanOrEqualTo(Date value) {
+            addCriterion("end_date >=", value, "end_date");
+            return (Criteria) this;
+        }
+
+        public Criteria andEnd_dateLessThan(Date value) {
+            addCriterion("end_date <", value, "end_date");
+            return (Criteria) this;
+        }
+
+        public Criteria andEnd_dateLessThanOrEqualTo(Date value) {
+            addCriterion("end_date <=", value, "end_date");
+            return (Criteria) this;
+        }
+
+        public Criteria andEnd_dateIn(List<Date> values) {
+            addCriterion("end_date in", values, "end_date");
+            return (Criteria) this;
+        }
+
+        public Criteria andEnd_dateNotIn(List<Date> values) {
+            addCriterion("end_date not in", values, "end_date");
+            return (Criteria) this;
+        }
+
+        public Criteria andEnd_dateBetween(Date value1, Date value2) {
+            addCriterion("end_date between", value1, value2, "end_date");
+            return (Criteria) this;
+        }
+
+        public Criteria andEnd_dateNotBetween(Date value1, Date value2) {
+            addCriterion("end_date not between", value1, value2, "end_date");
+            return (Criteria) this;
+        }
+    }
+
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table guacamole..guacamole_connection_history
+     *
+     * @mbggenerated do_not_delete_during_merge Tue Feb 19 23:09:22 PST 2013
+     */
+    public static class Criteria extends GeneratedCriteria {
+
+        protected Criteria() {
+            super();
+        }
+    }
+
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table guacamole..guacamole_connection_history
+     *
+     * @mbggenerated Tue Feb 19 23:09:22 PST 2013
+     */
+    public static class Criterion {
+        private String condition;
+
+        private Object value;
+
+        private Object secondValue;
+
+        private boolean noValue;
+
+        private boolean singleValue;
+
+        private boolean betweenValue;
+
+        private boolean listValue;
+
+        private String typeHandler;
+
+        public String getCondition() {
+            return condition;
+        }
+
+        public Object getValue() {
+            return value;
+        }
+
+        public Object getSecondValue() {
+            return secondValue;
+        }
+
+        public boolean isNoValue() {
+            return noValue;
+        }
+
+        public boolean isSingleValue() {
+            return singleValue;
+        }
+
+        public boolean isBetweenValue() {
+            return betweenValue;
+        }
+
+        public boolean isListValue() {
+            return listValue;
+        }
+
+        public String getTypeHandler() {
+            return typeHandler;
+        }
+
+        protected Criterion(String condition) {
+            super();
+            this.condition = condition;
+            this.typeHandler = null;
+            this.noValue = true;
+        }
+
+        protected Criterion(String condition, Object value, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.typeHandler = typeHandler;
+            if (value instanceof List<?>) {
+                this.listValue = true;
+            } else {
+                this.singleValue = true;
+            }
+        }
+
+        protected Criterion(String condition, Object value) {
+            this(condition, value, null);
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.secondValue = secondValue;
+            this.typeHandler = typeHandler;
+            this.betweenValue = true;
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue) {
+            this(condition, value, secondValue, null);
+        }
+    }
+}

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

@@ -5,7 +5,7 @@ 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 12 20:35:54 PST 2013
+     * @mbggenerated Tue Feb 19 23:09:22 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 12 20:35:54 PST 2013
+     * @mbggenerated Tue Feb 19 23:09:22 PST 2013
      */
     public String getParameter_value() {
         return parameter_value;
@@ -27,7 +27,7 @@ public class ConnectionParameter extends ConnectionParameterKey {
      *
      * @param parameter_value the value for guacamole..guacamole_connection_parameter.parameter_value
      *
-     * @mbggenerated Tue Feb 12 20:35:54 PST 2013
+     * @mbggenerated Tue Feb 19 23:09:22 PST 2013
      */
     public void setParameter_value(String parameter_value) {
         this.parameter_value = parameter_value;

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

@@ -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 12 20:35:54 PST 2013
+     * @mbggenerated Tue Feb 19 23:09:22 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 12 20:35:54 PST 2013
+     * @mbggenerated Tue Feb 19 23:09:22 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 12 20:35:54 PST 2013
+     * @mbggenerated Tue Feb 19 23:09:22 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 12 20:35:54 PST 2013
+     * @mbggenerated Tue Feb 19 23:09:22 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 12 20:35:54 PST 2013
+     * @mbggenerated Tue Feb 19 23:09:22 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 12 20:35:54 PST 2013
+     * @mbggenerated Tue Feb 19 23:09:22 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 12 20:35:54 PST 2013
+     * @mbggenerated Tue Feb 19 23:09:22 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 12 20:35:54 PST 2013
+     * @mbggenerated Tue Feb 19 23:09:22 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 12 20:35:54 PST 2013
+     * @mbggenerated Tue Feb 19 23:09:22 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 12 20:35:54 PST 2013
+     * @mbggenerated Tue Feb 19 23:09:22 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 12 20:35:54 PST 2013
+     * @mbggenerated Tue Feb 19 23:09:22 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 12 20:35:54 PST 2013
+     * @mbggenerated Tue Feb 19 23:09:22 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 12 20:35:54 PST 2013
+     * @mbggenerated Tue Feb 19 23:09:22 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 12 20:35:54 PST 2013
+     * @mbggenerated Tue Feb 19 23:09:22 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 12 20:35:54 PST 2013
+     * @mbggenerated Tue Feb 19 23:09:22 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 12 20:35:54 PST 2013
+     * @mbggenerated do_not_delete_during_merge Tue Feb 19 23:09:22 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 12 20:35:54 PST 2013
+     * @mbggenerated Tue Feb 19 23:09:22 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

@@ -5,7 +5,7 @@ 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 12 20:35:54 PST 2013
+     * @mbggenerated Tue Feb 19 23:09:22 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 12 20:35:54 PST 2013
+     * @mbggenerated Tue Feb 19 23:09:22 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 12 20:35:54 PST 2013
+     * @mbggenerated Tue Feb 19 23:09:22 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 12 20:35:54 PST 2013
+     * @mbggenerated Tue Feb 19 23:09:22 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 12 20:35:54 PST 2013
+     * @mbggenerated Tue Feb 19 23:09:22 PST 2013
      */
     public String getParameter_name() {
         return parameter_name;
@@ -59,7 +59,7 @@ public class ConnectionParameterKey {
      *
      * @param parameter_name the value for guacamole..guacamole_connection_parameter.parameter_name
      *
-     * @mbggenerated Tue Feb 12 20:35:54 PST 2013
+     * @mbggenerated Tue Feb 19 23:09:22 PST 2013
      */
     public void setParameter_name(String parameter_name) {
         this.parameter_name = parameter_name;

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

@@ -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 12 20:35:54 PST 2013
+     * @mbggenerated Tue Feb 19 23:09:22 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 12 20:35:54 PST 2013
+     * @mbggenerated Tue Feb 19 23:09:22 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 12 20:35:54 PST 2013
+     * @mbggenerated Tue Feb 19 23:09:22 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 12 20:35:54 PST 2013
+     * @mbggenerated Tue Feb 19 23:09:22 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 12 20:35:54 PST 2013
+     * @mbggenerated Tue Feb 19 23:09:22 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 12 20:35:54 PST 2013
+     * @mbggenerated Tue Feb 19 23:09:22 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 12 20:35:54 PST 2013
+     * @mbggenerated Tue Feb 19 23:09:22 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 12 20:35:54 PST 2013
+     * @mbggenerated Tue Feb 19 23:09:22 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 12 20:35:54 PST 2013
+     * @mbggenerated Tue Feb 19 23:09:22 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 12 20:35:54 PST 2013
+     * @mbggenerated Tue Feb 19 23:09:22 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 12 20:35:54 PST 2013
+     * @mbggenerated Tue Feb 19 23:09:22 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 12 20:35:54 PST 2013
+     * @mbggenerated Tue Feb 19 23:09:22 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 12 20:35:54 PST 2013
+     * @mbggenerated Tue Feb 19 23:09:22 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 12 20:35:54 PST 2013
+     * @mbggenerated Tue Feb 19 23:09:22 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 12 20:35:54 PST 2013
+     * @mbggenerated Tue Feb 19 23:09:22 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 12 20:35:54 PST 2013
+     * @mbggenerated do_not_delete_during_merge Tue Feb 19 23:09:22 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 12 20:35:54 PST 2013
+     * @mbggenerated Tue Feb 19 23:09:22 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

@@ -5,7 +5,7 @@ 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 12 20:35:54 PST 2013
+     * @mbggenerated Tue Feb 19 23:09:22 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 12 20:35:54 PST 2013
+     * @mbggenerated Tue Feb 19 23:09:22 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 12 20:35:54 PST 2013
+     * @mbggenerated Tue Feb 19 23:09:22 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 12 20:35:54 PST 2013
+     * @mbggenerated Tue Feb 19 23:09:22 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 12 20:35:54 PST 2013
+     * @mbggenerated Tue Feb 19 23:09:22 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 12 20:35:54 PST 2013
+     * @mbggenerated Tue Feb 19 23:09:22 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 12 20:35:54 PST 2013
+     * @mbggenerated Tue Feb 19 23:09:22 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 12 20:35:54 PST 2013
+     * @mbggenerated Tue Feb 19 23:09:22 PST 2013
      */
     public String getPermission() {
         return permission;
@@ -91,7 +91,7 @@ public class ConnectionPermissionKey {
      *
      * @param permission the value for guacamole..guacamole_connection_permission.permission
      *
-     * @mbggenerated Tue Feb 12 20:35:54 PST 2013
+     * @mbggenerated Tue Feb 19 23:09:22 PST 2013
      */
     public void setPermission(String permission) {
         this.permission = permission;

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

@@ -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 12 20:35:54 PST 2013
+     * @mbggenerated Tue Feb 19 23:09:22 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 12 20:35:54 PST 2013
+     * @mbggenerated Tue Feb 19 23:09:22 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 12 20:35:54 PST 2013
+     * @mbggenerated Tue Feb 19 23:09:22 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 12 20:35:54 PST 2013
+     * @mbggenerated Tue Feb 19 23:09:22 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 12 20:35:54 PST 2013
+     * @mbggenerated Tue Feb 19 23:09:22 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 12 20:35:54 PST 2013
+     * @mbggenerated Tue Feb 19 23:09:22 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 12 20:35:54 PST 2013
+     * @mbggenerated Tue Feb 19 23:09:22 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 12 20:35:54 PST 2013
+     * @mbggenerated Tue Feb 19 23:09:22 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 12 20:35:54 PST 2013
+     * @mbggenerated Tue Feb 19 23:09:22 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 12 20:35:54 PST 2013
+     * @mbggenerated Tue Feb 19 23:09:22 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 12 20:35:54 PST 2013
+     * @mbggenerated Tue Feb 19 23:09:22 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 12 20:35:54 PST 2013
+     * @mbggenerated Tue Feb 19 23:09:22 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 12 20:35:54 PST 2013
+     * @mbggenerated Tue Feb 19 23:09:22 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 12 20:35:54 PST 2013
+     * @mbggenerated Tue Feb 19 23:09:22 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 12 20:35:54 PST 2013
+     * @mbggenerated Tue Feb 19 23:09:22 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 12 20:35:54 PST 2013
+     * @mbggenerated do_not_delete_during_merge Tue Feb 19 23:09:22 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 12 20:35:54 PST 2013
+     * @mbggenerated Tue Feb 19 23:09:22 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

@@ -5,7 +5,7 @@ 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 12 20:35:54 PST 2013
+     * @mbggenerated Tue Feb 19 23:09:22 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 12 20:35:54 PST 2013
+     * @mbggenerated Tue Feb 19 23:09:22 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 12 20:35:54 PST 2013
+     * @mbggenerated Tue Feb 19 23:09:22 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 12 20:35:54 PST 2013
+     * @mbggenerated Tue Feb 19 23:09:22 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 12 20:35:54 PST 2013
+     * @mbggenerated Tue Feb 19 23:09:22 PST 2013
      */
     public String getPermission() {
         return permission;
@@ -59,7 +59,7 @@ public class SystemPermissionKey {
      *
      * @param permission the value for guacamole..guacamole_system_permission.permission
      *
-     * @mbggenerated Tue Feb 12 20:35:54 PST 2013
+     * @mbggenerated Tue Feb 19 23:09:22 PST 2013
      */
     public void setPermission(String permission) {
         this.permission = permission;

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

@@ -5,7 +5,7 @@ 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 20:35:54 PST 2013
+     * @mbggenerated Tue Feb 19 23:09:22 PST 2013
      */
     private Integer user_id;
 
@@ -13,7 +13,7 @@ public class User {
      * This field was generated by MyBatis Generator.
      * This field corresponds to the database column guacamole..guacamole_user.username
      *
-     * @mbggenerated Tue Feb 12 20:35:54 PST 2013
+     * @mbggenerated Tue Feb 19 23:09:22 PST 2013
      */
     private String username;
 
@@ -23,7 +23,7 @@ public class User {
      *
      * @return the value of guacamole..guacamole_user.user_id
      *
-     * @mbggenerated Tue Feb 12 20:35:54 PST 2013
+     * @mbggenerated Tue Feb 19 23:09:22 PST 2013
      */
     public Integer getUser_id() {
         return user_id;
@@ -35,7 +35,7 @@ public class User {
      *
      * @param user_id the value for guacamole..guacamole_user.user_id
      *
-     * @mbggenerated Tue Feb 12 20:35:54 PST 2013
+     * @mbggenerated Tue Feb 19 23:09:22 PST 2013
      */
     public void setUser_id(Integer user_id) {
         this.user_id = user_id;
@@ -47,7 +47,7 @@ public class User {
      *
      * @return the value of guacamole..guacamole_user.username
      *
-     * @mbggenerated Tue Feb 12 20:35:54 PST 2013
+     * @mbggenerated Tue Feb 19 23:09:22 PST 2013
      */
     public String getUsername() {
         return username;
@@ -59,7 +59,7 @@ public class User {
      *
      * @param username the value for guacamole..guacamole_user.username
      *
-     * @mbggenerated Tue Feb 12 20:35:54 PST 2013
+     * @mbggenerated Tue Feb 19 23:09:22 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

@@ -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 12 20:35:54 PST 2013
+     * @mbggenerated Tue Feb 19 23:09:22 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 12 20:35:54 PST 2013
+     * @mbggenerated Tue Feb 19 23:09:22 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 12 20:35:54 PST 2013
+     * @mbggenerated Tue Feb 19 23:09:22 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 12 20:35:54 PST 2013
+     * @mbggenerated Tue Feb 19 23:09:22 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 12 20:35:54 PST 2013
+     * @mbggenerated Tue Feb 19 23:09:22 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 12 20:35:54 PST 2013
+     * @mbggenerated Tue Feb 19 23:09:22 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 12 20:35:54 PST 2013
+     * @mbggenerated Tue Feb 19 23:09:22 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 12 20:35:54 PST 2013
+     * @mbggenerated Tue Feb 19 23:09:22 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 12 20:35:54 PST 2013
+     * @mbggenerated Tue Feb 19 23:09:22 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 12 20:35:54 PST 2013
+     * @mbggenerated Tue Feb 19 23:09:22 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 12 20:35:54 PST 2013
+     * @mbggenerated Tue Feb 19 23:09:22 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 12 20:35:54 PST 2013
+     * @mbggenerated Tue Feb 19 23:09:22 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 12 20:35:54 PST 2013
+     * @mbggenerated Tue Feb 19 23:09:22 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 12 20:35:54 PST 2013
+     * @mbggenerated Tue Feb 19 23:09:22 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 12 20:35:54 PST 2013
+     * @mbggenerated Tue Feb 19 23:09:22 PST 2013
      */
     protected abstract static class GeneratedCriteria {
         protected List<Criterion> criteria;
@@ -329,7 +329,7 @@ public class UserExample {
      * 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 12 20:35:54 PST 2013
+     * @mbggenerated do_not_delete_during_merge Tue Feb 19 23:09:22 PST 2013
      */
     public static class Criteria extends GeneratedCriteria {
 
@@ -342,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 12 20:35:54 PST 2013
+     * @mbggenerated Tue Feb 19 23:09:22 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

@@ -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 12 20:35:54 PST 2013
+     * @mbggenerated Tue Feb 19 23:09:22 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 12 20:35:54 PST 2013
+     * @mbggenerated Tue Feb 19 23:09:22 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 12 20:35:54 PST 2013
+     * @mbggenerated Tue Feb 19 23:09:22 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 12 20:35:54 PST 2013
+     * @mbggenerated Tue Feb 19 23:09:22 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 12 20:35:54 PST 2013
+     * @mbggenerated Tue Feb 19 23:09:22 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 12 20:35:54 PST 2013
+     * @mbggenerated Tue Feb 19 23:09:22 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 12 20:35:54 PST 2013
+     * @mbggenerated Tue Feb 19 23:09:22 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 12 20:35:54 PST 2013
+     * @mbggenerated Tue Feb 19 23:09:22 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 12 20:35:54 PST 2013
+     * @mbggenerated Tue Feb 19 23:09:22 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 12 20:35:54 PST 2013
+     * @mbggenerated Tue Feb 19 23:09:22 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 12 20:35:54 PST 2013
+     * @mbggenerated Tue Feb 19 23:09:22 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 12 20:35:54 PST 2013
+     * @mbggenerated Tue Feb 19 23:09:22 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 12 20:35:54 PST 2013
+     * @mbggenerated Tue Feb 19 23:09:22 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 12 20:35:54 PST 2013
+     * @mbggenerated Tue Feb 19 23:09:22 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 12 20:35:54 PST 2013
+     * @mbggenerated Tue Feb 19 23:09:22 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 12 20:35:54 PST 2013
+     * @mbggenerated do_not_delete_during_merge Tue Feb 19 23:09:22 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 12 20:35:54 PST 2013
+     * @mbggenerated Tue Feb 19 23:09:22 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

@@ -5,7 +5,7 @@ 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 12 20:35:54 PST 2013
+     * @mbggenerated Tue Feb 19 23:09:22 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 12 20:35:54 PST 2013
+     * @mbggenerated Tue Feb 19 23:09:22 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 12 20:35:54 PST 2013
+     * @mbggenerated Tue Feb 19 23:09:22 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 12 20:35:54 PST 2013
+     * @mbggenerated Tue Feb 19 23:09:22 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 12 20:35:54 PST 2013
+     * @mbggenerated Tue Feb 19 23:09:22 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 12 20:35:54 PST 2013
+     * @mbggenerated Tue Feb 19 23:09:22 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 12 20:35:54 PST 2013
+     * @mbggenerated Tue Feb 19 23:09:22 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 12 20:35:54 PST 2013
+     * @mbggenerated Tue Feb 19 23:09:22 PST 2013
      */
     public String getPermission() {
         return permission;
@@ -91,7 +91,7 @@ public class UserPermissionKey {
      *
      * @param permission the value for guacamole..guacamole_user_permission.permission
      *
-     * @mbggenerated Tue Feb 12 20:35:54 PST 2013
+     * @mbggenerated Tue Feb 19 23:09:22 PST 2013
      */
     public void setPermission(String permission) {
         this.permission = permission;

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

@@ -5,7 +5,7 @@ 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 20:35:54 PST 2013
+     * @mbggenerated Tue Feb 19 23:09:22 PST 2013
      */
     private byte[] password_hash;
 
@@ -13,7 +13,7 @@ public class UserWithBLOBs extends User {
      * This field was generated by MyBatis Generator.
      * This field corresponds to the database column guacamole..guacamole_user.password_salt
      *
-     * @mbggenerated Tue Feb 12 20:35:54 PST 2013
+     * @mbggenerated Tue Feb 19 23:09:22 PST 2013
      */
     private byte[] password_salt;
 
@@ -23,7 +23,7 @@ public class UserWithBLOBs extends User {
      *
      * @return the value of guacamole..guacamole_user.password_hash
      *
-     * @mbggenerated Tue Feb 12 20:35:54 PST 2013
+     * @mbggenerated Tue Feb 19 23:09:22 PST 2013
      */
     public byte[] getPassword_hash() {
         return password_hash;
@@ -35,7 +35,7 @@ public class UserWithBLOBs extends User {
      *
      * @param password_hash the value for guacamole..guacamole_user.password_hash
      *
-     * @mbggenerated Tue Feb 12 20:35:54 PST 2013
+     * @mbggenerated Tue Feb 19 23:09:22 PST 2013
      */
     public void setPassword_hash(byte[] password_hash) {
         this.password_hash = password_hash;
@@ -47,7 +47,7 @@ public class UserWithBLOBs extends User {
      *
      * @return the value of guacamole..guacamole_user.password_salt
      *
-     * @mbggenerated Tue Feb 12 20:35:54 PST 2013
+     * @mbggenerated Tue Feb 19 23:09:22 PST 2013
      */
     public byte[] getPassword_salt() {
         return password_salt;
@@ -59,7 +59,7 @@ public class UserWithBLOBs extends User {
      *
      * @param password_salt the value for guacamole..guacamole_user.password_salt
      *
-     * @mbggenerated Tue Feb 12 20:35:54 PST 2013
+     * @mbggenerated Tue Feb 19 23:09:22 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/utility/ProviderUtility.java

@@ -0,0 +1,226 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is guacamole-auth-mysql.
+ *
+ * The Initial Developer of the Original Code is
+ * James Muehlner.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+package net.sourceforge.guacamole.net.auth.mysql.utility;
+
+import com.google.inject.Inject;
+import com.google.inject.Provider;
+import java.util.ArrayList;
+import java.util.List;
+import net.sourceforge.guacamole.GuacamoleException;
+import net.sourceforge.guacamole.net.auth.Connection;
+import net.sourceforge.guacamole.net.auth.User;
+import net.sourceforge.guacamole.net.auth.mysql.MySQLConnection;
+import net.sourceforge.guacamole.net.auth.mysql.MySQLConnectionRecord;
+import net.sourceforge.guacamole.net.auth.mysql.MySQLUser;
+import net.sourceforge.guacamole.net.auth.mysql.dao.ConnectionHistoryMapper;
+import net.sourceforge.guacamole.net.auth.mysql.dao.ConnectionMapper;
+import net.sourceforge.guacamole.net.auth.mysql.dao.UserMapper;
+import net.sourceforge.guacamole.net.auth.mysql.model.ConnectionExample;
+import net.sourceforge.guacamole.net.auth.mysql.model.ConnectionHistory;
+import net.sourceforge.guacamole.net.auth.mysql.model.ConnectionHistoryExample;
+import net.sourceforge.guacamole.net.auth.mysql.model.UserExample;
+import net.sourceforge.guacamole.net.auth.mysql.model.UserWithBLOBs;
+
+/**
+ * Provides convenient provider methods for MySQLUser, MySQLConnection, and MySQLConnctionRecord objects.
+ * @author James Muehlner
+ */
+public class ProviderUtility {
+    @Inject
+    UserMapper userDAO;
+    
+    @Inject
+    ConnectionMapper connectionDAO;
+    
+    @Inject
+    ConnectionHistoryMapper connectionHistoryDAO;
+    
+    @Inject
+    Provider<MySQLUser> mySQLUserProvider;
+    
+    @Inject
+    Provider<MySQLConnection> mySQLConnectionProvider;
+    
+    @Inject
+    Provider<MySQLConnectionRecord> mySQLConnectionRecordProvider;
+    
+    /**
+     * Create a new user based on the provided object.
+     * @param user
+     * @return the new MySQLUser object.
+     * @throws GuacamoleException 
+     */
+    public MySQLUser getNewMySQLUser(User user) throws GuacamoleException {
+        MySQLUser mySQLUser = mySQLUserProvider.get();
+        mySQLUser.initNew(user);
+        return mySQLUser;
+    }
+    
+    /**
+     * Get the user based on the username of the provided object.
+     * @param user
+     * @return the new MySQLUser object.
+     * @throws GuacamoleException 
+     */
+    public MySQLUser getExistingMySQLUser(User user) throws GuacamoleException {
+        return getExistingMySQLUser(user.getUsername());
+    }
+    
+    /**
+     * Get the user based on the username of the provided object.
+     * @param name
+     * @return the new MySQLUser object.
+     * @throws GuacamoleException 
+     */
+    public MySQLUser getExistingMySQLUser(String name) throws GuacamoleException {
+        MySQLUser mySQLUser = mySQLUserProvider.get();
+        mySQLUser.initExisting(name);
+        return mySQLUser;
+    }
+    
+    /**
+     * Get an existing MySQLUser from a user database record.
+     * @param user
+     * @return the existing MySQLUser object.
+     */
+    public MySQLUser getExistingMySQLUser(UserWithBLOBs user) {
+        MySQLUser mySQLUser = mySQLUserProvider.get();
+        mySQLUser.init(user);
+        return mySQLUser;
+    }
+    
+    /**
+     * Get an existing MySQLUser from a user ID.
+     * @param id
+     * @return the existing MySQLUser object if found, null if not.
+     */
+    public MySQLUser getExistingMySQLUser(Integer id) {
+        UserExample example = new UserExample();
+        example.createCriteria().andUser_idEqualTo(id);
+        List<UserWithBLOBs> users = userDAO.selectByExampleWithBLOBs(example);
+        if(users.isEmpty())
+            return null;
+        return getExistingMySQLUser(users.get(0));
+    }
+        
+    
+    /**
+     * Create a new connection based on the provided object.
+     * @param connection
+     * @return the new Connection object.
+     * @throws GuacamoleException 
+     */
+    public MySQLConnection getNewMySQLConnection(Connection connection) throws GuacamoleException {
+        MySQLConnection mySQLConnection = mySQLConnectionProvider.get();
+        mySQLConnection.initNew(connection);
+        return mySQLConnection;
+    }
+    
+    /**
+     * Get the connection based on the connection name of the provided object.
+     * @param connection
+     * @return the new Connection object.
+     * @throws GuacamoleException 
+     */
+    public MySQLConnection getExistingMySQLConnection(Connection connection) throws GuacamoleException {
+        return getExistingMySQLConnection(connection.getIdentifier());
+    }
+    
+    /**
+     * Get the connection based on the connection name of the provided object.
+     * @param name
+     * @return the new Connection object.
+     * @throws GuacamoleException 
+     */
+    public MySQLConnection getExistingMySQLConnection(String name) throws GuacamoleException {
+        MySQLConnection mySQLConnection = mySQLConnectionProvider.get();
+        mySQLConnection.initExisting(name);
+        return mySQLConnection;
+    }
+    
+    /**
+     * Get an existing MySQLConnection from a connection database record.
+     * @param connection
+     * @return the existing MySQLConnection object.
+     */
+    public MySQLConnection getExistingMySQLConnection(net.sourceforge.guacamole.net.auth.mysql.model.Connection connection) {
+        MySQLConnection mySQLConnection = mySQLConnectionProvider.get();
+        mySQLConnection.init(connection);
+        return mySQLConnection;
+    }
+    
+    /**
+     * Get an existing MySQLConnection from a connection ID.
+     * @param id
+     * @return the existing MySQLConnection object if found, null if not.
+     */
+    public MySQLConnection getExistingMySQLConnection(Integer id) {
+        ConnectionExample example = new ConnectionExample();
+        example.createCriteria().andConnection_idEqualTo(id);
+        List<net.sourceforge.guacamole.net.auth.mysql.model.Connection> connections = connectionDAO.selectByExample(example);
+        if(connections.isEmpty())
+            return null;
+        return getExistingMySQLConnection(connections.get(0));
+    }
+    
+    /**
+     * Gets a list of existing MySQLConnectionRecord from the database. These represent
+     * the history records of the connection.
+     * @param connectionID
+     * @return the list of MySQLConnectionRecord related to this connectionID.
+     */
+    public List<MySQLConnectionRecord> getExistingMySQLConnectionRecords(Integer connectionID) {
+        ConnectionHistoryExample example = new ConnectionHistoryExample();
+        example.createCriteria().andConnection_idEqualTo(connectionID);
+        List<ConnectionHistory> connectionHistories = connectionHistoryDAO.selectByExample(example);
+        List<MySQLConnectionRecord> connectionRecords = new ArrayList<MySQLConnectionRecord>();
+        for(ConnectionHistory history : connectionHistories) {
+            connectionRecords.add(getExistingMySQLConnectionRecord(history));
+        }
+        return connectionRecords;
+    }
+    
+    /**
+     * Create a MySQLConnectionRecord object around a single ConnectionHistory database record.
+     * @param history
+     * @return the new MySQLConnectionRecord object.
+     */
+    public MySQLConnectionRecord getExistingMySQLConnectionRecord(ConnectionHistory history) {
+        MySQLConnectionRecord record = mySQLConnectionRecordProvider.get();
+        record.init(history);
+        return record;
+    }
+}

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

@@ -0,0 +1,286 @@
+<?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.ConnectionHistoryMapper" >
+  <resultMap id="BaseResultMap" type="net.sourceforge.guacamole.net.auth.mysql.model.ConnectionHistory" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Tue Feb 19 23:09:22 PST 2013.
+    -->
+    <id column="history_id" property="history_id" jdbcType="INTEGER" />
+    <result column="user_id" property="user_id" jdbcType="INTEGER" />
+    <result column="connection_id" property="connection_id" jdbcType="INTEGER" />
+    <result column="start_date" property="start_date" jdbcType="TIMESTAMP" />
+    <result column="end_date" property="end_date" jdbcType="TIMESTAMP" />
+  </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 19 23:09:22 PST 2013.
+    -->
+    <where >
+      <foreach collection="oredCriteria" item="criteria" separator="or" >
+        <if test="criteria.valid" >
+          <trim prefix="(" suffix=")" prefixOverrides="and" >
+            <foreach collection="criteria.criteria" item="criterion" >
+              <choose >
+                <when test="criterion.noValue" >
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue" >
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue" >
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue" >
+                  and ${criterion.condition}
+                  <foreach collection="criterion.value" item="listItem" open="(" close=")" separator="," >
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Update_By_Example_Where_Clause" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Tue Feb 19 23:09:22 PST 2013.
+    -->
+    <where >
+      <foreach collection="example.oredCriteria" item="criteria" separator="or" >
+        <if test="criteria.valid" >
+          <trim prefix="(" suffix=")" prefixOverrides="and" >
+            <foreach collection="criteria.criteria" item="criterion" >
+              <choose >
+                <when test="criterion.noValue" >
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue" >
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue" >
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue" >
+                  and ${criterion.condition}
+                  <foreach collection="criterion.value" item="listItem" open="(" close=")" separator="," >
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Base_Column_List" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Tue Feb 19 23:09:22 PST 2013.
+    -->
+    history_id, user_id, connection_id, start_date, end_date
+  </sql>
+  <select id="selectByExample" resultMap="BaseResultMap" parameterType="net.sourceforge.guacamole.net.auth.mysql.model.ConnectionHistoryExample" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Tue Feb 19 23:09:22 PST 2013.
+    -->
+    select
+    <if test="distinct" >
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from guacamole..guacamole_connection_history
+    <if test="_parameter != null" >
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null" >
+      order by ${orderByClause}
+    </if>
+  </select>
+  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Tue Feb 19 23:09:22 PST 2013.
+    -->
+    select 
+    <include refid="Base_Column_List" />
+    from guacamole..guacamole_connection_history
+    where history_id = #{history_id,jdbcType=INTEGER}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Tue Feb 19 23:09:22 PST 2013.
+    -->
+    delete from guacamole..guacamole_connection_history
+    where history_id = #{history_id,jdbcType=INTEGER}
+  </delete>
+  <delete id="deleteByExample" parameterType="net.sourceforge.guacamole.net.auth.mysql.model.ConnectionHistoryExample" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Tue Feb 19 23:09:22 PST 2013.
+    -->
+    delete from guacamole..guacamole_connection_history
+    <if test="_parameter != null" >
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="net.sourceforge.guacamole.net.auth.mysql.model.ConnectionHistory" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Tue Feb 19 23:09:22 PST 2013.
+    -->
+    insert into guacamole..guacamole_connection_history (history_id, user_id, connection_id, 
+      start_date, end_date)
+    values (#{history_id,jdbcType=INTEGER}, #{user_id,jdbcType=INTEGER}, #{connection_id,jdbcType=INTEGER}, 
+      #{start_date,jdbcType=TIMESTAMP}, #{end_date,jdbcType=TIMESTAMP})
+  </insert>
+  <insert id="insertSelective" parameterType="net.sourceforge.guacamole.net.auth.mysql.model.ConnectionHistory" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Tue Feb 19 23:09:22 PST 2013.
+    -->
+    insert into guacamole..guacamole_connection_history
+    <trim prefix="(" suffix=")" suffixOverrides="," >
+      <if test="history_id != null" >
+        history_id,
+      </if>
+      <if test="user_id != null" >
+        user_id,
+      </if>
+      <if test="connection_id != null" >
+        connection_id,
+      </if>
+      <if test="start_date != null" >
+        start_date,
+      </if>
+      <if test="end_date != null" >
+        end_date,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides="," >
+      <if test="history_id != null" >
+        #{history_id,jdbcType=INTEGER},
+      </if>
+      <if test="user_id != null" >
+        #{user_id,jdbcType=INTEGER},
+      </if>
+      <if test="connection_id != null" >
+        #{connection_id,jdbcType=INTEGER},
+      </if>
+      <if test="start_date != null" >
+        #{start_date,jdbcType=TIMESTAMP},
+      </if>
+      <if test="end_date != null" >
+        #{end_date,jdbcType=TIMESTAMP},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="net.sourceforge.guacamole.net.auth.mysql.model.ConnectionHistoryExample" resultType="java.lang.Integer" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Tue Feb 19 23:09:22 PST 2013.
+    -->
+    select count(*) from guacamole..guacamole_connection_history
+    <if test="_parameter != null" >
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Tue Feb 19 23:09:22 PST 2013.
+    -->
+    update guacamole..guacamole_connection_history
+    <set >
+      <if test="record.history_id != null" >
+        history_id = #{record.history_id,jdbcType=INTEGER},
+      </if>
+      <if test="record.user_id != null" >
+        user_id = #{record.user_id,jdbcType=INTEGER},
+      </if>
+      <if test="record.connection_id != null" >
+        connection_id = #{record.connection_id,jdbcType=INTEGER},
+      </if>
+      <if test="record.start_date != null" >
+        start_date = #{record.start_date,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.end_date != null" >
+        end_date = #{record.end_date,jdbcType=TIMESTAMP},
+      </if>
+    </set>
+    <if test="_parameter != null" >
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExample" parameterType="map" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Tue Feb 19 23:09:22 PST 2013.
+    -->
+    update guacamole..guacamole_connection_history
+    set history_id = #{record.history_id,jdbcType=INTEGER},
+      user_id = #{record.user_id,jdbcType=INTEGER},
+      connection_id = #{record.connection_id,jdbcType=INTEGER},
+      start_date = #{record.start_date,jdbcType=TIMESTAMP},
+      end_date = #{record.end_date,jdbcType=TIMESTAMP}
+    <if test="_parameter != null" >
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="net.sourceforge.guacamole.net.auth.mysql.model.ConnectionHistory" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Tue Feb 19 23:09:22 PST 2013.
+    -->
+    update guacamole..guacamole_connection_history
+    <set >
+      <if test="user_id != null" >
+        user_id = #{user_id,jdbcType=INTEGER},
+      </if>
+      <if test="connection_id != null" >
+        connection_id = #{connection_id,jdbcType=INTEGER},
+      </if>
+      <if test="start_date != null" >
+        start_date = #{start_date,jdbcType=TIMESTAMP},
+      </if>
+      <if test="end_date != null" >
+        end_date = #{end_date,jdbcType=TIMESTAMP},
+      </if>
+    </set>
+    where history_id = #{history_id,jdbcType=INTEGER}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="net.sourceforge.guacamole.net.auth.mysql.model.ConnectionHistory" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Tue Feb 19 23:09:22 PST 2013.
+    -->
+    update guacamole..guacamole_connection_history
+    set user_id = #{user_id,jdbcType=INTEGER},
+      connection_id = #{connection_id,jdbcType=INTEGER},
+      start_date = #{start_date,jdbcType=TIMESTAMP},
+      end_date = #{end_date,jdbcType=TIMESTAMP}
+    where history_id = #{history_id,jdbcType=INTEGER}
+  </update>
+</mapper>

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

@@ -1,40 +1,40 @@
-<?xml version="1.0" encoding="UTF-8" ?>
+<?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" >
+<!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.ConnectionMapper" >
+<mapper namespace="net.sourceforge.guacamole.net.auth.mysql.dao.ConnectionMapper">
-  <resultMap id="BaseResultMap" type="net.sourceforge.guacamole.net.auth.mysql.model.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 12 20:35:54 PST 2013.
+      This element was generated on Tue Feb 19 23:09:22 PST 2013.
     -->
-    <id column="connection_id" property="connection_id" jdbcType="INTEGER" />
+    <id column="connection_id" jdbcType="INTEGER" property="connection_id" />
-    <result column="connection_name" property="connection_name" jdbcType="VARCHAR" />
+    <result column="connection_name" jdbcType="VARCHAR" property="connection_name" />
-    <result column="protocol" property="protocol" jdbcType="VARCHAR" />
+    <result column="protocol" jdbcType="VARCHAR" property="protocol" />
   </resultMap>
-  <sql id="Example_Where_Clause" >
+  <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 12 20:35:54 PST 2013.
+      This element was generated on Tue Feb 19 23:09:22 PST 2013.
     -->
-    <where >
+    <where>
-      <foreach collection="oredCriteria" item="criteria" separator="or" >
+      <foreach collection="oredCriteria" item="criteria" separator="or">
-        <if test="criteria.valid" >
+        <if test="criteria.valid">
-          <trim prefix="(" suffix=")" prefixOverrides="and" >
+          <trim prefix="(" prefixOverrides="and" suffix=")">
-            <foreach collection="criteria.criteria" item="criterion" >
+            <foreach collection="criteria.criteria" item="criterion">
-              <choose >
+              <choose>
-                <when test="criterion.noValue" >
+                <when test="criterion.noValue">
                   and ${criterion.condition}
                 </when>
-                <when test="criterion.singleValue" >
+                <when test="criterion.singleValue">
                   and ${criterion.condition} #{criterion.value}
                 </when>
-                <when test="criterion.betweenValue" >
+                <when test="criterion.betweenValue">
                   and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
                 </when>
-                <when test="criterion.listValue" >
+                <when test="criterion.listValue">
                   and ${criterion.condition}
-                  <foreach collection="criterion.value" item="listItem" open="(" close=")" separator="," >
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
                     #{listItem}
                   </foreach>
                 </when>
@@ -45,30 +45,30 @@
       </foreach>
     </where>
   </sql>
-  <sql id="Update_By_Example_Where_Clause" >
+  <sql id="Update_By_Example_Where_Clause">
     <!--
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Feb 12 20:35:54 PST 2013.
+      This element was generated on Tue Feb 19 23:09:22 PST 2013.
     -->
-    <where >
+    <where>
-      <foreach collection="example.oredCriteria" item="criteria" separator="or" >
+      <foreach collection="example.oredCriteria" item="criteria" separator="or">
-        <if test="criteria.valid" >
+        <if test="criteria.valid">
-          <trim prefix="(" suffix=")" prefixOverrides="and" >
+          <trim prefix="(" prefixOverrides="and" suffix=")">
-            <foreach collection="criteria.criteria" item="criterion" >
+            <foreach collection="criteria.criteria" item="criterion">
-              <choose >
+              <choose>
-                <when test="criterion.noValue" >
+                <when test="criterion.noValue">
                   and ${criterion.condition}
                 </when>
-                <when test="criterion.singleValue" >
+                <when test="criterion.singleValue">
                   and ${criterion.condition} #{criterion.value}
                 </when>
-                <when test="criterion.betweenValue" >
+                <when test="criterion.betweenValue">
                   and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
                 </when>
-                <when test="criterion.listValue" >
+                <when test="criterion.listValue">
                   and ${criterion.condition}
-                  <foreach collection="criterion.value" item="listItem" open="(" close=")" separator="," >
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
                     #{listItem}
                   </foreach>
                 </when>
@@ -79,174 +79,174 @@
       </foreach>
     </where>
   </sql>
-  <sql id="Base_Column_List" >
+  <sql id="Base_Column_List">
     <!--
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Feb 12 20:35:54 PST 2013.
+      This element was generated on Tue Feb 19 23:09:22 PST 2013.
     -->
     connection_id, connection_name, protocol
   </sql>
-  <select id="selectByExample" resultMap="BaseResultMap" parameterType="net.sourceforge.guacamole.net.auth.mysql.model.ConnectionExample" >
+  <select id="selectByExample" parameterType="net.sourceforge.guacamole.net.auth.mysql.model.ConnectionExample" resultMap="BaseResultMap">
     <!--
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Feb 12 20:35:54 PST 2013.
+      This element was generated on Tue Feb 19 23:09:22 PST 2013.
     -->
     select
-    <if test="distinct" >
+    <if test="distinct">
       distinct
     </if>
     <include refid="Base_Column_List" />
     from guacamole..guacamole_connection
-    <if test="_parameter != null" >
+    <if test="_parameter != null">
       <include refid="Example_Where_Clause" />
     </if>
-    <if test="orderByClause != null" >
+    <if test="orderByClause != null">
       order by ${orderByClause}
     </if>
   </select>
-  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
+  <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
     <!--
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Feb 12 20:35:54 PST 2013.
+      This element was generated on Tue Feb 19 23:09:22 PST 2013.
     -->
     select 
     <include refid="Base_Column_List" />
     from guacamole..guacamole_connection
     where connection_id = #{connection_id,jdbcType=INTEGER}
   </select>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
     <!--
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Feb 12 20:35:54 PST 2013.
+      This element was generated on Tue Feb 19 23:09:22 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.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 12 20:35:54 PST 2013.
+      This element was generated on Tue Feb 19 23:09:22 PST 2013.
     -->
     delete from guacamole..guacamole_connection
-    <if test="_parameter != null" >
+    <if test="_parameter != null">
       <include refid="Example_Where_Clause" />
     </if>
   </delete>
-  <insert id="insert" parameterType="net.sourceforge.guacamole.net.auth.mysql.model.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 12 20:35:54 PST 2013.
+      This element was generated on Tue Feb 19 23:09:22 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.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 12 20:35:54 PST 2013.
+      This element was generated on Tue Feb 19 23:09:22 PST 2013.
     -->
     insert into guacamole..guacamole_connection
-    <trim prefix="(" suffix=")" suffixOverrides="," >
+    <trim prefix="(" suffix=")" suffixOverrides=",">
-      <if test="connection_id != null" >
+      <if test="connection_id != null">
         connection_id,
       </if>
-      <if test="connection_name != null" >
+      <if test="connection_name != null">
         connection_name,
       </if>
-      <if test="protocol != null" >
+      <if test="protocol != null">
         protocol,
       </if>
     </trim>
-    <trim prefix="values (" suffix=")" suffixOverrides="," >
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
-      <if test="connection_id != null" >
+      <if test="connection_id != null">
         #{connection_id,jdbcType=INTEGER},
       </if>
-      <if test="connection_name != null" >
+      <if test="connection_name != null">
         #{connection_name,jdbcType=VARCHAR},
       </if>
-      <if test="protocol != null" >
+      <if test="protocol != null">
         #{protocol,jdbcType=VARCHAR},
       </if>
     </trim>
   </insert>
-  <select id="countByExample" parameterType="net.sourceforge.guacamole.net.auth.mysql.model.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 12 20:35:54 PST 2013.
+      This element was generated on Tue Feb 19 23:09:22 PST 2013.
     -->
     select count(*) from guacamole..guacamole_connection
-    <if test="_parameter != null" >
+    <if test="_parameter != null">
       <include refid="Example_Where_Clause" />
     </if>
   </select>
-  <update id="updateByExampleSelective" parameterType="map" >
+  <update id="updateByExampleSelective" parameterType="map">
     <!--
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Feb 12 20:35:54 PST 2013.
+      This element was generated on Tue Feb 19 23:09:22 PST 2013.
     -->
     update guacamole..guacamole_connection
-    <set >
+    <set>
-      <if test="record.connection_id != null" >
+      <if test="record.connection_id != null">
         connection_id = #{record.connection_id,jdbcType=INTEGER},
       </if>
-      <if test="record.connection_name != null" >
+      <if test="record.connection_name != null">
         connection_name = #{record.connection_name,jdbcType=VARCHAR},
       </if>
-      <if test="record.protocol != null" >
+      <if test="record.protocol != null">
         protocol = #{record.protocol,jdbcType=VARCHAR},
       </if>
     </set>
-    <if test="_parameter != null" >
+    <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
   </update>
-  <update id="updateByExample" parameterType="map" >
+  <update id="updateByExample" parameterType="map">
     <!--
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Feb 12 20:35:54 PST 2013.
+      This element was generated on Tue Feb 19 23:09:22 PST 2013.
     -->
     update guacamole..guacamole_connection
     set connection_id = #{record.connection_id,jdbcType=INTEGER},
       connection_name = #{record.connection_name,jdbcType=VARCHAR},
       protocol = #{record.protocol,jdbcType=VARCHAR}
-    <if test="_parameter != null" >
+    <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
   </update>
-  <update id="updateByPrimaryKeySelective" parameterType="net.sourceforge.guacamole.net.auth.mysql.model.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 12 20:35:54 PST 2013.
+      This element was generated on Tue Feb 19 23:09:22 PST 2013.
     -->
     update guacamole..guacamole_connection
-    <set >
+    <set>
-      <if test="connection_name != null" >
+      <if test="connection_name != null">
         connection_name = #{connection_name,jdbcType=VARCHAR},
       </if>
-      <if test="protocol != null" >
+      <if test="protocol != null">
         protocol = #{protocol,jdbcType=VARCHAR},
       </if>
     </set>
     where connection_id = #{connection_id,jdbcType=INTEGER}
   </update>
-  <update id="updateByPrimaryKey" parameterType="net.sourceforge.guacamole.net.auth.mysql.model.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 12 20:35:54 PST 2013.
+      This element was generated on Tue Feb 19 23:09:22 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,40 +1,40 @@
-<?xml version="1.0" encoding="UTF-8" ?>
+<?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" >
+<!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.ConnectionParameterMapper" >
+<mapper namespace="net.sourceforge.guacamole.net.auth.mysql.dao.ConnectionParameterMapper">
-  <resultMap id="BaseResultMap" type="net.sourceforge.guacamole.net.auth.mysql.model.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 12 20:35:54 PST 2013.
+      This element was generated on Tue Feb 19 23:09:22 PST 2013.
     -->
-    <id column="connection_id" property="connection_id" jdbcType="INTEGER" />
+    <id column="connection_id" jdbcType="INTEGER" property="connection_id" />
-    <id column="parameter_name" property="parameter_name" jdbcType="VARCHAR" />
+    <id column="parameter_name" jdbcType="VARCHAR" property="parameter_name" />
-    <result column="parameter_value" property="parameter_value" jdbcType="VARCHAR" />
+    <result column="parameter_value" jdbcType="VARCHAR" property="parameter_value" />
   </resultMap>
-  <sql id="Example_Where_Clause" >
+  <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 12 20:35:54 PST 2013.
+      This element was generated on Tue Feb 19 23:09:22 PST 2013.
     -->
-    <where >
+    <where>
-      <foreach collection="oredCriteria" item="criteria" separator="or" >
+      <foreach collection="oredCriteria" item="criteria" separator="or">
-        <if test="criteria.valid" >
+        <if test="criteria.valid">
-          <trim prefix="(" suffix=")" prefixOverrides="and" >
+          <trim prefix="(" prefixOverrides="and" suffix=")">
-            <foreach collection="criteria.criteria" item="criterion" >
+            <foreach collection="criteria.criteria" item="criterion">
-              <choose >
+              <choose>
-                <when test="criterion.noValue" >
+                <when test="criterion.noValue">
                   and ${criterion.condition}
                 </when>
-                <when test="criterion.singleValue" >
+                <when test="criterion.singleValue">
                   and ${criterion.condition} #{criterion.value}
                 </when>
-                <when test="criterion.betweenValue" >
+                <when test="criterion.betweenValue">
                   and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
                 </when>
-                <when test="criterion.listValue" >
+                <when test="criterion.listValue">
                   and ${criterion.condition}
-                  <foreach collection="criterion.value" item="listItem" open="(" close=")" separator="," >
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
                     #{listItem}
                   </foreach>
                 </when>
@@ -45,30 +45,30 @@
       </foreach>
     </where>
   </sql>
-  <sql id="Update_By_Example_Where_Clause" >
+  <sql id="Update_By_Example_Where_Clause">
     <!--
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Feb 12 20:35:54 PST 2013.
+      This element was generated on Tue Feb 19 23:09:22 PST 2013.
     -->
-    <where >
+    <where>
-      <foreach collection="example.oredCriteria" item="criteria" separator="or" >
+      <foreach collection="example.oredCriteria" item="criteria" separator="or">
-        <if test="criteria.valid" >
+        <if test="criteria.valid">
-          <trim prefix="(" suffix=")" prefixOverrides="and" >
+          <trim prefix="(" prefixOverrides="and" suffix=")">
-            <foreach collection="criteria.criteria" item="criterion" >
+            <foreach collection="criteria.criteria" item="criterion">
-              <choose >
+              <choose>
-                <when test="criterion.noValue" >
+                <when test="criterion.noValue">
                   and ${criterion.condition}
                 </when>
-                <when test="criterion.singleValue" >
+                <when test="criterion.singleValue">
                   and ${criterion.condition} #{criterion.value}
                 </when>
-                <when test="criterion.betweenValue" >
+                <when test="criterion.betweenValue">
                   and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
                 </when>
-                <when test="criterion.listValue" >
+                <when test="criterion.listValue">
                   and ${criterion.condition}
-                  <foreach collection="criterion.value" item="listItem" open="(" close=")" separator="," >
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
                     #{listItem}
                   </foreach>
                 </when>
@@ -79,38 +79,38 @@
       </foreach>
     </where>
   </sql>
-  <sql id="Base_Column_List" >
+  <sql id="Base_Column_List">
     <!--
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Feb 12 20:35:54 PST 2013.
+      This element was generated on Tue Feb 19 23:09:22 PST 2013.
     -->
     connection_id, parameter_name, parameter_value
   </sql>
-  <select id="selectByExample" resultMap="BaseResultMap" parameterType="net.sourceforge.guacamole.net.auth.mysql.model.ConnectionParameterExample" >
+  <select id="selectByExample" parameterType="net.sourceforge.guacamole.net.auth.mysql.model.ConnectionParameterExample" resultMap="BaseResultMap">
     <!--
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Feb 12 20:35:54 PST 2013.
+      This element was generated on Tue Feb 19 23:09:22 PST 2013.
     -->
     select
-    <if test="distinct" >
+    <if test="distinct">
       distinct
     </if>
     <include refid="Base_Column_List" />
     from guacamole..guacamole_connection_parameter
-    <if test="_parameter != null" >
+    <if test="_parameter != null">
       <include refid="Example_Where_Clause" />
     </if>
-    <if test="orderByClause != null" >
+    <if test="orderByClause != null">
       order by ${orderByClause}
     </if>
   </select>
-  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="net.sourceforge.guacamole.net.auth.mysql.model.ConnectionParameterKey" >
+  <select id="selectByPrimaryKey" parameterType="net.sourceforge.guacamole.net.auth.mysql.model.ConnectionParameterKey" resultMap="BaseResultMap">
     <!--
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Feb 12 20:35:54 PST 2013.
+      This element was generated on Tue Feb 19 23:09:22 PST 2013.
     -->
     select 
     <include refid="Base_Column_List" />
@@ -118,135 +118,135 @@
     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.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 12 20:35:54 PST 2013.
+      This element was generated on Tue Feb 19 23:09:22 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.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 12 20:35:54 PST 2013.
+      This element was generated on Tue Feb 19 23:09:22 PST 2013.
     -->
     delete from guacamole..guacamole_connection_parameter
-    <if test="_parameter != null" >
+    <if test="_parameter != null">
       <include refid="Example_Where_Clause" />
     </if>
   </delete>
-  <insert id="insert" parameterType="net.sourceforge.guacamole.net.auth.mysql.model.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 12 20:35:54 PST 2013.
+      This element was generated on Tue Feb 19 23:09:22 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.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 12 20:35:54 PST 2013.
+      This element was generated on Tue Feb 19 23:09:22 PST 2013.
     -->
     insert into guacamole..guacamole_connection_parameter
-    <trim prefix="(" suffix=")" suffixOverrides="," >
+    <trim prefix="(" suffix=")" suffixOverrides=",">
-      <if test="connection_id != null" >
+      <if test="connection_id != null">
         connection_id,
       </if>
-      <if test="parameter_name != null" >
+      <if test="parameter_name != null">
         parameter_name,
       </if>
-      <if test="parameter_value != null" >
+      <if test="parameter_value != null">
         parameter_value,
       </if>
     </trim>
-    <trim prefix="values (" suffix=")" suffixOverrides="," >
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
-      <if test="connection_id != null" >
+      <if test="connection_id != null">
         #{connection_id,jdbcType=INTEGER},
       </if>
-      <if test="parameter_name != null" >
+      <if test="parameter_name != null">
         #{parameter_name,jdbcType=VARCHAR},
       </if>
-      <if test="parameter_value != null" >
+      <if test="parameter_value != null">
         #{parameter_value,jdbcType=VARCHAR},
       </if>
     </trim>
   </insert>
-  <select id="countByExample" parameterType="net.sourceforge.guacamole.net.auth.mysql.model.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 12 20:35:54 PST 2013.
+      This element was generated on Tue Feb 19 23:09:22 PST 2013.
     -->
     select count(*) from guacamole..guacamole_connection_parameter
-    <if test="_parameter != null" >
+    <if test="_parameter != null">
       <include refid="Example_Where_Clause" />
     </if>
   </select>
-  <update id="updateByExampleSelective" parameterType="map" >
+  <update id="updateByExampleSelective" parameterType="map">
     <!--
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Feb 12 20:35:54 PST 2013.
+      This element was generated on Tue Feb 19 23:09:22 PST 2013.
     -->
     update guacamole..guacamole_connection_parameter
-    <set >
+    <set>
-      <if test="record.connection_id != null" >
+      <if test="record.connection_id != null">
         connection_id = #{record.connection_id,jdbcType=INTEGER},
       </if>
-      <if test="record.parameter_name != null" >
+      <if test="record.parameter_name != null">
         parameter_name = #{record.parameter_name,jdbcType=VARCHAR},
       </if>
-      <if test="record.parameter_value != null" >
+      <if test="record.parameter_value != null">
         parameter_value = #{record.parameter_value,jdbcType=VARCHAR},
       </if>
     </set>
-    <if test="_parameter != null" >
+    <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
   </update>
-  <update id="updateByExample" parameterType="map" >
+  <update id="updateByExample" parameterType="map">
     <!--
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Feb 12 20:35:54 PST 2013.
+      This element was generated on Tue Feb 19 23:09:22 PST 2013.
     -->
     update guacamole..guacamole_connection_parameter
     set connection_id = #{record.connection_id,jdbcType=INTEGER},
       parameter_name = #{record.parameter_name,jdbcType=VARCHAR},
       parameter_value = #{record.parameter_value,jdbcType=VARCHAR}
-    <if test="_parameter != null" >
+    <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
   </update>
-  <update id="updateByPrimaryKeySelective" parameterType="net.sourceforge.guacamole.net.auth.mysql.model.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 12 20:35:54 PST 2013.
+      This element was generated on Tue Feb 19 23:09:22 PST 2013.
     -->
     update guacamole..guacamole_connection_parameter
-    <set >
+    <set>
-      <if test="parameter_value != null" >
+      <if test="parameter_value != null">
         parameter_value = #{parameter_value,jdbcType=VARCHAR},
       </if>
     </set>
     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.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 12 20:35:54 PST 2013.
+      This element was generated on Tue Feb 19 23:09:22 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,40 +1,40 @@
-<?xml version="1.0" encoding="UTF-8" ?>
+<?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" >
+<!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.ConnectionPermissionMapper" >
+<mapper namespace="net.sourceforge.guacamole.net.auth.mysql.dao.ConnectionPermissionMapper">
-  <resultMap id="BaseResultMap" type="net.sourceforge.guacamole.net.auth.mysql.model.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 12 20:35:54 PST 2013.
+      This element was generated on Tue Feb 19 23:09:22 PST 2013.
     -->
-    <id column="user_id" property="user_id" jdbcType="INTEGER" />
+    <id column="user_id" jdbcType="INTEGER" property="user_id" />
-    <id column="connection_id" property="connection_id" jdbcType="INTEGER" />
+    <id column="connection_id" jdbcType="INTEGER" property="connection_id" />
-    <id column="permission" property="permission" jdbcType="CHAR" />
+    <id column="permission" jdbcType="CHAR" property="permission" />
   </resultMap>
-  <sql id="Example_Where_Clause" >
+  <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 12 20:35:54 PST 2013.
+      This element was generated on Tue Feb 19 23:09:22 PST 2013.
     -->
-    <where >
+    <where>
-      <foreach collection="oredCriteria" item="criteria" separator="or" >
+      <foreach collection="oredCriteria" item="criteria" separator="or">
-        <if test="criteria.valid" >
+        <if test="criteria.valid">
-          <trim prefix="(" suffix=")" prefixOverrides="and" >
+          <trim prefix="(" prefixOverrides="and" suffix=")">
-            <foreach collection="criteria.criteria" item="criterion" >
+            <foreach collection="criteria.criteria" item="criterion">
-              <choose >
+              <choose>
-                <when test="criterion.noValue" >
+                <when test="criterion.noValue">
                   and ${criterion.condition}
                 </when>
-                <when test="criterion.singleValue" >
+                <when test="criterion.singleValue">
                   and ${criterion.condition} #{criterion.value}
                 </when>
-                <when test="criterion.betweenValue" >
+                <when test="criterion.betweenValue">
                   and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
                 </when>
-                <when test="criterion.listValue" >
+                <when test="criterion.listValue">
                   and ${criterion.condition}
-                  <foreach collection="criterion.value" item="listItem" open="(" close=")" separator="," >
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
                     #{listItem}
                   </foreach>
                 </when>
@@ -45,30 +45,30 @@
       </foreach>
     </where>
   </sql>
-  <sql id="Update_By_Example_Where_Clause" >
+  <sql id="Update_By_Example_Where_Clause">
     <!--
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Feb 12 20:35:54 PST 2013.
+      This element was generated on Tue Feb 19 23:09:22 PST 2013.
     -->
-    <where >
+    <where>
-      <foreach collection="example.oredCriteria" item="criteria" separator="or" >
+      <foreach collection="example.oredCriteria" item="criteria" separator="or">
-        <if test="criteria.valid" >
+        <if test="criteria.valid">
-          <trim prefix="(" suffix=")" prefixOverrides="and" >
+          <trim prefix="(" prefixOverrides="and" suffix=")">
-            <foreach collection="criteria.criteria" item="criterion" >
+            <foreach collection="criteria.criteria" item="criterion">
-              <choose >
+              <choose>
-                <when test="criterion.noValue" >
+                <when test="criterion.noValue">
                   and ${criterion.condition}
                 </when>
-                <when test="criterion.singleValue" >
+                <when test="criterion.singleValue">
                   and ${criterion.condition} #{criterion.value}
                 </when>
-                <when test="criterion.betweenValue" >
+                <when test="criterion.betweenValue">
                   and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
                 </when>
-                <when test="criterion.listValue" >
+                <when test="criterion.listValue">
                   and ${criterion.condition}
-                  <foreach collection="criterion.value" item="listItem" open="(" close=")" separator="," >
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
                     #{listItem}
                   </foreach>
                 </when>
@@ -79,140 +79,140 @@
       </foreach>
     </where>
   </sql>
-  <sql id="Base_Column_List" >
+  <sql id="Base_Column_List">
     <!--
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Feb 12 20:35:54 PST 2013.
+      This element was generated on Tue Feb 19 23:09:22 PST 2013.
     -->
     user_id, connection_id, permission
   </sql>
-  <select id="selectByExample" resultMap="BaseResultMap" parameterType="net.sourceforge.guacamole.net.auth.mysql.model.ConnectionPermissionExample" >
+  <select id="selectByExample" parameterType="net.sourceforge.guacamole.net.auth.mysql.model.ConnectionPermissionExample" resultMap="BaseResultMap">
     <!--
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Feb 12 20:35:54 PST 2013.
+      This element was generated on Tue Feb 19 23:09:22 PST 2013.
     -->
     select
-    <if test="distinct" >
+    <if test="distinct">
       distinct
     </if>
     <include refid="Base_Column_List" />
     from guacamole..guacamole_connection_permission
-    <if test="_parameter != null" >
+    <if test="_parameter != null">
       <include refid="Example_Where_Clause" />
     </if>
-    <if test="orderByClause != null" >
+    <if test="orderByClause != null">
       order by ${orderByClause}
     </if>
   </select>
-  <delete id="deleteByPrimaryKey" parameterType="net.sourceforge.guacamole.net.auth.mysql.model.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 12 20:35:54 PST 2013.
+      This element was generated on Tue Feb 19 23:09:22 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.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 12 20:35:54 PST 2013.
+      This element was generated on Tue Feb 19 23:09:22 PST 2013.
     -->
     delete from guacamole..guacamole_connection_permission
-    <if test="_parameter != null" >
+    <if test="_parameter != null">
       <include refid="Example_Where_Clause" />
     </if>
   </delete>
-  <insert id="insert" parameterType="net.sourceforge.guacamole.net.auth.mysql.model.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 12 20:35:54 PST 2013.
+      This element was generated on Tue Feb 19 23:09:22 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.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 12 20:35:54 PST 2013.
+      This element was generated on Tue Feb 19 23:09:22 PST 2013.
     -->
     insert into guacamole..guacamole_connection_permission
-    <trim prefix="(" suffix=")" suffixOverrides="," >
+    <trim prefix="(" suffix=")" suffixOverrides=",">
-      <if test="user_id != null" >
+      <if test="user_id != null">
         user_id,
       </if>
-      <if test="connection_id != null" >
+      <if test="connection_id != null">
         connection_id,
       </if>
-      <if test="permission != null" >
+      <if test="permission != null">
         permission,
       </if>
     </trim>
-    <trim prefix="values (" suffix=")" suffixOverrides="," >
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
-      <if test="user_id != null" >
+      <if test="user_id != null">
         #{user_id,jdbcType=INTEGER},
       </if>
-      <if test="connection_id != null" >
+      <if test="connection_id != null">
         #{connection_id,jdbcType=INTEGER},
       </if>
-      <if test="permission != null" >
+      <if test="permission != null">
         #{permission,jdbcType=CHAR},
       </if>
     </trim>
   </insert>
-  <select id="countByExample" parameterType="net.sourceforge.guacamole.net.auth.mysql.model.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 12 20:35:54 PST 2013.
+      This element was generated on Tue Feb 19 23:09:22 PST 2013.
     -->
     select count(*) from guacamole..guacamole_connection_permission
-    <if test="_parameter != null" >
+    <if test="_parameter != null">
       <include refid="Example_Where_Clause" />
     </if>
   </select>
-  <update id="updateByExampleSelective" parameterType="map" >
+  <update id="updateByExampleSelective" parameterType="map">
     <!--
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Feb 12 20:35:54 PST 2013.
+      This element was generated on Tue Feb 19 23:09:22 PST 2013.
     -->
     update guacamole..guacamole_connection_permission
-    <set >
+    <set>
-      <if test="record.user_id != null" >
+      <if test="record.user_id != null">
         user_id = #{record.user_id,jdbcType=INTEGER},
       </if>
-      <if test="record.connection_id != null" >
+      <if test="record.connection_id != null">
         connection_id = #{record.connection_id,jdbcType=INTEGER},
       </if>
-      <if test="record.permission != null" >
+      <if test="record.permission != null">
         permission = #{record.permission,jdbcType=CHAR},
       </if>
     </set>
-    <if test="_parameter != null" >
+    <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
   </update>
-  <update id="updateByExample" parameterType="map" >
+  <update id="updateByExample" parameterType="map">
     <!--
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Feb 12 20:35:54 PST 2013.
+      This element was generated on Tue Feb 19 23:09:22 PST 2013.
     -->
     update guacamole..guacamole_connection_permission
     set user_id = #{record.user_id,jdbcType=INTEGER},
       connection_id = #{record.connection_id,jdbcType=INTEGER},
       permission = #{record.permission,jdbcType=CHAR}
-    <if test="_parameter != null" >
+    <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
   </update>

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

@@ -1,39 +1,39 @@
-<?xml version="1.0" encoding="UTF-8" ?>
+<?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" >
+<!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.SystemPermissionMapper" >
+<mapper namespace="net.sourceforge.guacamole.net.auth.mysql.dao.SystemPermissionMapper">
-  <resultMap id="BaseResultMap" type="net.sourceforge.guacamole.net.auth.mysql.model.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 12 20:35:54 PST 2013.
+      This element was generated on Tue Feb 19 23:09:22 PST 2013.
     -->
-    <id column="user_id" property="user_id" jdbcType="INTEGER" />
+    <id column="user_id" jdbcType="INTEGER" property="user_id" />
-    <id column="permission" property="permission" jdbcType="CHAR" />
+    <id column="permission" jdbcType="CHAR" property="permission" />
   </resultMap>
-  <sql id="Example_Where_Clause" >
+  <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 12 20:35:54 PST 2013.
+      This element was generated on Tue Feb 19 23:09:22 PST 2013.
     -->
-    <where >
+    <where>
-      <foreach collection="oredCriteria" item="criteria" separator="or" >
+      <foreach collection="oredCriteria" item="criteria" separator="or">
-        <if test="criteria.valid" >
+        <if test="criteria.valid">
-          <trim prefix="(" suffix=")" prefixOverrides="and" >
+          <trim prefix="(" prefixOverrides="and" suffix=")">
-            <foreach collection="criteria.criteria" item="criterion" >
+            <foreach collection="criteria.criteria" item="criterion">
-              <choose >
+              <choose>
-                <when test="criterion.noValue" >
+                <when test="criterion.noValue">
                   and ${criterion.condition}
                 </when>
-                <when test="criterion.singleValue" >
+                <when test="criterion.singleValue">
                   and ${criterion.condition} #{criterion.value}
                 </when>
-                <when test="criterion.betweenValue" >
+                <when test="criterion.betweenValue">
                   and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
                 </when>
-                <when test="criterion.listValue" >
+                <when test="criterion.listValue">
                   and ${criterion.condition}
-                  <foreach collection="criterion.value" item="listItem" open="(" close=")" separator="," >
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
                     #{listItem}
                   </foreach>
                 </when>
@@ -44,30 +44,30 @@
       </foreach>
     </where>
   </sql>
-  <sql id="Update_By_Example_Where_Clause" >
+  <sql id="Update_By_Example_Where_Clause">
     <!--
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Feb 12 20:35:54 PST 2013.
+      This element was generated on Tue Feb 19 23:09:22 PST 2013.
     -->
-    <where >
+    <where>
-      <foreach collection="example.oredCriteria" item="criteria" separator="or" >
+      <foreach collection="example.oredCriteria" item="criteria" separator="or">
-        <if test="criteria.valid" >
+        <if test="criteria.valid">
-          <trim prefix="(" suffix=")" prefixOverrides="and" >
+          <trim prefix="(" prefixOverrides="and" suffix=")">
-            <foreach collection="criteria.criteria" item="criterion" >
+            <foreach collection="criteria.criteria" item="criterion">
-              <choose >
+              <choose>
-                <when test="criterion.noValue" >
+                <when test="criterion.noValue">
                   and ${criterion.condition}
                 </when>
-                <when test="criterion.singleValue" >
+                <when test="criterion.singleValue">
                   and ${criterion.condition} #{criterion.value}
                 </when>
-                <when test="criterion.betweenValue" >
+                <when test="criterion.betweenValue">
                   and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
                 </when>
-                <when test="criterion.listValue" >
+                <when test="criterion.listValue">
                   and ${criterion.condition}
-                  <foreach collection="criterion.value" item="listItem" open="(" close=")" separator="," >
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
                     #{listItem}
                   </foreach>
                 </when>
@@ -78,127 +78,127 @@
       </foreach>
     </where>
   </sql>
-  <sql id="Base_Column_List" >
+  <sql id="Base_Column_List">
     <!--
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Feb 12 20:35:54 PST 2013.
+      This element was generated on Tue Feb 19 23:09:22 PST 2013.
     -->
     user_id, permission
   </sql>
-  <select id="selectByExample" resultMap="BaseResultMap" parameterType="net.sourceforge.guacamole.net.auth.mysql.model.SystemPermissionExample" >
+  <select id="selectByExample" parameterType="net.sourceforge.guacamole.net.auth.mysql.model.SystemPermissionExample" resultMap="BaseResultMap">
     <!--
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Feb 12 20:35:54 PST 2013.
+      This element was generated on Tue Feb 19 23:09:22 PST 2013.
     -->
     select
-    <if test="distinct" >
+    <if test="distinct">
       distinct
     </if>
     <include refid="Base_Column_List" />
     from guacamole..guacamole_system_permission
-    <if test="_parameter != null" >
+    <if test="_parameter != null">
       <include refid="Example_Where_Clause" />
     </if>
-    <if test="orderByClause != null" >
+    <if test="orderByClause != null">
       order by ${orderByClause}
     </if>
   </select>
-  <delete id="deleteByPrimaryKey" parameterType="net.sourceforge.guacamole.net.auth.mysql.model.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 12 20:35:54 PST 2013.
+      This element was generated on Tue Feb 19 23:09:22 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.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 12 20:35:54 PST 2013.
+      This element was generated on Tue Feb 19 23:09:22 PST 2013.
     -->
     delete from guacamole..guacamole_system_permission
-    <if test="_parameter != null" >
+    <if test="_parameter != null">
       <include refid="Example_Where_Clause" />
     </if>
   </delete>
-  <insert id="insert" parameterType="net.sourceforge.guacamole.net.auth.mysql.model.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 12 20:35:54 PST 2013.
+      This element was generated on Tue Feb 19 23:09:22 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.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 12 20:35:54 PST 2013.
+      This element was generated on Tue Feb 19 23:09:22 PST 2013.
     -->
     insert into guacamole..guacamole_system_permission
-    <trim prefix="(" suffix=")" suffixOverrides="," >
+    <trim prefix="(" suffix=")" suffixOverrides=",">
-      <if test="user_id != null" >
+      <if test="user_id != null">
         user_id,
       </if>
-      <if test="permission != null" >
+      <if test="permission != null">
         permission,
       </if>
     </trim>
-    <trim prefix="values (" suffix=")" suffixOverrides="," >
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
-      <if test="user_id != null" >
+      <if test="user_id != null">
         #{user_id,jdbcType=INTEGER},
       </if>
-      <if test="permission != null" >
+      <if test="permission != null">
         #{permission,jdbcType=CHAR},
       </if>
     </trim>
   </insert>
-  <select id="countByExample" parameterType="net.sourceforge.guacamole.net.auth.mysql.model.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 12 20:35:54 PST 2013.
+      This element was generated on Tue Feb 19 23:09:22 PST 2013.
     -->
     select count(*) from guacamole..guacamole_system_permission
-    <if test="_parameter != null" >
+    <if test="_parameter != null">
       <include refid="Example_Where_Clause" />
     </if>
   </select>
-  <update id="updateByExampleSelective" parameterType="map" >
+  <update id="updateByExampleSelective" parameterType="map">
     <!--
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Feb 12 20:35:54 PST 2013.
+      This element was generated on Tue Feb 19 23:09:22 PST 2013.
     -->
     update guacamole..guacamole_system_permission
-    <set >
+    <set>
-      <if test="record.user_id != null" >
+      <if test="record.user_id != null">
         user_id = #{record.user_id,jdbcType=INTEGER},
       </if>
-      <if test="record.permission != null" >
+      <if test="record.permission != null">
         permission = #{record.permission,jdbcType=CHAR},
       </if>
     </set>
-    <if test="_parameter != null" >
+    <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
   </update>
-  <update id="updateByExample" parameterType="map" >
+  <update id="updateByExample" parameterType="map">
     <!--
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Feb 12 20:35:54 PST 2013.
+      This element was generated on Tue Feb 19 23:09:22 PST 2013.
     -->
     update guacamole..guacamole_system_permission
     set user_id = #{record.user_id,jdbcType=INTEGER},
       permission = #{record.permission,jdbcType=CHAR}
-    <if test="_parameter != null" >
+    <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
   </update>

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

@@ -1,48 +1,48 @@
-<?xml version="1.0" encoding="UTF-8" ?>
+<?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" >
+<!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.UserMapper" >
+<mapper namespace="net.sourceforge.guacamole.net.auth.mysql.dao.UserMapper">
-  <resultMap id="BaseResultMap" type="net.sourceforge.guacamole.net.auth.mysql.model.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 12 20:35:54 PST 2013.
+      This element was generated on Tue Feb 19 23:09:22 PST 2013.
     -->
-    <id column="user_id" property="user_id" jdbcType="INTEGER" />
+    <id column="user_id" jdbcType="INTEGER" property="user_id" />
-    <result column="username" property="username" jdbcType="VARCHAR" />
+    <result column="username" jdbcType="VARCHAR" property="username" />
   </resultMap>
-  <resultMap id="ResultMapWithBLOBs" type="net.sourceforge.guacamole.net.auth.mysql.model.UserWithBLOBs" extends="BaseResultMap" >
+  <resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="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 12 20:35:54 PST 2013.
+      This element was generated on Tue Feb 19 23:09:22 PST 2013.
     -->
-    <result column="password_hash" property="password_hash" jdbcType="BINARY" />
+    <result column="password_hash" jdbcType="BINARY" property="password_hash" />
-    <result column="password_salt" property="password_salt" jdbcType="BINARY" />
+    <result column="password_salt" jdbcType="BINARY" property="password_salt" />
   </resultMap>
-  <sql id="Example_Where_Clause" >
+  <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 12 20:35:54 PST 2013.
+      This element was generated on Tue Feb 19 23:09:22 PST 2013.
     -->
-    <where >
+    <where>
-      <foreach collection="oredCriteria" item="criteria" separator="or" >
+      <foreach collection="oredCriteria" item="criteria" separator="or">
-        <if test="criteria.valid" >
+        <if test="criteria.valid">
-          <trim prefix="(" suffix=")" prefixOverrides="and" >
+          <trim prefix="(" prefixOverrides="and" suffix=")">
-            <foreach collection="criteria.criteria" item="criterion" >
+            <foreach collection="criteria.criteria" item="criterion">
-              <choose >
+              <choose>
-                <when test="criterion.noValue" >
+                <when test="criterion.noValue">
                   and ${criterion.condition}
                 </when>
-                <when test="criterion.singleValue" >
+                <when test="criterion.singleValue">
                   and ${criterion.condition} #{criterion.value}
                 </when>
-                <when test="criterion.betweenValue" >
+                <when test="criterion.betweenValue">
                   and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
                 </when>
-                <when test="criterion.listValue" >
+                <when test="criterion.listValue">
                   and ${criterion.condition}
-                  <foreach collection="criterion.value" item="listItem" open="(" close=")" separator="," >
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
                     #{listItem}
                   </foreach>
                 </when>
@@ -53,30 +53,30 @@
       </foreach>
     </where>
   </sql>
-  <sql id="Update_By_Example_Where_Clause" >
+  <sql id="Update_By_Example_Where_Clause">
     <!--
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Feb 12 20:35:54 PST 2013.
+      This element was generated on Tue Feb 19 23:09:22 PST 2013.
     -->
-    <where >
+    <where>
-      <foreach collection="example.oredCriteria" item="criteria" separator="or" >
+      <foreach collection="example.oredCriteria" item="criteria" separator="or">
-        <if test="criteria.valid" >
+        <if test="criteria.valid">
-          <trim prefix="(" suffix=")" prefixOverrides="and" >
+          <trim prefix="(" prefixOverrides="and" suffix=")">
-            <foreach collection="criteria.criteria" item="criterion" >
+            <foreach collection="criteria.criteria" item="criterion">
-              <choose >
+              <choose>
-                <when test="criterion.noValue" >
+                <when test="criterion.noValue">
                   and ${criterion.condition}
                 </when>
-                <when test="criterion.singleValue" >
+                <when test="criterion.singleValue">
                   and ${criterion.condition} #{criterion.value}
                 </when>
-                <when test="criterion.betweenValue" >
+                <when test="criterion.betweenValue">
                   and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
                 </when>
-                <when test="criterion.listValue" >
+                <when test="criterion.listValue">
                   and ${criterion.condition}
-                  <foreach collection="criterion.value" item="listItem" open="(" close=")" separator="," >
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
                     #{listItem}
                   </foreach>
                 </when>
@@ -87,67 +87,67 @@
       </foreach>
     </where>
   </sql>
-  <sql id="Base_Column_List" >
+  <sql id="Base_Column_List">
     <!--
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Feb 12 20:35:54 PST 2013.
+      This element was generated on Tue Feb 19 23:09:22 PST 2013.
     -->
     user_id, username
   </sql>
-  <sql id="Blob_Column_List" >
+  <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 12 20:35:54 PST 2013.
+      This element was generated on Tue Feb 19 23:09:22 PST 2013.
     -->
     password_hash, password_salt
   </sql>
-  <select id="selectByExampleWithBLOBs" resultMap="ResultMapWithBLOBs" parameterType="net.sourceforge.guacamole.net.auth.mysql.model.UserExample" >
+  <select id="selectByExampleWithBLOBs" parameterType="net.sourceforge.guacamole.net.auth.mysql.model.UserExample" resultMap="ResultMapWithBLOBs">
     <!--
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Feb 12 20:35:54 PST 2013.
+      This element was generated on Tue Feb 19 23:09:22 PST 2013.
     -->
     select
-    <if test="distinct" >
+    <if test="distinct">
       distinct
     </if>
     <include refid="Base_Column_List" />
     ,
     <include refid="Blob_Column_List" />
     from guacamole..guacamole_user
-    <if test="_parameter != null" >
+    <if test="_parameter != null">
       <include refid="Example_Where_Clause" />
     </if>
-    <if test="orderByClause != null" >
+    <if test="orderByClause != null">
       order by ${orderByClause}
     </if>
   </select>
-  <select id="selectByExample" resultMap="BaseResultMap" parameterType="net.sourceforge.guacamole.net.auth.mysql.model.UserExample" >
+  <select id="selectByExample" parameterType="net.sourceforge.guacamole.net.auth.mysql.model.UserExample" resultMap="BaseResultMap">
     <!--
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Feb 12 20:35:54 PST 2013.
+      This element was generated on Tue Feb 19 23:09:22 PST 2013.
     -->
     select
-    <if test="distinct" >
+    <if test="distinct">
       distinct
     </if>
     <include refid="Base_Column_List" />
     from guacamole..guacamole_user
-    <if test="_parameter != null" >
+    <if test="_parameter != null">
       <include refid="Example_Where_Clause" />
     </if>
-    <if test="orderByClause != null" >
+    <if test="orderByClause != null">
       order by ${orderByClause}
     </if>
   </select>
-  <select id="selectByPrimaryKey" resultMap="ResultMapWithBLOBs" parameterType="java.lang.Integer" >
+  <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="ResultMapWithBLOBs">
     <!--
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Feb 12 20:35:54 PST 2013.
+      This element was generated on Tue Feb 19 23:09:22 PST 2013.
     -->
     select 
     <include refid="Base_Column_List" />
@@ -156,162 +156,162 @@
     from guacamole..guacamole_user
     where user_id = #{user_id,jdbcType=INTEGER}
   </select>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
     <!--
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Feb 12 20:35:54 PST 2013.
+      This element was generated on Tue Feb 19 23:09:22 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.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 12 20:35:54 PST 2013.
+      This element was generated on Tue Feb 19 23:09:22 PST 2013.
     -->
     delete from guacamole..guacamole_user
-    <if test="_parameter != null" >
+    <if test="_parameter != null">
       <include refid="Example_Where_Clause" />
     </if>
   </delete>
-  <insert id="insert" parameterType="net.sourceforge.guacamole.net.auth.mysql.model.UserWithBLOBs" >
+  <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 12 20:35:54 PST 2013.
+      This element was generated on Tue Feb 19 23:09:22 PST 2013.
     -->
     insert into guacamole..guacamole_user (user_id, username, password_hash, 
       password_salt)
     values (#{user_id,jdbcType=INTEGER}, #{username,jdbcType=VARCHAR}, #{password_hash,jdbcType=BINARY}, 
       #{password_salt,jdbcType=BINARY})
   </insert>
-  <insert id="insertSelective" parameterType="net.sourceforge.guacamole.net.auth.mysql.model.UserWithBLOBs" >
+  <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 12 20:35:54 PST 2013.
+      This element was generated on Tue Feb 19 23:09:22 PST 2013.
     -->
     insert into guacamole..guacamole_user
-    <trim prefix="(" suffix=")" suffixOverrides="," >
+    <trim prefix="(" suffix=")" suffixOverrides=",">
-      <if test="user_id != null" >
+      <if test="user_id != null">
         user_id,
       </if>
-      <if test="username != null" >
+      <if test="username != null">
         username,
       </if>
-      <if test="password_hash != null" >
+      <if test="password_hash != null">
         password_hash,
       </if>
-      <if test="password_salt != null" >
+      <if test="password_salt != null">
         password_salt,
       </if>
     </trim>
-    <trim prefix="values (" suffix=")" suffixOverrides="," >
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
-      <if test="user_id != null" >
+      <if test="user_id != null">
         #{user_id,jdbcType=INTEGER},
       </if>
-      <if test="username != null" >
+      <if test="username != null">
         #{username,jdbcType=VARCHAR},
       </if>
-      <if test="password_hash != null" >
+      <if test="password_hash != null">
         #{password_hash,jdbcType=BINARY},
       </if>
-      <if test="password_salt != null" >
+      <if test="password_salt != null">
         #{password_salt,jdbcType=BINARY},
       </if>
     </trim>
   </insert>
-  <select id="countByExample" parameterType="net.sourceforge.guacamole.net.auth.mysql.model.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 12 20:35:54 PST 2013.
+      This element was generated on Tue Feb 19 23:09:22 PST 2013.
     -->
     select count(*) from guacamole..guacamole_user
-    <if test="_parameter != null" >
+    <if test="_parameter != null">
       <include refid="Example_Where_Clause" />
     </if>
   </select>
-  <update id="updateByExampleSelective" parameterType="map" >
+  <update id="updateByExampleSelective" parameterType="map">
     <!--
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Feb 12 20:35:54 PST 2013.
+      This element was generated on Tue Feb 19 23:09:22 PST 2013.
     -->
     update guacamole..guacamole_user
-    <set >
+    <set>
-      <if test="record.user_id != null" >
+      <if test="record.user_id != null">
         user_id = #{record.user_id,jdbcType=INTEGER},
       </if>
-      <if test="record.username != null" >
+      <if test="record.username != null">
         username = #{record.username,jdbcType=VARCHAR},
       </if>
-      <if test="record.password_hash != null" >
+      <if test="record.password_hash != null">
         password_hash = #{record.password_hash,jdbcType=BINARY},
       </if>
-      <if test="record.password_salt != null" >
+      <if test="record.password_salt != null">
         password_salt = #{record.password_salt,jdbcType=BINARY},
       </if>
     </set>
-    <if test="_parameter != null" >
+    <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
   </update>
-  <update id="updateByExampleWithBLOBs" parameterType="map" >
+  <update id="updateByExampleWithBLOBs" parameterType="map">
     <!--
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Feb 12 20:35:54 PST 2013.
+      This element was generated on Tue Feb 19 23:09:22 PST 2013.
     -->
     update guacamole..guacamole_user
     set user_id = #{record.user_id,jdbcType=INTEGER},
       username = #{record.username,jdbcType=VARCHAR},
       password_hash = #{record.password_hash,jdbcType=BINARY},
       password_salt = #{record.password_salt,jdbcType=BINARY}
-    <if test="_parameter != null" >
+    <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
   </update>
-  <update id="updateByExample" parameterType="map" >
+  <update id="updateByExample" parameterType="map">
     <!--
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Feb 12 20:35:54 PST 2013.
+      This element was generated on Tue Feb 19 23:09:22 PST 2013.
     -->
     update guacamole..guacamole_user
     set user_id = #{record.user_id,jdbcType=INTEGER},
       username = #{record.username,jdbcType=VARCHAR}
-    <if test="_parameter != null" >
+    <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
   </update>
-  <update id="updateByPrimaryKeySelective" parameterType="net.sourceforge.guacamole.net.auth.mysql.model.UserWithBLOBs" >
+  <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 12 20:35:54 PST 2013.
+      This element was generated on Tue Feb 19 23:09:22 PST 2013.
     -->
     update guacamole..guacamole_user
-    <set >
+    <set>
-      <if test="username != null" >
+      <if test="username != null">
         username = #{username,jdbcType=VARCHAR},
       </if>
-      <if test="password_hash != null" >
+      <if test="password_hash != null">
         password_hash = #{password_hash,jdbcType=BINARY},
       </if>
-      <if test="password_salt != null" >
+      <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.UserWithBLOBs" >
+  <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 12 20:35:54 PST 2013.
+      This element was generated on Tue Feb 19 23:09:22 PST 2013.
     -->
     update guacamole..guacamole_user
     set username = #{username,jdbcType=VARCHAR},
@@ -319,11 +319,11 @@
       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.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 12 20:35:54 PST 2013.
+      This element was generated on Tue Feb 19 23:09:22 PST 2013.
     -->
     update guacamole..guacamole_user
     set username = #{username,jdbcType=VARCHAR}

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

@@ -1,40 +1,40 @@
-<?xml version="1.0" encoding="UTF-8" ?>
+<?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" >
+<!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.UserPermissionMapper" >
+<mapper namespace="net.sourceforge.guacamole.net.auth.mysql.dao.UserPermissionMapper">
-  <resultMap id="BaseResultMap" type="net.sourceforge.guacamole.net.auth.mysql.model.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 12 20:35:54 PST 2013.
+      This element was generated on Tue Feb 19 23:09:22 PST 2013.
     -->
-    <id column="user_id" property="user_id" jdbcType="INTEGER" />
+    <id column="user_id" jdbcType="INTEGER" property="user_id" />
-    <id column="affected_user_id" property="affected_user_id" jdbcType="INTEGER" />
+    <id column="affected_user_id" jdbcType="INTEGER" property="affected_user_id" />
-    <id column="permission" property="permission" jdbcType="CHAR" />
+    <id column="permission" jdbcType="CHAR" property="permission" />
   </resultMap>
-  <sql id="Example_Where_Clause" >
+  <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 12 20:35:54 PST 2013.
+      This element was generated on Tue Feb 19 23:09:22 PST 2013.
     -->
-    <where >
+    <where>
-      <foreach collection="oredCriteria" item="criteria" separator="or" >
+      <foreach collection="oredCriteria" item="criteria" separator="or">
-        <if test="criteria.valid" >
+        <if test="criteria.valid">
-          <trim prefix="(" suffix=")" prefixOverrides="and" >
+          <trim prefix="(" prefixOverrides="and" suffix=")">
-            <foreach collection="criteria.criteria" item="criterion" >
+            <foreach collection="criteria.criteria" item="criterion">
-              <choose >
+              <choose>
-                <when test="criterion.noValue" >
+                <when test="criterion.noValue">
                   and ${criterion.condition}
                 </when>
-                <when test="criterion.singleValue" >
+                <when test="criterion.singleValue">
                   and ${criterion.condition} #{criterion.value}
                 </when>
-                <when test="criterion.betweenValue" >
+                <when test="criterion.betweenValue">
                   and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
                 </when>
-                <when test="criterion.listValue" >
+                <when test="criterion.listValue">
                   and ${criterion.condition}
-                  <foreach collection="criterion.value" item="listItem" open="(" close=")" separator="," >
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
                     #{listItem}
                   </foreach>
                 </when>
@@ -45,30 +45,30 @@
       </foreach>
     </where>
   </sql>
-  <sql id="Update_By_Example_Where_Clause" >
+  <sql id="Update_By_Example_Where_Clause">
     <!--
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Feb 12 20:35:54 PST 2013.
+      This element was generated on Tue Feb 19 23:09:22 PST 2013.
     -->
-    <where >
+    <where>
-      <foreach collection="example.oredCriteria" item="criteria" separator="or" >
+      <foreach collection="example.oredCriteria" item="criteria" separator="or">
-        <if test="criteria.valid" >
+        <if test="criteria.valid">
-          <trim prefix="(" suffix=")" prefixOverrides="and" >
+          <trim prefix="(" prefixOverrides="and" suffix=")">
-            <foreach collection="criteria.criteria" item="criterion" >
+            <foreach collection="criteria.criteria" item="criterion">
-              <choose >
+              <choose>
-                <when test="criterion.noValue" >
+                <when test="criterion.noValue">
                   and ${criterion.condition}
                 </when>
-                <when test="criterion.singleValue" >
+                <when test="criterion.singleValue">
                   and ${criterion.condition} #{criterion.value}
                 </when>
-                <when test="criterion.betweenValue" >
+                <when test="criterion.betweenValue">
                   and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
                 </when>
-                <when test="criterion.listValue" >
+                <when test="criterion.listValue">
                   and ${criterion.condition}
-                  <foreach collection="criterion.value" item="listItem" open="(" close=")" separator="," >
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
                     #{listItem}
                   </foreach>
                 </when>
@@ -79,140 +79,140 @@
       </foreach>
     </where>
   </sql>
-  <sql id="Base_Column_List" >
+  <sql id="Base_Column_List">
     <!--
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Feb 12 20:35:54 PST 2013.
+      This element was generated on Tue Feb 19 23:09:22 PST 2013.
     -->
     user_id, affected_user_id, permission
   </sql>
-  <select id="selectByExample" resultMap="BaseResultMap" parameterType="net.sourceforge.guacamole.net.auth.mysql.model.UserPermissionExample" >
+  <select id="selectByExample" parameterType="net.sourceforge.guacamole.net.auth.mysql.model.UserPermissionExample" resultMap="BaseResultMap">
     <!--
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Feb 12 20:35:54 PST 2013.
+      This element was generated on Tue Feb 19 23:09:22 PST 2013.
     -->
     select
-    <if test="distinct" >
+    <if test="distinct">
       distinct
     </if>
     <include refid="Base_Column_List" />
     from guacamole..guacamole_user_permission
-    <if test="_parameter != null" >
+    <if test="_parameter != null">
       <include refid="Example_Where_Clause" />
     </if>
-    <if test="orderByClause != null" >
+    <if test="orderByClause != null">
       order by ${orderByClause}
     </if>
   </select>
-  <delete id="deleteByPrimaryKey" parameterType="net.sourceforge.guacamole.net.auth.mysql.model.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 12 20:35:54 PST 2013.
+      This element was generated on Tue Feb 19 23:09:22 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.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 12 20:35:54 PST 2013.
+      This element was generated on Tue Feb 19 23:09:22 PST 2013.
     -->
     delete from guacamole..guacamole_user_permission
-    <if test="_parameter != null" >
+    <if test="_parameter != null">
       <include refid="Example_Where_Clause" />
     </if>
   </delete>
-  <insert id="insert" parameterType="net.sourceforge.guacamole.net.auth.mysql.model.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 12 20:35:54 PST 2013.
+      This element was generated on Tue Feb 19 23:09:22 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.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 12 20:35:54 PST 2013.
+      This element was generated on Tue Feb 19 23:09:22 PST 2013.
     -->
     insert into guacamole..guacamole_user_permission
-    <trim prefix="(" suffix=")" suffixOverrides="," >
+    <trim prefix="(" suffix=")" suffixOverrides=",">
-      <if test="user_id != null" >
+      <if test="user_id != null">
         user_id,
       </if>
-      <if test="affected_user_id != null" >
+      <if test="affected_user_id != null">
         affected_user_id,
       </if>
-      <if test="permission != null" >
+      <if test="permission != null">
         permission,
       </if>
     </trim>
-    <trim prefix="values (" suffix=")" suffixOverrides="," >
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
-      <if test="user_id != null" >
+      <if test="user_id != null">
         #{user_id,jdbcType=INTEGER},
       </if>
-      <if test="affected_user_id != null" >
+      <if test="affected_user_id != null">
         #{affected_user_id,jdbcType=INTEGER},
       </if>
-      <if test="permission != null" >
+      <if test="permission != null">
         #{permission,jdbcType=CHAR},
       </if>
     </trim>
   </insert>
-  <select id="countByExample" parameterType="net.sourceforge.guacamole.net.auth.mysql.model.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 12 20:35:54 PST 2013.
+      This element was generated on Tue Feb 19 23:09:22 PST 2013.
     -->
     select count(*) from guacamole..guacamole_user_permission
-    <if test="_parameter != null" >
+    <if test="_parameter != null">
       <include refid="Example_Where_Clause" />
     </if>
   </select>
-  <update id="updateByExampleSelective" parameterType="map" >
+  <update id="updateByExampleSelective" parameterType="map">
     <!--
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Feb 12 20:35:54 PST 2013.
+      This element was generated on Tue Feb 19 23:09:22 PST 2013.
     -->
     update guacamole..guacamole_user_permission
-    <set >
+    <set>
-      <if test="record.user_id != null" >
+      <if test="record.user_id != null">
         user_id = #{record.user_id,jdbcType=INTEGER},
       </if>
-      <if test="record.affected_user_id != null" >
+      <if test="record.affected_user_id != null">
         affected_user_id = #{record.affected_user_id,jdbcType=INTEGER},
       </if>
-      <if test="record.permission != null" >
+      <if test="record.permission != null">
         permission = #{record.permission,jdbcType=CHAR},
       </if>
     </set>
-    <if test="_parameter != null" >
+    <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
   </update>
-  <update id="updateByExample" parameterType="map" >
+  <update id="updateByExample" parameterType="map">
     <!--
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Feb 12 20:35:54 PST 2013.
+      This element was generated on Tue Feb 19 23:09:22 PST 2013.
     -->
     update guacamole..guacamole_user_permission
     set user_id = #{record.user_id,jdbcType=INTEGER},
       affected_user_id = #{record.affected_user_id,jdbcType=INTEGER},
       permission = #{record.permission,jdbcType=CHAR}
-    <if test="_parameter != null" >
+    <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
   </update>