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 6212374a0..f08d28f59 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,33 +23,43 @@ package net.sourceforge.guacamole.net.auth.mysql; +import org.glyptodon.guacamole.auth.mysql.user.MySQLUserContext; +import org.glyptodon.guacamole.auth.mysql.connectiongroup.MySQLRootConnectionGroup; +import org.glyptodon.guacamole.auth.mysql.connectiongroup.MySQLConnectionGroup; +import org.glyptodon.guacamole.auth.mysql.connectiongroup.ConnectionGroupDirectory; +import org.glyptodon.guacamole.auth.mysql.connection.ConnectionDirectory; +import org.glyptodon.guacamole.auth.mysql.connection.MySQLGuacamoleConfiguration; +import org.glyptodon.guacamole.auth.mysql.connection.MySQLConnection; +import org.glyptodon.guacamole.auth.mysql.permission.MySQLSystemPermissionSet; +import org.glyptodon.guacamole.auth.mysql.user.MySQLUser; +import org.glyptodon.guacamole.auth.mysql.user.UserDirectory; import com.google.inject.Binder; import com.google.inject.Guice; import com.google.inject.Injector; import com.google.inject.Module; import com.google.inject.name.Names; import java.util.Properties; -import net.sourceforge.guacamole.net.auth.mysql.dao.ConnectionGroupMapper; -import net.sourceforge.guacamole.net.auth.mysql.dao.ConnectionMapper; -import net.sourceforge.guacamole.net.auth.mysql.dao.ConnectionRecordMapper; -import net.sourceforge.guacamole.net.auth.mysql.dao.ParameterMapper; -import net.sourceforge.guacamole.net.auth.mysql.dao.SystemPermissionMapper; +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 net.sourceforge.guacamole.net.auth.mysql.dao.UserMapper; -import net.sourceforge.guacamole.net.auth.mysql.properties.MySQLGuacamoleProperties; -import net.sourceforge.guacamole.net.auth.mysql.service.ConnectionGroupService; -import net.sourceforge.guacamole.net.auth.mysql.service.ConnectionService; -import net.sourceforge.guacamole.net.auth.mysql.service.GuacamoleSocketService; -import net.sourceforge.guacamole.net.auth.mysql.service.PasswordEncryptionService; -import net.sourceforge.guacamole.net.auth.mysql.service.SHA256PasswordEncryptionService; -import net.sourceforge.guacamole.net.auth.mysql.service.SaltService; -import net.sourceforge.guacamole.net.auth.mysql.service.SecureRandomSaltService; -import net.sourceforge.guacamole.net.auth.mysql.service.SystemPermissionService; -import net.sourceforge.guacamole.net.auth.mysql.service.UnrestrictedGuacamoleSocketService; -import net.sourceforge.guacamole.net.auth.mysql.service.UserService; +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; 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 b21abfcae..24de42d2d 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 @@ -21,8 +21,8 @@ */ /** - * Base classes which support the MySQL authentication provider, including - * the authentication provider itself. + * 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. */ package net.sourceforge.guacamole.net.auth.mysql; - diff --git a/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/DirectoryObject.java b/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/base/DirectoryObject.java similarity index 94% rename from extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/DirectoryObject.java rename to extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/base/DirectoryObject.java index 168f1761f..67e546269 100644 --- a/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/DirectoryObject.java +++ b/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/base/DirectoryObject.java @@ -20,9 +20,8 @@ * THE SOFTWARE. */ -package net.sourceforge.guacamole.net.auth.mysql; +package org.glyptodon.guacamole.auth.mysql.base; -import net.sourceforge.guacamole.net.auth.mysql.model.ObjectModel; import org.glyptodon.guacamole.net.auth.Identifiable; /** diff --git a/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/dao/DirectoryObjectMapper.java b/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/base/DirectoryObjectMapper.java similarity index 97% rename from extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/dao/DirectoryObjectMapper.java rename to extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/base/DirectoryObjectMapper.java index 69ffa133a..3d47491f8 100644 --- a/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/dao/DirectoryObjectMapper.java +++ b/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/base/DirectoryObjectMapper.java @@ -20,11 +20,11 @@ * THE SOFTWARE. */ -package net.sourceforge.guacamole.net.auth.mysql.dao; +package org.glyptodon.guacamole.auth.mysql.base; import java.util.Collection; import java.util.Set; -import net.sourceforge.guacamole.net.auth.mysql.model.UserModel; +import org.glyptodon.guacamole.auth.mysql.user.UserModel; import org.apache.ibatis.annotations.Param; /** diff --git a/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/service/DirectoryObjectService.java b/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/base/DirectoryObjectService.java similarity index 97% rename from extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/service/DirectoryObjectService.java rename to extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/base/DirectoryObjectService.java index ae251390c..a6ac70dc1 100644 --- a/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/service/DirectoryObjectService.java +++ b/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/base/DirectoryObjectService.java @@ -20,16 +20,13 @@ * THE SOFTWARE. */ -package net.sourceforge.guacamole.net.auth.mysql.service; +package org.glyptodon.guacamole.auth.mysql.base; import java.util.ArrayList; import java.util.Collection; import java.util.Collections; import java.util.Set; -import net.sourceforge.guacamole.net.auth.mysql.AuthenticatedUser; -import net.sourceforge.guacamole.net.auth.mysql.DirectoryObject; -import net.sourceforge.guacamole.net.auth.mysql.dao.DirectoryObjectMapper; -import net.sourceforge.guacamole.net.auth.mysql.model.ObjectModel; +import org.glyptodon.guacamole.auth.mysql.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/net/sourceforge/guacamole/net/auth/mysql/model/ObjectModel.java b/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/base/ObjectModel.java similarity index 97% rename from extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/model/ObjectModel.java rename to extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/base/ObjectModel.java index 4c3077d1c..58ec04658 100644 --- a/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/model/ObjectModel.java +++ b/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/base/ObjectModel.java @@ -20,7 +20,7 @@ * THE SOFTWARE. */ -package net.sourceforge.guacamole.net.auth.mysql.model; +package org.glyptodon.guacamole.auth.mysql.base; /** * Object representation of a Guacamole object, such as a user or connection, diff --git a/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/RestrictedObject.java b/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/base/RestrictedObject.java similarity index 96% rename from extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/RestrictedObject.java rename to extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/base/RestrictedObject.java index 16481d488..f27bd2b32 100644 --- a/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/RestrictedObject.java +++ b/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/base/RestrictedObject.java @@ -20,7 +20,9 @@ * THE SOFTWARE. */ -package net.sourceforge.guacamole.net.auth.mysql; +package org.glyptodon.guacamole.auth.mysql.base; + +import org.glyptodon.guacamole.auth.mysql.user.AuthenticatedUser; /** * Common base class for objects that are associated with the users that 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/mysql/base/package-info.java new file mode 100644 index 000000000..e7b11a621 --- /dev/null +++ b/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/base/package-info.java @@ -0,0 +1,28 @@ +/* + * Copyright (C) 2015 Glyptodon LLC + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ + +/** + * Base classes supporting the MySQL authentication provider and defining the + * relationships between the model and the implementations of guacamole-ext + * classes. + */ +package org.glyptodon.guacamole.auth.mysql.base; diff --git a/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/properties/MySQLGuacamoleProperties.java b/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/conf/MySQLGuacamoleProperties.java similarity index 98% rename from extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/properties/MySQLGuacamoleProperties.java rename to extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/conf/MySQLGuacamoleProperties.java index a4e7ef044..d71883ade 100644 --- a/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/properties/MySQLGuacamoleProperties.java +++ b/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/conf/MySQLGuacamoleProperties.java @@ -20,7 +20,7 @@ * THE SOFTWARE. */ -package net.sourceforge.guacamole.net.auth.mysql.properties; +package org.glyptodon.guacamole.auth.mysql.conf; import org.glyptodon.guacamole.properties.BooleanGuacamoleProperty; import org.glyptodon.guacamole.properties.IntegerGuacamoleProperty; diff --git a/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/service/package-info.java b/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/conf/package-info.java similarity index 85% rename from extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/service/package-info.java rename to extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/conf/package-info.java index d665bbc7d..b200d0d73 100644 --- a/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/service/package-info.java +++ b/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/conf/package-info.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2013 Glyptodon LLC + * Copyright (C) 2015 Glyptodon LLC * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -21,8 +21,6 @@ */ /** - * Service classes which help fill the needs of the MySQL authentication - * provider. + * Classes related to the configuration of the MySQL authentication provider. */ -package net.sourceforge.guacamole.net.auth.mysql.service; - +package org.glyptodon.guacamole.auth.mysql.conf; diff --git a/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/ConnectionDirectory.java b/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/connection/ConnectionDirectory.java similarity index 96% rename from extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/ConnectionDirectory.java rename to extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/connection/ConnectionDirectory.java index c54e16b92..3f898c29b 100644 --- a/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/ConnectionDirectory.java +++ b/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/connection/ConnectionDirectory.java @@ -20,14 +20,14 @@ * THE SOFTWARE. */ -package net.sourceforge.guacamole.net.auth.mysql; +package org.glyptodon.guacamole.auth.mysql.connection; import com.google.inject.Inject; import java.util.Collection; import java.util.Collections; import java.util.Set; -import net.sourceforge.guacamole.net.auth.mysql.service.ConnectionService; +import org.glyptodon.guacamole.auth.mysql.user.AuthenticatedUser; import org.glyptodon.guacamole.GuacamoleException; import org.glyptodon.guacamole.net.auth.Connection; import org.glyptodon.guacamole.net.auth.Directory; diff --git a/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/dao/ConnectionMapper.java b/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/connection/ConnectionMapper.java similarity index 93% rename from extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/dao/ConnectionMapper.java rename to extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/connection/ConnectionMapper.java index 4890361aa..33c0bac48 100644 --- a/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/dao/ConnectionMapper.java +++ b/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/connection/ConnectionMapper.java @@ -20,11 +20,11 @@ * THE SOFTWARE. */ -package net.sourceforge.guacamole.net.auth.mysql.dao; +package org.glyptodon.guacamole.auth.mysql.connection; import java.util.Set; -import net.sourceforge.guacamole.net.auth.mysql.model.ConnectionModel; -import net.sourceforge.guacamole.net.auth.mysql.model.UserModel; +import org.glyptodon.guacamole.auth.mysql.base.DirectoryObjectMapper; +import org.glyptodon.guacamole.auth.mysql.user.UserModel; import org.apache.ibatis.annotations.Param; /** diff --git a/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/model/ConnectionModel.java b/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/connection/ConnectionModel.java similarity index 97% rename from extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/model/ConnectionModel.java rename to extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/connection/ConnectionModel.java index de2dac14a..34fc2cc16 100644 --- a/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/model/ConnectionModel.java +++ b/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/connection/ConnectionModel.java @@ -20,7 +20,9 @@ * THE SOFTWARE. */ -package net.sourceforge.guacamole.net.auth.mysql.model; +package org.glyptodon.guacamole.auth.mysql.connection; + +import org.glyptodon.guacamole.auth.mysql.base.ObjectModel; /** * Object representation of a Guacamole connection, as represented in the diff --git a/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/dao/ConnectionRecordMapper.java b/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/connection/ConnectionRecordMapper.java similarity index 94% rename from extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/dao/ConnectionRecordMapper.java rename to extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/connection/ConnectionRecordMapper.java index a584d3fbf..e23f8b64a 100644 --- a/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/dao/ConnectionRecordMapper.java +++ b/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/connection/ConnectionRecordMapper.java @@ -20,10 +20,9 @@ * THE SOFTWARE. */ -package net.sourceforge.guacamole.net.auth.mysql.dao; +package org.glyptodon.guacamole.auth.mysql.connection; import java.util.List; -import net.sourceforge.guacamole.net.auth.mysql.model.ConnectionRecordModel; import org.apache.ibatis.annotations.Param; /** diff --git a/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/model/ConnectionRecordModel.java b/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/connection/ConnectionRecordModel.java similarity index 98% rename from extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/model/ConnectionRecordModel.java rename to extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/connection/ConnectionRecordModel.java index 200918da7..7e10e8476 100644 --- a/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/model/ConnectionRecordModel.java +++ b/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/connection/ConnectionRecordModel.java @@ -20,7 +20,7 @@ * THE SOFTWARE. */ -package net.sourceforge.guacamole.net.auth.mysql.model; +package org.glyptodon.guacamole.auth.mysql.connection; import java.util.Date; diff --git a/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/service/ConnectionService.java b/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/connection/ConnectionService.java similarity index 94% rename from extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/service/ConnectionService.java rename to extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/connection/ConnectionService.java index 0708f7f47..01cc3b04a 100644 --- a/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/service/ConnectionService.java +++ b/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/connection/ConnectionService.java @@ -20,7 +20,7 @@ * THE SOFTWARE. */ -package net.sourceforge.guacamole.net.auth.mysql.service; +package org.glyptodon.guacamole.auth.mysql.connection; import com.google.inject.Inject; import com.google.inject.Provider; @@ -30,16 +30,10 @@ import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.Set; -import net.sourceforge.guacamole.net.auth.mysql.AuthenticatedUser; -import net.sourceforge.guacamole.net.auth.mysql.MySQLConnection; -import net.sourceforge.guacamole.net.auth.mysql.MySQLConnectionRecord; -import net.sourceforge.guacamole.net.auth.mysql.dao.ConnectionMapper; -import net.sourceforge.guacamole.net.auth.mysql.dao.ConnectionRecordMapper; -import net.sourceforge.guacamole.net.auth.mysql.dao.DirectoryObjectMapper; -import net.sourceforge.guacamole.net.auth.mysql.dao.ParameterMapper; -import net.sourceforge.guacamole.net.auth.mysql.model.ConnectionModel; -import net.sourceforge.guacamole.net.auth.mysql.model.ConnectionRecordModel; -import net.sourceforge.guacamole.net.auth.mysql.model.ParameterModel; +import org.glyptodon.guacamole.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.GuacamoleClientException; import org.glyptodon.guacamole.GuacamoleException; import org.glyptodon.guacamole.GuacamoleSecurityException; diff --git a/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/MySQLConnection.java b/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/connection/MySQLConnection.java similarity index 94% rename from extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/MySQLConnection.java rename to extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/connection/MySQLConnection.java index 6c36a52e5..205972771 100644 --- a/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/MySQLConnection.java +++ b/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/connection/MySQLConnection.java @@ -20,14 +20,14 @@ * THE SOFTWARE. */ -package net.sourceforge.guacamole.net.auth.mysql; +package org.glyptodon.guacamole.auth.mysql.connection; import com.google.inject.Inject; import com.google.inject.Provider; import java.util.List; -import net.sourceforge.guacamole.net.auth.mysql.model.ConnectionModel; -import net.sourceforge.guacamole.net.auth.mysql.service.ConnectionService; -import net.sourceforge.guacamole.net.auth.mysql.service.GuacamoleSocketService; +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.GuacamoleException; import org.glyptodon.guacamole.net.GuacamoleSocket; import org.glyptodon.guacamole.net.auth.Connection; diff --git a/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/MySQLConnectionRecord.java b/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/connection/MySQLConnectionRecord.java similarity index 94% rename from extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/MySQLConnectionRecord.java rename to extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/connection/MySQLConnectionRecord.java index 27fcb5a42..01086797e 100644 --- a/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/MySQLConnectionRecord.java +++ b/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/connection/MySQLConnectionRecord.java @@ -20,11 +20,10 @@ * THE SOFTWARE. */ -package net.sourceforge.guacamole.net.auth.mysql; +package org.glyptodon.guacamole.auth.mysql.connection; import java.util.Date; -import net.sourceforge.guacamole.net.auth.mysql.model.ConnectionRecordModel; import org.glyptodon.guacamole.net.auth.ConnectionRecord; /** diff --git a/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/MySQLGuacamoleConfiguration.java b/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/connection/MySQLGuacamoleConfiguration.java similarity index 94% rename from extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/MySQLGuacamoleConfiguration.java rename to extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/connection/MySQLGuacamoleConfiguration.java index 9f837928f..70ca86258 100644 --- a/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/MySQLGuacamoleConfiguration.java +++ b/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/connection/MySQLGuacamoleConfiguration.java @@ -20,12 +20,11 @@ * THE SOFTWARE. */ -package net.sourceforge.guacamole.net.auth.mysql; +package org.glyptodon.guacamole.auth.mysql.connection; import com.google.inject.Inject; import java.util.Map; -import net.sourceforge.guacamole.net.auth.mysql.model.ConnectionModel; -import net.sourceforge.guacamole.net.auth.mysql.service.ConnectionService; +import org.glyptodon.guacamole.auth.mysql.user.AuthenticatedUser; import org.glyptodon.guacamole.protocol.GuacamoleConfiguration; /** diff --git a/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/dao/ParameterMapper.java b/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/connection/ParameterMapper.java similarity index 95% rename from extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/dao/ParameterMapper.java rename to extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/connection/ParameterMapper.java index 0ec5655e8..f54392aa5 100644 --- a/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/dao/ParameterMapper.java +++ b/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/connection/ParameterMapper.java @@ -20,10 +20,9 @@ * THE SOFTWARE. */ -package net.sourceforge.guacamole.net.auth.mysql.dao; +package org.glyptodon.guacamole.auth.mysql.connection; import java.util.Collection; -import net.sourceforge.guacamole.net.auth.mysql.model.ParameterModel; import org.apache.ibatis.annotations.Param; /** diff --git a/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/model/ParameterModel.java b/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/connection/ParameterModel.java similarity index 98% rename from extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/model/ParameterModel.java rename to extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/connection/ParameterModel.java index 6764269c5..ec96cfb4a 100644 --- a/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/model/ParameterModel.java +++ b/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/connection/ParameterModel.java @@ -20,7 +20,7 @@ * THE SOFTWARE. */ -package net.sourceforge.guacamole.net.auth.mysql.model; +package org.glyptodon.guacamole.auth.mysql.connection; /** * A single parameter name/value pair belonging to a connection. diff --git a/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/properties/package-info.java b/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/connection/package-info.java similarity index 85% rename from extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/properties/package-info.java rename to extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/connection/package-info.java index cf3a32372..52ba27dff 100644 --- a/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/properties/package-info.java +++ b/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/connection/package-info.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2013 Glyptodon LLC + * Copyright (C) 2015 Glyptodon LLC * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -21,8 +21,6 @@ */ /** - * Properties which control the configuration of the MySQL authentication - * provider. + * Classes related to connections and their parameters and history. */ -package net.sourceforge.guacamole.net.auth.mysql.properties; - +package org.glyptodon.guacamole.auth.mysql.connection; diff --git a/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/ConnectionGroupDirectory.java b/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/connectiongroup/ConnectionGroupDirectory.java similarity index 96% rename from extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/ConnectionGroupDirectory.java rename to extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/connectiongroup/ConnectionGroupDirectory.java index 28f1e4cc6..8789b2e9d 100644 --- a/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/ConnectionGroupDirectory.java +++ b/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/connectiongroup/ConnectionGroupDirectory.java @@ -20,14 +20,14 @@ * THE SOFTWARE. */ -package net.sourceforge.guacamole.net.auth.mysql; +package org.glyptodon.guacamole.auth.mysql.connectiongroup; import com.google.inject.Inject; import java.util.Collection; import java.util.Collections; import java.util.Set; -import net.sourceforge.guacamole.net.auth.mysql.service.ConnectionGroupService; +import org.glyptodon.guacamole.auth.mysql.user.AuthenticatedUser; import org.glyptodon.guacamole.GuacamoleException; import org.glyptodon.guacamole.net.auth.ConnectionGroup; import org.glyptodon.guacamole.net.auth.Directory; diff --git a/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/dao/ConnectionGroupMapper.java b/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/connectiongroup/ConnectionGroupMapper.java similarity index 93% rename from extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/dao/ConnectionGroupMapper.java rename to extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/connectiongroup/ConnectionGroupMapper.java index 1a69a78a8..99c3addf1 100644 --- a/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/dao/ConnectionGroupMapper.java +++ b/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/connectiongroup/ConnectionGroupMapper.java @@ -20,11 +20,11 @@ * THE SOFTWARE. */ -package net.sourceforge.guacamole.net.auth.mysql.dao; +package org.glyptodon.guacamole.auth.mysql.connectiongroup; import java.util.Set; -import net.sourceforge.guacamole.net.auth.mysql.model.ConnectionGroupModel; -import net.sourceforge.guacamole.net.auth.mysql.model.UserModel; +import org.glyptodon.guacamole.auth.mysql.base.DirectoryObjectMapper; +import org.glyptodon.guacamole.auth.mysql.user.UserModel; import org.apache.ibatis.annotations.Param; /** diff --git a/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/model/ConnectionGroupModel.java b/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/connectiongroup/ConnectionGroupModel.java similarity index 97% rename from extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/model/ConnectionGroupModel.java rename to extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/connectiongroup/ConnectionGroupModel.java index 29242122f..ce7276e90 100644 --- a/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/model/ConnectionGroupModel.java +++ b/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/connectiongroup/ConnectionGroupModel.java @@ -20,8 +20,9 @@ * THE SOFTWARE. */ -package net.sourceforge.guacamole.net.auth.mysql.model; +package org.glyptodon.guacamole.auth.mysql.connectiongroup; +import org.glyptodon.guacamole.auth.mysql.base.ObjectModel; import org.glyptodon.guacamole.net.auth.ConnectionGroup; /** diff --git a/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/service/ConnectionGroupService.java b/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/connectiongroup/ConnectionGroupService.java similarity index 94% rename from extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/service/ConnectionGroupService.java rename to extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/connectiongroup/ConnectionGroupService.java index 34e62ca7b..0fba4151b 100644 --- a/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/service/ConnectionGroupService.java +++ b/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/connectiongroup/ConnectionGroupService.java @@ -20,16 +20,15 @@ * THE SOFTWARE. */ -package net.sourceforge.guacamole.net.auth.mysql.service; +package org.glyptodon.guacamole.auth.mysql.connectiongroup; import com.google.inject.Inject; import com.google.inject.Provider; import java.util.Set; -import net.sourceforge.guacamole.net.auth.mysql.AuthenticatedUser; -import net.sourceforge.guacamole.net.auth.mysql.MySQLConnectionGroup; -import net.sourceforge.guacamole.net.auth.mysql.dao.ConnectionGroupMapper; -import net.sourceforge.guacamole.net.auth.mysql.dao.DirectoryObjectMapper; -import net.sourceforge.guacamole.net.auth.mysql.model.ConnectionGroupModel; +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.GuacamoleClientException; import org.glyptodon.guacamole.GuacamoleException; import org.glyptodon.guacamole.GuacamoleSecurityException; diff --git a/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/MySQLConnectionGroup.java b/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/connectiongroup/MySQLConnectionGroup.java similarity index 91% rename from extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/MySQLConnectionGroup.java rename to extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/connectiongroup/MySQLConnectionGroup.java index cdc37fc92..0488498a1 100644 --- a/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/MySQLConnectionGroup.java +++ b/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/connectiongroup/MySQLConnectionGroup.java @@ -20,14 +20,13 @@ * THE SOFTWARE. */ -package net.sourceforge.guacamole.net.auth.mysql; +package org.glyptodon.guacamole.auth.mysql.connectiongroup; import com.google.inject.Inject; import java.util.Set; -import net.sourceforge.guacamole.net.auth.mysql.model.ConnectionGroupModel; -import net.sourceforge.guacamole.net.auth.mysql.service.ConnectionGroupService; -import net.sourceforge.guacamole.net.auth.mysql.service.ConnectionService; -import net.sourceforge.guacamole.net.auth.mysql.service.GuacamoleSocketService; +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.GuacamoleException; import org.glyptodon.guacamole.net.GuacamoleSocket; import org.glyptodon.guacamole.net.auth.ConnectionGroup; diff --git a/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/MySQLRootConnectionGroup.java b/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/connectiongroup/MySQLRootConnectionGroup.java similarity index 95% rename from extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/MySQLRootConnectionGroup.java rename to extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/connectiongroup/MySQLRootConnectionGroup.java index 5c9dbe488..dee968ae8 100644 --- a/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/MySQLRootConnectionGroup.java +++ b/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/connectiongroup/MySQLRootConnectionGroup.java @@ -20,12 +20,12 @@ * THE SOFTWARE. */ -package net.sourceforge.guacamole.net.auth.mysql; +package org.glyptodon.guacamole.auth.mysql.connectiongroup; import com.google.inject.Inject; import java.util.Set; -import net.sourceforge.guacamole.net.auth.mysql.service.ConnectionGroupService; -import net.sourceforge.guacamole.net.auth.mysql.service.ConnectionService; +import org.glyptodon.guacamole.auth.mysql.user.AuthenticatedUser; +import org.glyptodon.guacamole.auth.mysql.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/mysql/connectiongroup/package-info.java new file mode 100644 index 000000000..4c27273f6 --- /dev/null +++ b/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/connectiongroup/package-info.java @@ -0,0 +1,26 @@ +/* + * Copyright (C) 2015 Glyptodon LLC + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ + +/** + * Classes related to connection groups. + */ +package org.glyptodon.guacamole.auth.mysql.connectiongroup; diff --git a/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/MySQLSystemPermissionSet.java b/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/permission/MySQLSystemPermissionSet.java similarity index 95% rename from extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/MySQLSystemPermissionSet.java rename to extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/permission/MySQLSystemPermissionSet.java index 5343feffb..ef48dc718 100644 --- a/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/MySQLSystemPermissionSet.java +++ b/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/permission/MySQLSystemPermissionSet.java @@ -20,12 +20,13 @@ * THE SOFTWARE. */ -package net.sourceforge.guacamole.net.auth.mysql; +package org.glyptodon.guacamole.auth.mysql.permission; +import org.glyptodon.guacamole.auth.mysql.user.MySQLUser; import com.google.inject.Inject; import java.util.Collections; import java.util.Set; -import net.sourceforge.guacamole.net.auth.mysql.service.SystemPermissionService; +import org.glyptodon.guacamole.auth.mysql.user.AuthenticatedUser; import org.glyptodon.guacamole.GuacamoleException; import org.glyptodon.guacamole.net.auth.permission.SystemPermission; import org.glyptodon.guacamole.net.auth.permission.SystemPermissionSet; diff --git a/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/dao/ObjectPermissionMapper.java b/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/permission/ObjectPermissionMapper.java similarity index 90% rename from extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/dao/ObjectPermissionMapper.java rename to extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/permission/ObjectPermissionMapper.java index 8764afba0..ebf92b7f2 100644 --- a/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/dao/ObjectPermissionMapper.java +++ b/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/permission/ObjectPermissionMapper.java @@ -20,9 +20,7 @@ * THE SOFTWARE. */ -package net.sourceforge.guacamole.net.auth.mysql.dao; - -import net.sourceforge.guacamole.net.auth.mysql.model.ObjectPermissionModel; +package org.glyptodon.guacamole.auth.mysql.permission; /** * Mapper for object-related permissions. diff --git a/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/model/ObjectPermissionModel.java b/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/permission/ObjectPermissionModel.java similarity index 98% rename from extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/model/ObjectPermissionModel.java rename to extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/permission/ObjectPermissionModel.java index 4194e216a..5c2c60f98 100644 --- a/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/model/ObjectPermissionModel.java +++ b/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/permission/ObjectPermissionModel.java @@ -20,7 +20,7 @@ * THE SOFTWARE. */ -package net.sourceforge.guacamole.net.auth.mysql.model; +package org.glyptodon.guacamole.auth.mysql.permission; import org.glyptodon.guacamole.net.auth.permission.ObjectPermission; diff --git a/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/service/ObjectPermissionService.java b/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/permission/ObjectPermissionService.java similarity index 97% rename from extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/service/ObjectPermissionService.java rename to extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/permission/ObjectPermissionService.java index 9a6290504..99f266466 100644 --- a/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/service/ObjectPermissionService.java +++ b/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/permission/ObjectPermissionService.java @@ -20,13 +20,13 @@ * THE SOFTWARE. */ -package net.sourceforge.guacamole.net.auth.mysql.service; +package org.glyptodon.guacamole.auth.mysql.permission; import java.util.Collection; import java.util.Collections; import java.util.HashSet; -import net.sourceforge.guacamole.net.auth.mysql.AuthenticatedUser; -import net.sourceforge.guacamole.net.auth.mysql.MySQLUser; +import org.glyptodon.guacamole.auth.mysql.user.AuthenticatedUser; +import org.glyptodon.guacamole.auth.mysql.user.MySQLUser; import org.glyptodon.guacamole.GuacamoleException; import org.glyptodon.guacamole.GuacamoleSecurityException; import org.glyptodon.guacamole.net.auth.permission.ObjectPermission; diff --git a/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/dao/PermissionMapper.java b/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/permission/PermissionMapper.java similarity index 95% rename from extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/dao/PermissionMapper.java rename to extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/permission/PermissionMapper.java index fad022fcf..6d8f2c876 100644 --- a/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/dao/PermissionMapper.java +++ b/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/permission/PermissionMapper.java @@ -20,10 +20,10 @@ * THE SOFTWARE. */ -package net.sourceforge.guacamole.net.auth.mysql.dao; +package org.glyptodon.guacamole.auth.mysql.permission; import java.util.Collection; -import net.sourceforge.guacamole.net.auth.mysql.model.UserModel; +import org.glyptodon.guacamole.auth.mysql.user.UserModel; import org.apache.ibatis.annotations.Param; /** diff --git a/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/model/PermissionModel.java b/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/permission/PermissionModel.java similarity index 98% rename from extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/model/PermissionModel.java rename to extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/permission/PermissionModel.java index d5242b7d5..4904e8ce6 100644 --- a/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/model/PermissionModel.java +++ b/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/permission/PermissionModel.java @@ -20,7 +20,7 @@ * THE SOFTWARE. */ -package net.sourceforge.guacamole.net.auth.mysql.model; +package org.glyptodon.guacamole.auth.mysql.permission; /** * Generic base permission model which grants a permission of a particular type diff --git a/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/service/PermissionService.java b/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/permission/PermissionService.java similarity index 97% rename from extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/service/PermissionService.java rename to extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/permission/PermissionService.java index ef3cf07ca..b3112b00d 100644 --- a/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/service/PermissionService.java +++ b/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/permission/PermissionService.java @@ -20,15 +20,14 @@ * THE SOFTWARE. */ -package net.sourceforge.guacamole.net.auth.mysql.service; +package org.glyptodon.guacamole.auth.mysql.permission; import java.util.ArrayList; import java.util.Collection; import java.util.HashSet; import java.util.Set; -import net.sourceforge.guacamole.net.auth.mysql.AuthenticatedUser; -import net.sourceforge.guacamole.net.auth.mysql.MySQLUser; -import net.sourceforge.guacamole.net.auth.mysql.dao.PermissionMapper; +import org.glyptodon.guacamole.auth.mysql.user.AuthenticatedUser; +import org.glyptodon.guacamole.auth.mysql.user.MySQLUser; import org.glyptodon.guacamole.GuacamoleException; import org.glyptodon.guacamole.GuacamoleSecurityException; import org.glyptodon.guacamole.net.auth.permission.Permission; diff --git a/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/dao/SystemPermissionMapper.java b/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/permission/SystemPermissionMapper.java similarity index 90% rename from extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/dao/SystemPermissionMapper.java rename to extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/permission/SystemPermissionMapper.java index 8646a3774..63378088c 100644 --- a/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/dao/SystemPermissionMapper.java +++ b/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/permission/SystemPermissionMapper.java @@ -20,10 +20,9 @@ * THE SOFTWARE. */ -package net.sourceforge.guacamole.net.auth.mysql.dao; +package org.glyptodon.guacamole.auth.mysql.permission; -import net.sourceforge.guacamole.net.auth.mysql.model.SystemPermissionModel; -import net.sourceforge.guacamole.net.auth.mysql.model.UserModel; +import org.glyptodon.guacamole.auth.mysql.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/net/sourceforge/guacamole/net/auth/mysql/model/SystemPermissionModel.java b/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/permission/SystemPermissionModel.java similarity index 96% rename from extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/model/SystemPermissionModel.java rename to extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/permission/SystemPermissionModel.java index 712bcab2d..a798cf110 100644 --- a/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/model/SystemPermissionModel.java +++ b/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/permission/SystemPermissionModel.java @@ -20,7 +20,7 @@ * THE SOFTWARE. */ -package net.sourceforge.guacamole.net.auth.mysql.model; +package org.glyptodon.guacamole.auth.mysql.permission; import org.glyptodon.guacamole.net.auth.permission.SystemPermission; diff --git a/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/service/SystemPermissionService.java b/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/permission/SystemPermissionService.java similarity index 93% rename from extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/service/SystemPermissionService.java rename to extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/permission/SystemPermissionService.java index 3c8978e01..3ad300796 100644 --- a/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/service/SystemPermissionService.java +++ b/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/permission/SystemPermissionService.java @@ -20,16 +20,13 @@ * THE SOFTWARE. */ -package net.sourceforge.guacamole.net.auth.mysql.service; +package org.glyptodon.guacamole.auth.mysql.permission; import com.google.inject.Inject; import com.google.inject.Provider; import java.util.Collection; -import net.sourceforge.guacamole.net.auth.mysql.AuthenticatedUser; -import net.sourceforge.guacamole.net.auth.mysql.MySQLSystemPermissionSet; -import net.sourceforge.guacamole.net.auth.mysql.MySQLUser; -import net.sourceforge.guacamole.net.auth.mysql.dao.SystemPermissionMapper; -import net.sourceforge.guacamole.net.auth.mysql.model.SystemPermissionModel; +import org.glyptodon.guacamole.auth.mysql.user.AuthenticatedUser; +import org.glyptodon.guacamole.auth.mysql.user.MySQLUser; import org.glyptodon.guacamole.GuacamoleException; import org.glyptodon.guacamole.GuacamoleSecurityException; import org.glyptodon.guacamole.net.auth.permission.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/mysql/permission/package-info.java new file mode 100644 index 000000000..79e89425a --- /dev/null +++ b/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/permission/package-info.java @@ -0,0 +1,26 @@ +/* + * Copyright (C) 2015 Glyptodon LLC + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ + +/** + * Classes related to object- and system-level permissions. + */ +package org.glyptodon.guacamole.auth.mysql.permission; diff --git a/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/service/PasswordEncryptionService.java b/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/security/PasswordEncryptionService.java similarity index 96% rename from extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/service/PasswordEncryptionService.java rename to extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/security/PasswordEncryptionService.java index 5d21eeb3e..1e0824b96 100644 --- a/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/service/PasswordEncryptionService.java +++ b/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/security/PasswordEncryptionService.java @@ -20,7 +20,7 @@ * THE SOFTWARE. */ -package net.sourceforge.guacamole.net.auth.mysql.service; +package org.glyptodon.guacamole.auth.mysql.security; /** * A service to perform password encryption and checking. diff --git a/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/service/SHA256PasswordEncryptionService.java b/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/security/SHA256PasswordEncryptionService.java similarity index 97% rename from extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/service/SHA256PasswordEncryptionService.java rename to extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/security/SHA256PasswordEncryptionService.java index 78f0cef65..ec2014673 100644 --- a/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/service/SHA256PasswordEncryptionService.java +++ b/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/security/SHA256PasswordEncryptionService.java @@ -20,7 +20,7 @@ * THE SOFTWARE. */ -package net.sourceforge.guacamole.net.auth.mysql.service; +package org.glyptodon.guacamole.auth.mysql.security; import java.io.UnsupportedEncodingException; import java.security.MessageDigest; diff --git a/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/service/SaltService.java b/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/security/SaltService.java similarity index 96% rename from extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/service/SaltService.java rename to extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/security/SaltService.java index 823fa93da..863e82769 100644 --- a/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/service/SaltService.java +++ b/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/security/SaltService.java @@ -20,7 +20,7 @@ * THE SOFTWARE. */ -package net.sourceforge.guacamole.net.auth.mysql.service; +package org.glyptodon.guacamole.auth.mysql.security; /** * A service to generate password salts. diff --git a/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/service/SecureRandomSaltService.java b/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/security/SecureRandomSaltService.java similarity index 96% rename from extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/service/SecureRandomSaltService.java rename to extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/security/SecureRandomSaltService.java index e119eb881..79a5cc489 100644 --- a/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/service/SecureRandomSaltService.java +++ b/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/security/SecureRandomSaltService.java @@ -20,7 +20,7 @@ * THE SOFTWARE. */ -package net.sourceforge.guacamole.net.auth.mysql.service; +package org.glyptodon.guacamole.auth.mysql.security; import java.security.SecureRandom; 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/mysql/security/package-info.java new file mode 100644 index 000000000..a8fa5e208 --- /dev/null +++ b/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/security/package-info.java @@ -0,0 +1,26 @@ +/* + * Copyright (C) 2015 Glyptodon LLC + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ + +/** + * Classes related to hashing or encryption. + */ +package org.glyptodon.guacamole.auth.mysql.security; diff --git a/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/service/AbstractGuacamoleSocketService.java b/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/socket/AbstractGuacamoleSocketService.java similarity index 93% rename from extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/service/AbstractGuacamoleSocketService.java rename to extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/socket/AbstractGuacamoleSocketService.java index de973b9dd..bc3480da3 100644 --- a/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/service/AbstractGuacamoleSocketService.java +++ b/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/socket/AbstractGuacamoleSocketService.java @@ -20,7 +20,7 @@ * THE SOFTWARE. */ -package net.sourceforge.guacamole.net.auth.mysql.service; +package org.glyptodon.guacamole.auth.mysql.socket; import com.google.inject.Inject; import java.util.Collection; @@ -30,15 +30,15 @@ import java.util.HashMap; import java.util.LinkedList; import java.util.List; import java.util.Map; -import net.sourceforge.guacamole.net.auth.mysql.AuthenticatedUser; -import net.sourceforge.guacamole.net.auth.mysql.MySQLConnection; -import net.sourceforge.guacamole.net.auth.mysql.MySQLConnectionGroup; -import net.sourceforge.guacamole.net.auth.mysql.dao.ConnectionRecordMapper; -import net.sourceforge.guacamole.net.auth.mysql.dao.ParameterMapper; -import net.sourceforge.guacamole.net.auth.mysql.model.ConnectionModel; -import net.sourceforge.guacamole.net.auth.mysql.model.ConnectionRecordModel; -import net.sourceforge.guacamole.net.auth.mysql.model.ParameterModel; -import net.sourceforge.guacamole.net.auth.mysql.model.UserModel; +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.GuacamoleException; import org.glyptodon.guacamole.environment.Environment; import org.glyptodon.guacamole.net.GuacamoleSocket; diff --git a/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/service/ActiveConnectionRecord.java b/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/socket/ActiveConnectionRecord.java similarity index 95% rename from extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/service/ActiveConnectionRecord.java rename to extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/socket/ActiveConnectionRecord.java index 70a9ce7c4..9bdc2ee67 100644 --- a/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/service/ActiveConnectionRecord.java +++ b/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/socket/ActiveConnectionRecord.java @@ -20,10 +20,10 @@ * THE SOFTWARE. */ -package net.sourceforge.guacamole.net.auth.mysql.service; +package org.glyptodon.guacamole.auth.mysql.socket; import java.util.Date; -import net.sourceforge.guacamole.net.auth.mysql.AuthenticatedUser; +import org.glyptodon.guacamole.auth.mysql.user.AuthenticatedUser; import org.glyptodon.guacamole.net.auth.ConnectionRecord; diff --git a/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/service/GuacamoleSocketService.java b/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/socket/GuacamoleSocketService.java similarity index 94% rename from extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/service/GuacamoleSocketService.java rename to extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/socket/GuacamoleSocketService.java index c14e0af8c..bea2fcbf3 100644 --- a/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/service/GuacamoleSocketService.java +++ b/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/socket/GuacamoleSocketService.java @@ -20,12 +20,12 @@ * THE SOFTWARE. */ -package net.sourceforge.guacamole.net.auth.mysql.service; +package org.glyptodon.guacamole.auth.mysql.socket; import java.util.List; -import net.sourceforge.guacamole.net.auth.mysql.AuthenticatedUser; -import net.sourceforge.guacamole.net.auth.mysql.MySQLConnection; -import net.sourceforge.guacamole.net.auth.mysql.MySQLConnectionGroup; +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.GuacamoleException; import org.glyptodon.guacamole.net.GuacamoleSocket; import org.glyptodon.guacamole.net.auth.Connection; diff --git a/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/service/UnrestrictedGuacamoleSocketService.java b/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/socket/UnrestrictedGuacamoleSocketService.java similarity index 90% rename from extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/service/UnrestrictedGuacamoleSocketService.java rename to extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/socket/UnrestrictedGuacamoleSocketService.java index c50d8f2d2..140c9aa29 100644 --- a/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/service/UnrestrictedGuacamoleSocketService.java +++ b/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/socket/UnrestrictedGuacamoleSocketService.java @@ -20,11 +20,11 @@ * THE SOFTWARE. */ -package net.sourceforge.guacamole.net.auth.mysql.service; +package org.glyptodon.guacamole.auth.mysql.socket; import com.google.inject.Singleton; -import net.sourceforge.guacamole.net.auth.mysql.AuthenticatedUser; -import net.sourceforge.guacamole.net.auth.mysql.MySQLConnection; +import org.glyptodon.guacamole.auth.mysql.user.AuthenticatedUser; +import org.glyptodon.guacamole.auth.mysql.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/mysql/socket/package-info.java new file mode 100644 index 000000000..498518883 --- /dev/null +++ b/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/socket/package-info.java @@ -0,0 +1,27 @@ +/* + * Copyright (C) 2015 Glyptodon LLC + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ + +/** + * Classes related to obtaining/configuring Guacamole sockets, and restricting + * access to those sockets. + */ +package org.glyptodon.guacamole.auth.mysql.socket; diff --git a/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/AuthenticatedUser.java b/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/user/AuthenticatedUser.java similarity index 97% rename from extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/AuthenticatedUser.java rename to extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/user/AuthenticatedUser.java index beaca0166..df66abde9 100644 --- a/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/AuthenticatedUser.java +++ b/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/user/AuthenticatedUser.java @@ -20,7 +20,7 @@ * THE SOFTWARE. */ -package net.sourceforge.guacamole.net.auth.mysql; +package org.glyptodon.guacamole.auth.mysql.user; import org.glyptodon.guacamole.net.auth.Credentials; diff --git a/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/MySQLUser.java b/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/user/MySQLUser.java similarity index 93% rename from extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/MySQLUser.java rename to extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/user/MySQLUser.java index ed67c8284..9b597ec21 100644 --- a/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/MySQLUser.java +++ b/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/user/MySQLUser.java @@ -20,13 +20,13 @@ * THE SOFTWARE. */ -package net.sourceforge.guacamole.net.auth.mysql; +package org.glyptodon.guacamole.auth.mysql.user; import com.google.inject.Inject; -import net.sourceforge.guacamole.net.auth.mysql.model.UserModel; -import net.sourceforge.guacamole.net.auth.mysql.service.PasswordEncryptionService; -import net.sourceforge.guacamole.net.auth.mysql.service.SaltService; -import net.sourceforge.guacamole.net.auth.mysql.service.SystemPermissionService; +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.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/net/sourceforge/guacamole/net/auth/mysql/MySQLUserContext.java b/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/user/MySQLUserContext.java similarity index 92% rename from extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/MySQLUserContext.java rename to extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/user/MySQLUserContext.java index 17754e283..b6026ed4b 100644 --- a/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/MySQLUserContext.java +++ b/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/user/MySQLUserContext.java @@ -20,9 +20,12 @@ * THE SOFTWARE. */ -package net.sourceforge.guacamole.net.auth.mysql; +package org.glyptodon.guacamole.auth.mysql.user; +import org.glyptodon.guacamole.auth.mysql.connectiongroup.MySQLRootConnectionGroup; +import org.glyptodon.guacamole.auth.mysql.connectiongroup.ConnectionGroupDirectory; +import org.glyptodon.guacamole.auth.mysql.connection.ConnectionDirectory; import com.google.inject.Inject; import com.google.inject.Provider; import org.glyptodon.guacamole.GuacamoleException; diff --git a/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/UserDirectory.java b/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/user/UserDirectory.java similarity index 94% rename from extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/UserDirectory.java rename to extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/user/UserDirectory.java index 406d33747..d81dc8fb8 100644 --- a/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/UserDirectory.java +++ b/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/user/UserDirectory.java @@ -20,16 +20,14 @@ * THE SOFTWARE. */ -package net.sourceforge.guacamole.net.auth.mysql; +package org.glyptodon.guacamole.auth.mysql.user; import com.google.inject.Inject; import java.util.Collection; import java.util.Collections; import java.util.Set; -import net.sourceforge.guacamole.net.auth.mysql.service.UserService; import org.glyptodon.guacamole.GuacamoleException; -import org.glyptodon.guacamole.GuacamoleSecurityException; import org.glyptodon.guacamole.net.auth.Directory; import org.glyptodon.guacamole.net.auth.User; import org.mybatis.guice.transactional.Transactional; diff --git a/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/dao/UserMapper.java b/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/user/UserMapper.java similarity index 93% rename from extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/dao/UserMapper.java rename to extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/user/UserMapper.java index 048d61207..58f6df0ff 100644 --- a/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/dao/UserMapper.java +++ b/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/user/UserMapper.java @@ -20,9 +20,9 @@ * THE SOFTWARE. */ -package net.sourceforge.guacamole.net.auth.mysql.dao; +package org.glyptodon.guacamole.auth.mysql.user; -import net.sourceforge.guacamole.net.auth.mysql.model.UserModel; +import org.glyptodon.guacamole.auth.mysql.base.DirectoryObjectMapper; import org.apache.ibatis.annotations.Param; /** diff --git a/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/model/UserModel.java b/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/user/UserModel.java similarity index 96% rename from extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/model/UserModel.java rename to extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/user/UserModel.java index 5893fd4c9..e0f1c416a 100644 --- a/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/model/UserModel.java +++ b/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/user/UserModel.java @@ -20,7 +20,9 @@ * THE SOFTWARE. */ -package net.sourceforge.guacamole.net.auth.mysql.model; +package org.glyptodon.guacamole.auth.mysql.user; + +import org.glyptodon.guacamole.auth.mysql.base.ObjectModel; /** * Object representation of a Guacamole user, as represented in the database. diff --git a/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/service/UserService.java b/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/user/UserService.java similarity index 93% rename from extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/service/UserService.java rename to extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/user/UserService.java index d2e67dc18..530a26dd6 100644 --- a/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/service/UserService.java +++ b/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/user/UserService.java @@ -20,18 +20,15 @@ * THE SOFTWARE. */ -package net.sourceforge.guacamole.net.auth.mysql.service; +package org.glyptodon.guacamole.auth.mysql.user; import com.google.inject.Inject; import com.google.inject.Provider; import java.util.Collection; import java.util.Collections; -import net.sourceforge.guacamole.net.auth.mysql.AuthenticatedUser; import org.glyptodon.guacamole.net.auth.Credentials; -import net.sourceforge.guacamole.net.auth.mysql.MySQLUser; -import net.sourceforge.guacamole.net.auth.mysql.dao.DirectoryObjectMapper; -import net.sourceforge.guacamole.net.auth.mysql.dao.UserMapper; -import net.sourceforge.guacamole.net.auth.mysql.model.UserModel; +import org.glyptodon.guacamole.auth.mysql.base.DirectoryObjectMapper; +import org.glyptodon.guacamole.auth.mysql.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/mysql/user/package-info.java new file mode 100644 index 000000000..c8d66ce42 --- /dev/null +++ b/extensions/guacamole-auth-mysql/src/main/java/org/glyptodon/guacamole/auth/mysql/user/package-info.java @@ -0,0 +1,26 @@ +/* + * Copyright (C) 2015 Glyptodon LLC + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ + +/** + * Classes related to Guacamole users. + */ +package org.glyptodon.guacamole.auth.mysql.user; diff --git a/extensions/guacamole-auth-mysql/src/main/resources/net/sourceforge/guacamole/net/auth/mysql/dao/ConnectionMapper.xml b/extensions/guacamole-auth-mysql/src/main/resources/org/glyptodon/guacamole/auth/mysql/connection/ConnectionMapper.xml similarity index 93% rename from extensions/guacamole-auth-mysql/src/main/resources/net/sourceforge/guacamole/net/auth/mysql/dao/ConnectionMapper.xml rename to extensions/guacamole-auth-mysql/src/main/resources/org/glyptodon/guacamole/auth/mysql/connection/ConnectionMapper.xml index 087bdda93..e9b7c1c27 100644 --- a/extensions/guacamole-auth-mysql/src/main/resources/net/sourceforge/guacamole/net/auth/mysql/dao/ConnectionMapper.xml +++ b/extensions/guacamole-auth-mysql/src/main/resources/org/glyptodon/guacamole/auth/mysql/connection/ConnectionMapper.xml @@ -24,10 +24,10 @@ THE SOFTWARE. --> - + - + @@ -115,7 +115,7 @@ + parameterType="org.glyptodon.guacamole.auth.mysql.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/net/sourceforge/guacamole/net/auth/mysql/dao/ConnectionRecordMapper.xml b/extensions/guacamole-auth-mysql/src/main/resources/org/glyptodon/guacamole/auth/mysql/connection/ConnectionRecordMapper.xml similarity index 89% rename from extensions/guacamole-auth-mysql/src/main/resources/net/sourceforge/guacamole/net/auth/mysql/dao/ConnectionRecordMapper.xml rename to extensions/guacamole-auth-mysql/src/main/resources/org/glyptodon/guacamole/auth/mysql/connection/ConnectionRecordMapper.xml index 4bfe352ee..0f66f50cd 100644 --- a/extensions/guacamole-auth-mysql/src/main/resources/net/sourceforge/guacamole/net/auth/mysql/dao/ConnectionRecordMapper.xml +++ b/extensions/guacamole-auth-mysql/src/main/resources/org/glyptodon/guacamole/auth/mysql/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/net/sourceforge/guacamole/net/auth/mysql/dao/ParameterMapper.xml b/extensions/guacamole-auth-mysql/src/main/resources/org/glyptodon/guacamole/auth/mysql/connection/ParameterMapper.xml similarity index 90% rename from extensions/guacamole-auth-mysql/src/main/resources/net/sourceforge/guacamole/net/auth/mysql/dao/ParameterMapper.xml rename to extensions/guacamole-auth-mysql/src/main/resources/org/glyptodon/guacamole/auth/mysql/connection/ParameterMapper.xml index 763167382..ef3ac8261 100644 --- a/extensions/guacamole-auth-mysql/src/main/resources/net/sourceforge/guacamole/net/auth/mysql/dao/ParameterMapper.xml +++ b/extensions/guacamole-auth-mysql/src/main/resources/org/glyptodon/guacamole/auth/mysql/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/net/sourceforge/guacamole/net/auth/mysql/dao/ConnectionGroupMapper.xml b/extensions/guacamole-auth-mysql/src/main/resources/org/glyptodon/guacamole/auth/mysql/connectiongroup/ConnectionGroupMapper.xml similarity index 93% rename from extensions/guacamole-auth-mysql/src/main/resources/net/sourceforge/guacamole/net/auth/mysql/dao/ConnectionGroupMapper.xml rename to extensions/guacamole-auth-mysql/src/main/resources/org/glyptodon/guacamole/auth/mysql/connectiongroup/ConnectionGroupMapper.xml index 1a7c16b84..6f3ccf958 100644 --- a/extensions/guacamole-auth-mysql/src/main/resources/net/sourceforge/guacamole/net/auth/mysql/dao/ConnectionGroupMapper.xml +++ b/extensions/guacamole-auth-mysql/src/main/resources/org/glyptodon/guacamole/auth/mysql/connectiongroup/ConnectionGroupMapper.xml @@ -24,10 +24,10 @@ THE SOFTWARE. --> - + - + @@ -116,7 +116,7 @@ + parameterType="org.glyptodon.guacamole.auth.mysql.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/net/sourceforge/guacamole/net/auth/mysql/dao/SystemPermissionMapper.xml b/extensions/guacamole-auth-mysql/src/main/resources/org/glyptodon/guacamole/auth/mysql/permission/SystemPermissionMapper.xml similarity index 88% rename from extensions/guacamole-auth-mysql/src/main/resources/net/sourceforge/guacamole/net/auth/mysql/dao/SystemPermissionMapper.xml rename to extensions/guacamole-auth-mysql/src/main/resources/org/glyptodon/guacamole/auth/mysql/permission/SystemPermissionMapper.xml index 65a02a100..b483d2440 100644 --- a/extensions/guacamole-auth-mysql/src/main/resources/net/sourceforge/guacamole/net/auth/mysql/dao/SystemPermissionMapper.xml +++ b/extensions/guacamole-auth-mysql/src/main/resources/org/glyptodon/guacamole/auth/mysql/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/net/sourceforge/guacamole/net/auth/mysql/dao/UserMapper.xml b/extensions/guacamole-auth-mysql/src/main/resources/org/glyptodon/guacamole/auth/mysql/user/UserMapper.xml similarity index 92% rename from extensions/guacamole-auth-mysql/src/main/resources/net/sourceforge/guacamole/net/auth/mysql/dao/UserMapper.xml rename to extensions/guacamole-auth-mysql/src/main/resources/org/glyptodon/guacamole/auth/mysql/user/UserMapper.xml index 4b732845d..ce4c05ee4 100644 --- a/extensions/guacamole-auth-mysql/src/main/resources/net/sourceforge/guacamole/net/auth/mysql/dao/UserMapper.xml +++ b/extensions/guacamole-auth-mysql/src/main/resources/org/glyptodon/guacamole/auth/mysql/user/UserMapper.xml @@ -24,10 +24,10 @@ THE SOFTWARE. --> - + - + @@ -108,7 +108,7 @@ + parameterType="org.glyptodon.guacamole.auth.mysql.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}