From 4eadf19a9158372216a6ae26b646ef4158ff9406 Mon Sep 17 00:00:00 2001
From: Michael Jumper <mike.jumper@guac-dev.org>
Date: Sun, 26 Apr 2015 23:21:46 -0700
Subject: [PATCH] GUAC-1170: Use relative paths for dist archives.

---
 .../guacamole-auth-jdbc/src/main/assembly/dist.xml    |  8 ++++----
 .../guacamole-auth-ldap/src/main/assembly/dist.xml    |  5 ++---
 .../guacamole-auth-noauth/src/main/assembly/dist.xml  | 11 +++++------
 project-assembly.xml                                  |  1 -
 4 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/extensions/guacamole-auth-jdbc/src/main/assembly/dist.xml b/extensions/guacamole-auth-jdbc/src/main/assembly/dist.xml
index a416ea191..915b17d17 100644
--- a/extensions/guacamole-auth-jdbc/src/main/assembly/dist.xml
+++ b/extensions/guacamole-auth-jdbc/src/main/assembly/dist.xml
@@ -16,12 +16,12 @@
 
             <!-- MySQL implementation -->
             <fileSet>
-                <outputDirectory>/mysql/schema</outputDirectory>
+                <outputDirectory>mysql/schema</outputDirectory>
                 <directory>modules/guacamole-auth-jdbc-mysql/schema</directory>
             </fileSet>
             <fileSet>
                 <directory>modules/guacamole-auth-jdbc-mysql/target/extension</directory>
-                <outputDirectory>/mysql</outputDirectory>
+                <outputDirectory>mysql</outputDirectory>
                 <includes>
                     <include>*.jar</include>
                 </includes>
@@ -29,12 +29,12 @@
 
             <!-- PostgreSQL implementation -->
             <fileSet>
-                <outputDirectory>/postgresql/schema</outputDirectory>
+                <outputDirectory>postgresql/schema</outputDirectory>
                 <directory>modules/guacamole-auth-jdbc-postgresql/schema</directory>
             </fileSet>
             <fileSet>
                 <directory>modules/guacamole-auth-jdbc-postgresql/target/extension</directory>
-                <outputDirectory>/postgresql</outputDirectory>
+                <outputDirectory>postgresql</outputDirectory>
                 <includes>
                     <include>*.jar</include>
                 </includes>
diff --git a/extensions/guacamole-auth-ldap/src/main/assembly/dist.xml b/extensions/guacamole-auth-ldap/src/main/assembly/dist.xml
index 0628ad61c..9b0b27dde 100644
--- a/extensions/guacamole-auth-ldap/src/main/assembly/dist.xml
+++ b/extensions/guacamole-auth-ldap/src/main/assembly/dist.xml
@@ -16,13 +16,12 @@
 
             <!-- Include docs -->
             <fileSet>
-                <outputDirectory>/</outputDirectory>
                 <directory>doc</directory>
             </fileSet>
 
             <!-- Include schema -->
             <fileSet>
-                <outputDirectory>/schema</outputDirectory>
+                <outputDirectory>schema</outputDirectory>
                 <directory>schema</directory>
             </fileSet>
 
@@ -33,7 +32,7 @@
     <dependencySets>
         <dependencySet>
 
-            <outputDirectory>/lib</outputDirectory>
+            <outputDirectory>lib</outputDirectory>
             <scope>runtime</scope>
             <unpack>false</unpack>
             <useProjectArtifact>true</useProjectArtifact>
diff --git a/extensions/guacamole-auth-noauth/src/main/assembly/dist.xml b/extensions/guacamole-auth-noauth/src/main/assembly/dist.xml
index bb4280639..610749432 100644
--- a/extensions/guacamole-auth-noauth/src/main/assembly/dist.xml
+++ b/extensions/guacamole-auth-noauth/src/main/assembly/dist.xml
@@ -14,11 +14,10 @@
     <!-- Include docs and schema -->
     <fileSets>
 
-            <!-- Include docs -->
-            <fileSet>
-                <outputDirectory>/</outputDirectory>
-                <directory>doc</directory>
-            </fileSet>
+        <!-- Include docs -->
+        <fileSet>
+            <directory>doc</directory>
+        </fileSet>
 
     </fileSets>
 
@@ -27,7 +26,7 @@
     <dependencySets>
         <dependencySet>
 
-            <outputDirectory>/lib</outputDirectory>
+            <outputDirectory>lib</outputDirectory>
             <scope>runtime</scope>
             <unpack>false</unpack>
             <useProjectArtifact>true</useProjectArtifact>
diff --git a/project-assembly.xml b/project-assembly.xml
index ec1d7249b..7745bb935 100644
--- a/project-assembly.xml
+++ b/project-assembly.xml
@@ -12,7 +12,6 @@
     <fileSets>
         <fileSet>
             <directory>${project.basedir}</directory>
-            <outputDirectory>/</outputDirectory>
             <useDefaultExcludes>true</useDefaultExcludes>
             <excludes>
                 <exclude>**/*.log</exclude>