From dce39bdc1ee7d7da8c4aa1b938b2ef728460a9f5 Mon Sep 17 00:00:00 2001
From: Michael Jumper <mjumper@apache.org>
Date: Sun, 28 Aug 2016 11:33:19 -0700
Subject: [PATCH] GUACAMOLE-93: Ensure database auth extension .jars are
 included in dist .tar.gz.

---
 .../modules/guacamole-auth-jdbc-dist/pom.xml  | 68 +++++++++++++++++++
 .../project-assembly.xml                      | 52 ++++++++++++++
 extensions/guacamole-auth-jdbc/pom.xml        | 32 +--------
 .../src/main/assembly/dist.xml                | 45 ------------
 guacamole-docker/bin/build-guacamole.sh       |  2 +-
 5 files changed, 124 insertions(+), 75 deletions(-)
 create mode 100644 extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-dist/pom.xml
 create mode 100644 extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-dist/project-assembly.xml
 delete mode 100644 extensions/guacamole-auth-jdbc/src/main/assembly/dist.xml

diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-dist/pom.xml b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-dist/pom.xml
new file mode 100644
index 000000000..32c7dfe48
--- /dev/null
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-dist/pom.xml
@@ -0,0 +1,68 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>org.apache.guacamole</groupId>
+    <artifactId>guacamole-auth-jdbc-dist</artifactId>
+    <packaging>jar</packaging>
+    <name>guacamole-auth-jdbc-dist</name>
+    <url>http://guac-dev.org/</url>
+
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    </properties>
+
+    <parent>
+        <groupId>org.apache.guacamole</groupId>
+        <artifactId>guacamole-auth-jdbc</artifactId>
+        <version>0.9.10-incubating</version>
+        <relativePath>../../</relativePath>
+    </parent>
+
+    <build>
+        <plugins>
+
+            <!-- Assembly plugin - for easy distribution -->
+            <plugin>
+                <artifactId>maven-assembly-plugin</artifactId>
+                <version>2.5.3</version>
+                <configuration>
+                    <finalName>${project.parent.artifactId}-${project.parent.version}</finalName>
+                    <appendAssemblyId>false</appendAssemblyId>
+                    <descriptors>
+                        <descriptor>project-assembly.xml</descriptor>
+                    </descriptors>
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>make-dist-archive</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>single</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+
+        </plugins>
+    </build>
+
+    <dependencies>
+
+        <!-- MySQL Authentication Extension -->
+        <dependency>
+            <groupId>org.apache.guacamole</groupId>
+            <artifactId>guacamole-auth-jdbc-mysql</artifactId>
+            <version>0.9.10-incubating</version>
+        </dependency>
+
+        <!-- PostgreSQL Authentication Extension -->
+        <dependency>
+            <groupId>org.apache.guacamole</groupId>
+            <artifactId>guacamole-auth-jdbc-postgresql</artifactId>
+            <version>0.9.10-incubating</version>
+        </dependency>
+
+    </dependencies>
+
+</project>
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-dist/project-assembly.xml b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-dist/project-assembly.xml
new file mode 100644
index 000000000..f69df7f59
--- /dev/null
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-dist/project-assembly.xml
@@ -0,0 +1,52 @@
+<assembly
+    xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
+
+    <id>dist</id>
+    <baseDirectory>${project.parent.artifactId}-${project.parent.version}</baseDirectory>
+
+    <!-- Output .tar.gz -->
+    <formats>
+        <format>tar.gz</format>
+    </formats>
+
+    <!-- Include extension .jars -->
+    <dependencySets>
+
+        <!-- MySQL extension .jar -->
+        <dependencySet>
+            <outputDirectory>mysql</outputDirectory>
+            <includes>
+                <include>org.apache.guacamole:guacamole-auth-jdbc-mysql</include>
+            </includes>
+        </dependencySet>
+
+        <!-- PostgreSQL extension .jar -->
+        <dependencySet>
+            <outputDirectory>postgresql</outputDirectory>
+            <includes>
+                <include>org.apache.guacamole:guacamole-auth-jdbc-postgresql</include>
+            </includes>
+        </dependencySet>
+
+    </dependencySets>
+
+    <!-- Include extension schema scripts -->
+    <fileSets>
+
+        <!-- MySQL schema scripts -->
+        <fileSet>
+            <outputDirectory>mysql/schema</outputDirectory>
+            <directory>../guacamole-auth-jdbc-mysql/schema</directory>
+        </fileSet>
+
+        <!-- PostgreSQL schema scripts -->
+        <fileSet>
+            <outputDirectory>postgresql/schema</outputDirectory>
+            <directory>../guacamole-auth-jdbc-postgresql/schema</directory>
+        </fileSet>
+
+    </fileSets>
+
+</assembly>
diff --git a/extensions/guacamole-auth-jdbc/pom.xml b/extensions/guacamole-auth-jdbc/pom.xml
index f2c1b09cb..37b5e3d21 100644
--- a/extensions/guacamole-auth-jdbc/pom.xml
+++ b/extensions/guacamole-auth-jdbc/pom.xml
@@ -17,6 +17,9 @@
 
     <modules>
 
