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 f08d28f59..2397eb058 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 @@ -23,49 +23,8 @@ package net.sourceforge.guacamole.net.auth.mysql; -import org.glyptodon.guacamole.auth.mysql.user.MySQLUserContext; -import org.glyptodon.guacamole.auth.mysql.connectiongroup.MySQLRootConnectionGroup; -import org.glyptodon.guacamole.auth.mysql.connectiongroup.MySQLConnectionGroup; -import org.glyptodon.guacamole.auth.mysql.connectiongroup.ConnectionGroupDirectory; -import org.glyptodon.guacamole.auth.mysql.connection.ConnectionDirectory; -import org.glyptodon.guacamole.auth.mysql.connection.MySQLGuacamoleConfiguration; -import org.glyptodon.guacamole.auth.mysql.connection.MySQLConnection; -import org.glyptodon.guacamole.auth.mysql.permission.MySQLSystemPermissionSet; -import org.glyptodon.guacamole.auth.mysql.user.MySQLUser; -import org.glyptodon.guacamole.auth.mysql.user.UserDirectory; -import com.google.inject.Binder; -import com.google.inject.Guice; -import com.google.inject.Injector; -import com.google.inject.Module; -import com.google.inject.name.Names; -import java.util.Properties; -import org.glyptodon.guacamole.auth.mysql.connectiongroup.ConnectionGroupMapper; -import org.glyptodon.guacamole.auth.mysql.connection.ConnectionMapper; -import org.glyptodon.guacamole.auth.mysql.connection.ConnectionRecordMapper; -import org.glyptodon.guacamole.auth.mysql.connection.ParameterMapper; -import org.glyptodon.guacamole.auth.mysql.permission.SystemPermissionMapper; import org.glyptodon.guacamole.GuacamoleException; -import org.glyptodon.guacamole.net.auth.AuthenticationProvider; -import org.glyptodon.guacamole.net.auth.Credentials; -import org.glyptodon.guacamole.net.auth.UserContext; -import org.glyptodon.guacamole.auth.mysql.user.UserMapper; -import org.glyptodon.guacamole.auth.mysql.conf.MySQLGuacamoleProperties; -import org.glyptodon.guacamole.auth.mysql.connectiongroup.ConnectionGroupService; -import org.glyptodon.guacamole.auth.mysql.connection.ConnectionService; -import org.glyptodon.guacamole.auth.mysql.socket.GuacamoleSocketService; -import org.glyptodon.guacamole.auth.mysql.security.PasswordEncryptionService; -import org.glyptodon.guacamole.auth.mysql.security.SHA256PasswordEncryptionService; -import org.glyptodon.guacamole.auth.mysql.security.SaltService; -import org.glyptodon.guacamole.auth.mysql.security.SecureRandomSaltService; -import org.glyptodon.guacamole.auth.mysql.permission.SystemPermissionService; -import org.glyptodon.guacamole.auth.mysql.socket.UnrestrictedGuacamoleSocketService; -import org.glyptodon.guacamole.auth.mysql.user.UserService; -import org.apache.ibatis.transaction.jdbc.JdbcTransactionFactory; -import org.glyptodon.guacamole.environment.Environment; -import org.glyptodon.guacamole.environment.LocalEnvironment; -import org.mybatis.guice.MyBatisModule; -import org.mybatis.guice.datasource.builtin.PooledDataSourceProvider; -import org.mybatis.guice.datasource.helper.JdbcHelper; +import org.glyptodon.guacamole.auth.jdbc.JDBCAuthenticationProvider; /** * Provides a MySQL based implementation of the AuthenticationProvider @@ -73,133 +32,18 @@ import org.mybatis.guice.datasource.helper.JdbcHelper; * * @author James Muehlner */ -public class MySQLAuthenticationProvider implements AuthenticationProvider { - - /** - * Injector which will manage the object graph of this authentication - * provider. - */ - private final Injector injector; - - @Override - public UserContext getUserContext(Credentials credentials) throws GuacamoleException { - - // Get user service - UserService userService = injector.getInstance(UserService.class); - - // Authenticate user - MySQLUser user = userService.retrieveUser(credentials); - if (user != null) { - - // Upon successful authentication, return new user context - MySQLUserContext context = injector.getInstance(MySQLUserContext.class); - context.init(user.getCurrentUser()); - return context; - - } - - // Otherwise, unauthorized - return null; - - } +public class MySQLAuthenticationProvider extends JDBCAuthenticationProvider { /** * Creates a new MySQLAuthenticationProvider that reads and writes * authentication data to a MySQL database defined by properties in * guacamole.properties. * - * @throws GuacamoleException If a required property is missing, or - * an error occurs while parsing a property. + * @throws GuacamoleException + * If a required property is missing, or an error occurs while parsing + * a property. */ public MySQLAuthenticationProvider() throws GuacamoleException { - - // Get local environment - final Environment environment = new LocalEnvironment(); - - final Properties myBatisProperties = new Properties(); - final Properties driverProperties = new Properties(); - - // Set the mysql properties for MyBatis. - myBatisProperties.setProperty("mybatis.environment.id", "guacamole"); - myBatisProperties.setProperty("JDBC.host", environment.getRequiredProperty(MySQLGuacamoleProperties.MYSQL_HOSTNAME)); - myBatisProperties.setProperty("JDBC.port", String.valueOf(environment.getRequiredProperty(MySQLGuacamoleProperties.MYSQL_PORT))); - myBatisProperties.setProperty("JDBC.schema", environment.getRequiredProperty(MySQLGuacamoleProperties.MYSQL_DATABASE)); - myBatisProperties.setProperty("JDBC.username", environment.getRequiredProperty(MySQLGuacamoleProperties.MYSQL_USERNAME)); - myBatisProperties.setProperty("JDBC.password", environment.getRequiredProperty(MySQLGuacamoleProperties.MYSQL_PASSWORD)); - myBatisProperties.setProperty("JDBC.autoCommit", "false"); - myBatisProperties.setProperty("mybatis.pooled.pingEnabled", "true"); - myBatisProperties.setProperty("mybatis.pooled.pingQuery", "SELECT 1"); - driverProperties.setProperty("characterEncoding","UTF-8"); - - // Set up Guice injector. - injector = Guice.createInjector( - JdbcHelper.MySQL, - - new Module() { - @Override - public void configure(Binder binder) { - Names.bindProperties(binder, myBatisProperties); - binder.bind(Properties.class) - .annotatedWith(Names.named("JDBC.driverProperties")) - .toInstance(driverProperties); - } - }, - - new MyBatisModule() { - @Override - protected void initialize() { - - // Datasource - bindDataSourceProviderType(PooledDataSourceProvider.class); - - // Transaction factory - bindTransactionFactoryType(JdbcTransactionFactory.class); - - // Add MyBatis mappers - addMapperClass(ConnectionMapper.class); - addMapperClass(ConnectionGroupMapper.class); - addMapperClass(ConnectionRecordMapper.class); - addMapperClass(ParameterMapper.class); - addMapperClass(SystemPermissionMapper.class); - addMapperClass(UserMapper.class); - - // Bind core implementations of guacamole-ext classes - bind(Environment.class).toInstance(environment); - bind(ConnectionDirectory.class); - bind(ConnectionGroupDirectory.class); - bind(MySQLConnection.class); - bind(MySQLConnectionGroup.class); - bind(MySQLGuacamoleConfiguration.class); - bind(MySQLUser.class); - bind(MySQLUserContext.class); - bind(MySQLRootConnectionGroup.class); - bind(MySQLSystemPermissionSet.class); - bind(UserDirectory.class); - - // Bind services - bind(ConnectionService.class); - bind(ConnectionGroupService.class); - bind(PasswordEncryptionService.class).to(SHA256PasswordEncryptionService.class); - bind(SaltService.class).to(SecureRandomSaltService.class); - bind(SystemPermissionService.class); - bind(UserService.class); - - // Bind appropriate socket service based on policy - bind(GuacamoleSocketService.class).to(UnrestrictedGuacamoleSocketService.class); - - } - } // end of mybatis module - - ); - } // end of constructor - - @Override - public UserContext updateUserContext(UserContext context, - Credentials credentials) throws GuacamoleException { - - // No need to update the context - return context; - } - + } diff --git a/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/package-info.java b/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/package-info.java index 24de42d2d..cdac45a07 100644 --- a/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/package-info.java +++ b/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/package-info.java @@ -22,7 +22,6 @@ /** * The MySQL authentication provider. This package exists purely for backwards- - * compatibility. All other classes have been moved to packages within - * org.glyptodon.guacamole.auth.mysql. + * compatibility. */ package net.sourceforge.guacamole.net.auth.mysql; diff --git a/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/jdbc/JDBCAuthenticationProvider.java b/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/jdbc/JDBCAuthenticationProvider.java new file mode 100644 index 000000000..3be906e29 --- /dev/null +++ b/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/jdbc/JDBCAuthenticationProvider.java @@ -0,0 +1,205 @@ +/* + * Copyright (C) 2015 Glyptodon LLC + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ + +package org.glyptodon.guacamole.auth.jdbc; + +import org.glyptodon.guacamole.auth.jdbc.user.MySQLUserContext; +import org.glyptodon.guacamole.auth.jdbc.connectiongroup.MySQLRootConnectionGroup; +import org.glyptodon.guacamole.auth.jdbc.connectiongroup.MySQLConnectionGroup; +import org.glyptodon.guacamole.auth.jdbc.connectiongroup.ConnectionGroupDirectory; +import org.glyptodon.guacamole.auth.jdbc.connection.ConnectionDirectory; +import org.glyptodon.guacamole.auth.jdbc.connection.MySQLGuacamoleConfiguration; +import org.glyptodon.guacamole.auth.jdbc.connection.MySQLConnection; +import org.glyptodon.guacamole.auth.jdbc.permission.MySQLSystemPermissionSet; +import org.glyptodon.guacamole.auth.jdbc.user.MySQLUser; +import org.glyptodon.guacamole.auth.jdbc.user.UserDirectory; +import com.google.inject.Binder; +import com.google.inject.Guice; +import com.google.inject.Injector; +import com.google.inject.Module; +import com.google.inject.name.Names; +import java.util.Properties; +import org.glyptodon.guacamole.auth.jdbc.connectiongroup.ConnectionGroupMapper; +import org.glyptodon.guacamole.auth.jdbc.connection.ConnectionMapper; +import org.glyptodon.guacamole.auth.jdbc.connection.ConnectionRecordMapper; +import org.glyptodon.guacamole.auth.jdbc.connection.ParameterMapper; +import org.glyptodon.guacamole.auth.jdbc.permission.SystemPermissionMapper; +import org.glyptodon.guacamole.GuacamoleException; +import org.glyptodon.guacamole.net.auth.AuthenticationProvider; +import org.glyptodon.guacamole.net.auth.Credentials; +import org.glyptodon.guacamole.net.auth.UserContext; +import org.glyptodon.guacamole.auth.jdbc.user.UserMapper; +import org.glyptodon.guacamole.auth.jdbc.conf.MySQLGuacamoleProperties; +import org.glyptodon.guacamole.auth.jdbc.connectiongroup.ConnectionGroupService; +import org.glyptodon.guacamole.auth.jdbc.connection.ConnectionService; +import org.glyptodon.guacamole.auth.jdbc.socket.GuacamoleSocketService; +import org.glyptodon.guacamole.auth.jdbc.security.PasswordEncryptionService; +import org.glyptodon.guacamole.auth.jdbc.security.SHA256PasswordEncryptionService; +import org.glyptodon.guacamole.auth.jdbc.security.SaltService; +import org.glyptodon.guacamole.auth.jdbc.security.SecureRandomSaltService; +import org.glyptodon.guacamole.auth.jdbc.permission.SystemPermissionService; +import org.glyptodon.guacamole.auth.jdbc.socket.UnrestrictedGuacamoleSocketService; +import org.glyptodon.guacamole.auth.jdbc.user.UserService; +import org.apache.ibatis.transaction.jdbc.JdbcTransactionFactory; +import org.glyptodon.guacamole.environment.Environment; +import org.glyptodon.guacamole.environment.LocalEnvironment; +import org.mybatis.guice.MyBatisModule; +import org.mybatis.guice.datasource.builtin.PooledDataSourceProvider; +import org.mybatis.guice.datasource.helper.JdbcHelper; + +/** + * Provides a MySQL based implementation of the AuthenticationProvider + * functionality. + * + * @author James Muehlner + */ +public class JDBCAuthenticationProvider implements AuthenticationProvider { + + /** + * Injector which will manage the object graph of this authentication + * provider. + */ + private final Injector injector; + + @Override + public UserContext getUserContext(Credentials credentials) throws GuacamoleException { + + // Get user service + UserService userService = injector.getInstance(UserService.class); + + // Authenticate user + MySQLUser user = userService.retrieveUser(credentials); + if (user != null) { + + // Upon successful authentication, return new user context + MySQLUserContext context = injector.getInstance(MySQLUserContext.class); + context.init(user.getCurrentUser()); + return context; + + } + + // Otherwise, unauthorized + return null; + + } + + /** + * Creates a new JDBCAuthenticationProvider that reads and writes + * authentication data to an arbitrary database defined by properties in + * guacamole.properties. + * + * @throws GuacamoleException + * If a required property is missing, or an error occurs while parsing + * a property. + */ + public JDBCAuthenticationProvider() throws GuacamoleException { + + // Get local environment + final Environment environment = new LocalEnvironment(); + + final Properties myBatisProperties = new Properties(); + final Properties driverProperties = new Properties(); + + // Set the mysql properties for MyBatis. + myBatisProperties.setProperty("mybatis.environment.id", "guacamole"); + myBatisProperties.setProperty("JDBC.host", environment.getRequiredProperty(MySQLGuacamoleProperties.MYSQL_HOSTNAME)); + myBatisProperties.setProperty("JDBC.port", String.valueOf(environment.getRequiredProperty(MySQLGuacamoleProperties.MYSQL_PORT))); + myBatisProperties.setProperty("JDBC.schema", environment.getRequiredProperty(MySQLGuacamoleProperties.MYSQL_DATABASE)); + myBatisProperties.setProperty("JDBC.username", environment.getRequiredProperty(MySQLGuacamoleProperties.MYSQL_USERNAME)); + myBatisProperties.setProperty("JDBC.password", environment.getRequiredProperty(MySQLGuacamoleProperties.MYSQL_PASSWORD)); + myBatisProperties.setProperty("JDBC.autoCommit", "false"); + myBatisProperties.setProperty("mybatis.pooled.pingEnabled", "true"); + myBatisProperties.setProperty("mybatis.pooled.pingQuery", "SELECT 1"); + driverProperties.setProperty("characterEncoding","UTF-8"); + + // Set up Guice injector. + injector = Guice.createInjector( + JdbcHelper.MySQL, + + new Module() { + @Override + public void configure(Binder binder) { + Names.bindProperties(binder, myBatisProperties); + binder.bind(Properties.class) + .annotatedWith(Names.named("JDBC.driverProperties")) + .toInstance(driverProperties); + } + }, + + new MyBatisModule() { + @Override + protected void initialize() { + + // Datasource + bindDataSourceProviderType(PooledDataSourceProvider.class); + + // Transaction factory + bindTransactionFactoryType(JdbcTransactionFactory.class); + + // Add MyBatis mappers + addMapperClass(ConnectionMapper.class); + addMapperClass(ConnectionGroupMapper.class); + addMapperClass(ConnectionRecordMapper.class); + addMapperClass(ParameterMapper.class); + addMapperClass(SystemPermissionMapper.class); + addMapperClass(UserMapper.class); + + // Bind core implementations of guacamole-ext classes + bind(Environment.class).toInstance(environment); + bind(ConnectionDirectory.class); + bind(ConnectionGroupDirectory.class); + bind(MySQLConnection.class); + bind(MySQLConnectionGroup.class); + bind(MySQLGuacamoleConfiguration.class); + bind(MySQLUser.class); + bind(MySQLUserContext.class); + bind(MySQLRootConnectionGroup.class); + bind(MySQLSystemPermissionSet.class); + bind(UserDirectory.class); + + // Bind services + bind(ConnectionService.class); + bind(ConnectionGroupService.class); + bind(PasswordEncryptionService.class).to(SHA256PasswordEncryptionService.class); + bind(SaltService.class).to(SecureRandomSaltService.class); + bind(SystemPermissionService.class); + bind(UserService.class); + + // Bind appropriate socket service based on policy + bind(GuacamoleSocketService.class).to(UnrestrictedGuacamoleSocketService.class); + + } + } // end of mybatis module + + ); + } // end of constructor + + @Override + public UserContext updateUserContext(UserContext context, + Credentials credentials) throws GuacamoleException { + + // No need to update the context + return context; + + } + +} diff --git a/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/base/DirectoryObject.java b/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/jdbc/base/DirectoryObject.java similarity index 97% rename from extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/base/DirectoryObject.java rename to extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/jdbc/base/DirectoryObject.java index 67e546269..0f3e6d6a5 100644 --- a/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/base/DirectoryObject.java +++ b/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/jdbc/base/DirectoryObject.java @@ -20,7 +20,7 @@ * THE SOFTWARE. */ -package org.glyptodon.guacamole.auth.mysql.base; +package org.glyptodon.guacamole.auth.jdbc.base; import org.glyptodon.guacamole.net.auth.Identifiable; diff --git a/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/base/DirectoryObjectMapper.java b/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/jdbc/base/DirectoryObjectMapper.java similarity index 97% rename from extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/base/DirectoryObjectMapper.java rename to extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/jdbc/base/DirectoryObjectMapper.java index 3d47491f8..d63cf3814 100644 --- a/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/base/DirectoryObjectMapper.java +++ b/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/jdbc/base/DirectoryObjectMapper.java @@ -20,11 +20,11 @@ * THE SOFTWARE. */ -package org.glyptodon.guacamole.auth.mysql.base; +package org.glyptodon.guacamole.auth.jdbc.base; import java.util.Collection; import java.util.Set; -import org.glyptodon.guacamole.auth.mysql.user.UserModel; +import org.glyptodon.guacamole.auth.jdbc.user.UserModel; import org.apache.ibatis.annotations.Param; /** diff --git a/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/base/DirectoryObjectService.java b/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/jdbc/base/DirectoryObjectService.java similarity index 99% rename from extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/base/DirectoryObjectService.java rename to extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/jdbc/base/DirectoryObjectService.java index a6ac70dc1..e370174ba 100644 --- a/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/base/DirectoryObjectService.java +++ b/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/jdbc/base/DirectoryObjectService.java @@ -20,13 +20,13 @@ * THE SOFTWARE. */ -package org.glyptodon.guacamole.auth.mysql.base; +package org.glyptodon.guacamole.auth.jdbc.base; import java.util.ArrayList; import java.util.Collection; import java.util.Collections; import java.util.Set; -import org.glyptodon.guacamole.auth.mysql.user.AuthenticatedUser; +import org.glyptodon.guacamole.auth.jdbc.user.AuthenticatedUser; import org.glyptodon.guacamole.GuacamoleException; import org.glyptodon.guacamole.GuacamoleSecurityException; import org.glyptodon.guacamole.net.auth.permission.ObjectPermission; diff --git a/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/base/ObjectModel.java b/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/jdbc/base/ObjectModel.java similarity index 98% rename from extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/base/ObjectModel.java rename to extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/jdbc/base/ObjectModel.java index 58ec04658..e936686cd 100644 --- a/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/base/ObjectModel.java +++ b/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/jdbc/base/ObjectModel.java @@ -20,7 +20,7 @@ * THE SOFTWARE. */ -package org.glyptodon.guacamole.auth.mysql.base; +package org.glyptodon.guacamole.auth.jdbc.base; /** * Object representation of a Guacamole object, such as a user or connection, diff --git a/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/base/RestrictedObject.java b/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/jdbc/base/RestrictedObject.java similarity index 96% rename from extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/base/RestrictedObject.java rename to extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/jdbc/base/RestrictedObject.java index f27bd2b32..0c506b6a0 100644 --- a/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/base/RestrictedObject.java +++ b/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/jdbc/base/RestrictedObject.java @@ -20,9 +20,9 @@ * THE SOFTWARE. */ -package org.glyptodon.guacamole.auth.mysql.base; +package org.glyptodon.guacamole.auth.jdbc.base; -import org.glyptodon.guacamole.auth.mysql.user.AuthenticatedUser; +import org.glyptodon.guacamole.auth.jdbc.user.AuthenticatedUser; /** * Common base class for objects that are associated with the users that diff --git a/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/base/package-info.java b/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/jdbc/base/package-info.java similarity index 96% rename from extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/base/package-info.java rename to extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/jdbc/base/package-info.java index e7b11a621..72f8f4816 100644 --- a/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/base/package-info.java +++ b/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/jdbc/base/package-info.java @@ -25,4 +25,4 @@ * relationships between the model and the implementations of guacamole-ext * classes. */ -package org.glyptodon.guacamole.auth.mysql.base; +package org.glyptodon.guacamole.auth.jdbc.base; diff --git a/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/conf/MySQLGuacamoleProperties.java b/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/jdbc/conf/MySQLGuacamoleProperties.java similarity index 98% rename from extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/conf/MySQLGuacamoleProperties.java rename to extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/jdbc/conf/MySQLGuacamoleProperties.java index d71883ade..9b38d23b0 100644 --- a/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/conf/MySQLGuacamoleProperties.java +++ b/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/jdbc/conf/MySQLGuacamoleProperties.java @@ -20,7 +20,7 @@ * THE SOFTWARE. */ -package org.glyptodon.guacamole.auth.mysql.conf; +package org.glyptodon.guacamole.auth.jdbc.conf; import org.glyptodon.guacamole.properties.BooleanGuacamoleProperty; import org.glyptodon.guacamole.properties.IntegerGuacamoleProperty; diff --git a/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/conf/package-info.java b/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/jdbc/conf/package-info.java similarity index 96% rename from extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/conf/package-info.java rename to extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/jdbc/conf/package-info.java index b200d0d73..5c16bfa04 100644 --- a/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/conf/package-info.java +++ b/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/jdbc/conf/package-info.java @@ -23,4 +23,4 @@ /** * Classes related to the configuration of the MySQL authentication provider. */ -package org.glyptodon.guacamole.auth.mysql.conf; +package org.glyptodon.guacamole.auth.jdbc.conf; diff --git a/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/connection/ConnectionDirectory.java b/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/jdbc/connection/ConnectionDirectory.java similarity index 96% rename from extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/connection/ConnectionDirectory.java rename to extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/jdbc/connection/ConnectionDirectory.java index 3f898c29b..4fba7e243 100644 --- a/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/connection/ConnectionDirectory.java +++ b/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/jdbc/connection/ConnectionDirectory.java @@ -20,14 +20,14 @@ * THE SOFTWARE. */ -package org.glyptodon.guacamole.auth.mysql.connection; +package org.glyptodon.guacamole.auth.jdbc.connection; import com.google.inject.Inject; import java.util.Collection; import java.util.Collections; import java.util.Set; -import org.glyptodon.guacamole.auth.mysql.user.AuthenticatedUser; +import org.glyptodon.guacamole.auth.jdbc.user.AuthenticatedUser; import org.glyptodon.guacamole.GuacamoleException; import org.glyptodon.guacamole.net.auth.Connection; import org.glyptodon.guacamole.net.auth.Directory; diff --git a/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/connection/ConnectionMapper.java b/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/jdbc/connection/ConnectionMapper.java similarity index 94% rename from extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/connection/ConnectionMapper.java rename to extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/jdbc/connection/ConnectionMapper.java index 33c0bac48..8c8cf0a2b 100644 --- a/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/connection/ConnectionMapper.java +++ b/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/jdbc/connection/ConnectionMapper.java @@ -20,11 +20,11 @@ * THE SOFTWARE. */ -package org.glyptodon.guacamole.auth.mysql.connection; +package org.glyptodon.guacamole.auth.jdbc.connection; import java.util.Set; -import org.glyptodon.guacamole.auth.mysql.base.DirectoryObjectMapper; -import org.glyptodon.guacamole.auth.mysql.user.UserModel; +import org.glyptodon.guacamole.auth.jdbc.base.DirectoryObjectMapper; +import org.glyptodon.guacamole.auth.jdbc.user.UserModel; import org.apache.ibatis.annotations.Param; /** diff --git a/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/connection/ConnectionModel.java b/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/jdbc/connection/ConnectionModel.java similarity index 97% rename from extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/connection/ConnectionModel.java rename to extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/jdbc/connection/ConnectionModel.java index 34fc2cc16..b4ef2e907 100644 --- a/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/connection/ConnectionModel.java +++ b/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/jdbc/connection/ConnectionModel.java @@ -20,9 +20,9 @@ * THE SOFTWARE. */ -package org.glyptodon.guacamole.auth.mysql.connection; +package org.glyptodon.guacamole.auth.jdbc.connection; -import org.glyptodon.guacamole.auth.mysql.base.ObjectModel; +import org.glyptodon.guacamole.auth.jdbc.base.ObjectModel; /** * Object representation of a Guacamole connection, as represented in the diff --git a/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/connection/ConnectionRecordMapper.java b/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/jdbc/connection/ConnectionRecordMapper.java similarity index 97% rename from extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/connection/ConnectionRecordMapper.java rename to extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/jdbc/connection/ConnectionRecordMapper.java index e23f8b64a..8816fb69c 100644 --- a/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/connection/ConnectionRecordMapper.java +++ b/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/jdbc/connection/ConnectionRecordMapper.java @@ -20,7 +20,7 @@ * THE SOFTWARE. */ -package org.glyptodon.guacamole.auth.mysql.connection; +package org.glyptodon.guacamole.auth.jdbc.connection; import java.util.List; import org.apache.ibatis.annotations.Param; diff --git a/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/connection/ConnectionRecordModel.java b/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/jdbc/connection/ConnectionRecordModel.java similarity index 98% rename from extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/connection/ConnectionRecordModel.java rename to extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/jdbc/connection/ConnectionRecordModel.java index 7e10e8476..aa35fb27c 100644 --- a/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/connection/ConnectionRecordModel.java +++ b/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/jdbc/connection/ConnectionRecordModel.java @@ -20,7 +20,7 @@ * THE SOFTWARE. */ -package org.glyptodon.guacamole.auth.mysql.connection; +package org.glyptodon.guacamole.auth.jdbc.connection; import java.util.Date; diff --git a/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/connection/ConnectionService.java b/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/jdbc/connection/ConnectionService.java similarity index 97% rename from extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/connection/ConnectionService.java rename to extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/jdbc/connection/ConnectionService.java index 01cc3b04a..3109638b8 100644 --- a/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/connection/ConnectionService.java +++ b/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/jdbc/connection/ConnectionService.java @@ -20,7 +20,7 @@ * THE SOFTWARE. */ -package org.glyptodon.guacamole.auth.mysql.connection; +package org.glyptodon.guacamole.auth.jdbc.connection; import com.google.inject.Inject; import com.google.inject.Provider; @@ -30,10 +30,10 @@ import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.Set; -import org.glyptodon.guacamole.auth.mysql.user.AuthenticatedUser; -import org.glyptodon.guacamole.auth.mysql.base.DirectoryObjectMapper; -import org.glyptodon.guacamole.auth.mysql.base.DirectoryObjectService; -import org.glyptodon.guacamole.auth.mysql.socket.GuacamoleSocketService; +import org.glyptodon.guacamole.auth.jdbc.user.AuthenticatedUser; +import org.glyptodon.guacamole.auth.jdbc.base.DirectoryObjectMapper; +import org.glyptodon.guacamole.auth.jdbc.base.DirectoryObjectService; +import org.glyptodon.guacamole.auth.jdbc.socket.GuacamoleSocketService; import org.glyptodon.guacamole.GuacamoleClientException; import org.glyptodon.guacamole.GuacamoleException; import org.glyptodon.guacamole.GuacamoleSecurityException; diff --git a/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/connection/MySQLConnection.java b/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/jdbc/connection/MySQLConnection.java similarity index 94% rename from extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/connection/MySQLConnection.java rename to extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/jdbc/connection/MySQLConnection.java index 205972771..df9bc02c2 100644 --- a/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/connection/MySQLConnection.java +++ b/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/jdbc/connection/MySQLConnection.java @@ -20,14 +20,14 @@ * THE SOFTWARE. */ -package org.glyptodon.guacamole.auth.mysql.connection; +package org.glyptodon.guacamole.auth.jdbc.connection; import com.google.inject.Inject; import com.google.inject.Provider; import java.util.List; -import org.glyptodon.guacamole.auth.mysql.base.DirectoryObject; -import org.glyptodon.guacamole.auth.mysql.connectiongroup.MySQLRootConnectionGroup; -import org.glyptodon.guacamole.auth.mysql.socket.GuacamoleSocketService; +import org.glyptodon.guacamole.auth.jdbc.base.DirectoryObject; +import org.glyptodon.guacamole.auth.jdbc.connectiongroup.MySQLRootConnectionGroup; +import org.glyptodon.guacamole.auth.jdbc.socket.GuacamoleSocketService; import org.glyptodon.guacamole.GuacamoleException; import org.glyptodon.guacamole.net.GuacamoleSocket; import org.glyptodon.guacamole.net.auth.Connection; diff --git a/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/connection/MySQLConnectionRecord.java b/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/jdbc/connection/MySQLConnectionRecord.java similarity index 97% rename from extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/connection/MySQLConnectionRecord.java rename to extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/jdbc/connection/MySQLConnectionRecord.java index 01086797e..b600af326 100644 --- a/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/connection/MySQLConnectionRecord.java +++ b/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/jdbc/connection/MySQLConnectionRecord.java @@ -20,7 +20,7 @@ * THE SOFTWARE. */ -package org.glyptodon.guacamole.auth.mysql.connection; +package org.glyptodon.guacamole.auth.jdbc.connection; import java.util.Date; diff --git a/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/connection/MySQLGuacamoleConfiguration.java b/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/jdbc/connection/MySQLGuacamoleConfiguration.java similarity index 96% rename from extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/connection/MySQLGuacamoleConfiguration.java rename to extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/jdbc/connection/MySQLGuacamoleConfiguration.java index 70ca86258..27f9abb6c 100644 --- a/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/connection/MySQLGuacamoleConfiguration.java +++ b/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/jdbc/connection/MySQLGuacamoleConfiguration.java @@ -20,11 +20,11 @@ * THE SOFTWARE. */ -package org.glyptodon.guacamole.auth.mysql.connection; +package org.glyptodon.guacamole.auth.jdbc.connection; import com.google.inject.Inject; import java.util.Map; -import org.glyptodon.guacamole.auth.mysql.user.AuthenticatedUser; +import org.glyptodon.guacamole.auth.jdbc.user.AuthenticatedUser; import org.glyptodon.guacamole.protocol.GuacamoleConfiguration; /** diff --git a/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/connection/ParameterMapper.java b/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/jdbc/connection/ParameterMapper.java similarity index 97% rename from extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/connection/ParameterMapper.java rename to extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/jdbc/connection/ParameterMapper.java index f54392aa5..b8bb26fb5 100644 --- a/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/connection/ParameterMapper.java +++ b/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/jdbc/connection/ParameterMapper.java @@ -20,7 +20,7 @@ * THE SOFTWARE. */ -package org.glyptodon.guacamole.auth.mysql.connection; +package org.glyptodon.guacamole.auth.jdbc.connection; import java.util.Collection; import org.apache.ibatis.annotations.Param; diff --git a/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/connection/ParameterModel.java b/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/jdbc/connection/ParameterModel.java similarity index 98% rename from extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/connection/ParameterModel.java rename to extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/jdbc/connection/ParameterModel.java index ec96cfb4a..103bdae49 100644 --- a/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/connection/ParameterModel.java +++ b/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/jdbc/connection/ParameterModel.java @@ -20,7 +20,7 @@ * THE SOFTWARE. */ -package org.glyptodon.guacamole.auth.mysql.connection; +package org.glyptodon.guacamole.auth.jdbc.connection; /** * A single parameter name/value pair belonging to a connection. diff --git a/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/connection/package-info.java b/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/jdbc/connection/package-info.java similarity index 95% rename from extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/connection/package-info.java rename to extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/jdbc/connection/package-info.java index 52ba27dff..6507c59b9 100644 --- a/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/connection/package-info.java +++ b/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/jdbc/connection/package-info.java @@ -23,4 +23,4 @@ /** * Classes related to connections and their parameters and history. */ -package org.glyptodon.guacamole.auth.mysql.connection; +package org.glyptodon.guacamole.auth.jdbc.connection; diff --git a/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/connectiongroup/ConnectionGroupDirectory.java b/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/jdbc/connectiongroup/ConnectionGroupDirectory.java similarity index 96% rename from extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/connectiongroup/ConnectionGroupDirectory.java rename to extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/jdbc/connectiongroup/ConnectionGroupDirectory.java index 8789b2e9d..7b752a329 100644 --- a/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/connectiongroup/ConnectionGroupDirectory.java +++ b/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/jdbc/connectiongroup/ConnectionGroupDirectory.java @@ -20,14 +20,14 @@ * THE SOFTWARE. */ -package org.glyptodon.guacamole.auth.mysql.connectiongroup; +package org.glyptodon.guacamole.auth.jdbc.connectiongroup; import com.google.inject.Inject; import java.util.Collection; import java.util.Collections; import java.util.Set; -import org.glyptodon.guacamole.auth.mysql.user.AuthenticatedUser; +import org.glyptodon.guacamole.auth.jdbc.user.AuthenticatedUser; import org.glyptodon.guacamole.GuacamoleException; import org.glyptodon.guacamole.net.auth.ConnectionGroup; import org.glyptodon.guacamole.net.auth.Directory; diff --git a/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/connectiongroup/ConnectionGroupMapper.java b/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/jdbc/connectiongroup/ConnectionGroupMapper.java similarity index 94% rename from extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/connectiongroup/ConnectionGroupMapper.java rename to extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/jdbc/connectiongroup/ConnectionGroupMapper.java index 99c3addf1..ad682cd20 100644 --- a/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/connectiongroup/ConnectionGroupMapper.java +++ b/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/jdbc/connectiongroup/ConnectionGroupMapper.java @@ -20,11 +20,11 @@ * THE SOFTWARE. */ -package org.glyptodon.guacamole.auth.mysql.connectiongroup; +package org.glyptodon.guacamole.auth.jdbc.connectiongroup; import java.util.Set; -import org.glyptodon.guacamole.auth.mysql.base.DirectoryObjectMapper; -import org.glyptodon.guacamole.auth.mysql.user.UserModel; +import org.glyptodon.guacamole.auth.jdbc.base.DirectoryObjectMapper; +import org.glyptodon.guacamole.auth.jdbc.user.UserModel; import org.apache.ibatis.annotations.Param; /** diff --git a/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/connectiongroup/ConnectionGroupModel.java b/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/jdbc/connectiongroup/ConnectionGroupModel.java similarity index 97% rename from extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/connectiongroup/ConnectionGroupModel.java rename to extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/jdbc/connectiongroup/ConnectionGroupModel.java index ce7276e90..68845df9c 100644 --- a/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/connectiongroup/ConnectionGroupModel.java +++ b/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/jdbc/connectiongroup/ConnectionGroupModel.java @@ -20,9 +20,9 @@ * THE SOFTWARE. */ -package org.glyptodon.guacamole.auth.mysql.connectiongroup; +package org.glyptodon.guacamole.auth.jdbc.connectiongroup; -import org.glyptodon.guacamole.auth.mysql.base.ObjectModel; +import org.glyptodon.guacamole.auth.jdbc.base.ObjectModel; import org.glyptodon.guacamole.net.auth.ConnectionGroup; /** diff --git a/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/connectiongroup/ConnectionGroupService.java b/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/jdbc/connectiongroup/ConnectionGroupService.java similarity index 95% rename from extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/connectiongroup/ConnectionGroupService.java rename to extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/jdbc/connectiongroup/ConnectionGroupService.java index 0fba4151b..4f50e9e65 100644 --- a/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/connectiongroup/ConnectionGroupService.java +++ b/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/jdbc/connectiongroup/ConnectionGroupService.java @@ -20,15 +20,15 @@ * THE SOFTWARE. */ -package org.glyptodon.guacamole.auth.mysql.connectiongroup; +package org.glyptodon.guacamole.auth.jdbc.connectiongroup; import com.google.inject.Inject; import com.google.inject.Provider; import java.util.Set; -import org.glyptodon.guacamole.auth.mysql.user.AuthenticatedUser; -import org.glyptodon.guacamole.auth.mysql.base.DirectoryObjectMapper; -import org.glyptodon.guacamole.auth.mysql.base.DirectoryObjectService; -import org.glyptodon.guacamole.auth.mysql.socket.GuacamoleSocketService; +import org.glyptodon.guacamole.auth.jdbc.user.AuthenticatedUser; +import org.glyptodon.guacamole.auth.jdbc.base.DirectoryObjectMapper; +import org.glyptodon.guacamole.auth.jdbc.base.DirectoryObjectService; +import org.glyptodon.guacamole.auth.jdbc.socket.GuacamoleSocketService; import org.glyptodon.guacamole.GuacamoleClientException; import org.glyptodon.guacamole.GuacamoleException; import org.glyptodon.guacamole.GuacamoleSecurityException; diff --git a/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/connectiongroup/MySQLConnectionGroup.java b/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/jdbc/connectiongroup/MySQLConnectionGroup.java similarity index 93% rename from extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/connectiongroup/MySQLConnectionGroup.java rename to extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/jdbc/connectiongroup/MySQLConnectionGroup.java index 0488498a1..f23f19969 100644 --- a/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/connectiongroup/MySQLConnectionGroup.java +++ b/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/jdbc/connectiongroup/MySQLConnectionGroup.java @@ -20,13 +20,13 @@ * THE SOFTWARE. */ -package org.glyptodon.guacamole.auth.mysql.connectiongroup; +package org.glyptodon.guacamole.auth.jdbc.connectiongroup; import com.google.inject.Inject; import java.util.Set; -import org.glyptodon.guacamole.auth.mysql.base.DirectoryObject; -import org.glyptodon.guacamole.auth.mysql.connection.ConnectionService; -import org.glyptodon.guacamole.auth.mysql.socket.GuacamoleSocketService; +import org.glyptodon.guacamole.auth.jdbc.base.DirectoryObject; +import org.glyptodon.guacamole.auth.jdbc.connection.ConnectionService; +import org.glyptodon.guacamole.auth.jdbc.socket.GuacamoleSocketService; import org.glyptodon.guacamole.GuacamoleException; import org.glyptodon.guacamole.net.GuacamoleSocket; import org.glyptodon.guacamole.net.auth.ConnectionGroup; diff --git a/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/connectiongroup/MySQLRootConnectionGroup.java b/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/jdbc/connectiongroup/MySQLRootConnectionGroup.java similarity index 96% rename from extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/connectiongroup/MySQLRootConnectionGroup.java rename to extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/jdbc/connectiongroup/MySQLRootConnectionGroup.java index dee968ae8..eeaf6e939 100644 --- a/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/connectiongroup/MySQLRootConnectionGroup.java +++ b/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/jdbc/connectiongroup/MySQLRootConnectionGroup.java @@ -20,12 +20,12 @@ * THE SOFTWARE. */ -package org.glyptodon.guacamole.auth.mysql.connectiongroup; +package org.glyptodon.guacamole.auth.jdbc.connectiongroup; import com.google.inject.Inject; import java.util.Set; -import org.glyptodon.guacamole.auth.mysql.user.AuthenticatedUser; -import org.glyptodon.guacamole.auth.mysql.connection.ConnectionService; +import org.glyptodon.guacamole.auth.jdbc.user.AuthenticatedUser; +import org.glyptodon.guacamole.auth.jdbc.connection.ConnectionService; import org.glyptodon.guacamole.GuacamoleException; import org.glyptodon.guacamole.GuacamoleSecurityException; import org.glyptodon.guacamole.net.GuacamoleSocket; diff --git a/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/connectiongroup/package-info.java b/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/jdbc/connectiongroup/package-info.java similarity index 95% rename from extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/connectiongroup/package-info.java rename to extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/jdbc/connectiongroup/package-info.java index 4c27273f6..a1d0bd250 100644 --- a/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/connectiongroup/package-info.java +++ b/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/jdbc/connectiongroup/package-info.java @@ -23,4 +23,4 @@ /** * Classes related to connection groups. */ -package org.glyptodon.guacamole.auth.mysql.connectiongroup; +package org.glyptodon.guacamole.auth.jdbc.connectiongroup; diff --git a/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/jdbc/package-info.java b/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/jdbc/package-info.java new file mode 100644 index 000000000..e4d12fca9 --- /dev/null +++ b/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/jdbc/package-info.java @@ -0,0 +1,29 @@ +/* + * Copyright (C) 2013 Glyptodon LLC + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ + +/** + * The base JDBC authentication provider. This authentication provider serves + * as a basis for other JDBC authentication provider implementations which are + * driven by relatively-common schemas. The only difference between such + * implementations are maintained within database-specific MyBatis mappings. + */ +package org.glyptodon.guacamole.auth.jdbc; diff --git a/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/permission/MySQLSystemPermissionSet.java b/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/jdbc/permission/MySQLSystemPermissionSet.java similarity index 95% rename from extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/permission/MySQLSystemPermissionSet.java rename to extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/jdbc/permission/MySQLSystemPermissionSet.java index ef48dc718..0bcf0a44b 100644 --- a/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/permission/MySQLSystemPermissionSet.java +++ b/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/jdbc/permission/MySQLSystemPermissionSet.java @@ -20,13 +20,13 @@ * THE SOFTWARE. */ -package org.glyptodon.guacamole.auth.mysql.permission; +package org.glyptodon.guacamole.auth.jdbc.permission; -import org.glyptodon.guacamole.auth.mysql.user.MySQLUser; +import org.glyptodon.guacamole.auth.jdbc.user.MySQLUser; import com.google.inject.Inject; import java.util.Collections; import java.util.Set; -import org.glyptodon.guacamole.auth.mysql.user.AuthenticatedUser; +import org.glyptodon.guacamole.auth.jdbc.user.AuthenticatedUser; import org.glyptodon.guacamole.GuacamoleException; import org.glyptodon.guacamole.net.auth.permission.SystemPermission; import org.glyptodon.guacamole.net.auth.permission.SystemPermissionSet; diff --git a/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/permission/ObjectPermissionMapper.java b/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/jdbc/permission/ObjectPermissionMapper.java similarity index 95% rename from extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/permission/ObjectPermissionMapper.java rename to extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/jdbc/permission/ObjectPermissionMapper.java index ebf92b7f2..777f54046 100644 --- a/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/permission/ObjectPermissionMapper.java +++ b/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/jdbc/permission/ObjectPermissionMapper.java @@ -20,7 +20,7 @@ * THE SOFTWARE. */ -package org.glyptodon.guacamole.auth.mysql.permission; +package org.glyptodon.guacamole.auth.jdbc.permission; /** * Mapper for object-related permissions. diff --git a/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/permission/ObjectPermissionModel.java b/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/jdbc/permission/ObjectPermissionModel.java similarity index 98% rename from extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/permission/ObjectPermissionModel.java rename to extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/jdbc/permission/ObjectPermissionModel.java index 5c2c60f98..7b193193d 100644 --- a/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/permission/ObjectPermissionModel.java +++ b/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/jdbc/permission/ObjectPermissionModel.java @@ -20,7 +20,7 @@ * THE SOFTWARE. */ -package org.glyptodon.guacamole.auth.mysql.permission; +package org.glyptodon.guacamole.auth.jdbc.permission; import org.glyptodon.guacamole.net.auth.permission.ObjectPermission; diff --git a/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/permission/ObjectPermissionService.java b/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/jdbc/permission/ObjectPermissionService.java similarity index 97% rename from extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/permission/ObjectPermissionService.java rename to extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/jdbc/permission/ObjectPermissionService.java index 99f266466..14b893c55 100644 --- a/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/permission/ObjectPermissionService.java +++ b/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/jdbc/permission/ObjectPermissionService.java @@ -20,13 +20,13 @@ * THE SOFTWARE. */ -package org.glyptodon.guacamole.auth.mysql.permission; +package org.glyptodon.guacamole.auth.jdbc.permission; import java.util.Collection; import java.util.Collections; import java.util.HashSet; -import org.glyptodon.guacamole.auth.mysql.user.AuthenticatedUser; -import org.glyptodon.guacamole.auth.mysql.user.MySQLUser; +import org.glyptodon.guacamole.auth.jdbc.user.AuthenticatedUser; +import org.glyptodon.guacamole.auth.jdbc.user.MySQLUser; import org.glyptodon.guacamole.GuacamoleException; import org.glyptodon.guacamole.GuacamoleSecurityException; import org.glyptodon.guacamole.net.auth.permission.ObjectPermission; diff --git a/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/permission/PermissionMapper.java b/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/jdbc/permission/PermissionMapper.java similarity index 95% rename from extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/permission/PermissionMapper.java rename to extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/jdbc/permission/PermissionMapper.java index 6d8f2c876..eff35a1ac 100644 --- a/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/permission/PermissionMapper.java +++ b/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/jdbc/permission/PermissionMapper.java @@ -20,10 +20,10 @@ * THE SOFTWARE. */ -package org.glyptodon.guacamole.auth.mysql.permission; +package org.glyptodon.guacamole.auth.jdbc.permission; import java.util.Collection; -import org.glyptodon.guacamole.auth.mysql.user.UserModel; +import org.glyptodon.guacamole.auth.jdbc.user.UserModel; import org.apache.ibatis.annotations.Param; /** diff --git a/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/permission/PermissionModel.java b/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/jdbc/permission/PermissionModel.java similarity index 98% rename from extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/permission/PermissionModel.java rename to extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/jdbc/permission/PermissionModel.java index 4904e8ce6..d50c9704f 100644 --- a/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/permission/PermissionModel.java +++ b/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/jdbc/permission/PermissionModel.java @@ -20,7 +20,7 @@ * THE SOFTWARE. */ -package org.glyptodon.guacamole.auth.mysql.permission; +package org.glyptodon.guacamole.auth.jdbc.permission; /** * Generic base permission model which grants a permission of a particular type diff --git a/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/permission/PermissionService.java b/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/jdbc/permission/PermissionService.java similarity index 97% rename from extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/permission/PermissionService.java rename to extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/jdbc/permission/PermissionService.java index b3112b00d..1e1266215 100644 --- a/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/permission/PermissionService.java +++ b/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/jdbc/permission/PermissionService.java @@ -20,14 +20,14 @@ * THE SOFTWARE. */ -package org.glyptodon.guacamole.auth.mysql.permission; +package org.glyptodon.guacamole.auth.jdbc.permission; import java.util.ArrayList; import java.util.Collection; import java.util.HashSet; import java.util.Set; -import org.glyptodon.guacamole.auth.mysql.user.AuthenticatedUser; -import org.glyptodon.guacamole.auth.mysql.user.MySQLUser; +import org.glyptodon.guacamole.auth.jdbc.user.AuthenticatedUser; +import org.glyptodon.guacamole.auth.jdbc.user.MySQLUser; import org.glyptodon.guacamole.GuacamoleException; import org.glyptodon.guacamole.GuacamoleSecurityException; import org.glyptodon.guacamole.net.auth.permission.Permission; diff --git a/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/permission/SystemPermissionMapper.java b/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/jdbc/permission/SystemPermissionMapper.java similarity index 94% rename from extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/permission/SystemPermissionMapper.java rename to extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/jdbc/permission/SystemPermissionMapper.java index 63378088c..fdcb63ce9 100644 --- a/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/permission/SystemPermissionMapper.java +++ b/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/jdbc/permission/SystemPermissionMapper.java @@ -20,9 +20,9 @@ * THE SOFTWARE. */ -package org.glyptodon.guacamole.auth.mysql.permission; +package org.glyptodon.guacamole.auth.jdbc.permission; -import org.glyptodon.guacamole.auth.mysql.user.UserModel; +import org.glyptodon.guacamole.auth.jdbc.user.UserModel; import org.apache.ibatis.annotations.Param; import org.glyptodon.guacamole.net.auth.permission.SystemPermission; diff --git a/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/permission/SystemPermissionModel.java b/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/jdbc/permission/SystemPermissionModel.java similarity index 96% rename from extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/permission/SystemPermissionModel.java rename to extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/jdbc/permission/SystemPermissionModel.java index a798cf110..8c1c13ac9 100644 --- a/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/permission/SystemPermissionModel.java +++ b/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/jdbc/permission/SystemPermissionModel.java @@ -20,7 +20,7 @@ * THE SOFTWARE. */ -package org.glyptodon.guacamole.auth.mysql.permission; +package org.glyptodon.guacamole.auth.jdbc.permission; import org.glyptodon.guacamole.net.auth.permission.SystemPermission; diff --git a/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/permission/SystemPermissionService.java b/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/jdbc/permission/SystemPermissionService.java similarity index 97% rename from extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/permission/SystemPermissionService.java rename to extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/jdbc/permission/SystemPermissionService.java index 3ad300796..90ebdc146 100644 --- a/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/permission/SystemPermissionService.java +++ b/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/jdbc/permission/SystemPermissionService.java @@ -20,13 +20,13 @@ * THE SOFTWARE. */ -package org.glyptodon.guacamole.auth.mysql.permission; +package org.glyptodon.guacamole.auth.jdbc.permission; import com.google.inject.Inject; import com.google.inject.Provider; import java.util.Collection; -import org.glyptodon.guacamole.auth.mysql.user.AuthenticatedUser; -import org.glyptodon.guacamole.auth.mysql.user.MySQLUser; +import org.glyptodon.guacamole.auth.jdbc.user.AuthenticatedUser; +import org.glyptodon.guacamole.auth.jdbc.user.MySQLUser; import org.glyptodon.guacamole.GuacamoleException; import org.glyptodon.guacamole.GuacamoleSecurityException; import org.glyptodon.guacamole.net.auth.permission.SystemPermission; diff --git a/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/permission/package-info.java b/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/jdbc/permission/package-info.java similarity index 95% rename from extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/permission/package-info.java rename to extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/jdbc/permission/package-info.java index 79e89425a..01b820ac1 100644 --- a/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/permission/package-info.java +++ b/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/jdbc/permission/package-info.java @@ -23,4 +23,4 @@ /** * Classes related to object- and system-level permissions. */ -package org.glyptodon.guacamole.auth.mysql.permission; +package org.glyptodon.guacamole.auth.jdbc.permission; diff --git a/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/security/PasswordEncryptionService.java b/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/jdbc/security/PasswordEncryptionService.java similarity index 96% rename from extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/security/PasswordEncryptionService.java rename to extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/jdbc/security/PasswordEncryptionService.java index 1e0824b96..ef3099468 100644 --- a/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/security/PasswordEncryptionService.java +++ b/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/jdbc/security/PasswordEncryptionService.java @@ -20,7 +20,7 @@ * THE SOFTWARE. */ -package org.glyptodon.guacamole.auth.mysql.security; +package org.glyptodon.guacamole.auth.jdbc.security; /** * A service to perform password encryption and checking. diff --git a/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/security/SHA256PasswordEncryptionService.java b/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/jdbc/security/SHA256PasswordEncryptionService.java similarity index 97% rename from extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/security/SHA256PasswordEncryptionService.java rename to extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/jdbc/security/SHA256PasswordEncryptionService.java index ec2014673..cfe5bc45f 100644 --- a/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/security/SHA256PasswordEncryptionService.java +++ b/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/jdbc/security/SHA256PasswordEncryptionService.java @@ -20,7 +20,7 @@ * THE SOFTWARE. */ -package org.glyptodon.guacamole.auth.mysql.security; +package org.glyptodon.guacamole.auth.jdbc.security; import java.io.UnsupportedEncodingException; import java.security.MessageDigest; diff --git a/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/security/SaltService.java b/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/jdbc/security/SaltService.java similarity index 96% rename from extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/security/SaltService.java rename to extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/jdbc/security/SaltService.java index 863e82769..7badde447 100644 --- a/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/security/SaltService.java +++ b/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/jdbc/security/SaltService.java @@ -20,7 +20,7 @@ * THE SOFTWARE. */ -package org.glyptodon.guacamole.auth.mysql.security; +package org.glyptodon.guacamole.auth.jdbc.security; /** * A service to generate password salts. diff --git a/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/security/SecureRandomSaltService.java b/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/jdbc/security/SecureRandomSaltService.java similarity index 96% rename from extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/security/SecureRandomSaltService.java rename to extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/jdbc/security/SecureRandomSaltService.java index 79a5cc489..608733b5b 100644 --- a/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/security/SecureRandomSaltService.java +++ b/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/jdbc/security/SecureRandomSaltService.java @@ -20,7 +20,7 @@ * THE SOFTWARE. */ -package org.glyptodon.guacamole.auth.mysql.security; +package org.glyptodon.guacamole.auth.jdbc.security; import java.security.SecureRandom; diff --git a/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/security/package-info.java b/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/jdbc/security/package-info.java similarity index 95% rename from extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/security/package-info.java rename to extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/jdbc/security/package-info.java index a8fa5e208..3f1d8b4f7 100644 --- a/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/security/package-info.java +++ b/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/jdbc/security/package-info.java @@ -23,4 +23,4 @@ /** * Classes related to hashing or encryption. */ -package org.glyptodon.guacamole.auth.mysql.security; +package org.glyptodon.guacamole.auth.jdbc.security; diff --git a/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/socket/AbstractGuacamoleSocketService.java b/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/jdbc/socket/AbstractGuacamoleSocketService.java similarity index 93% rename from extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/socket/AbstractGuacamoleSocketService.java rename to extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/jdbc/socket/AbstractGuacamoleSocketService.java index bc3480da3..9ef4903a7 100644 --- a/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/socket/AbstractGuacamoleSocketService.java +++ b/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/jdbc/socket/AbstractGuacamoleSocketService.java @@ -20,7 +20,7 @@ * THE SOFTWARE. */ -package org.glyptodon.guacamole.auth.mysql.socket; +package org.glyptodon.guacamole.auth.jdbc.socket; import com.google.inject.Inject; import java.util.Collection; @@ -30,15 +30,15 @@ import java.util.HashMap; import java.util.LinkedList; import java.util.List; import java.util.Map; -import org.glyptodon.guacamole.auth.mysql.user.AuthenticatedUser; -import org.glyptodon.guacamole.auth.mysql.connection.MySQLConnection; -import org.glyptodon.guacamole.auth.mysql.connectiongroup.MySQLConnectionGroup; -import org.glyptodon.guacamole.auth.mysql.connection.ConnectionRecordMapper; -import org.glyptodon.guacamole.auth.mysql.connection.ParameterMapper; -import org.glyptodon.guacamole.auth.mysql.connection.ConnectionModel; -import org.glyptodon.guacamole.auth.mysql.connection.ConnectionRecordModel; -import org.glyptodon.guacamole.auth.mysql.connection.ParameterModel; -import org.glyptodon.guacamole.auth.mysql.user.UserModel; +import org.glyptodon.guacamole.auth.jdbc.user.AuthenticatedUser; +import org.glyptodon.guacamole.auth.jdbc.connection.MySQLConnection; +import org.glyptodon.guacamole.auth.jdbc.connectiongroup.MySQLConnectionGroup; +import org.glyptodon.guacamole.auth.jdbc.connection.ConnectionRecordMapper; +import org.glyptodon.guacamole.auth.jdbc.connection.ParameterMapper; +import org.glyptodon.guacamole.auth.jdbc.connection.ConnectionModel; +import org.glyptodon.guacamole.auth.jdbc.connection.ConnectionRecordModel; +import org.glyptodon.guacamole.auth.jdbc.connection.ParameterModel; +import org.glyptodon.guacamole.auth.jdbc.user.UserModel; import org.glyptodon.guacamole.GuacamoleException; import org.glyptodon.guacamole.environment.Environment; import org.glyptodon.guacamole.net.GuacamoleSocket; diff --git a/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/socket/ActiveConnectionRecord.java b/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/jdbc/socket/ActiveConnectionRecord.java similarity index 95% rename from extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/socket/ActiveConnectionRecord.java rename to extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/jdbc/socket/ActiveConnectionRecord.java index 9bdc2ee67..f32669446 100644 --- a/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/socket/ActiveConnectionRecord.java +++ b/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/jdbc/socket/ActiveConnectionRecord.java @@ -20,10 +20,10 @@ * THE SOFTWARE. */ -package org.glyptodon.guacamole.auth.mysql.socket; +package org.glyptodon.guacamole.auth.jdbc.socket; import java.util.Date; -import org.glyptodon.guacamole.auth.mysql.user.AuthenticatedUser; +import org.glyptodon.guacamole.auth.jdbc.user.AuthenticatedUser; import org.glyptodon.guacamole.net.auth.ConnectionRecord; diff --git a/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/socket/GuacamoleSocketService.java b/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/jdbc/socket/GuacamoleSocketService.java similarity index 94% rename from extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/socket/GuacamoleSocketService.java rename to extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/jdbc/socket/GuacamoleSocketService.java index bea2fcbf3..2ef2025ce 100644 --- a/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/socket/GuacamoleSocketService.java +++ b/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/jdbc/socket/GuacamoleSocketService.java @@ -20,12 +20,12 @@ * THE SOFTWARE. */ -package org.glyptodon.guacamole.auth.mysql.socket; +package org.glyptodon.guacamole.auth.jdbc.socket; import java.util.List; -import org.glyptodon.guacamole.auth.mysql.user.AuthenticatedUser; -import org.glyptodon.guacamole.auth.mysql.connection.MySQLConnection; -import org.glyptodon.guacamole.auth.mysql.connectiongroup.MySQLConnectionGroup; +import org.glyptodon.guacamole.auth.jdbc.user.AuthenticatedUser; +import org.glyptodon.guacamole.auth.jdbc.connection.MySQLConnection; +import org.glyptodon.guacamole.auth.jdbc.connectiongroup.MySQLConnectionGroup; import org.glyptodon.guacamole.GuacamoleException; import org.glyptodon.guacamole.net.GuacamoleSocket; import org.glyptodon.guacamole.net.auth.Connection; diff --git a/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/socket/UnrestrictedGuacamoleSocketService.java b/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/jdbc/socket/UnrestrictedGuacamoleSocketService.java similarity index 90% rename from extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/socket/UnrestrictedGuacamoleSocketService.java rename to extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/jdbc/socket/UnrestrictedGuacamoleSocketService.java index 140c9aa29..02bb5263a 100644 --- a/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/socket/UnrestrictedGuacamoleSocketService.java +++ b/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/jdbc/socket/UnrestrictedGuacamoleSocketService.java @@ -20,11 +20,11 @@ * THE SOFTWARE. */ -package org.glyptodon.guacamole.auth.mysql.socket; +package org.glyptodon.guacamole.auth.jdbc.socket; import com.google.inject.Singleton; -import org.glyptodon.guacamole.auth.mysql.user.AuthenticatedUser; -import org.glyptodon.guacamole.auth.mysql.connection.MySQLConnection; +import org.glyptodon.guacamole.auth.jdbc.user.AuthenticatedUser; +import org.glyptodon.guacamole.auth.jdbc.connection.MySQLConnection; import org.glyptodon.guacamole.GuacamoleException; diff --git a/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/socket/package-info.java b/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/jdbc/socket/package-info.java similarity index 96% rename from extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/socket/package-info.java rename to extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/jdbc/socket/package-info.java index 498518883..42c8cc335 100644 --- a/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/socket/package-info.java +++ b/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/jdbc/socket/package-info.java @@ -24,4 +24,4 @@ * Classes related to obtaining/configuring Guacamole sockets, and restricting * access to those sockets. */ -package org.glyptodon.guacamole.auth.mysql.socket; +package org.glyptodon.guacamole.auth.jdbc.socket; diff --git a/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/user/AuthenticatedUser.java b/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/jdbc/user/AuthenticatedUser.java similarity index 98% rename from extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/user/AuthenticatedUser.java rename to extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/jdbc/user/AuthenticatedUser.java index df66abde9..d6181ccfb 100644 --- a/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/user/AuthenticatedUser.java +++ b/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/jdbc/user/AuthenticatedUser.java @@ -20,7 +20,7 @@ * THE SOFTWARE. */ -package org.glyptodon.guacamole.auth.mysql.user; +package org.glyptodon.guacamole.auth.jdbc.user; import org.glyptodon.guacamole.net.auth.Credentials; diff --git a/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/user/MySQLUser.java b/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/jdbc/user/MySQLUser.java similarity index 93% rename from extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/user/MySQLUser.java rename to extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/jdbc/user/MySQLUser.java index 9b597ec21..8243cc5fd 100644 --- a/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/user/MySQLUser.java +++ b/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/jdbc/user/MySQLUser.java @@ -20,13 +20,13 @@ * THE SOFTWARE. */ -package org.glyptodon.guacamole.auth.mysql.user; +package org.glyptodon.guacamole.auth.jdbc.user; import com.google.inject.Inject; -import org.glyptodon.guacamole.auth.mysql.base.DirectoryObject; -import org.glyptodon.guacamole.auth.mysql.security.PasswordEncryptionService; -import org.glyptodon.guacamole.auth.mysql.security.SaltService; -import org.glyptodon.guacamole.auth.mysql.permission.SystemPermissionService; +import org.glyptodon.guacamole.auth.jdbc.base.DirectoryObject; +import org.glyptodon.guacamole.auth.jdbc.security.PasswordEncryptionService; +import org.glyptodon.guacamole.auth.jdbc.security.SaltService; +import org.glyptodon.guacamole.auth.jdbc.permission.SystemPermissionService; import org.glyptodon.guacamole.GuacamoleException; import org.glyptodon.guacamole.net.auth.User; import org.glyptodon.guacamole.net.auth.permission.ObjectPermissionSet; diff --git a/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/user/MySQLUserContext.java b/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/jdbc/user/MySQLUserContext.java similarity index 92% rename from extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/user/MySQLUserContext.java rename to extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/jdbc/user/MySQLUserContext.java index b6026ed4b..4151a8ee1 100644 --- a/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/user/MySQLUserContext.java +++ b/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/jdbc/user/MySQLUserContext.java @@ -20,12 +20,12 @@ * THE SOFTWARE. */ -package org.glyptodon.guacamole.auth.mysql.user; +package org.glyptodon.guacamole.auth.jdbc.user; -import org.glyptodon.guacamole.auth.mysql.connectiongroup.MySQLRootConnectionGroup; -import org.glyptodon.guacamole.auth.mysql.connectiongroup.ConnectionGroupDirectory; -import org.glyptodon.guacamole.auth.mysql.connection.ConnectionDirectory; +import org.glyptodon.guacamole.auth.jdbc.connectiongroup.MySQLRootConnectionGroup; +import org.glyptodon.guacamole.auth.jdbc.connectiongroup.ConnectionGroupDirectory; +import org.glyptodon.guacamole.auth.jdbc.connection.ConnectionDirectory; import com.google.inject.Inject; import com.google.inject.Provider; import org.glyptodon.guacamole.GuacamoleException; diff --git a/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/user/UserDirectory.java b/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/jdbc/user/UserDirectory.java similarity index 98% rename from extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/user/UserDirectory.java rename to extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/jdbc/user/UserDirectory.java index d81dc8fb8..ae02e066c 100644 --- a/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/user/UserDirectory.java +++ b/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/jdbc/user/UserDirectory.java @@ -20,7 +20,7 @@ * THE SOFTWARE. */ -package org.glyptodon.guacamole.auth.mysql.user; +package org.glyptodon.guacamole.auth.jdbc.user; import com.google.inject.Inject; diff --git a/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/user/UserMapper.java b/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/jdbc/user/UserMapper.java similarity index 93% rename from extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/user/UserMapper.java rename to extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/jdbc/user/UserMapper.java index 58f6df0ff..fbe83ae25 100644 --- a/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/user/UserMapper.java +++ b/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/jdbc/user/UserMapper.java @@ -20,9 +20,9 @@ * THE SOFTWARE. */ -package org.glyptodon.guacamole.auth.mysql.user; +package org.glyptodon.guacamole.auth.jdbc.user; -import org.glyptodon.guacamole.auth.mysql.base.DirectoryObjectMapper; +import org.glyptodon.guacamole.auth.jdbc.base.DirectoryObjectMapper; import org.apache.ibatis.annotations.Param; /** diff --git a/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/user/UserModel.java b/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/jdbc/user/UserModel.java similarity index 96% rename from extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/user/UserModel.java rename to extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/jdbc/user/UserModel.java index e0f1c416a..546b1927a 100644 --- a/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/user/UserModel.java +++ b/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/jdbc/user/UserModel.java @@ -20,9 +20,9 @@ * THE SOFTWARE. */ -package org.glyptodon.guacamole.auth.mysql.user; +package org.glyptodon.guacamole.auth.jdbc.user; -import org.glyptodon.guacamole.auth.mysql.base.ObjectModel; +import org.glyptodon.guacamole.auth.jdbc.base.ObjectModel; /** * Object representation of a Guacamole user, as represented in the database. diff --git a/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/user/UserService.java b/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/jdbc/user/UserService.java similarity index 96% rename from extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/user/UserService.java rename to extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/jdbc/user/UserService.java index 530a26dd6..e3ff5a23a 100644 --- a/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/user/UserService.java +++ b/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/jdbc/user/UserService.java @@ -20,15 +20,15 @@ * THE SOFTWARE. */ -package org.glyptodon.guacamole.auth.mysql.user; +package org.glyptodon.guacamole.auth.jdbc.user; import com.google.inject.Inject; import com.google.inject.Provider; import java.util.Collection; import java.util.Collections; import org.glyptodon.guacamole.net.auth.Credentials; -import org.glyptodon.guacamole.auth.mysql.base.DirectoryObjectMapper; -import org.glyptodon.guacamole.auth.mysql.base.DirectoryObjectService; +import org.glyptodon.guacamole.auth.jdbc.base.DirectoryObjectMapper; +import org.glyptodon.guacamole.auth.jdbc.base.DirectoryObjectService; import org.glyptodon.guacamole.GuacamoleClientException; import org.glyptodon.guacamole.GuacamoleException; import org.glyptodon.guacamole.net.auth.User; diff --git a/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/user/package-info.java b/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/jdbc/user/package-info.java similarity index 95% rename from extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/user/package-info.java rename to extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/jdbc/user/package-info.java index c8d66ce42..e5c15703f 100644 --- a/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/user/package-info.java +++ b/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/jdbc/user/package-info.java @@ -23,4 +23,4 @@ /** * Classes related to Guacamole users. */ -package org.glyptodon.guacamole.auth.mysql.user; +package org.glyptodon.guacamole.auth.jdbc.user; diff --git a/extensions/guacamole-auth-mysql/src/main/resources/org/glyptodon/guacamole/auth/mysql/connection/ConnectionMapper.xml b/extensions/guacamole-auth-mysql/src/main/resources/org/glyptodon/guacamole/auth/jdbc/connection/ConnectionMapper.xml similarity index 95% rename from extensions/guacamole-auth-mysql/src/main/resources/org/glyptodon/guacamole/auth/mysql/connection/ConnectionMapper.xml rename to extensions/guacamole-auth-mysql/src/main/resources/org/glyptodon/guacamole/auth/jdbc/connection/ConnectionMapper.xml index e9b7c1c27..ac8fb6d6b 100644 --- a/extensions/guacamole-auth-mysql/src/main/resources/org/glyptodon/guacamole/auth/mysql/connection/ConnectionMapper.xml +++ b/extensions/guacamole-auth-mysql/src/main/resources/org/glyptodon/guacamole/auth/jdbc/connection/ConnectionMapper.xml @@ -24,10 +24,10 @@ THE SOFTWARE. --> - + - + @@ -115,7 +115,7 @@ + parameterType="org.glyptodon.guacamole.auth.jdbc.connection.ConnectionModel"> INSERT INTO guacamole_connection ( connection_name, @@ -131,7 +131,7 @@ - + UPDATE guacamole_connection SET connection_name = #{object.name,jdbcType=VARCHAR}, parent_id = #{object.parentIdentifier,jdbcType=VARCHAR}, diff --git a/extensions/guacamole-auth-mysql/src/main/resources/org/glyptodon/guacamole/auth/mysql/connection/ConnectionRecordMapper.xml b/extensions/guacamole-auth-mysql/src/main/resources/org/glyptodon/guacamole/auth/jdbc/connection/ConnectionRecordMapper.xml similarity index 93% rename from extensions/guacamole-auth-mysql/src/main/resources/org/glyptodon/guacamole/auth/mysql/connection/ConnectionRecordMapper.xml rename to extensions/guacamole-auth-mysql/src/main/resources/org/glyptodon/guacamole/auth/jdbc/connection/ConnectionRecordMapper.xml index 0f66f50cd..b5775f607 100644 --- a/extensions/guacamole-auth-mysql/src/main/resources/org/glyptodon/guacamole/auth/mysql/connection/ConnectionRecordMapper.xml +++ b/extensions/guacamole-auth-mysql/src/main/resources/org/glyptodon/guacamole/auth/jdbc/connection/ConnectionRecordMapper.xml @@ -24,10 +24,10 @@ THE SOFTWARE. --> - + - + @@ -55,7 +55,7 @@ - + INSERT INTO guacamole_connection_history ( connection_id, diff --git a/extensions/guacamole-auth-mysql/src/main/resources/org/glyptodon/guacamole/auth/mysql/connection/ParameterMapper.xml b/extensions/guacamole-auth-mysql/src/main/resources/org/glyptodon/guacamole/auth/jdbc/connection/ParameterMapper.xml similarity index 94% rename from extensions/guacamole-auth-mysql/src/main/resources/org/glyptodon/guacamole/auth/mysql/connection/ParameterMapper.xml rename to extensions/guacamole-auth-mysql/src/main/resources/org/glyptodon/guacamole/auth/jdbc/connection/ParameterMapper.xml index ef3ac8261..ccd386c14 100644 --- a/extensions/guacamole-auth-mysql/src/main/resources/org/glyptodon/guacamole/auth/mysql/connection/ParameterMapper.xml +++ b/extensions/guacamole-auth-mysql/src/main/resources/org/glyptodon/guacamole/auth/jdbc/connection/ParameterMapper.xml @@ -24,10 +24,10 @@ THE SOFTWARE. --> - + - + @@ -51,7 +51,7 @@ - + INSERT INTO guacamole_connection_parameter ( connection_id, diff --git a/extensions/guacamole-auth-mysql/src/main/resources/org/glyptodon/guacamole/auth/mysql/connectiongroup/ConnectionGroupMapper.xml b/extensions/guacamole-auth-mysql/src/main/resources/org/glyptodon/guacamole/auth/jdbc/connectiongroup/ConnectionGroupMapper.xml similarity index 95% rename from extensions/guacamole-auth-mysql/src/main/resources/org/glyptodon/guacamole/auth/mysql/connectiongroup/ConnectionGroupMapper.xml rename to extensions/guacamole-auth-mysql/src/main/resources/org/glyptodon/guacamole/auth/jdbc/connectiongroup/ConnectionGroupMapper.xml index 6f3ccf958..d79cdf61e 100644 --- a/extensions/guacamole-auth-mysql/src/main/resources/org/glyptodon/guacamole/auth/mysql/connectiongroup/ConnectionGroupMapper.xml +++ b/extensions/guacamole-auth-mysql/src/main/resources/org/glyptodon/guacamole/auth/jdbc/connectiongroup/ConnectionGroupMapper.xml @@ -24,10 +24,10 @@ THE SOFTWARE. --> - + - + @@ -116,7 +116,7 @@ + parameterType="org.glyptodon.guacamole.auth.jdbc.connectiongroup.ConnectionGroupModel"> INSERT INTO guacamole_connection_group ( connection_group_name, @@ -132,7 +132,7 @@ - + UPDATE guacamole_connection_group SET connection_group_name = #{object.name,jdbcType=VARCHAR}, parent_id = #{object.parentIdentifier,jdbcType=VARCHAR}, diff --git a/extensions/guacamole-auth-mysql/src/main/resources/org/glyptodon/guacamole/auth/mysql/permission/SystemPermissionMapper.xml b/extensions/guacamole-auth-mysql/src/main/resources/org/glyptodon/guacamole/auth/jdbc/permission/SystemPermissionMapper.xml similarity index 93% rename from extensions/guacamole-auth-mysql/src/main/resources/org/glyptodon/guacamole/auth/mysql/permission/SystemPermissionMapper.xml rename to extensions/guacamole-auth-mysql/src/main/resources/org/glyptodon/guacamole/auth/jdbc/permission/SystemPermissionMapper.xml index b483d2440..55eacd072 100644 --- a/extensions/guacamole-auth-mysql/src/main/resources/org/glyptodon/guacamole/auth/mysql/permission/SystemPermissionMapper.xml +++ b/extensions/guacamole-auth-mysql/src/main/resources/org/glyptodon/guacamole/auth/jdbc/permission/SystemPermissionMapper.xml @@ -24,10 +24,10 @@ THE SOFTWARE. --> - + - + - + DELETE FROM guacamole_system_permission WHERE (user_id, permission) IN @@ -76,7 +76,7 @@ - + INSERT IGNORE INTO guacamole_system_permission ( user_id, diff --git a/extensions/guacamole-auth-mysql/src/main/resources/org/glyptodon/guacamole/auth/mysql/user/UserMapper.xml b/extensions/guacamole-auth-mysql/src/main/resources/org/glyptodon/guacamole/auth/jdbc/user/UserMapper.xml similarity index 95% rename from extensions/guacamole-auth-mysql/src/main/resources/org/glyptodon/guacamole/auth/mysql/user/UserMapper.xml rename to extensions/guacamole-auth-mysql/src/main/resources/org/glyptodon/guacamole/auth/jdbc/user/UserMapper.xml index ce4c05ee4..b3726eb8f 100644 --- a/extensions/guacamole-auth-mysql/src/main/resources/org/glyptodon/guacamole/auth/mysql/user/UserMapper.xml +++ b/extensions/guacamole-auth-mysql/src/main/resources/org/glyptodon/guacamole/auth/jdbc/user/UserMapper.xml @@ -24,10 +24,10 @@ THE SOFTWARE. --> - + - + @@ -108,7 +108,7 @@ + parameterType="org.glyptodon.guacamole.auth.jdbc.user.UserModel"> INSERT INTO guacamole_user ( username, @@ -124,7 +124,7 @@ - + UPDATE guacamole_user SET password_hash = #{object.passwordHash,jdbcType=BINARY}, password_salt = #{object.passwordSalt,jdbcType=BINARY}