diff options
| author | Greg Wilkins | 2011-11-28 22:06:25 +0000 |
|---|---|---|
| committer | Greg Wilkins | 2011-11-28 22:06:25 +0000 |
| commit | 55d5020980aa0b2118f8a3f00e5306bb264fe689 (patch) | |
| tree | 4da0894a745e23db2941a61aeb5e238aaec11fdb /jetty-security/src/main/java/org | |
| parent | cbec18af6028105cfa5261c6176c29ac210140bc (diff) | |
| parent | 4ce72ee5498149536c695211ea1a43329863b203 (diff) | |
| download | org.eclipse.jetty.project-55d5020980aa0b2118f8a3f00e5306bb264fe689.tar.gz org.eclipse.jetty.project-55d5020980aa0b2118f8a3f00e5306bb264fe689.tar.xz org.eclipse.jetty.project-55d5020980aa0b2118f8a3f00e5306bb264fe689.zip | |
Merge remote-tracking branch 'origin/master' into jetty-8
Conflicts:
VERSION.txt
jetty-server/src/main/java/org/eclipse/jetty/server/AbstractHttpConnection.java
jetty-server/src/main/java/org/eclipse/jetty/server/Response.java
jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletHandler.java
Diffstat (limited to 'jetty-security/src/main/java/org')
2 files changed, 2 insertions, 2 deletions
diff --git a/jetty-security/src/main/java/org/eclipse/jetty/security/ConstraintSecurityHandler.java b/jetty-security/src/main/java/org/eclipse/jetty/security/ConstraintSecurityHandler.java index 3b427e8826..44280872b4 100644 --- a/jetty-security/src/main/java/org/eclipse/jetty/security/ConstraintSecurityHandler.java +++ b/jetty-security/src/main/java/org/eclipse/jetty/security/ConstraintSecurityHandler.java @@ -25,8 +25,8 @@ import java.util.concurrent.CopyOnWriteArrayList; import java.util.concurrent.CopyOnWriteArraySet; import org.eclipse.jetty.http.PathMap; -import org.eclipse.jetty.server.Connector; import org.eclipse.jetty.server.AbstractHttpConnection; +import org.eclipse.jetty.server.Connector; import org.eclipse.jetty.server.Request; import org.eclipse.jetty.server.Response; import org.eclipse.jetty.server.UserIdentity; diff --git a/jetty-security/src/main/java/org/eclipse/jetty/security/authentication/FormAuthenticator.java b/jetty-security/src/main/java/org/eclipse/jetty/security/authentication/FormAuthenticator.java index 38b486560e..c21768fde1 100644 --- a/jetty-security/src/main/java/org/eclipse/jetty/security/authentication/FormAuthenticator.java +++ b/jetty-security/src/main/java/org/eclipse/jetty/security/authentication/FormAuthenticator.java @@ -32,9 +32,9 @@ import org.eclipse.jetty.http.HttpMethods; import org.eclipse.jetty.http.MimeTypes; import org.eclipse.jetty.security.ServerAuthException; import org.eclipse.jetty.security.UserAuthentication; +import org.eclipse.jetty.server.AbstractHttpConnection; import org.eclipse.jetty.server.Authentication; import org.eclipse.jetty.server.Authentication.User; -import org.eclipse.jetty.server.AbstractHttpConnection; import org.eclipse.jetty.server.Request; import org.eclipse.jetty.server.UserIdentity; import org.eclipse.jetty.util.MultiMap; |