#857: Fixed tomcat login to use catalina base as parent dir.

hawtio · Jan 27, 2014 · 3bae222 · 3bae222
1 parent 282042d
commit 3bae222
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/hawtio-web/src/main/java/io/hawt/web/tomcat/TomcatUserDatabaseLoginContext.java b/hawtio-web/src/main/java/io/hawt/web/tomcat/TomcatUserDatabaseLoginContext.java
@@ -35,10 +35,15 @@ public class TomcatUserDatabaseLoginContext implements LoginModule {
     public void initialize(Subject subject, CallbackHandler callbackHandler, Map<String, ?> sharedState, Map<String, ?> options) {
         this.subject = subject;
         this.callbackHandler = callbackHandler;
-        this.file = new File(fileName);
+
+        String base = System.getProperty("catalina.base", ".");
+        LOG.debug("Using base directory: {}", base);
+        this.file = new File(base, fileName);
 
         if (!file.exists()) {
-            throw new IllegalStateException("Apache Tomcat user database file " + file + " does not exists");
+            String msg = "Cannot find Apache Tomcat user database file: " + file;
+            LOG.warn(msg);
+            throw new IllegalStateException(msg);
         }
     }
 

diff --git a/hawtio-web/src/main/webapp/WEB-INF/log4j.properties b/hawtio-web/src/main/webapp/WEB-INF/log4j.properties
@@ -2,6 +2,9 @@
 #
 log4j.rootLogger=INFO, console, file
 
+# to enable DEBUG or TRACE logging for hawtio
+#log4j.logger.io.hawt=DEBUG
+
 # Console will only display warnnings
 log4j.appender.console=org.apache.log4j.ConsoleAppender
 log4j.appender.console.layout=org.apache.log4j.PatternLayout