From e853f0bed7cc7c9334b32aa6cb6ac54896e81b39 Mon Sep 17 00:00:00 2001
From: Michael Jumper <zhangmaike@users.sourceforge.net>
Date: Wed, 13 Jul 2011 18:08:11 -0700
Subject: [PATCH] Added logging via SLF4J

---
 pom.xml                                            |   38 +++++++++++---------
 .../net/basic/BasicGuacamoleTunnelServlet.java     |   10 +++++-
 2 files changed, 30 insertions(+), 18 deletions(-)

diff --git a/pom.xml b/pom.xml
index b4bf0f0..5b465e3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -16,6 +16,7 @@
     <build>
         <plugins>
 
+            <!-- Written for 1.6 -->
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
@@ -38,7 +39,7 @@
                         </resource>
                     </webResources>
                     
-                    <!-- Add guacamole-common-js -->
+                    <!-- Add files from guacamole-common-js -->
                     <overlays>
                         <overlay>
                             <groupId>net.sourceforge.guacamole</groupId>
@@ -51,19 +52,11 @@
             </plugin>
 
         </plugins>
-
-        <extensions>
-            <!-- Required for SSH deploy -->
-            <extension>
-                <groupId>org.apache.maven.wagon</groupId>
-                <artifactId>wagon-ssh-external</artifactId>
-            </extension>
-        </extensions>
-
     </build>
 
     <dependencies>
 
+        <!-- Java servlet API -->
         <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>servlet-api</artifactId>
@@ -71,6 +64,20 @@
             <scope>provided</scope>
         </dependency>
 
+        <!-- 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>net.sourceforge.guacamole</groupId>
             <artifactId>guacamole-common</artifactId>
@@ -78,6 +85,7 @@
             <scope>compile</scope>
         </dependency>
 
+        <!-- Guacamole JavaScript API -->
         <dependency>
             <groupId>net.sourceforge.guacamole</groupId>
             <artifactId>guacamole-common-js</artifactId>
@@ -89,17 +97,13 @@
     </dependencies>
 
     <repositories>
+        
+        <!-- Central Guacamole repository -->
         <repository>
             <id>guac-dev</id>
             <url>http://guac-dev.org/repo</url>
         </repository>
+        
     </repositories>
 
-    <distributionManagement>
-        <repository>
-            <id>guac-dev</id>
-            <url>${guac-dev.dist.repo}</url>
-        </repository>
-    </distributionManagement>
-
 </project>
diff --git a/src/main/java/net/sourceforge/guacamole/net/basic/BasicGuacamoleTunnelServlet.java b/src/main/java/net/sourceforge/guacamole/net/basic/BasicGuacamoleTunnelServlet.java
index 160d290..7416505 100644
--- a/src/main/java/net/sourceforge/guacamole/net/basic/BasicGuacamoleTunnelServlet.java
+++ b/src/main/java/net/sourceforge/guacamole/net/basic/BasicGuacamoleTunnelServlet.java
@@ -31,9 +31,13 @@ import net.sourceforge.guacamole.net.GuacamoleTunnel;
 import net.sourceforge.guacamole.net.basic.properties.BasicGuacamoleProperties;
 import net.sourceforge.guacamole.protocol.ConfiguredGuacamoleSocket;
 import net.sourceforge.guacamole.servlet.GuacamoleTunnelServlet;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class BasicGuacamoleTunnelServlet extends GuacamoleTunnelServlet {
 
+    private Logger logger = LoggerFactory.getLogger(BasicGuacamoleTunnelServlet.class);
+    
     private AuthenticationProvider authProvider;
 
     @Override
@@ -60,8 +64,12 @@ public class BasicGuacamoleTunnelServlet extends GuacamoleTunnelServlet {
 
         // Get authorized config
         GuacamoleConfiguration config = authProvider.getAuthorizedConfiguration(username, password);
-        if (config == null)
+        if (config == null) {
+            logger.warn("Failed login from {} for user \"{}\".", request.getRemoteAddr(), username);
             throw new GuacamoleException("Invalid login");
+        }
+
+        logger.debug("Successful login from {} for user \"{}\".", request.getRemoteAddr(), username);
 
         // Configure and connect socket
         String hostname = GuacamoleProperties.getProperty(GuacamoleProperties.GUACD_HOSTNAME);
-- 
1.7.10.4