Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGreg Wilkins2012-08-01 21:51:54 -0400
committerGreg Wilkins2012-08-01 21:51:54 -0400
commit96b5c05674e16d335db78d40e0983aad791cf163 (patch)
tree93678924190a1664894c5930068042848ad641a4 /jetty-security/src
parentd6ef039f2c9aa36ff1c788e0ee483a5d86b9db85 (diff)
downloadorg.eclipse.jetty.project-96b5c05674e16d335db78d40e0983aad791cf163.tar.gz
org.eclipse.jetty.project-96b5c05674e16d335db78d40e0983aad791cf163.tar.xz
org.eclipse.jetty.project-96b5c05674e16d335db78d40e0983aad791cf163.zip
jetty-9 one connector passing most tests
Diffstat (limited to 'jetty-security/src')
-rw-r--r--jetty-security/src/main/java/org/eclipse/jetty/security/SpnegoLoginService.java1
-rw-r--r--jetty-security/src/main/java/org/eclipse/jetty/security/authentication/FormAuthenticator.java1
-rw-r--r--jetty-security/src/test/java/org/eclipse/jetty/security/DataConstraintsTest.java13
3 files changed, 9 insertions, 6 deletions
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 913e97d2b2..77583395db 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
@@ -17,6 +17,7 @@
package org.eclipse.jetty.security;
import java.util.Properties;
+
import javax.security.auth.Subject;
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 faaf7380ef..26196b7119 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
@@ -16,6 +16,7 @@ package org.eclipse.jetty.security.authentication;
import java.io.IOException;
import java.util.Collections;
import java.util.Enumeration;
+
import javax.servlet.RequestDispatcher;
import javax.servlet.ServletException;
import javax.servlet.ServletRequest;
diff --git a/jetty-security/src/test/java/org/eclipse/jetty/security/DataConstraintsTest.java b/jetty-security/src/test/java/org/eclipse/jetty/security/DataConstraintsTest.java
index 90f21b3ab9..3757f584a7 100644
--- a/jetty-security/src/test/java/org/eclipse/jetty/security/DataConstraintsTest.java
+++ b/jetty-security/src/test/java/org/eclipse/jetty/security/DataConstraintsTest.java
@@ -13,8 +13,12 @@
package org.eclipse.jetty.security;
+import static org.junit.Assert.assertThat;
+import static org.junit.matchers.JUnitMatchers.containsString;
+
import java.io.IOException;
import java.util.Arrays;
+
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
@@ -23,6 +27,7 @@ import org.eclipse.jetty.http.HttpMethod;
import org.eclipse.jetty.http.HttpScheme;
import org.eclipse.jetty.security.authentication.BasicAuthenticator;
import org.eclipse.jetty.server.Connector;
+import org.eclipse.jetty.server.HttpConfiguration;
import org.eclipse.jetty.server.LocalConnector;
import org.eclipse.jetty.server.Request;
import org.eclipse.jetty.server.Server;
@@ -35,9 +40,6 @@ import org.junit.After;
import org.junit.Before;
import org.junit.Test;
-import static org.junit.Assert.assertThat;
-import static org.junit.matchers.JUnitMatchers.containsString;
-
/**
* @version $Revision: 1441 $ $Date: 2010-04-02 12:28:17 +0200 (Fri, 02 Apr 2010) $
*/
@@ -59,9 +61,8 @@ public class DataConstraintsTest
_connector.getHttpConfig().setIntegralScheme("FTP");
_connector.getHttpConfig().setConfidentialPort(9999);
_connector.getHttpConfig().setConfidentialScheme("SPDY");
- _connectorS = new LocalConnector(_server)
+ _connectorS = new LocalConnector(_server,new HttpConfiguration(null,false)
{
-
@Override
public void customize(Request request) throws IOException
{
@@ -81,7 +82,7 @@ public class DataConstraintsTest
{
return true;
}
- };
+ },null,null,null,null,false,0);
_server.setConnectors(new Connector[]{_connector,_connectorS});
ContextHandler _context = new ContextHandler();

Back to the top