From a271550bcb5ad8714778fb25a6eb0534c154ced8 Mon Sep 17 00:00:00 2001 From: Michael Jumper Date: Fri, 27 Feb 2015 21:24:11 -0800 Subject: [PATCH] GUAC-1101: Move JDBC-related auth into single parent project. --- .../README | 46 +++++---- .../guacamole-auth-jdbc-base}/.gitignore | 0 .../modules/guacamole-auth-jdbc-base/pom.xml | 85 ++++++++++++++++ .../JDBCAuthenticationProviderModule.java | 0 .../auth/jdbc/base/DirectoryObject.java | 0 .../auth/jdbc/base/DirectoryObjectMapper.java | 0 .../jdbc/base/DirectoryObjectService.java | 0 .../guacamole/auth/jdbc/base/ObjectModel.java | 0 .../auth/jdbc/base/RestrictedObject.java | 0 .../auth/jdbc/base/package-info.java | 0 .../jdbc/connection/ConnectionDirectory.java | 0 .../jdbc/connection/ConnectionMapper.java | 0 .../auth/jdbc/connection/ConnectionModel.java | 0 .../connection/ConnectionRecordMapper.java | 0 .../connection/ConnectionRecordModel.java | 0 .../jdbc/connection/ConnectionService.java | 0 .../auth/jdbc/connection/MySQLConnection.java | 0 .../connection/MySQLConnectionRecord.java | 0 .../MySQLGuacamoleConfiguration.java | 0 .../auth/jdbc/connection/ParameterMapper.java | 0 .../auth/jdbc/connection/ParameterModel.java | 0 .../auth/jdbc/connection/package-info.java | 0 .../ConnectionGroupDirectory.java | 0 .../ConnectionGroupMapper.java | 0 .../connectiongroup/ConnectionGroupModel.java | 0 .../ConnectionGroupService.java | 0 .../connectiongroup/MySQLConnectionGroup.java | 0 .../MySQLRootConnectionGroup.java | 0 .../jdbc/connectiongroup/package-info.java | 0 .../guacamole/auth/jdbc/package-info.java | 0 .../permission/MySQLSystemPermissionSet.java | 0 .../permission/ObjectPermissionMapper.java | 0 .../permission/ObjectPermissionModel.java | 0 .../permission/ObjectPermissionService.java | 0 .../jdbc/permission/PermissionMapper.java | 0 .../auth/jdbc/permission/PermissionModel.java | 0 .../jdbc/permission/PermissionService.java | 0 .../permission/SystemPermissionMapper.java | 0 .../permission/SystemPermissionModel.java | 0 .../permission/SystemPermissionService.java | 0 .../auth/jdbc/permission/package-info.java | 0 .../security/PasswordEncryptionService.java | 0 .../SHA256PasswordEncryptionService.java | 0 .../auth/jdbc/security/SaltService.java | 0 .../security/SecureRandomSaltService.java | 0 .../auth/jdbc/security/package-info.java | 0 .../AbstractGuacamoleSocketService.java | 0 .../jdbc/socket/ActiveConnectionRecord.java | 0 .../jdbc/socket/GuacamoleSocketService.java | 0 .../UnrestrictedGuacamoleSocketService.java | 0 .../auth/jdbc/socket/package-info.java | 0 .../auth/jdbc/user/AuthenticatedUser.java | 0 .../guacamole/auth/jdbc/user/MySQLUser.java | 0 .../auth/jdbc/user/MySQLUserContext.java | 0 .../auth/jdbc/user/UserContextService.java | 0 .../auth/jdbc/user/UserDirectory.java | 0 .../guacamole/auth/jdbc/user/UserMapper.java | 0 .../guacamole/auth/jdbc/user/UserModel.java | 0 .../guacamole/auth/jdbc/user/UserService.java | 0 .../auth/jdbc/user/package-info.java | 0 .../modules}/guacamole-auth-mysql/.gitignore | 0 .../modules}/guacamole-auth-mysql/pom.xml | 16 +-- .../schema/001-create-schema.sql | 0 .../schema/002-create-admin-user.sql | 0 .../schema/upgrade/upgrade-pre-0.8.2.sql | 0 .../mysql/MySQLAuthenticationProvider.java | 0 .../MySQLAuthenticationProviderModule.java | 0 .../auth/mysql/MySQLGuacamoleProperties.java | 0 .../net/auth/mysql/package-info.java | 0 .../auth/jdbc/connection/ConnectionMapper.xml | 0 .../connection/ConnectionRecordMapper.xml | 0 .../auth/jdbc/connection/ParameterMapper.xml | 0 .../connectiongroup/ConnectionGroupMapper.xml | 0 .../permission/SystemPermissionMapper.xml | 0 .../guacamole/auth/jdbc/user/UserMapper.xml | 0 extensions/guacamole-auth-jdbc/pom.xml | 97 +++++++------------ .../src/main/assembly/dist.xml | 20 ++-- extensions/guacamole-auth-mysql/LICENSE | 19 ---- 78 files changed, 151 insertions(+), 132 deletions(-) rename extensions/{guacamole-auth-mysql => guacamole-auth-jdbc}/README (62%) rename extensions/guacamole-auth-jdbc/{ => modules/guacamole-auth-jdbc-base}/.gitignore (100%) create mode 100644 extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/pom.xml rename extensions/guacamole-auth-jdbc/{ => modules/guacamole-auth-jdbc-base}/src/main/java/org/glyptodon/guacamole/auth/jdbc/JDBCAuthenticationProviderModule.java (100%) rename extensions/guacamole-auth-jdbc/{ => modules/guacamole-auth-jdbc-base}/src/main/java/org/glyptodon/guacamole/auth/jdbc/base/DirectoryObject.java (100%) rename extensions/guacamole-auth-jdbc/{ => modules/guacamole-auth-jdbc-base}/src/main/java/org/glyptodon/guacamole/auth/jdbc/base/DirectoryObjectMapper.java (100%) rename extensions/guacamole-auth-jdbc/{ => modules/guacamole-auth-jdbc-base}/src/main/java/org/glyptodon/guacamole/auth/jdbc/base/DirectoryObjectService.java (100%) rename extensions/guacamole-auth-jdbc/{ => modules/guacamole-auth-jdbc-base}/src/main/java/org/glyptodon/guacamole/auth/jdbc/base/ObjectModel.java (100%) rename extensions/guacamole-auth-jdbc/{ => modules/guacamole-auth-jdbc-base}/src/main/java/org/glyptodon/guacamole/auth/jdbc/base/RestrictedObject.java (100%) rename extensions/guacamole-auth-jdbc/{ => modules/guacamole-auth-jdbc-base}/src/main/java/org/glyptodon/guacamole/auth/jdbc/base/package-info.java (100%) rename extensions/guacamole-auth-jdbc/{ => modules/guacamole-auth-jdbc-base}/src/main/java/org/glyptodon/guacamole/auth/jdbc/connection/ConnectionDirectory.java (100%) rename extensions/guacamole-auth-jdbc/{ => modules/guacamole-auth-jdbc-base}/src/main/java/org/glyptodon/guacamole/auth/jdbc/connection/ConnectionMapper.java (100%) rename extensions/guacamole-auth-jdbc/{ => modules/guacamole-auth-jdbc-base}/src/main/java/org/glyptodon/guacamole/auth/jdbc/connection/ConnectionModel.java (100%) rename extensions/guacamole-auth-jdbc/{ => modules/guacamole-auth-jdbc-base}/src/main/java/org/glyptodon/guacamole/auth/jdbc/connection/ConnectionRecordMapper.java (100%) rename extensions/guacamole-auth-jdbc/{ => modules/guacamole-auth-jdbc-base}/src/main/java/org/glyptodon/guacamole/auth/jdbc/connection/ConnectionRecordModel.java (100%) rename extensions/guacamole-auth-jdbc/{ => modules/guacamole-auth-jdbc-base}/src/main/java/org/glyptodon/guacamole/auth/jdbc/connection/ConnectionService.java (100%) rename extensions/guacamole-auth-jdbc/{ => modules/guacamole-auth-jdbc-base}/src/main/java/org/glyptodon/guacamole/auth/jdbc/connection/MySQLConnection.java (100%) rename extensions/guacamole-auth-jdbc/{ => modules/guacamole-auth-jdbc-base}/src/main/java/org/glyptodon/guacamole/auth/jdbc/connection/MySQLConnectionRecord.java (100%) rename extensions/guacamole-auth-jdbc/{ => modules/guacamole-auth-jdbc-base}/src/main/java/org/glyptodon/guacamole/auth/jdbc/connection/MySQLGuacamoleConfiguration.java (100%) rename extensions/guacamole-auth-jdbc/{ => modules/guacamole-auth-jdbc-base}/src/main/java/org/glyptodon/guacamole/auth/jdbc/connection/ParameterMapper.java (100%) rename extensions/guacamole-auth-jdbc/{ => modules/guacamole-auth-jdbc-base}/src/main/java/org/glyptodon/guacamole/auth/jdbc/connection/ParameterModel.java (100%) rename extensions/guacamole-auth-jdbc/{ => modules/guacamole-auth-jdbc-base}/src/main/java/org/glyptodon/guacamole/auth/jdbc/connection/package-info.java (100%) rename extensions/guacamole-auth-jdbc/{ => modules/guacamole-auth-jdbc-base}/src/main/java/org/glyptodon/guacamole/auth/jdbc/connectiongroup/ConnectionGroupDirectory.java (100%) rename extensions/guacamole-auth-jdbc/{ => modules/guacamole-auth-jdbc-base}/src/main/java/org/glyptodon/guacamole/auth/jdbc/connectiongroup/ConnectionGroupMapper.java (100%) rename extensions/guacamole-auth-jdbc/{ => modules/guacamole-auth-jdbc-base}/src/main/java/org/glyptodon/guacamole/auth/jdbc/connectiongroup/ConnectionGroupModel.java (100%) rename extensions/guacamole-auth-jdbc/{ => modules/guacamole-auth-jdbc-base}/src/main/java/org/glyptodon/guacamole/auth/jdbc/connectiongroup/ConnectionGroupService.java (100%) rename extensions/guacamole-auth-jdbc/{ => modules/guacamole-auth-jdbc-base}/src/main/java/org/glyptodon/guacamole/auth/jdbc/connectiongroup/MySQLConnectionGroup.java (100%) rename extensions/guacamole-auth-jdbc/{ => modules/guacamole-auth-jdbc-base}/src/main/java/org/glyptodon/guacamole/auth/jdbc/connectiongroup/MySQLRootConnectionGroup.java (100%) rename extensions/guacamole-auth-jdbc/{ => modules/guacamole-auth-jdbc-base}/src/main/java/org/glyptodon/guacamole/auth/jdbc/connectiongroup/package-info.java (100%) rename extensions/guacamole-auth-jdbc/{ => modules/guacamole-auth-jdbc-base}/src/main/java/org/glyptodon/guacamole/auth/jdbc/package-info.java (100%) rename extensions/guacamole-auth-jdbc/{ => modules/guacamole-auth-jdbc-base}/src/main/java/org/glyptodon/guacamole/auth/jdbc/permission/MySQLSystemPermissionSet.java (100%) rename extensions/guacamole-auth-jdbc/{ => modules/guacamole-auth-jdbc-base}/src/main/java/org/glyptodon/guacamole/auth/jdbc/permission/ObjectPermissionMapper.java (100%) rename extensions/guacamole-auth-jdbc/{ => modules/guacamole-auth-jdbc-base}/src/main/java/org/glyptodon/guacamole/auth/jdbc/permission/ObjectPermissionModel.java (100%) rename extensions/guacamole-auth-jdbc/{ => modules/guacamole-auth-jdbc-base}/src/main/java/org/glyptodon/guacamole/auth/jdbc/permission/ObjectPermissionService.java (100%) rename extensions/guacamole-auth-jdbc/{ => modules/guacamole-auth-jdbc-base}/src/main/java/org/glyptodon/guacamole/auth/jdbc/permission/PermissionMapper.java (100%) rename extensions/guacamole-auth-jdbc/{ => modules/guacamole-auth-jdbc-base}/src/main/java/org/glyptodon/guacamole/auth/jdbc/permission/PermissionModel.java (100%) rename extensions/guacamole-auth-jdbc/{ => modules/guacamole-auth-jdbc-base}/src/main/java/org/glyptodon/guacamole/auth/jdbc/permission/PermissionService.java (100%) rename extensions/guacamole-auth-jdbc/{ => modules/guacamole-auth-jdbc-base}/src/main/java/org/glyptodon/guacamole/auth/jdbc/permission/SystemPermissionMapper.java (100%) rename extensions/guacamole-auth-jdbc/{ => modules/guacamole-auth-jdbc-base}/src/main/java/org/glyptodon/guacamole/auth/jdbc/permission/SystemPermissionModel.java (100%) rename extensions/guacamole-auth-jdbc/{ => modules/guacamole-auth-jdbc-base}/src/main/java/org/glyptodon/guacamole/auth/jdbc/permission/SystemPermissionService.java (100%) rename extensions/guacamole-auth-jdbc/{ => modules/guacamole-auth-jdbc-base}/src/main/java/org/glyptodon/guacamole/auth/jdbc/permission/package-info.java (100%) rename extensions/guacamole-auth-jdbc/{ => modules/guacamole-auth-jdbc-base}/src/main/java/org/glyptodon/guacamole/auth/jdbc/security/PasswordEncryptionService.java (100%) rename extensions/guacamole-auth-jdbc/{ => modules/guacamole-auth-jdbc-base}/src/main/java/org/glyptodon/guacamole/auth/jdbc/security/SHA256PasswordEncryptionService.java (100%) rename extensions/guacamole-auth-jdbc/{ => modules/guacamole-auth-jdbc-base}/src/main/java/org/glyptodon/guacamole/auth/jdbc/security/SaltService.java (100%) rename extensions/guacamole-auth-jdbc/{ => modules/guacamole-auth-jdbc-base}/src/main/java/org/glyptodon/guacamole/auth/jdbc/security/SecureRandomSaltService.java (100%) rename extensions/guacamole-auth-jdbc/{ => modules/guacamole-auth-jdbc-base}/src/main/java/org/glyptodon/guacamole/auth/jdbc/security/package-info.java (100%) rename extensions/guacamole-auth-jdbc/{ => modules/guacamole-auth-jdbc-base}/src/main/java/org/glyptodon/guacamole/auth/jdbc/socket/AbstractGuacamoleSocketService.java (100%) rename extensions/guacamole-auth-jdbc/{ => modules/guacamole-auth-jdbc-base}/src/main/java/org/glyptodon/guacamole/auth/jdbc/socket/ActiveConnectionRecord.java (100%) rename extensions/guacamole-auth-jdbc/{ => modules/guacamole-auth-jdbc-base}/src/main/java/org/glyptodon/guacamole/auth/jdbc/socket/GuacamoleSocketService.java (100%) rename extensions/guacamole-auth-jdbc/{ => modules/guacamole-auth-jdbc-base}/src/main/java/org/glyptodon/guacamole/auth/jdbc/socket/UnrestrictedGuacamoleSocketService.java (100%) rename extensions/guacamole-auth-jdbc/{ => modules/guacamole-auth-jdbc-base}/src/main/java/org/glyptodon/guacamole/auth/jdbc/socket/package-info.java (100%) rename extensions/guacamole-auth-jdbc/{ => modules/guacamole-auth-jdbc-base}/src/main/java/org/glyptodon/guacamole/auth/jdbc/user/AuthenticatedUser.java (100%) rename extensions/guacamole-auth-jdbc/{ => modules/guacamole-auth-jdbc-base}/src/main/java/org/glyptodon/guacamole/auth/jdbc/user/MySQLUser.java (100%) rename extensions/guacamole-auth-jdbc/{ => modules/guacamole-auth-jdbc-base}/src/main/java/org/glyptodon/guacamole/auth/jdbc/user/MySQLUserContext.java (100%) rename extensions/guacamole-auth-jdbc/{ => modules/guacamole-auth-jdbc-base}/src/main/java/org/glyptodon/guacamole/auth/jdbc/user/UserContextService.java (100%) rename extensions/guacamole-auth-jdbc/{ => modules/guacamole-auth-jdbc-base}/src/main/java/org/glyptodon/guacamole/auth/jdbc/user/UserDirectory.java (100%) rename extensions/guacamole-auth-jdbc/{ => modules/guacamole-auth-jdbc-base}/src/main/java/org/glyptodon/guacamole/auth/jdbc/user/UserMapper.java (100%) rename extensions/guacamole-auth-jdbc/{ => modules/guacamole-auth-jdbc-base}/src/main/java/org/glyptodon/guacamole/auth/jdbc/user/UserModel.java (100%) rename extensions/guacamole-auth-jdbc/{ => modules/guacamole-auth-jdbc-base}/src/main/java/org/glyptodon/guacamole/auth/jdbc/user/UserService.java (100%) rename extensions/guacamole-auth-jdbc/{ => modules/guacamole-auth-jdbc-base}/src/main/java/org/glyptodon/guacamole/auth/jdbc/user/package-info.java (100%) rename extensions/{ => guacamole-auth-jdbc/modules}/guacamole-auth-mysql/.gitignore (100%) rename extensions/{ => guacamole-auth-jdbc/modules}/guacamole-auth-mysql/pom.xml (77%) rename extensions/{ => guacamole-auth-jdbc/modules}/guacamole-auth-mysql/schema/001-create-schema.sql (100%) rename extensions/{ => guacamole-auth-jdbc/modules}/guacamole-auth-mysql/schema/002-create-admin-user.sql (100%) rename extensions/{ => guacamole-auth-jdbc/modules}/guacamole-auth-mysql/schema/upgrade/upgrade-pre-0.8.2.sql (100%) rename extensions/{ => guacamole-auth-jdbc/modules}/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/MySQLAuthenticationProvider.java (100%) rename extensions/{ => guacamole-auth-jdbc/modules}/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/MySQLAuthenticationProviderModule.java (100%) rename extensions/{ => guacamole-auth-jdbc/modules}/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/MySQLGuacamoleProperties.java (100%) rename extensions/{ => guacamole-auth-jdbc/modules}/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/package-info.java (100%) rename extensions/{ => guacamole-auth-jdbc/modules}/guacamole-auth-mysql/src/main/resources/org/glyptodon/guacamole/auth/jdbc/connection/ConnectionMapper.xml (100%) rename extensions/{ => guacamole-auth-jdbc/modules}/guacamole-auth-mysql/src/main/resources/org/glyptodon/guacamole/auth/jdbc/connection/ConnectionRecordMapper.xml (100%) rename extensions/{ => guacamole-auth-jdbc/modules}/guacamole-auth-mysql/src/main/resources/org/glyptodon/guacamole/auth/jdbc/connection/ParameterMapper.xml (100%) rename extensions/{ => guacamole-auth-jdbc/modules}/guacamole-auth-mysql/src/main/resources/org/glyptodon/guacamole/auth/jdbc/connectiongroup/ConnectionGroupMapper.xml (100%) rename extensions/{ => guacamole-auth-jdbc/modules}/guacamole-auth-mysql/src/main/resources/org/glyptodon/guacamole/auth/jdbc/permission/SystemPermissionMapper.xml (100%) rename extensions/{ => guacamole-auth-jdbc/modules}/guacamole-auth-mysql/src/main/resources/org/glyptodon/guacamole/auth/jdbc/user/UserMapper.xml (100%) rename extensions/{guacamole-auth-mysql => guacamole-auth-jdbc}/src/main/assembly/dist.xml (57%) delete mode 100644 extensions/guacamole-auth-mysql/LICENSE diff --git a/extensions/guacamole-auth-mysql/README b/extensions/guacamole-auth-jdbc/README similarity index 62% rename from extensions/guacamole-auth-mysql/README rename to extensions/guacamole-auth-jdbc/README index 733e369dd..d4fa250aa 100644 --- a/extensions/guacamole-auth-mysql/README +++ b/extensions/guacamole-auth-jdbc/README @@ -17,29 +17,30 @@ Distribution-specific documentation is provided on the Guacamole wiki: ------------------------------------------------------------ - What is guacamole-auth-mysql? + What is guacamole-auth-jdbc? ------------------------------------------------------------ -guacamole-auth-ldap is a Java library for use with the Guacamole web -application to provide MySQL based authentication. +guacamole-auth-jdbc is a Java library for use with the Guacamole web +application to provide database-driven authentication. -guacamole-auth-mysql provides an authentication provider which can be -set in guacamole.properties to allow MySQL authentication of Guacamole -users. Additional properties are required to configure the mysql -connection parameters. +guacamole-auth-jdbc provides multiple authentication provider implementations +which each provide a support for a different database. These authentication +providers can be set in guacamole.properties to allow authentication of +Guacamole users through that type of database. -A schema file are provided to create the required tables in your -mysql database. +Schema files are provided to create the required tables in your database of +choice. ------------------------------------------------------------ - Compiling and installing guacamole-auth-mysql + Compiling and installing guacamole-auth-jdbc ------------------------------------------------------------ -guacamole-auth-mysql is built using Maven. Building guacamole-auth-mysql -compiles all classes and packages them into a redistributable .jar file. This -.jar file can be installed in the library directory configured in -guacamole.properties such that the authentication provider is available. +guacamole-auth-jdbc is built using Maven. Building guacamole-auth-jdbc compiles +all classes and packages them into a redistributable .tar.gz archive. This +archive contains multiple .jar files, each of this corresponds to a +database-specific authentication provider implementation that can be installed +in the library directory configured in guacamole.properties. 1) Run mvn package @@ -68,13 +69,16 @@ guacamole.properties such that the authentication provider is available. with username 'guacadmin' and password 'guacadmin'. This user can be used to set up any other connections and users. -6) Configure guacamole.properties for MySQL +6) Configure guacamole.properties for your database - There are additional properties required by the MySQL JDBC driver - which must be added/changed in your guacamole.properties: + There are additional properties required by JDBC drivers which must + be added/changed in your guacamole.properties. These parameters are + specific to the database being used. - # Configuration for MySQL connection - mysql-hostname: mysql.host.name + For MySQL, the following properties are available: + + # Database connection configuration + mysql-hostname: database.host.name mysql-port: 3306 mysql-database: guacamole.database.name mysql-username: user @@ -91,8 +95,8 @@ guacamole.properties such that the authentication provider is available. Reporting problems ------------------------------------------------------------ -Please report any bugs encountered by opening a new ticket at the Trac system +Please report any bugs encountered by opening a new issue in the JIRA system hosted at: - http://guac-dev.org/trac/ + http://glyptodon.org/jira/ diff --git a/extensions/guacamole-auth-jdbc/.gitignore b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/.gitignore similarity index 100% rename from extensions/guacamole-auth-jdbc/.gitignore rename to extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/.gitignore diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/pom.xml b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/pom.xml new file mode 100644 index 000000000..6c2aa4597 --- /dev/null +++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/pom.xml @@ -0,0 +1,85 @@ + + + 4.0.0 + org.glyptodon.guacamole + guacamole-auth-jdbc-base + jar + 0.9.5 + guacamole-auth-jdbc-base + http://guac-dev.org/ + + + UTF-8 + + + + + + + + org.apache.maven.plugins + maven-compiler-plugin + + 1.6 + 1.6 + + + + + + + + + + + org.glyptodon.guacamole + guacamole-common + 0.9.4 + provided + + + + + org.glyptodon.guacamole + guacamole-ext + 0.9.5 + provided + + + + + org.slf4j + slf4j-api + 1.7.7 + + + + + org.mybatis + mybatis + 3.2.8 + + + + + org.mybatis + mybatis-guice + 3.6 + + + + + com.google.inject + guice + 3.0 + + + com.google.inject.extensions + guice-multibindings + 3.0 + + + + + diff --git a/extensions/guacamole-auth-jdbc/src/main/java/org/glyptodon/guacamole/auth/jdbc/JDBCAuthenticationProviderModule.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/JDBCAuthenticationProviderModule.java similarity index 100% rename from extensions/guacamole-auth-jdbc/src/main/java/org/glyptodon/guacamole/auth/jdbc/JDBCAuthenticationProviderModule.java rename to extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/JDBCAuthenticationProviderModule.java diff --git a/extensions/guacamole-auth-jdbc/src/main/java/org/glyptodon/guacamole/auth/jdbc/base/DirectoryObject.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/base/DirectoryObject.java similarity index 100% rename from extensions/guacamole-auth-jdbc/src/main/java/org/glyptodon/guacamole/auth/jdbc/base/DirectoryObject.java rename to extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/base/DirectoryObject.java diff --git a/extensions/guacamole-auth-jdbc/src/main/java/org/glyptodon/guacamole/auth/jdbc/base/DirectoryObjectMapper.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/base/DirectoryObjectMapper.java similarity index 100% rename from extensions/guacamole-auth-jdbc/src/main/java/org/glyptodon/guacamole/auth/jdbc/base/DirectoryObjectMapper.java rename to extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/base/DirectoryObjectMapper.java diff --git a/extensions/guacamole-auth-jdbc/src/main/java/org/glyptodon/guacamole/auth/jdbc/base/DirectoryObjectService.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/base/DirectoryObjectService.java similarity index 100% rename from extensions/guacamole-auth-jdbc/src/main/java/org/glyptodon/guacamole/auth/jdbc/base/DirectoryObjectService.java rename to extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/base/DirectoryObjectService.java diff --git a/extensions/guacamole-auth-jdbc/src/main/java/org/glyptodon/guacamole/auth/jdbc/base/ObjectModel.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/base/ObjectModel.java similarity index 100% rename from extensions/guacamole-auth-jdbc/src/main/java/org/glyptodon/guacamole/auth/jdbc/base/ObjectModel.java rename to extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/base/ObjectModel.java diff --git a/extensions/guacamole-auth-jdbc/src/main/java/org/glyptodon/guacamole/auth/jdbc/base/RestrictedObject.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/base/RestrictedObject.java similarity index 100% rename from extensions/guacamole-auth-jdbc/src/main/java/org/glyptodon/guacamole/auth/jdbc/base/RestrictedObject.java rename to extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/base/RestrictedObject.java diff --git a/extensions/guacamole-auth-jdbc/src/main/java/org/glyptodon/guacamole/auth/jdbc/base/package-info.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/base/package-info.java similarity index 100% rename from extensions/guacamole-auth-jdbc/src/main/java/org/glyptodon/guacamole/auth/jdbc/base/package-info.java rename to extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/base/package-info.java diff --git a/extensions/guacamole-auth-jdbc/src/main/java/org/glyptodon/guacamole/auth/jdbc/connection/ConnectionDirectory.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/connection/ConnectionDirectory.java similarity index 100% rename from extensions/guacamole-auth-jdbc/src/main/java/org/glyptodon/guacamole/auth/jdbc/connection/ConnectionDirectory.java rename to extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/connection/ConnectionDirectory.java diff --git a/extensions/guacamole-auth-jdbc/src/main/java/org/glyptodon/guacamole/auth/jdbc/connection/ConnectionMapper.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/connection/ConnectionMapper.java similarity index 100% rename from extensions/guacamole-auth-jdbc/src/main/java/org/glyptodon/guacamole/auth/jdbc/connection/ConnectionMapper.java rename to extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/connection/ConnectionMapper.java diff --git a/extensions/guacamole-auth-jdbc/src/main/java/org/glyptodon/guacamole/auth/jdbc/connection/ConnectionModel.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/connection/ConnectionModel.java similarity index 100% rename from extensions/guacamole-auth-jdbc/src/main/java/org/glyptodon/guacamole/auth/jdbc/connection/ConnectionModel.java rename to extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/connection/ConnectionModel.java diff --git a/extensions/guacamole-auth-jdbc/src/main/java/org/glyptodon/guacamole/auth/jdbc/connection/ConnectionRecordMapper.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/connection/ConnectionRecordMapper.java similarity index 100% rename from extensions/guacamole-auth-jdbc/src/main/java/org/glyptodon/guacamole/auth/jdbc/connection/ConnectionRecordMapper.java rename to extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/connection/ConnectionRecordMapper.java diff --git a/extensions/guacamole-auth-jdbc/src/main/java/org/glyptodon/guacamole/auth/jdbc/connection/ConnectionRecordModel.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/connection/ConnectionRecordModel.java similarity index 100% rename from extensions/guacamole-auth-jdbc/src/main/java/org/glyptodon/guacamole/auth/jdbc/connection/ConnectionRecordModel.java rename to extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/connection/ConnectionRecordModel.java diff --git a/extensions/guacamole-auth-jdbc/src/main/java/org/glyptodon/guacamole/auth/jdbc/connection/ConnectionService.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/connection/ConnectionService.java similarity index 100% rename from extensions/guacamole-auth-jdbc/src/main/java/org/glyptodon/guacamole/auth/jdbc/connection/ConnectionService.java rename to extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/connection/ConnectionService.java diff --git a/extensions/guacamole-auth-jdbc/src/main/java/org/glyptodon/guacamole/auth/jdbc/connection/MySQLConnection.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/connection/MySQLConnection.java similarity index 100% rename from extensions/guacamole-auth-jdbc/src/main/java/org/glyptodon/guacamole/auth/jdbc/connection/MySQLConnection.java rename to extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/connection/MySQLConnection.java diff --git a/extensions/guacamole-auth-jdbc/src/main/java/org/glyptodon/guacamole/auth/jdbc/connection/MySQLConnectionRecord.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/connection/MySQLConnectionRecord.java similarity index 100% rename from extensions/guacamole-auth-jdbc/src/main/java/org/glyptodon/guacamole/auth/jdbc/connection/MySQLConnectionRecord.java rename to extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/connection/MySQLConnectionRecord.java diff --git a/extensions/guacamole-auth-jdbc/src/main/java/org/glyptodon/guacamole/auth/jdbc/connection/MySQLGuacamoleConfiguration.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/connection/MySQLGuacamoleConfiguration.java similarity index 100% rename from extensions/guacamole-auth-jdbc/src/main/java/org/glyptodon/guacamole/auth/jdbc/connection/MySQLGuacamoleConfiguration.java rename to extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/connection/MySQLGuacamoleConfiguration.java diff --git a/extensions/guacamole-auth-jdbc/src/main/java/org/glyptodon/guacamole/auth/jdbc/connection/ParameterMapper.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/connection/ParameterMapper.java similarity index 100% rename from extensions/guacamole-auth-jdbc/src/main/java/org/glyptodon/guacamole/auth/jdbc/connection/ParameterMapper.java rename to extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/connection/ParameterMapper.java diff --git a/extensions/guacamole-auth-jdbc/src/main/java/org/glyptodon/guacamole/auth/jdbc/connection/ParameterModel.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/connection/ParameterModel.java similarity index 100% rename from extensions/guacamole-auth-jdbc/src/main/java/org/glyptodon/guacamole/auth/jdbc/connection/ParameterModel.java rename to extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/connection/ParameterModel.java diff --git a/extensions/guacamole-auth-jdbc/src/main/java/org/glyptodon/guacamole/auth/jdbc/connection/package-info.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/connection/package-info.java similarity index 100% rename from extensions/guacamole-auth-jdbc/src/main/java/org/glyptodon/guacamole/auth/jdbc/connection/package-info.java rename to extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/connection/package-info.java diff --git a/extensions/guacamole-auth-jdbc/src/main/java/org/glyptodon/guacamole/auth/jdbc/connectiongroup/ConnectionGroupDirectory.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/connectiongroup/ConnectionGroupDirectory.java similarity index 100% rename from extensions/guacamole-auth-jdbc/src/main/java/org/glyptodon/guacamole/auth/jdbc/connectiongroup/ConnectionGroupDirectory.java rename to extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/connectiongroup/ConnectionGroupDirectory.java diff --git a/extensions/guacamole-auth-jdbc/src/main/java/org/glyptodon/guacamole/auth/jdbc/connectiongroup/ConnectionGroupMapper.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/connectiongroup/ConnectionGroupMapper.java similarity index 100% rename from extensions/guacamole-auth-jdbc/src/main/java/org/glyptodon/guacamole/auth/jdbc/connectiongroup/ConnectionGroupMapper.java rename to extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/connectiongroup/ConnectionGroupMapper.java diff --git a/extensions/guacamole-auth-jdbc/src/main/java/org/glyptodon/guacamole/auth/jdbc/connectiongroup/ConnectionGroupModel.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/connectiongroup/ConnectionGroupModel.java similarity index 100% rename from extensions/guacamole-auth-jdbc/src/main/java/org/glyptodon/guacamole/auth/jdbc/connectiongroup/ConnectionGroupModel.java rename to extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/connectiongroup/ConnectionGroupModel.java diff --git a/extensions/guacamole-auth-jdbc/src/main/java/org/glyptodon/guacamole/auth/jdbc/connectiongroup/ConnectionGroupService.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/connectiongroup/ConnectionGroupService.java similarity index 100% rename from extensions/guacamole-auth-jdbc/src/main/java/org/glyptodon/guacamole/auth/jdbc/connectiongroup/ConnectionGroupService.java rename to extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/connectiongroup/ConnectionGroupService.java diff --git a/extensions/guacamole-auth-jdbc/src/main/java/org/glyptodon/guacamole/auth/jdbc/connectiongroup/MySQLConnectionGroup.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/connectiongroup/MySQLConnectionGroup.java similarity index 100% rename from extensions/guacamole-auth-jdbc/src/main/java/org/glyptodon/guacamole/auth/jdbc/connectiongroup/MySQLConnectionGroup.java rename to extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/connectiongroup/MySQLConnectionGroup.java diff --git a/extensions/guacamole-auth-jdbc/src/main/java/org/glyptodon/guacamole/auth/jdbc/connectiongroup/MySQLRootConnectionGroup.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/connectiongroup/MySQLRootConnectionGroup.java similarity index 100% rename from extensions/guacamole-auth-jdbc/src/main/java/org/glyptodon/guacamole/auth/jdbc/connectiongroup/MySQLRootConnectionGroup.java rename to extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/connectiongroup/MySQLRootConnectionGroup.java diff --git a/extensions/guacamole-auth-jdbc/src/main/java/org/glyptodon/guacamole/auth/jdbc/connectiongroup/package-info.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/connectiongroup/package-info.java similarity index 100% rename from extensions/guacamole-auth-jdbc/src/main/java/org/glyptodon/guacamole/auth/jdbc/connectiongroup/package-info.java rename to extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/connectiongroup/package-info.java diff --git a/extensions/guacamole-auth-jdbc/src/main/java/org/glyptodon/guacamole/auth/jdbc/package-info.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/package-info.java similarity index 100% rename from extensions/guacamole-auth-jdbc/src/main/java/org/glyptodon/guacamole/auth/jdbc/package-info.java rename to extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/package-info.java diff --git a/extensions/guacamole-auth-jdbc/src/main/java/org/glyptodon/guacamole/auth/jdbc/permission/MySQLSystemPermissionSet.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/permission/MySQLSystemPermissionSet.java similarity index 100% rename from extensions/guacamole-auth-jdbc/src/main/java/org/glyptodon/guacamole/auth/jdbc/permission/MySQLSystemPermissionSet.java rename to extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/permission/MySQLSystemPermissionSet.java diff --git a/extensions/guacamole-auth-jdbc/src/main/java/org/glyptodon/guacamole/auth/jdbc/permission/ObjectPermissionMapper.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/permission/ObjectPermissionMapper.java similarity index 100% rename from extensions/guacamole-auth-jdbc/src/main/java/org/glyptodon/guacamole/auth/jdbc/permission/ObjectPermissionMapper.java rename to extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/permission/ObjectPermissionMapper.java diff --git a/extensions/guacamole-auth-jdbc/src/main/java/org/glyptodon/guacamole/auth/jdbc/permission/ObjectPermissionModel.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/permission/ObjectPermissionModel.java similarity index 100% rename from extensions/guacamole-auth-jdbc/src/main/java/org/glyptodon/guacamole/auth/jdbc/permission/ObjectPermissionModel.java rename to extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/permission/ObjectPermissionModel.java diff --git a/extensions/guacamole-auth-jdbc/src/main/java/org/glyptodon/guacamole/auth/jdbc/permission/ObjectPermissionService.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/permission/ObjectPermissionService.java similarity index 100% rename from extensions/guacamole-auth-jdbc/src/main/java/org/glyptodon/guacamole/auth/jdbc/permission/ObjectPermissionService.java rename to extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/permission/ObjectPermissionService.java diff --git a/extensions/guacamole-auth-jdbc/src/main/java/org/glyptodon/guacamole/auth/jdbc/permission/PermissionMapper.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/permission/PermissionMapper.java similarity index 100% rename from extensions/guacamole-auth-jdbc/src/main/java/org/glyptodon/guacamole/auth/jdbc/permission/PermissionMapper.java rename to extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/permission/PermissionMapper.java diff --git a/extensions/guacamole-auth-jdbc/src/main/java/org/glyptodon/guacamole/auth/jdbc/permission/PermissionModel.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/permission/PermissionModel.java similarity index 100% rename from extensions/guacamole-auth-jdbc/src/main/java/org/glyptodon/guacamole/auth/jdbc/permission/PermissionModel.java rename to extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/permission/PermissionModel.java diff --git a/extensions/guacamole-auth-jdbc/src/main/java/org/glyptodon/guacamole/auth/jdbc/permission/PermissionService.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/permission/PermissionService.java similarity index 100% rename from extensions/guacamole-auth-jdbc/src/main/java/org/glyptodon/guacamole/auth/jdbc/permission/PermissionService.java rename to extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/permission/PermissionService.java diff --git a/extensions/guacamole-auth-jdbc/src/main/java/org/glyptodon/guacamole/auth/jdbc/permission/SystemPermissionMapper.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/permission/SystemPermissionMapper.java similarity index 100% rename from extensions/guacamole-auth-jdbc/src/main/java/org/glyptodon/guacamole/auth/jdbc/permission/SystemPermissionMapper.java rename to extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/permission/SystemPermissionMapper.java diff --git a/extensions/guacamole-auth-jdbc/src/main/java/org/glyptodon/guacamole/auth/jdbc/permission/SystemPermissionModel.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/permission/SystemPermissionModel.java similarity index 100% rename from extensions/guacamole-auth-jdbc/src/main/java/org/glyptodon/guacamole/auth/jdbc/permission/SystemPermissionModel.java rename to extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/permission/SystemPermissionModel.java diff --git a/extensions/guacamole-auth-jdbc/src/main/java/org/glyptodon/guacamole/auth/jdbc/permission/SystemPermissionService.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/permission/SystemPermissionService.java similarity index 100% rename from extensions/guacamole-auth-jdbc/src/main/java/org/glyptodon/guacamole/auth/jdbc/permission/SystemPermissionService.java rename to extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/permission/SystemPermissionService.java diff --git a/extensions/guacamole-auth-jdbc/src/main/java/org/glyptodon/guacamole/auth/jdbc/permission/package-info.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/permission/package-info.java similarity index 100% rename from extensions/guacamole-auth-jdbc/src/main/java/org/glyptodon/guacamole/auth/jdbc/permission/package-info.java rename to extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/permission/package-info.java diff --git a/extensions/guacamole-auth-jdbc/src/main/java/org/glyptodon/guacamole/auth/jdbc/security/PasswordEncryptionService.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/security/PasswordEncryptionService.java similarity index 100% rename from extensions/guacamole-auth-jdbc/src/main/java/org/glyptodon/guacamole/auth/jdbc/security/PasswordEncryptionService.java rename to extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/security/PasswordEncryptionService.java diff --git a/extensions/guacamole-auth-jdbc/src/main/java/org/glyptodon/guacamole/auth/jdbc/security/SHA256PasswordEncryptionService.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/security/SHA256PasswordEncryptionService.java similarity index 100% rename from extensions/guacamole-auth-jdbc/src/main/java/org/glyptodon/guacamole/auth/jdbc/security/SHA256PasswordEncryptionService.java rename to extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/security/SHA256PasswordEncryptionService.java diff --git a/extensions/guacamole-auth-jdbc/src/main/java/org/glyptodon/guacamole/auth/jdbc/security/SaltService.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/security/SaltService.java similarity index 100% rename from extensions/guacamole-auth-jdbc/src/main/java/org/glyptodon/guacamole/auth/jdbc/security/SaltService.java rename to extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/security/SaltService.java diff --git a/extensions/guacamole-auth-jdbc/src/main/java/org/glyptodon/guacamole/auth/jdbc/security/SecureRandomSaltService.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/security/SecureRandomSaltService.java similarity index 100% rename from extensions/guacamole-auth-jdbc/src/main/java/org/glyptodon/guacamole/auth/jdbc/security/SecureRandomSaltService.java rename to extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/security/SecureRandomSaltService.java diff --git a/extensions/guacamole-auth-jdbc/src/main/java/org/glyptodon/guacamole/auth/jdbc/security/package-info.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/security/package-info.java similarity index 100% rename from extensions/guacamole-auth-jdbc/src/main/java/org/glyptodon/guacamole/auth/jdbc/security/package-info.java rename to extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/security/package-info.java diff --git a/extensions/guacamole-auth-jdbc/src/main/java/org/glyptodon/guacamole/auth/jdbc/socket/AbstractGuacamoleSocketService.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/socket/AbstractGuacamoleSocketService.java similarity index 100% rename from extensions/guacamole-auth-jdbc/src/main/java/org/glyptodon/guacamole/auth/jdbc/socket/AbstractGuacamoleSocketService.java rename to extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/socket/AbstractGuacamoleSocketService.java diff --git a/extensions/guacamole-auth-jdbc/src/main/java/org/glyptodon/guacamole/auth/jdbc/socket/ActiveConnectionRecord.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/socket/ActiveConnectionRecord.java similarity index 100% rename from extensions/guacamole-auth-jdbc/src/main/java/org/glyptodon/guacamole/auth/jdbc/socket/ActiveConnectionRecord.java rename to extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/socket/ActiveConnectionRecord.java diff --git a/extensions/guacamole-auth-jdbc/src/main/java/org/glyptodon/guacamole/auth/jdbc/socket/GuacamoleSocketService.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/socket/GuacamoleSocketService.java similarity index 100% rename from extensions/guacamole-auth-jdbc/src/main/java/org/glyptodon/guacamole/auth/jdbc/socket/GuacamoleSocketService.java rename to extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/socket/GuacamoleSocketService.java diff --git a/extensions/guacamole-auth-jdbc/src/main/java/org/glyptodon/guacamole/auth/jdbc/socket/UnrestrictedGuacamoleSocketService.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/socket/UnrestrictedGuacamoleSocketService.java similarity index 100% rename from extensions/guacamole-auth-jdbc/src/main/java/org/glyptodon/guacamole/auth/jdbc/socket/UnrestrictedGuacamoleSocketService.java rename to extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/socket/UnrestrictedGuacamoleSocketService.java diff --git a/extensions/guacamole-auth-jdbc/src/main/java/org/glyptodon/guacamole/auth/jdbc/socket/package-info.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/socket/package-info.java similarity index 100% rename from extensions/guacamole-auth-jdbc/src/main/java/org/glyptodon/guacamole/auth/jdbc/socket/package-info.java rename to extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/socket/package-info.java diff --git a/extensions/guacamole-auth-jdbc/src/main/java/org/glyptodon/guacamole/auth/jdbc/user/AuthenticatedUser.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/user/AuthenticatedUser.java similarity index 100% rename from extensions/guacamole-auth-jdbc/src/main/java/org/glyptodon/guacamole/auth/jdbc/user/AuthenticatedUser.java rename to extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/user/AuthenticatedUser.java diff --git a/extensions/guacamole-auth-jdbc/src/main/java/org/glyptodon/guacamole/auth/jdbc/user/MySQLUser.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/user/MySQLUser.java similarity index 100% rename from extensions/guacamole-auth-jdbc/src/main/java/org/glyptodon/guacamole/auth/jdbc/user/MySQLUser.java rename to extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/user/MySQLUser.java diff --git a/extensions/guacamole-auth-jdbc/src/main/java/org/glyptodon/guacamole/auth/jdbc/user/MySQLUserContext.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/user/MySQLUserContext.java similarity index 100% rename from extensions/guacamole-auth-jdbc/src/main/java/org/glyptodon/guacamole/auth/jdbc/user/MySQLUserContext.java rename to extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/user/MySQLUserContext.java diff --git a/extensions/guacamole-auth-jdbc/src/main/java/org/glyptodon/guacamole/auth/jdbc/user/UserContextService.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/user/UserContextService.java similarity index 100% rename from extensions/guacamole-auth-jdbc/src/main/java/org/glyptodon/guacamole/auth/jdbc/user/UserContextService.java rename to extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/user/UserContextService.java diff --git a/extensions/guacamole-auth-jdbc/src/main/java/org/glyptodon/guacamole/auth/jdbc/user/UserDirectory.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/user/UserDirectory.java similarity index 100% rename from extensions/guacamole-auth-jdbc/src/main/java/org/glyptodon/guacamole/auth/jdbc/user/UserDirectory.java rename to extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/user/UserDirectory.java diff --git a/extensions/guacamole-auth-jdbc/src/main/java/org/glyptodon/guacamole/auth/jdbc/user/UserMapper.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/user/UserMapper.java similarity index 100% rename from extensions/guacamole-auth-jdbc/src/main/java/org/glyptodon/guacamole/auth/jdbc/user/UserMapper.java rename to extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/user/UserMapper.java diff --git a/extensions/guacamole-auth-jdbc/src/main/java/org/glyptodon/guacamole/auth/jdbc/user/UserModel.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/user/UserModel.java similarity index 100% rename from extensions/guacamole-auth-jdbc/src/main/java/org/glyptodon/guacamole/auth/jdbc/user/UserModel.java rename to extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/user/UserModel.java diff --git a/extensions/guacamole-auth-jdbc/src/main/java/org/glyptodon/guacamole/auth/jdbc/user/UserService.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/user/UserService.java similarity index 100% rename from extensions/guacamole-auth-jdbc/src/main/java/org/glyptodon/guacamole/auth/jdbc/user/UserService.java rename to extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/user/UserService.java diff --git a/extensions/guacamole-auth-jdbc/src/main/java/org/glyptodon/guacamole/auth/jdbc/user/package-info.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/user/package-info.java similarity index 100% rename from extensions/guacamole-auth-jdbc/src/main/java/org/glyptodon/guacamole/auth/jdbc/user/package-info.java rename to extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/glyptodon/guacamole/auth/jdbc/user/package-info.java diff --git a/extensions/guacamole-auth-mysql/.gitignore b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-mysql/.gitignore similarity index 100% rename from extensions/guacamole-auth-mysql/.gitignore rename to extensions/guacamole-auth-jdbc/modules/guacamole-auth-mysql/.gitignore diff --git a/extensions/guacamole-auth-mysql/pom.xml b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-mysql/pom.xml similarity index 77% rename from extensions/guacamole-auth-mysql/pom.xml rename to extensions/guacamole-auth-jdbc/modules/guacamole-auth-mysql/pom.xml index 7e2e11d95..c4b7e7051 100644 --- a/extensions/guacamole-auth-mysql/pom.xml +++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-mysql/pom.xml @@ -45,20 +45,6 @@ - - make-dist-archive - package - - single - - - ${project.artifactId}-${project.version} - false - - src/main/assembly/dist.xml - - - @@ -78,7 +64,7 @@ org.glyptodon.guacamole - guacamole-auth-jdbc + guacamole-auth-jdbc-base 0.9.5 diff --git a/extensions/guacamole-auth-mysql/schema/001-create-schema.sql b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-mysql/schema/001-create-schema.sql similarity index 100% rename from extensions/guacamole-auth-mysql/schema/001-create-schema.sql rename to extensions/guacamole-auth-jdbc/modules/guacamole-auth-mysql/schema/001-create-schema.sql diff --git a/extensions/guacamole-auth-mysql/schema/002-create-admin-user.sql b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-mysql/schema/002-create-admin-user.sql similarity index 100% rename from extensions/guacamole-auth-mysql/schema/002-create-admin-user.sql rename to extensions/guacamole-auth-jdbc/modules/guacamole-auth-mysql/schema/002-create-admin-user.sql diff --git a/extensions/guacamole-auth-mysql/schema/upgrade/upgrade-pre-0.8.2.sql b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-mysql/schema/upgrade/upgrade-pre-0.8.2.sql similarity index 100% rename from extensions/guacamole-auth-mysql/schema/upgrade/upgrade-pre-0.8.2.sql rename to extensions/guacamole-auth-jdbc/modules/guacamole-auth-mysql/schema/upgrade/upgrade-pre-0.8.2.sql diff --git a/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/MySQLAuthenticationProvider.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/MySQLAuthenticationProvider.java similarity index 100% rename from extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/MySQLAuthenticationProvider.java rename to extensions/guacamole-auth-jdbc/modules/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/MySQLAuthenticationProvider.java diff --git a/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/MySQLAuthenticationProviderModule.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/MySQLAuthenticationProviderModule.java similarity index 100% rename from extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/MySQLAuthenticationProviderModule.java rename to extensions/guacamole-auth-jdbc/modules/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/MySQLAuthenticationProviderModule.java diff --git a/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/MySQLGuacamoleProperties.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/MySQLGuacamoleProperties.java similarity index 100% rename from extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/MySQLGuacamoleProperties.java rename to extensions/guacamole-auth-jdbc/modules/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/MySQLGuacamoleProperties.java diff --git a/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/package-info.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/package-info.java similarity index 100% rename from extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/package-info.java rename to extensions/guacamole-auth-jdbc/modules/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/package-info.java diff --git a/extensions/guacamole-auth-mysql/src/main/resources/org/glyptodon/guacamole/auth/jdbc/connection/ConnectionMapper.xml b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-mysql/src/main/resources/org/glyptodon/guacamole/auth/jdbc/connection/ConnectionMapper.xml similarity index 100% rename from extensions/guacamole-auth-mysql/src/main/resources/org/glyptodon/guacamole/auth/jdbc/connection/ConnectionMapper.xml rename to extensions/guacamole-auth-jdbc/modules/guacamole-auth-mysql/src/main/resources/org/glyptodon/guacamole/auth/jdbc/connection/ConnectionMapper.xml diff --git a/extensions/guacamole-auth-mysql/src/main/resources/org/glyptodon/guacamole/auth/jdbc/connection/ConnectionRecordMapper.xml b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-mysql/src/main/resources/org/glyptodon/guacamole/auth/jdbc/connection/ConnectionRecordMapper.xml similarity index 100% rename from extensions/guacamole-auth-mysql/src/main/resources/org/glyptodon/guacamole/auth/jdbc/connection/ConnectionRecordMapper.xml rename to extensions/guacamole-auth-jdbc/modules/guacamole-auth-mysql/src/main/resources/org/glyptodon/guacamole/auth/jdbc/connection/ConnectionRecordMapper.xml diff --git a/extensions/guacamole-auth-mysql/src/main/resources/org/glyptodon/guacamole/auth/jdbc/connection/ParameterMapper.xml b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-mysql/src/main/resources/org/glyptodon/guacamole/auth/jdbc/connection/ParameterMapper.xml similarity index 100% rename from extensions/guacamole-auth-mysql/src/main/resources/org/glyptodon/guacamole/auth/jdbc/connection/ParameterMapper.xml rename to extensions/guacamole-auth-jdbc/modules/guacamole-auth-mysql/src/main/resources/org/glyptodon/guacamole/auth/jdbc/connection/ParameterMapper.xml diff --git a/extensions/guacamole-auth-mysql/src/main/resources/org/glyptodon/guacamole/auth/jdbc/connectiongroup/ConnectionGroupMapper.xml b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-mysql/src/main/resources/org/glyptodon/guacamole/auth/jdbc/connectiongroup/ConnectionGroupMapper.xml similarity index 100% rename from extensions/guacamole-auth-mysql/src/main/resources/org/glyptodon/guacamole/auth/jdbc/connectiongroup/ConnectionGroupMapper.xml rename to extensions/guacamole-auth-jdbc/modules/guacamole-auth-mysql/src/main/resources/org/glyptodon/guacamole/auth/jdbc/connectiongroup/ConnectionGroupMapper.xml diff --git a/extensions/guacamole-auth-mysql/src/main/resources/org/glyptodon/guacamole/auth/jdbc/permission/SystemPermissionMapper.xml b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-mysql/src/main/resources/org/glyptodon/guacamole/auth/jdbc/permission/SystemPermissionMapper.xml similarity index 100% rename from extensions/guacamole-auth-mysql/src/main/resources/org/glyptodon/guacamole/auth/jdbc/permission/SystemPermissionMapper.xml rename to extensions/guacamole-auth-jdbc/modules/guacamole-auth-mysql/src/main/resources/org/glyptodon/guacamole/auth/jdbc/permission/SystemPermissionMapper.xml diff --git a/extensions/guacamole-auth-mysql/src/main/resources/org/glyptodon/guacamole/auth/jdbc/user/UserMapper.xml b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-mysql/src/main/resources/org/glyptodon/guacamole/auth/jdbc/user/UserMapper.xml similarity index 100% rename from extensions/guacamole-auth-mysql/src/main/resources/org/glyptodon/guacamole/auth/jdbc/user/UserMapper.xml rename to extensions/guacamole-auth-jdbc/modules/guacamole-auth-mysql/src/main/resources/org/glyptodon/guacamole/auth/jdbc/user/UserMapper.xml diff --git a/extensions/guacamole-auth-jdbc/pom.xml b/extensions/guacamole-auth-jdbc/pom.xml index 68b098b54..5f86c8d8b 100644 --- a/extensions/guacamole-auth-jdbc/pom.xml +++ b/extensions/guacamole-auth-jdbc/pom.xml @@ -1,10 +1,12 @@ - + 4.0.0 org.glyptodon.guacamole guacamole-auth-jdbc - jar + pom 0.9.5 guacamole-auth-jdbc http://guac-dev.org/ @@ -13,73 +15,42 @@ UTF-8 + + + + modules/guacamole-auth-jdbc-base + + + modules/guacamole-auth-mysql + + + - + - org.apache.maven.plugins - maven-compiler-plugin - - 1.6 - 1.6 - + maven-assembly-plugin + 2.2-beta-5 + + + make-dist-archive + package + + single + + + ${project.artifactId}-${project.version} + false + + src/main/assembly/dist.xml + + + + - - - - - org.glyptodon.guacamole - guacamole-common - 0.9.4 - provided - - - - - org.glyptodon.guacamole - guacamole-ext - 0.9.5 - provided - - - - - org.slf4j - slf4j-api - 1.7.7 - - - - - org.mybatis - mybatis - 3.2.8 - - - - - org.mybatis - mybatis-guice - 3.6 - - - - - com.google.inject - guice - 3.0 - - - com.google.inject.extensions - guice-multibindings - 3.0 - - - - diff --git a/extensions/guacamole-auth-mysql/src/main/assembly/dist.xml b/extensions/guacamole-auth-jdbc/src/main/assembly/dist.xml similarity index 57% rename from extensions/guacamole-auth-mysql/src/main/assembly/dist.xml rename to extensions/guacamole-auth-jdbc/src/main/assembly/dist.xml index f8cc2764d..c99e3465f 100644 --- a/extensions/guacamole-auth-mysql/src/main/assembly/dist.xml +++ b/extensions/guacamole-auth-jdbc/src/main/assembly/dist.xml @@ -11,25 +11,17 @@ tar.gz - + - + - / - doc + /mysql/schema + modules/guacamole-auth-mysql/schema - - - /schema - schema - - - - - ${project.build.directory}/extension - / + modules/guacamole-auth-mysql/target/extension + /mysql *.jar diff --git a/extensions/guacamole-auth-mysql/LICENSE b/extensions/guacamole-auth-mysql/LICENSE deleted file mode 100644 index 540cdcf75..000000000 --- a/extensions/guacamole-auth-mysql/LICENSE +++ /dev/null @@ -1,19 +0,0 @@ -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.