Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGreg Wilkins2012-10-29 02:59:39 -0400
committerGreg Wilkins2012-10-29 02:59:39 -0400
commitadd3c2b3817d754041c2f6e097fa543a56deedc9 (patch)
tree3954f3c4f733a258c845e627dea4c5b9da167d9f /jetty-security/src
parent77a7ff3122a456ce8420510cfae871ceedb323b4 (diff)
downloadorg.eclipse.jetty.project-add3c2b3817d754041c2f6e097fa543a56deedc9.tar.gz
org.eclipse.jetty.project-add3c2b3817d754041c2f6e097fa543a56deedc9.tar.xz
org.eclipse.jetty.project-add3c2b3817d754041c2f6e097fa543a56deedc9.zip
392237 improved names and examples for documentation
Diffstat (limited to 'jetty-security/src')
-rw-r--r--jetty-security/src/main/java/org/eclipse/jetty/security/ConstraintSecurityHandler.java4
-rw-r--r--jetty-security/src/test/java/org/eclipse/jetty/security/DataConstraintsTest.java10
2 files changed, 7 insertions, 7 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 eb9235ab42..e701dad925 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
@@ -40,7 +40,7 @@ import javax.servlet.annotation.ServletSecurity.TransportGuarantee;
import org.eclipse.jetty.http.HttpStatus;
import org.eclipse.jetty.http.PathMap;
import org.eclipse.jetty.server.HttpChannel;
-import org.eclipse.jetty.server.HttpChannelConfig;
+import org.eclipse.jetty.server.HttpConfiguration;
import org.eclipse.jetty.server.Request;
import org.eclipse.jetty.server.Response;
import org.eclipse.jetty.server.UserIdentity;
@@ -694,7 +694,7 @@ public class ConstraintSecurityHandler extends SecurityHandler implements Constr
if (dataConstraint == null || dataConstraint == UserDataConstraint.None)
return true;
- HttpChannelConfig httpConfig = HttpChannel.getCurrentHttpChannel().getHttpChannelConfig();
+ HttpConfiguration httpConfig = HttpChannel.getCurrentHttpChannel().getHttpConfiguration();
if (dataConstraint == UserDataConstraint.Confidential || dataConstraint == UserDataConstraint.Integral)
{
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 65c8eacc95..5b4a0f455b 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
@@ -28,7 +28,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.HttpChannelConfig;
+import org.eclipse.jetty.server.HttpConfiguration;
import org.eclipse.jetty.server.HttpConnectionFactory;
import org.eclipse.jetty.server.LocalConnector;
import org.eclipse.jetty.server.Request;
@@ -62,16 +62,16 @@ public class DataConstraintsTest
_server = new Server();
HttpConnectionFactory http = new HttpConnectionFactory();
- http.getHttpChannelConfig().setSecurePort(9999);
- http.getHttpChannelConfig().setSecureScheme("BWTP");
+ http.getHttpConfiguration().setSecurePort(9999);
+ http.getHttpConfiguration().setSecureScheme("BWTP");
_connector = new LocalConnector(_server,http);
_connector.setIdleTimeout(300000);
HttpConnectionFactory https = new HttpConnectionFactory();
- https.getHttpChannelConfig().addCustomizer(new HttpChannelConfig.Customizer()
+ https.getHttpConfiguration().addCustomizer(new HttpConfiguration.Customizer()
{
@Override
- public void customize(Connector connector, HttpChannelConfig channelConfig, Request request)
+ public void customize(Connector connector, HttpConfiguration channelConfig, Request request)
{
request.setScheme(HttpScheme.HTTPS.asString());
request.setSecure(true);

Back to the top