diff --git a/extensions/guacamole-auth-mysql/doc/examples/mybatisGeneratorConfig.xml b/extensions/guacamole-auth-mysql/doc/examples/mybatisGeneratorConfig.xml index b2110b992..aae06dd98 100644 --- a/extensions/guacamole-auth-mysql/doc/examples/mybatisGeneratorConfig.xml +++ b/extensions/guacamole-auth-mysql/doc/examples/mybatisGeneratorConfig.xml @@ -63,6 +63,11 @@ + + + +
+ diff --git a/extensions/guacamole-auth-mysql/schema/guacamole-auth-mysql-schema.sql b/extensions/guacamole-auth-mysql/schema/guacamole-auth-mysql-schema.sql index 1bfbf6815..591936243 100644 --- a/extensions/guacamole-auth-mysql/schema/guacamole-auth-mysql-schema.sql +++ b/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 + diff --git a/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/ConnectionDirectory.java b/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/ConnectionDirectory.java new file mode 100644 index 000000000..f99e14e99 --- /dev/null +++ b/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{ + + /** + * 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 getIdentifiers() throws GuacamoleException { + Set connectionNameSet = new HashSet(); + Set 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 existingConfiguration = new HashMap(); + ConnectionParameterExample example = new ConnectionParameterExample(); + List connectionParameters = connectionParameterDAO.selectByExample(example); + for(ConnectionParameter parameter : connectionParameters) + existingConfiguration.put(parameter.getParameter_name(), parameter.getParameter_value()); + + List parametersToInsert = new ArrayList(); + List parametersToUpdate = new ArrayList(); + + Set 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."); + } + +} diff --git a/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/MySQLAuthenticationProvider.java b/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/MySQLAuthenticationProvider.java index 09497a943..5cd9ca423 100644 --- a/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/MySQLAuthenticationProvider.java +++ b/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); } } ); diff --git a/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/MySQLConnection.java b/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/MySQLConnection.java index b01563f0a..968e7288b 100644 --- a/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/MySQLConnection.java +++ b/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/MySQLConnection.java @@ -1,7 +1,38 @@ -/* - * To change this template, choose Tools | Templates - * and open the template in the editor. - */ +/* ***** 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; @@ -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 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 getHistory() throws GuacamoleException { + return providerUtility.getExistingMySQLConnectionRecords(connection.getConnection_id()); + } } diff --git a/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/MySQLConnectionRecord.java b/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/MySQLConnectionRecord.java new file mode 100644 index 000000000..099f5a482 --- /dev/null +++ b/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; + } + +} diff --git a/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/MySQLUser.java b/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/MySQLUser.java index ad4e36ca7..491d3d9e1 100644 --- a/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/MySQLUser.java +++ b/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 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); diff --git a/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/MySQLUserContext.java b/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/MySQLUserContext.java index 5d33b169a..fc55da470 100644 --- a/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/MySQLUserContext.java +++ b/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 getConnectionDirectory() throws GuacamoleException { - throw new UnsupportedOperationException("Not supported yet."); + return connectionDirectory; } } diff --git a/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/UserDirectory.java b/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/UserDirectory.java index 667720db4..92dd7d22f 100644 --- a/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/UserDirectory.java +++ b/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 { PermissionCheckUtility permissionCheckUtility; @Inject - Provider mySQLUserProvider; + ProviderUtility providerUtility; /** * Set the user for this directory. @@ -110,45 +110,11 @@ public class UserDirectory implements Directory { 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 { 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 { 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 { 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); diff --git a/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/dao/ConnectionHistoryMapper.java b/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/dao/ConnectionHistoryMapper.java new file mode 100644 index 000000000..8a28bdc8c --- /dev/null +++ b/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 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); +} \ No newline at end of file diff --git a/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/dao/ConnectionMapper.java b/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/dao/ConnectionMapper.java index c94ce35fb..659e11ef6 100644 --- a/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/dao/ConnectionMapper.java +++ b/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 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); } \ No newline at end of file diff --git a/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/dao/ConnectionParameterMapper.java b/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/dao/ConnectionParameterMapper.java index d8375bc71..cd4b1df63 100644 --- a/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/dao/ConnectionParameterMapper.java +++ b/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 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); } \ No newline at end of file diff --git a/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/dao/ConnectionPermissionMapper.java b/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/dao/ConnectionPermissionMapper.java index b764d3238..5ba73ce6d 100644 --- a/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/dao/ConnectionPermissionMapper.java +++ b/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 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); } \ No newline at end of file diff --git a/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/dao/SystemPermissionMapper.java b/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/dao/SystemPermissionMapper.java index 2aa690b53..1d12f9e07 100644 --- a/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/dao/SystemPermissionMapper.java +++ b/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 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); } \ No newline at end of file diff --git a/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/dao/UserMapper.java b/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/dao/UserMapper.java index d74677309..acbcfd299 100644 --- a/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/dao/UserMapper.java +++ b/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 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 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); } \ No newline at end of file diff --git a/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/dao/UserPermissionMapper.java b/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/dao/UserPermissionMapper.java index 3cba6639d..132d00eca 100644 --- a/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/dao/UserPermissionMapper.java +++ b/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 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); } \ No newline at end of file diff --git a/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/model/Connection.java b/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/model/Connection.java index fa5b3b7d8..3be686d99 100644 --- a/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/model/Connection.java +++ b/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; diff --git a/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/model/ConnectionExample.java b/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/model/ConnectionExample.java index c3490071b..4e5d37c61 100644 --- a/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/model/ConnectionExample.java +++ b/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 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(); @@ -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 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 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; diff --git a/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/model/ConnectionHistory.java b/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/model/ConnectionHistory.java new file mode 100644 index 000000000..937a7b989 --- /dev/null +++ b/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; + } +} \ No newline at end of file diff --git a/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/model/ConnectionHistoryExample.java b/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/model/ConnectionHistoryExample.java new file mode 100644 index 000000000..2d3db94e8 --- /dev/null +++ b/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 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(); + } + + /** + * 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 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 criteria; + + protected GeneratedCriteria() { + super(); + criteria = new ArrayList(); + } + + public boolean isValid() { + return criteria.size() > 0; + } + + public List getAllCriteria() { + return criteria; + } + + public List 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 values) { + addCriterion("history_id in", values, "history_id"); + return (Criteria) this; + } + + public Criteria andHistory_idNotIn(List 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 values) { + addCriterion("user_id in", values, "user_id"); + return (Criteria) this; + } + + public Criteria andUser_idNotIn(List 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 values) { + addCriterion("connection_id in", values, "connection_id"); + return (Criteria) this; + } + + public Criteria andConnection_idNotIn(List 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 values) { + addCriterion("start_date in", values, "start_date"); + return (Criteria) this; + } + + public Criteria andStart_dateNotIn(List 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 values) { + addCriterion("end_date in", values, "end_date"); + return (Criteria) this; + } + + public Criteria andEnd_dateNotIn(List 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); + } + } +} \ No newline at end of file diff --git a/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/model/ConnectionParameter.java b/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/model/ConnectionParameter.java index e15c4fb0f..95deac7df 100644 --- a/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/model/ConnectionParameter.java +++ b/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; diff --git a/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/model/ConnectionParameterExample.java b/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/model/ConnectionParameterExample.java index ae1cd3519..bdc44b136 100644 --- a/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/model/ConnectionParameterExample.java +++ b/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 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(); @@ -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 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 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; diff --git a/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/model/ConnectionParameterKey.java b/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/model/ConnectionParameterKey.java index 494c9c162..2bc72662d 100644 --- a/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/model/ConnectionParameterKey.java +++ b/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; diff --git a/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/model/ConnectionPermissionExample.java b/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/model/ConnectionPermissionExample.java index 4f898bbfb..5e4264f6f 100644 --- a/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/model/ConnectionPermissionExample.java +++ b/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 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(); @@ -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 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 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; diff --git a/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/model/ConnectionPermissionKey.java b/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/model/ConnectionPermissionKey.java index 31b7e5b3a..f93afff7f 100644 --- a/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/model/ConnectionPermissionKey.java +++ b/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; diff --git a/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/model/SystemPermissionExample.java b/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/model/SystemPermissionExample.java index 36f76ff33..3a042a6a3 100644 --- a/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/model/SystemPermissionExample.java +++ b/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 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(); @@ -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 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 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; diff --git a/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/model/SystemPermissionKey.java b/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/model/SystemPermissionKey.java index e7d8523dc..707614471 100644 --- a/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/model/SystemPermissionKey.java +++ b/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; diff --git a/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/model/User.java b/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/model/User.java index c8ddd1ba1..516249839 100644 --- a/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/model/User.java +++ b/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; diff --git a/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/model/UserExample.java b/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/model/UserExample.java index 19baccadb..a766bc074 100644 --- a/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/model/UserExample.java +++ b/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 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(); @@ -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 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 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; diff --git a/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/model/UserPermissionExample.java b/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/model/UserPermissionExample.java index 1d65e896d..bdb1c89dc 100644 --- a/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/model/UserPermissionExample.java +++ b/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 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(); @@ -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 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 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; diff --git a/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/model/UserPermissionKey.java b/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/model/UserPermissionKey.java index 711785577..35e4b95e0 100644 --- a/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/model/UserPermissionKey.java +++ b/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; diff --git a/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/model/UserWithBLOBs.java b/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/model/UserWithBLOBs.java index 36838bdfa..27d44d714 100644 --- a/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/model/UserWithBLOBs.java +++ b/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; diff --git a/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/utility/ProviderUtility.java b/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/utility/ProviderUtility.java new file mode 100644 index 000000000..f2b91428f --- /dev/null +++ b/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 mySQLUserProvider; + + @Inject + Provider mySQLConnectionProvider; + + @Inject + Provider 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 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 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 getExistingMySQLConnectionRecords(Integer connectionID) { + ConnectionHistoryExample example = new ConnectionHistoryExample(); + example.createCriteria().andConnection_idEqualTo(connectionID); + List connectionHistories = connectionHistoryDAO.selectByExample(example); + List connectionRecords = new ArrayList(); + 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; + } +} diff --git a/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/xml/ConnectionHistoryMapper.xml b/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/xml/ConnectionHistoryMapper.xml new file mode 100644 index 000000000..784d896fd --- /dev/null +++ b/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/xml/ConnectionHistoryMapper.xml @@ -0,0 +1,286 @@ + + + + + + + + + + + + + + + + + + + + + and ${criterion.condition} + + + and ${criterion.condition} #{criterion.value} + + + and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} + + + and ${criterion.condition} + + #{listItem} + + + + + + + + + + + + + + + + + + + and ${criterion.condition} + + + and ${criterion.condition} #{criterion.value} + + + and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} + + + and ${criterion.condition} + + #{listItem} + + + + + + + + + + + + history_id, user_id, connection_id, start_date, end_date + + + + + + delete from guacamole..guacamole_connection_history + where history_id = #{history_id,jdbcType=INTEGER} + + + + delete from guacamole..guacamole_connection_history + + + + + + + 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 into guacamole..guacamole_connection_history + + + history_id, + + + user_id, + + + connection_id, + + + start_date, + + + end_date, + + + + + #{history_id,jdbcType=INTEGER}, + + + #{user_id,jdbcType=INTEGER}, + + + #{connection_id,jdbcType=INTEGER}, + + + #{start_date,jdbcType=TIMESTAMP}, + + + #{end_date,jdbcType=TIMESTAMP}, + + + + + + + update guacamole..guacamole_connection_history + + + 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}, + + + + + + + + + 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} + + + + + + + update guacamole..guacamole_connection_history + + + 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 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} + + \ No newline at end of file diff --git a/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/xml/ConnectionMapper.xml b/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/xml/ConnectionMapper.xml index db0a8aad7..80646bd9d 100644 --- a/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/xml/ConnectionMapper.xml +++ b/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/xml/ConnectionMapper.xml @@ -1,40 +1,40 @@ - - - - + + + + - - - + + + - + - - - - - - - + + + + + + + and ${criterion.condition} - + and ${criterion.condition} #{criterion.value} - + and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} - + and ${criterion.condition} - + #{listItem} @@ -45,30 +45,30 @@ - + - - - - - - - + + + + + + + and ${criterion.condition} - + and ${criterion.condition} #{criterion.value} - + and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} - + and ${criterion.condition} - + #{listItem} @@ -79,174 +79,174 @@ - + connection_id, connection_name, protocol - select - + distinct from guacamole..guacamole_connection - + - + order by ${orderByClause} - select from guacamole..guacamole_connection where connection_id = #{connection_id,jdbcType=INTEGER} - + delete from guacamole..guacamole_connection where connection_id = #{connection_id,jdbcType=INTEGER} - + delete from guacamole..guacamole_connection - + - + insert into guacamole..guacamole_connection (connection_id, connection_name, protocol ) values (#{connection_id,jdbcType=INTEGER}, #{connection_name,jdbcType=VARCHAR}, #{protocol,jdbcType=VARCHAR} ) - + insert into guacamole..guacamole_connection - - + + connection_id, - + connection_name, - + protocol, - - + + #{connection_id,jdbcType=INTEGER}, - + #{connection_name,jdbcType=VARCHAR}, - + #{protocol,jdbcType=VARCHAR}, - select count(*) from guacamole..guacamole_connection - + - + update guacamole..guacamole_connection - - + + connection_id = #{record.connection_id,jdbcType=INTEGER}, - + connection_name = #{record.connection_name,jdbcType=VARCHAR}, - + protocol = #{record.protocol,jdbcType=VARCHAR}, - + - + update guacamole..guacamole_connection set connection_id = #{record.connection_id,jdbcType=INTEGER}, connection_name = #{record.connection_name,jdbcType=VARCHAR}, protocol = #{record.protocol,jdbcType=VARCHAR} - + - + update guacamole..guacamole_connection - - + + connection_name = #{connection_name,jdbcType=VARCHAR}, - + protocol = #{protocol,jdbcType=VARCHAR}, where connection_id = #{connection_id,jdbcType=INTEGER} - + update guacamole..guacamole_connection set connection_name = #{connection_name,jdbcType=VARCHAR}, diff --git a/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/xml/ConnectionParameterMapper.xml b/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/xml/ConnectionParameterMapper.xml index dab04a451..146622a62 100644 --- a/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/xml/ConnectionParameterMapper.xml +++ b/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/xml/ConnectionParameterMapper.xml @@ -1,40 +1,40 @@ - - - - + + + + - - - + + + - + - - - - - - - + + + + + + + and ${criterion.condition} - + and ${criterion.condition} #{criterion.value} - + and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} - + and ${criterion.condition} - + #{listItem} @@ -45,30 +45,30 @@ - + - - - - - - - + + + + + + + and ${criterion.condition} - + and ${criterion.condition} #{criterion.value} - + and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} - + and ${criterion.condition} - + #{listItem} @@ -79,38 +79,38 @@ - + connection_id, parameter_name, parameter_value - select - + distinct from guacamole..guacamole_connection_parameter - + - + order by ${orderByClause} - select @@ -118,135 +118,135 @@ where connection_id = #{connection_id,jdbcType=INTEGER} and parameter_name = #{parameter_name,jdbcType=VARCHAR} - + delete from guacamole..guacamole_connection_parameter where connection_id = #{connection_id,jdbcType=INTEGER} and parameter_name = #{parameter_name,jdbcType=VARCHAR} - + delete from guacamole..guacamole_connection_parameter - + - + 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 into guacamole..guacamole_connection_parameter - - + + connection_id, - + parameter_name, - + parameter_value, - - + + #{connection_id,jdbcType=INTEGER}, - + #{parameter_name,jdbcType=VARCHAR}, - + #{parameter_value,jdbcType=VARCHAR}, - select count(*) from guacamole..guacamole_connection_parameter - + - + update guacamole..guacamole_connection_parameter - - + + connection_id = #{record.connection_id,jdbcType=INTEGER}, - + parameter_name = #{record.parameter_name,jdbcType=VARCHAR}, - + parameter_value = #{record.parameter_value,jdbcType=VARCHAR}, - + - + 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} - + - + update guacamole..guacamole_connection_parameter - - + + parameter_value = #{parameter_value,jdbcType=VARCHAR}, where connection_id = #{connection_id,jdbcType=INTEGER} and parameter_name = #{parameter_name,jdbcType=VARCHAR} - + update guacamole..guacamole_connection_parameter set parameter_value = #{parameter_value,jdbcType=VARCHAR} diff --git a/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/xml/ConnectionPermissionMapper.xml b/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/xml/ConnectionPermissionMapper.xml index 748522557..240d868bb 100644 --- a/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/xml/ConnectionPermissionMapper.xml +++ b/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/xml/ConnectionPermissionMapper.xml @@ -1,40 +1,40 @@ - - - - + + + + - - - + + + - + - - - - - - - + + + + + + + and ${criterion.condition} - + and ${criterion.condition} #{criterion.value} - + and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} - + and ${criterion.condition} - + #{listItem} @@ -45,30 +45,30 @@ - + - - - - - - - + + + + + + + and ${criterion.condition} - + and ${criterion.condition} #{criterion.value} - + and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} - + and ${criterion.condition} - + #{listItem} @@ -79,140 +79,140 @@ - + user_id, connection_id, permission - select - + distinct from guacamole..guacamole_connection_permission - + - + order by ${orderByClause} - + 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 from guacamole..guacamole_connection_permission - + - + insert into guacamole..guacamole_connection_permission (user_id, connection_id, permission ) values (#{user_id,jdbcType=INTEGER}, #{connection_id,jdbcType=INTEGER}, #{permission,jdbcType=CHAR} ) - + insert into guacamole..guacamole_connection_permission - - + + user_id, - + connection_id, - + permission, - - + + #{user_id,jdbcType=INTEGER}, - + #{connection_id,jdbcType=INTEGER}, - + #{permission,jdbcType=CHAR}, - select count(*) from guacamole..guacamole_connection_permission - + - + update guacamole..guacamole_connection_permission - - + + user_id = #{record.user_id,jdbcType=INTEGER}, - + connection_id = #{record.connection_id,jdbcType=INTEGER}, - + permission = #{record.permission,jdbcType=CHAR}, - + - + 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} - + diff --git a/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/xml/SystemPermissionMapper.xml b/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/xml/SystemPermissionMapper.xml index 790c15e8e..2ca6297ac 100644 --- a/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/xml/SystemPermissionMapper.xml +++ b/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/xml/SystemPermissionMapper.xml @@ -1,39 +1,39 @@ - - - - + + + + - - + + - + - - - - - - - + + + + + + + and ${criterion.condition} - + and ${criterion.condition} #{criterion.value} - + and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} - + and ${criterion.condition} - + #{listItem} @@ -44,30 +44,30 @@ - + - - - - - - - + + + + + + + and ${criterion.condition} - + and ${criterion.condition} #{criterion.value} - + and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} - + and ${criterion.condition} - + #{listItem} @@ -78,127 +78,127 @@ - + user_id, permission - select - + distinct from guacamole..guacamole_system_permission - + - + order by ${orderByClause} - + delete from guacamole..guacamole_system_permission where user_id = #{user_id,jdbcType=INTEGER} and permission = #{permission,jdbcType=CHAR} - + delete from guacamole..guacamole_system_permission - + - + insert into guacamole..guacamole_system_permission (user_id, permission) values (#{user_id,jdbcType=INTEGER}, #{permission,jdbcType=CHAR}) - + insert into guacamole..guacamole_system_permission - - + + user_id, - + permission, - - + + #{user_id,jdbcType=INTEGER}, - + #{permission,jdbcType=CHAR}, - select count(*) from guacamole..guacamole_system_permission - + - + update guacamole..guacamole_system_permission - - + + user_id = #{record.user_id,jdbcType=INTEGER}, - + permission = #{record.permission,jdbcType=CHAR}, - + - + update guacamole..guacamole_system_permission set user_id = #{record.user_id,jdbcType=INTEGER}, permission = #{record.permission,jdbcType=CHAR} - + diff --git a/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/xml/UserMapper.xml b/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/xml/UserMapper.xml index 7af380321..5fe55f665 100644 --- a/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/xml/UserMapper.xml +++ b/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/xml/UserMapper.xml @@ -1,48 +1,48 @@ - - - - + + + + - - + + - + - - + + - + - - - - - - - + + + + + + + and ${criterion.condition} - + and ${criterion.condition} #{criterion.value} - + and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} - + and ${criterion.condition} - + #{listItem} @@ -53,30 +53,30 @@ - + - - - - - - - + + + + + + + and ${criterion.condition} - + and ${criterion.condition} #{criterion.value} - + and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} - + and ${criterion.condition} - + #{listItem} @@ -87,67 +87,67 @@ - + user_id, username - + password_hash, password_salt - select - + distinct , from guacamole..guacamole_user - + - + order by ${orderByClause} - select - + distinct from guacamole..guacamole_user - + - + order by ${orderByClause} - select @@ -156,162 +156,162 @@ from guacamole..guacamole_user where user_id = #{user_id,jdbcType=INTEGER} - + delete from guacamole..guacamole_user where user_id = #{user_id,jdbcType=INTEGER} - + delete from guacamole..guacamole_user - + - + 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 into guacamole..guacamole_user - - + + user_id, - + username, - + password_hash, - + password_salt, - - + + #{user_id,jdbcType=INTEGER}, - + #{username,jdbcType=VARCHAR}, - + #{password_hash,jdbcType=BINARY}, - + #{password_salt,jdbcType=BINARY}, - select count(*) from guacamole..guacamole_user - + - + update guacamole..guacamole_user - - + + 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}, - + - + 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} - + - + update guacamole..guacamole_user set user_id = #{record.user_id,jdbcType=INTEGER}, username = #{record.username,jdbcType=VARCHAR} - + - + update guacamole..guacamole_user - - + + username = #{username,jdbcType=VARCHAR}, - + password_hash = #{password_hash,jdbcType=BINARY}, - + password_salt = #{password_salt,jdbcType=BINARY}, where user_id = #{user_id,jdbcType=INTEGER} - + 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 guacamole..guacamole_user set username = #{username,jdbcType=VARCHAR} diff --git a/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/xml/UserPermissionMapper.xml b/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/xml/UserPermissionMapper.xml index 363ebea71..97f86bbe5 100644 --- a/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/xml/UserPermissionMapper.xml +++ b/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/xml/UserPermissionMapper.xml @@ -1,40 +1,40 @@ - - - - + + + + - - - + + + - + - - - - - - - + + + + + + + and ${criterion.condition} - + and ${criterion.condition} #{criterion.value} - + and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} - + and ${criterion.condition} - + #{listItem} @@ -45,30 +45,30 @@ - + - - - - - - - + + + + + + + and ${criterion.condition} - + and ${criterion.condition} #{criterion.value} - + and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} - + and ${criterion.condition} - + #{listItem} @@ -79,140 +79,140 @@ - + user_id, affected_user_id, permission - select - + distinct from guacamole..guacamole_user_permission - + - + order by ${orderByClause} - + 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 from guacamole..guacamole_user_permission - + - + 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 into guacamole..guacamole_user_permission - - + + user_id, - + affected_user_id, - + permission, - - + + #{user_id,jdbcType=INTEGER}, - + #{affected_user_id,jdbcType=INTEGER}, - + #{permission,jdbcType=CHAR}, - select count(*) from guacamole..guacamole_user_permission - + - + update guacamole..guacamole_user_permission - - + + user_id = #{record.user_id,jdbcType=INTEGER}, - + affected_user_id = #{record.affected_user_id,jdbcType=INTEGER}, - + permission = #{record.permission,jdbcType=CHAR}, - + - + 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} - +