From b6b5cdc8aaba1d4be5a27a4f803abeba357616c2 Mon Sep 17 00:00:00 2001
From: Michael Jumper <mike.jumper@guac-dev.org>
Date: Mon, 26 Aug 2013 15:32:27 -0700
Subject: [PATCH] Fix classpath in dist.xml. Remove unnecessary logging
 dependency.

---
 .../guacamole-auth-ldap/src/main/assembly/dist.xml  |  4 ++--
 .../guacamole-auth-mysql/src/main/assembly/dist.xml |  4 ++--
 extensions/guacamole-auth-noauth/pom.xml            | 13 -------------
 .../src/main/assembly/dist.xml                      |  4 ++--
 4 files changed, 6 insertions(+), 19 deletions(-)

diff --git a/extensions/guacamole-auth-ldap/src/main/assembly/dist.xml b/extensions/guacamole-auth-ldap/src/main/assembly/dist.xml
index a13bce3e2..0628ad61c 100644
--- a/extensions/guacamole-auth-ldap/src/main/assembly/dist.xml
+++ b/extensions/guacamole-auth-ldap/src/main/assembly/dist.xml
@@ -42,10 +42,10 @@
             <excludes>
 
                 <!-- Do not include guacamole-common -->
-                <exclude>net.sourceforge.guacamole:guacamole-common</exclude>
+                <exclude>org.glyptodon.guacamole:guacamole-common</exclude>
 
                 <!-- Do not include guacamole-ext -->
-                <exclude>net.sourceforge.guacamole:guacamole-ext</exclude>
+                <exclude>org.glyptodon.guacamole:guacamole-ext</exclude>
 
             </excludes>
         </dependencySet>
diff --git a/extensions/guacamole-auth-mysql/src/main/assembly/dist.xml b/extensions/guacamole-auth-mysql/src/main/assembly/dist.xml
index a13bce3e2..0628ad61c 100644
--- a/extensions/guacamole-auth-mysql/src/main/assembly/dist.xml
+++ b/extensions/guacamole-auth-mysql/src/main/assembly/dist.xml
@@ -42,10 +42,10 @@
             <excludes>
 
                 <!-- Do not include guacamole-common -->
-                <exclude>net.sourceforge.guacamole:guacamole-common</exclude>
+                <exclude>org.glyptodon.guacamole:guacamole-common</exclude>
 
                 <!-- Do not include guacamole-ext -->
-                <exclude>net.sourceforge.guacamole:guacamole-ext</exclude>
+                <exclude>org.glyptodon.guacamole:guacamole-ext</exclude>
 
             </excludes>
         </dependencySet>
diff --git a/extensions/guacamole-auth-noauth/pom.xml b/extensions/guacamole-auth-noauth/pom.xml
index 9547e8b05..7667a9e75 100644
--- a/extensions/guacamole-auth-noauth/pom.xml
+++ b/extensions/guacamole-auth-noauth/pom.xml
@@ -53,19 +53,6 @@
 
     <dependencies>
 
-        <!-- SLF4J - logging -->
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-api</artifactId>
-            <version>1.6.1</version>
-        </dependency>
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-jcl</artifactId>
-            <version>1.6.1</version>
-            <scope>runtime</scope>
-        </dependency>
-
         <!-- Guacamole Java API -->
         <dependency>
             <groupId>org.glyptodon.guacamole</groupId>
diff --git a/extensions/guacamole-auth-noauth/src/main/assembly/dist.xml b/extensions/guacamole-auth-noauth/src/main/assembly/dist.xml
index 6d90e1c3a..bb4280639 100644
--- a/extensions/guacamole-auth-noauth/src/main/assembly/dist.xml
+++ b/extensions/guacamole-auth-noauth/src/main/assembly/dist.xml
@@ -36,10 +36,10 @@
             <excludes>
 
                 <!-- Do not include guacamole-common -->
-                <exclude>net.sourceforge.guacamole:guacamole-common</exclude>
+                <exclude>org.glyptodon.guacamole:guacamole-common</exclude>
 
                 <!-- Do not include guacamole-ext -->
-                <exclude>net.sourceforge.guacamole:guacamole-ext</exclude>
+                <exclude>org.glyptodon.guacamole:guacamole-ext</exclude>
 
             </excludes>
         </dependencySet>