Upgrade rop-tutorials
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/40001f6c Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/40001f6c Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/40001f6c Branch: refs/heads/master Commit: 40001f6c2ca0273db5422ee7bccfa3bffa02ff01 Parents: edcfb7b Author: Arseni Bulatski <ancars...@gmail.com> Authored: Tue Feb 13 13:00:16 2018 +0300 Committer: Arseni Bulatski <ancars...@gmail.com> Committed: Tue Feb 13 13:07:38 2018 +0300 ---------------------------------------------------------------------- .../apache/cayenne/tutorial/persistent/client/Main.java | 1 - .../java/org/apache/cayenne/tutorial/Http2Server.java | 12 ++++++++++-- 2 files changed, 10 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cayenne/blob/40001f6c/tutorials/tutorial-rop-client/src/main/java/org/apache/cayenne/tutorial/persistent/client/Main.java ---------------------------------------------------------------------- diff --git a/tutorials/tutorial-rop-client/src/main/java/org/apache/cayenne/tutorial/persistent/client/Main.java b/tutorials/tutorial-rop-client/src/main/java/org/apache/cayenne/tutorial/persistent/client/Main.java index 83c78fd..bc8fc0d 100644 --- a/tutorials/tutorial-rop-client/src/main/java/org/apache/cayenne/tutorial/persistent/client/Main.java +++ b/tutorials/tutorial-rop-client/src/main/java/org/apache/cayenne/tutorial/persistent/client/Main.java @@ -35,7 +35,6 @@ public class Main { Map<String, String> properties = new HashMap<>(); properties.put(ClientConstants.ROP_SERVICE_URL_PROPERTY, "http://localhost:8080/cayenne-service"); - properties.put(ClientConstants.ROP_SERVICE_USE_ALPN_PROPERTY, "false"); properties.put(ClientConstants.ROP_SERVICE_USERNAME_PROPERTY, "cayenne-user"); properties.put(ClientConstants.ROP_SERVICE_PASSWORD_PROPERTY, "secret"); properties.put(ClientConstants.ROP_SERVICE_REALM_PROPERTY, "Cayenne Realm"); http://git-wip-us.apache.org/repos/asf/cayenne/blob/40001f6c/tutorials/tutorial-rop-server-http2/src/main/java/org/apache/cayenne/tutorial/Http2Server.java ---------------------------------------------------------------------- diff --git a/tutorials/tutorial-rop-server-http2/src/main/java/org/apache/cayenne/tutorial/Http2Server.java b/tutorials/tutorial-rop-server-http2/src/main/java/org/apache/cayenne/tutorial/Http2Server.java index ab0656e..74b0063 100644 --- a/tutorials/tutorial-rop-server-http2/src/main/java/org/apache/cayenne/tutorial/Http2Server.java +++ b/tutorials/tutorial-rop-server-http2/src/main/java/org/apache/cayenne/tutorial/Http2Server.java @@ -21,9 +21,17 @@ package org.apache.cayenne.tutorial; import org.eclipse.jetty.http2.HTTP2Cipher; import org.eclipse.jetty.http2.server.HTTP2ServerConnectionFactory; -import org.eclipse.jetty.security.*; +import org.eclipse.jetty.security.ConstraintMapping; +import org.eclipse.jetty.security.ConstraintSecurityHandler; +import org.eclipse.jetty.security.HashLoginService; +import org.eclipse.jetty.security.SecurityHandler; +import org.eclipse.jetty.security.UserStore; import org.eclipse.jetty.security.authentication.BasicAuthenticator; -import org.eclipse.jetty.server.*; +import org.eclipse.jetty.server.HttpConfiguration; +import org.eclipse.jetty.server.SecureRequestCustomizer; +import org.eclipse.jetty.server.Server; +import org.eclipse.jetty.server.ServerConnector; +import org.eclipse.jetty.server.SslConnectionFactory; import org.eclipse.jetty.servlet.ServletContextHandler; import org.eclipse.jetty.servlet.ServletHolder; import org.eclipse.jetty.util.security.Constraint;