Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGreg Wilkins2014-07-10 00:43:39 -0400
committerGreg Wilkins2014-07-10 00:43:39 -0400
commit5e281dd449eb153599693875ceb6d7208372d9e7 (patch)
tree2ee960586eccdf6226f3ec725abd57a053e004d7 /jetty-security/src/main/java/org/eclipse
parent068ec214194f62fd7aa83816978188ff8ef587dc (diff)
parent55ca09a00e54d91439224c4360780ff10f4fc649 (diff)
downloadorg.eclipse.jetty.project-5e281dd449eb153599693875ceb6d7208372d9e7.tar.gz
org.eclipse.jetty.project-5e281dd449eb153599693875ceb6d7208372d9e7.tar.xz
org.eclipse.jetty.project-5e281dd449eb153599693875ceb6d7208372d9e7.zip
Merge remote-tracking branch 'origin/master' into jetty-http2
Conflicts: jetty-util/src/main/java/org/eclipse/jetty/util/IteratingCallback.java
Diffstat (limited to 'jetty-security/src/main/java/org/eclipse')
-rw-r--r--jetty-security/src/main/java/org/eclipse/jetty/security/IdentityService.java1
-rw-r--r--jetty-security/src/main/java/org/eclipse/jetty/security/SecurityHandler.java1
-rw-r--r--jetty-security/src/main/java/org/eclipse/jetty/security/authentication/DigestAuthenticator.java1
3 files changed, 0 insertions, 3 deletions
diff --git a/jetty-security/src/main/java/org/eclipse/jetty/security/IdentityService.java b/jetty-security/src/main/java/org/eclipse/jetty/security/IdentityService.java
index 99094c17a9..21eba25164 100644
--- a/jetty-security/src/main/java/org/eclipse/jetty/security/IdentityService.java
+++ b/jetty-security/src/main/java/org/eclipse/jetty/security/IdentityService.java
@@ -22,7 +22,6 @@ import java.security.Principal;
import javax.security.auth.Subject;
-import org.eclipse.jetty.server.Request;
import org.eclipse.jetty.server.UserIdentity;
/* ------------------------------------------------------------ */
diff --git a/jetty-security/src/main/java/org/eclipse/jetty/security/SecurityHandler.java b/jetty-security/src/main/java/org/eclipse/jetty/security/SecurityHandler.java
index 606cf3d9b9..84e1e74fd6 100644
--- a/jetty-security/src/main/java/org/eclipse/jetty/security/SecurityHandler.java
+++ b/jetty-security/src/main/java/org/eclipse/jetty/security/SecurityHandler.java
@@ -43,7 +43,6 @@ import org.eclipse.jetty.server.handler.ContextHandler;
import org.eclipse.jetty.server.handler.ContextHandler.Context;
import org.eclipse.jetty.server.handler.HandlerWrapper;
import org.eclipse.jetty.server.session.AbstractSession;
-import org.eclipse.jetty.util.component.LifeCycle;
import org.eclipse.jetty.util.log.Log;
import org.eclipse.jetty.util.log.Logger;
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 13537e6cb7..be5db7ef7b 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
@@ -34,7 +34,6 @@ import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.eclipse.jetty.http.HttpHeader;
-import org.eclipse.jetty.security.SecurityHandler;
import org.eclipse.jetty.security.ServerAuthException;
import org.eclipse.jetty.security.UserAuthentication;
import org.eclipse.jetty.server.Authentication;

Back to the top