Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan Bartel2011-10-24 01:30:10 -0400
committerJan Bartel2011-10-24 01:30:10 -0400
commitfc497fe1e83c8e717aea62762eafda753808c86a (patch)
treeb0f0eb6c95b1da882866cb293368f056ad19697f /jetty-security/src/main/java
parenta6b41a7deb9ae919c2e5a9c8838bc44f079d8f1f (diff)
parentcd0628ab66dcece88b20acb20eaa2c64f9866fa0 (diff)
downloadorg.eclipse.jetty.project-fc497fe1e83c8e717aea62762eafda753808c86a.tar.gz
org.eclipse.jetty.project-fc497fe1e83c8e717aea62762eafda753808c86a.tar.xz
org.eclipse.jetty.project-fc497fe1e83c8e717aea62762eafda753808c86a.zip
Merge remote-tracking branch 'origin/master' into jetty-8
Diffstat (limited to 'jetty-security/src/main/java')
-rw-r--r--jetty-security/src/main/java/org/eclipse/jetty/security/HashLoginService.java3
-rw-r--r--jetty-security/src/main/java/org/eclipse/jetty/security/JDBCLoginService.java2
-rw-r--r--jetty-security/src/main/java/org/eclipse/jetty/security/SpnegoLoginService.java2
-rw-r--r--jetty-security/src/main/java/org/eclipse/jetty/security/authentication/DigestAuthenticator.java3
4 files changed, 5 insertions, 5 deletions
diff --git a/jetty-security/src/main/java/org/eclipse/jetty/security/HashLoginService.java b/jetty-security/src/main/java/org/eclipse/jetty/security/HashLoginService.java
index 12b51f5150..9b833f5adb 100644
--- a/jetty-security/src/main/java/org/eclipse/jetty/security/HashLoginService.java
+++ b/jetty-security/src/main/java/org/eclipse/jetty/security/HashLoginService.java
@@ -135,9 +135,8 @@ public class HashLoginService extends MappedLoginService implements UserListener
if (_propertyUserStore == null)
{
if(LOG.isDebugEnabled())
- {
LOG.debug("doStart: Starting new PropertyUserStore. PropertiesFile: " + _config + " refreshInterval: " + _refreshInterval);
- }
+
_propertyUserStore = new PropertyUserStore();
_propertyUserStore.setRefreshInterval(_refreshInterval);
_propertyUserStore.setConfig(_config);
diff --git a/jetty-security/src/main/java/org/eclipse/jetty/security/JDBCLoginService.java b/jetty-security/src/main/java/org/eclipse/jetty/security/JDBCLoginService.java
index 03a4786efb..20942b1e57 100644
--- a/jetty-security/src/main/java/org/eclipse/jetty/security/JDBCLoginService.java
+++ b/jetty-security/src/main/java/org/eclipse/jetty/security/JDBCLoginService.java
@@ -137,7 +137,7 @@ public class JDBCLoginService extends MappedLoginService
|| _password == null
|| _cacheTime < 0)
{
- if (LOG.isDebugEnabled()) LOG.debug("UserRealm " + getName() + " has not been properly configured");
+ LOG.warn("UserRealm " + getName() + " has not been properly configured");
}
_cacheTime *= 1000;
_lastHashPurge = 0;
diff --git a/jetty-security/src/main/java/org/eclipse/jetty/security/SpnegoLoginService.java b/jetty-security/src/main/java/org/eclipse/jetty/security/SpnegoLoginService.java
index f4949b05d4..0f8c0a2de8 100644
--- a/jetty-security/src/main/java/org/eclipse/jetty/security/SpnegoLoginService.java
+++ b/jetty-security/src/main/java/org/eclipse/jetty/security/SpnegoLoginService.java
@@ -100,7 +100,7 @@ public class SpnegoLoginService extends AbstractLifeCycle implements LoginServic
_targetName = properties.getProperty("targetName");
- LOG.debug("\n\nTarget Name\n\n" + _targetName);
+ LOG.debug("Target Name {}", _targetName);
super.doStart();
}
diff --git a/jetty-security/src/main/java/org/eclipse/jetty/security/authentication/DigestAuthenticator.java b/jetty-security/src/main/java/org/eclipse/jetty/security/authentication/DigestAuthenticator.java
index 5a2ecf412e..ca5d2cd7cf 100644
--- a/jetty-security/src/main/java/org/eclipse/jetty/security/authentication/DigestAuthenticator.java
+++ b/jetty-security/src/main/java/org/eclipse/jetty/security/authentication/DigestAuthenticator.java
@@ -117,7 +117,8 @@ public class DigestAuthenticator extends LoginAuthenticator
boolean stale = false;
if (credentials != null)
{
- if (LOG.isDebugEnabled()) LOG.debug("Credentials: " + credentials);
+ if (LOG.isDebugEnabled())
+ LOG.debug("Credentials: " + credentials);
QuotedStringTokenizer tokenizer = new QuotedStringTokenizer(credentials, "=, ", true, false);
final Digest digest = new Digest(request.getMethod());
String last = null;

Back to the top