From fc25bb33aab602e216606bbed1076450b3811198 Mon Sep 17 00:00:00 2001
From: Michael Jumper <mike.jumper@guac-dev.org>
Date: Fri, 27 Feb 2015 21:57:01 -0800
Subject: [PATCH] GUAC-1101: Rename guacamole-auth-mysql hierarchically.

---
 .../.gitignore                                                | 0
 .../pom.xml                                                   | 4 ++--
 .../schema/001-create-schema.sql                              | 0
 .../schema/002-create-admin-user.sql                          | 0
 .../schema/upgrade/upgrade-pre-0.8.2.sql                      | 0
 .../guacamole/net/auth/mysql/MySQLAuthenticationProvider.java | 0
 .../net/auth/mysql/MySQLAuthenticationProviderModule.java     | 0
 .../guacamole/net/auth/mysql/MySQLGuacamoleProperties.java    | 0
 .../sourceforge/guacamole/net/auth/mysql/package-info.java    | 0
 .../guacamole/auth/jdbc/connection/ConnectionMapper.xml       | 0
 .../guacamole/auth/jdbc/connection/ConnectionRecordMapper.xml | 0
 .../guacamole/auth/jdbc/connection/ParameterMapper.xml        | 0
 .../auth/jdbc/connectiongroup/ConnectionGroupMapper.xml       | 0
 .../guacamole/auth/jdbc/permission/SystemPermissionMapper.xml | 0
 .../org/glyptodon/guacamole/auth/jdbc/user/UserMapper.xml     | 0
 extensions/guacamole-auth-jdbc/pom.xml                        | 2 +-
 extensions/guacamole-auth-jdbc/src/main/assembly/dist.xml     | 4 ++--
 17 files changed, 5 insertions(+), 5 deletions(-)
 rename extensions/guacamole-auth-jdbc/modules/{guacamole-auth-mysql => guacamole-auth-jdbc-mysql}/.gitignore (100%)
 rename extensions/guacamole-auth-jdbc/modules/{guacamole-auth-mysql => guacamole-auth-jdbc-mysql}/pom.xml (96%)
 rename extensions/guacamole-auth-jdbc/modules/{guacamole-auth-mysql => guacamole-auth-jdbc-mysql}/schema/001-create-schema.sql (100%)
 rename extensions/guacamole-auth-jdbc/modules/{guacamole-auth-mysql => guacamole-auth-jdbc-mysql}/schema/002-create-admin-user.sql (100%)
 rename extensions/guacamole-auth-jdbc/modules/{guacamole-auth-mysql => guacamole-auth-jdbc-mysql}/schema/upgrade/upgrade-pre-0.8.2.sql (100%)
 rename extensions/guacamole-auth-jdbc/modules/{guacamole-auth-mysql => guacamole-auth-jdbc-mysql}/src/main/java/net/sourceforge/guacamole/net/auth/mysql/MySQLAuthenticationProvider.java (100%)
 rename extensions/guacamole-auth-jdbc/modules/{guacamole-auth-mysql => guacamole-auth-jdbc-mysql}/src/main/java/net/sourceforge/guacamole/net/auth/mysql/MySQLAuthenticationProviderModule.java (100%)
 rename extensions/guacamole-auth-jdbc/modules/{guacamole-auth-mysql => guacamole-auth-jdbc-mysql}/src/main/java/net/sourceforge/guacamole/net/auth/mysql/MySQLGuacamoleProperties.java (100%)
 rename extensions/guacamole-auth-jdbc/modules/{guacamole-auth-mysql => guacamole-auth-jdbc-mysql}/src/main/java/net/sourceforge/guacamole/net/auth/mysql/package-info.java (100%)
 rename extensions/guacamole-auth-jdbc/modules/{guacamole-auth-mysql => guacamole-auth-jdbc-mysql}/src/main/resources/org/glyptodon/guacamole/auth/jdbc/connection/ConnectionMapper.xml (100%)
 rename extensions/guacamole-auth-jdbc/modules/{guacamole-auth-mysql => guacamole-auth-jdbc-mysql}/src/main/resources/org/glyptodon/guacamole/auth/jdbc/connection/ConnectionRecordMapper.xml (100%)
 rename extensions/guacamole-auth-jdbc/modules/{guacamole-auth-mysql => guacamole-auth-jdbc-mysql}/src/main/resources/org/glyptodon/guacamole/auth/jdbc/connection/ParameterMapper.xml (100%)
 rename extensions/guacamole-auth-jdbc/modules/{guacamole-auth-mysql => guacamole-auth-jdbc-mysql}/src/main/resources/org/glyptodon/guacamole/auth/jdbc/connectiongroup/ConnectionGroupMapper.xml (100%)
 rename extensions/guacamole-auth-jdbc/modules/{guacamole-auth-mysql => guacamole-auth-jdbc-mysql}/src/main/resources/org/glyptodon/guacamole/auth/jdbc/permission/SystemPermissionMapper.xml (100%)
 rename extensions/guacamole-auth-jdbc/modules/{guacamole-auth-mysql => guacamole-auth-jdbc-mysql}/src/main/resources/org/glyptodon/guacamole/auth/jdbc/user/UserMapper.xml (100%)

diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-mysql/.gitignore b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/.gitignore
similarity index 100%
rename from extensions/guacamole-auth-jdbc/modules/guacamole-auth-mysql/.gitignore
rename to extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/.gitignore
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-mysql/pom.xml b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/pom.xml
similarity index 96%
rename from extensions/guacamole-auth-jdbc/modules/guacamole-auth-mysql/pom.xml
rename to extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/pom.xml
index 33a03394f..47dbf1797 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-mysql/pom.xml
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/pom.xml
@@ -3,9 +3,9 @@
 
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.glyptodon.guacamole</groupId>
-    <artifactId>guacamole-auth-mysql</artifactId>
+    <artifactId>guacamole-auth-jdbc-mysql</artifactId>
     <packaging>jar</packaging>
-    <name>guacamole-auth-mysql</name>
+    <name>guacamole-auth-jdbc-mysql</name>
     <url>http://guac-dev.org/</url>
 
     <properties>
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-mysql/schema/001-create-schema.sql b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/schema/001-create-schema.sql
similarity index 100%
rename from extensions/guacamole-auth-jdbc/modules/guacamole-auth-mysql/schema/001-create-schema.sql
rename to extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/schema/001-create-schema.sql
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-mysql/schema/002-create-admin-user.sql b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/schema/002-create-admin-user.sql
similarity index 100%
rename from extensions/guacamole-auth-jdbc/modules/guacamole-auth-mysql/schema/002-create-admin-user.sql
rename to extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/schema/002-create-admin-user.sql
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-mysql/schema/upgrade/upgrade-pre-0.8.2.sql b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/schema/upgrade/upgrade-pre-0.8.2.sql
similarity index 100%
rename from extensions/guacamole-auth-jdbc/modules/guacamole-auth-mysql/schema/upgrade/upgrade-pre-0.8.2.sql
rename to extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/schema/upgrade/upgrade-pre-0.8.2.sql
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/MySQLAuthenticationProvider.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/MySQLAuthenticationProvider.java
similarity index 100%
rename from extensions/guacamole-auth-jdbc/modules/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/MySQLAuthenticationProvider.java
rename to extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/MySQLAuthenticationProvider.java
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/MySQLAuthenticationProviderModule.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/MySQLAuthenticationProviderModule.java
similarity index 100%
rename from extensions/guacamole-auth-jdbc/modules/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/MySQLAuthenticationProviderModule.java
rename to extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/MySQLAuthenticationProviderModule.java
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/MySQLGuacamoleProperties.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/MySQLGuacamoleProperties.java
similarity index 100%
rename from extensions/guacamole-auth-jdbc/modules/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/MySQLGuacamoleProperties.java
rename to extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/MySQLGuacamoleProperties.java
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/package-info.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/package-info.java
similarity index 100%
rename from extensions/guacamole-auth-jdbc/modules/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/package-info.java
rename to extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/package-info.java
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-mysql/src/main/resources/org/glyptodon/guacamole/auth/jdbc/connection/ConnectionMapper.xml b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/src/main/resources/org/glyptodon/guacamole/auth/jdbc/connection/ConnectionMapper.xml
similarity index 100%
rename from extensions/guacamole-auth-jdbc/modules/guacamole-auth-mysql/src/main/resources/org/glyptodon/guacamole/auth/jdbc/connection/ConnectionMapper.xml
rename to extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/src/main/resources/org/glyptodon/guacamole/auth/jdbc/connection/ConnectionMapper.xml
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-mysql/src/main/resources/org/glyptodon/guacamole/auth/jdbc/connection/ConnectionRecordMapper.xml b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/src/main/resources/org/glyptodon/guacamole/auth/jdbc/connection/ConnectionRecordMapper.xml
similarity index 100%
rename from extensions/guacamole-auth-jdbc/modules/guacamole-auth-mysql/src/main/resources/org/glyptodon/guacamole/auth/jdbc/connection/ConnectionRecordMapper.xml
rename to extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/src/main/resources/org/glyptodon/guacamole/auth/jdbc/connection/ConnectionRecordMapper.xml
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-mysql/src/main/resources/org/glyptodon/guacamole/auth/jdbc/connection/ParameterMapper.xml b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/src/main/resources/org/glyptodon/guacamole/auth/jdbc/connection/ParameterMapper.xml
similarity index 100%
rename from extensions/guacamole-auth-jdbc/modules/guacamole-auth-mysql/src/main/resources/org/glyptodon/guacamole/auth/jdbc/connection/ParameterMapper.xml
rename to extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/src/main/resources/org/glyptodon/guacamole/auth/jdbc/connection/ParameterMapper.xml
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-mysql/src/main/resources/org/glyptodon/guacamole/auth/jdbc/connectiongroup/ConnectionGroupMapper.xml b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/src/main/resources/org/glyptodon/guacamole/auth/jdbc/connectiongroup/ConnectionGroupMapper.xml
similarity index 100%
rename from extensions/guacamole-auth-jdbc/modules/guacamole-auth-mysql/src/main/resources/org/glyptodon/guacamole/auth/jdbc/connectiongroup/ConnectionGroupMapper.xml
rename to extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/src/main/resources/org/glyptodon/guacamole/auth/jdbc/connectiongroup/ConnectionGroupMapper.xml
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-mysql/src/main/resources/org/glyptodon/guacamole/auth/jdbc/permission/SystemPermissionMapper.xml b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/src/main/resources/org/glyptodon/guacamole/auth/jdbc/permission/SystemPermissionMapper.xml
similarity index 100%
rename from extensions/guacamole-auth-jdbc/modules/guacamole-auth-mysql/src/main/resources/org/glyptodon/guacamole/auth/jdbc/permission/SystemPermissionMapper.xml
rename to extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/src/main/resources/org/glyptodon/guacamole/auth/jdbc/permission/SystemPermissionMapper.xml
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-mysql/src/main/resources/org/glyptodon/guacamole/auth/jdbc/user/UserMapper.xml b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/src/main/resources/org/glyptodon/guacamole/auth/jdbc/user/UserMapper.xml
similarity index 100%
rename from extensions/guacamole-auth-jdbc/modules/guacamole-auth-mysql/src/main/resources/org/glyptodon/guacamole/auth/jdbc/user/UserMapper.xml
rename to extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-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 96bd61864..c6c622994 100644
--- a/extensions/guacamole-auth-jdbc/pom.xml
+++ b/extensions/guacamole-auth-jdbc/pom.xml
@@ -21,7 +21,7 @@
         <module>modules/guacamole-auth-jdbc-base</module>
 
         <!-- MySQL authentication -->
-        <module>modules/guacamole-auth-mysql</module>
+        <module>modules/guacamole-auth-jdbc-mysql</module>
 
     </modules>
 
diff --git a/extensions/guacamole-auth-jdbc/src/main/assembly/dist.xml b/extensions/guacamole-auth-jdbc/src/main/assembly/dist.xml
index c99e3465f..2d20b63a0 100644
--- a/extensions/guacamole-auth-jdbc/src/main/assembly/dist.xml
+++ b/extensions/guacamole-auth-jdbc/src/main/assembly/dist.xml
@@ -17,10 +17,10 @@
             <!-- MySQL implementation -->
             <fileSet>
                 <outputDirectory>/mysql/schema</outputDirectory>
-                <directory>modules/guacamole-auth-mysql/schema</directory>
+                <directory>modules/guacamole-auth-jdbc-mysql/schema</directory>
             </fileSet>
             <fileSet>
-                <directory>modules/guacamole-auth-mysql/target/extension</directory>
+                <directory>modules/guacamole-auth-jdbc-mysql/target/extension</directory>
                 <outputDirectory>/mysql</outputDirectory>
                 <includes>
                     <include>*.jar</include>