+        <!-- Distribution .tar.gz -->
+        <module>modules/guacamole-auth-jdbc-dist</module>
+
         <!-- Base JDBC classes -->
         <module>modules/guacamole-auth-jdbc-base</module>
 
@@ -26,35 +29,6 @@
 
     </modules>
 
-    <build>
-        <plugins>
-
-            <!-- Assembly plugin - for easy distribution -->
-            <plugin>
-                <artifactId>maven-assembly-plugin</artifactId>
-                <version>2.5.3</version>
-                <inherited>false</inherited>
-                <executions>
-                    <execution>
-                        <id>make-dist-archive</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>single</goal>
-                        </goals>
-                        <configuration>
-                            <finalName>${project.artifactId}-${project.version}</finalName>
-                            <appendAssemblyId>false</appendAssemblyId>
-                            <descriptors>
-                                <descriptor>src/main/assembly/dist.xml</descriptor>
-                            </descriptors>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-
-        </plugins>
-    </build>
-
     <dependencyManagement>
         <dependencies>
 
diff --git a/extensions/guacamole-auth-jdbc/src/main/assembly/dist.xml b/extensions/guacamole-auth-jdbc/src/main/assembly/dist.xml
deleted file mode 100644
index 4e72cec1e..000000000
--- a/extensions/guacamole-auth-jdbc/src/main/assembly/dist.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<assembly
-    xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
-    
-    <id>dist</id>
-    <baseDirectory>${project.artifactId}-${project.version}</baseDirectory>
-
-    <!-- Output tar.gz -->
-    <formats>
-        <format>tar.gz</format>
-    </formats>
-
-    <!-- Include all implementations -->
-    <fileSets>
-
-            <!-- MySQL implementation -->
-            <fileSet>
-                <outputDirectory>mysql/schema</outputDirectory>
-                <directory>modules/guacamole-auth-jdbc-mysql/schema</directory>
-            </fileSet>
-            <fileSet>
-                <directory>modules/guacamole-auth-jdbc-mysql/target</directory>
-                <outputDirectory>mysql</outputDirectory>
-                <includes>
-                    <include>*.jar</include>
-                </includes>
-            </fileSet>
-
-            <!-- PostgreSQL implementation -->
-            <fileSet>
-                <outputDirectory>postgresql/schema</outputDirectory>
-                <directory>modules/guacamole-auth-jdbc-postgresql/schema</directory>
-            </fileSet>
-            <fileSet>
-                <directory>modules/guacamole-auth-jdbc-postgresql/target</directory>
-                <outputDirectory>postgresql</outputDirectory>
-                <includes>
-                    <include>*.jar</include>
-                </includes>
-            </fileSet>
-
-    </fileSets>
-
-</assembly>
diff --git a/guacamole-docker/bin/build-guacamole.sh b/guacamole-docker/bin/build-guacamole.sh
index 0f531e2e1..4df6289f0 100755
--- a/guacamole-docker/bin/build-guacamole.sh
+++ b/guacamole-docker/bin/build-guacamole.sh
@@ -66,7 +66,7 @@ cp guacamole/target/*.war "$DESTINATION/guacamole.war"
 # Copy JDBC auth extensions and SQL scripts
 #
 
-tar -xzf extensions/guacamole-auth-jdbc/target/*.tar.gz \
+tar -xzf extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-dist/target/*.tar.gz \
     -C "$DESTINATION"                                   \
     --wildcards                                         \
     --no-anchored                                       \