From edcfb7b1f46624dc9bdc6133a4e87d410076c23a Mon Sep 17 00:00:00 2001 From: Arseni Bulatski Date: Tue, 13 Feb 2018 12:58:28 +0300 Subject: [PATCH 1/2] Upgrade rop-tutorials --- tutorials/pom.xml | 2 +- tutorials/tutorial-rop-client/pom.xml | 4 ++-- .../cayenne/tutorial/persistent/client/Main.java | 5 +++++ .../java/org/apache/cayenne/tutorial/Http2Server.java | 9 ++++----- .../src/main/resources/cayenne-project.xml | 9 +++++---- .../src/main/resources/datamap.map.xml | 10 +++++----- tutorials/tutorial-rop-server/pom.xml | 5 ----- 7 files changed, 22 insertions(+), 22 deletions(-) diff --git a/tutorials/pom.xml b/tutorials/pom.xml index 4478ff6224..9b81a69c72 100644 --- a/tutorials/pom.xml +++ b/tutorials/pom.xml @@ -39,7 +39,7 @@ - 9.3.19.v20170502 + 9.4.8.v20171121 diff --git a/tutorials/tutorial-rop-client/pom.xml b/tutorials/tutorial-rop-client/pom.xml index 14cb6869e8..9554c56927 100644 --- a/tutorials/tutorial-rop-client/pom.xml +++ b/tutorials/tutorial-rop-client/pom.xml @@ -27,7 +27,7 @@ org.apache.cayenne - cayenne-client + cayenne-client-jetty ${project.version} @@ -36,7 +36,7 @@ compile - + 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 d70843cdae..83c78fdba5 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 @@ -20,6 +20,8 @@ import org.apache.cayenne.ObjectContext; import org.apache.cayenne.configuration.rop.client.ClientConstants; +import org.apache.cayenne.configuration.rop.client.ClientJettyHttp2Module; +import org.apache.cayenne.configuration.rop.client.ClientJettyHttpModule; import org.apache.cayenne.configuration.rop.client.ClientRuntime; import org.apache.cayenne.query.ObjectSelect; @@ -33,11 +35,14 @@ public static void main(String[] args) { Map 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"); ClientRuntime runtime = ClientRuntime.builder() .properties(properties) + .addModule(new ClientJettyHttpModule()) .build(); ObjectContext context = runtime.newContext(); 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 20028fd381..ab0656eeb4 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,10 +21,7 @@ import org.eclipse.jetty.http2.HTTP2Cipher; import org.eclipse.jetty.http2.server.HTTP2ServerConnectionFactory; -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.*; import org.eclipse.jetty.security.authentication.BasicAuthenticator; import org.eclipse.jetty.server.*; import org.eclipse.jetty.servlet.ServletContextHandler; @@ -84,7 +81,9 @@ public static void main(String... args) throws Exception { private static SecurityHandler basicAuth(String username, String password, String realm) { HashLoginService loginService = new HashLoginService(); - loginService.putUser(username, Credential.getCredential(password), new String[]{"cayenne-service-user"}); + UserStore userStore = new UserStore(); + userStore.addUser(username, Credential.getCredential(password), new String[]{"cayenne-service-user"}); + loginService.setUserStore(userStore); loginService.setName(realm); Constraint constraint = new Constraint(); diff --git a/tutorials/tutorial-rop-server-http2/src/main/resources/cayenne-project.xml b/tutorials/tutorial-rop-server-http2/src/main/resources/cayenne-project.xml index 1c7f367df4..27b1c1b1da 100644 --- a/tutorials/tutorial-rop-server-http2/src/main/resources/cayenne-project.xml +++ b/tutorials/tutorial-rop-server-http2/src/main/resources/cayenne-project.xml @@ -1,11 +1,12 @@ - + - + schema-update-strategy="org.apache.cayenne.access.dbsync.CreateIfNoSchemaStrategy"> diff --git a/tutorials/tutorial-rop-server-http2/src/main/resources/datamap.map.xml b/tutorials/tutorial-rop-server-http2/src/main/resources/datamap.map.xml index e0a7e3f71f..f879288160 100644 --- a/tutorials/tutorial-rop-server-http2/src/main/resources/datamap.map.xml +++ b/tutorials/tutorial-rop-server-http2/src/main/resources/datamap.map.xml @@ -1,8 +1,8 @@ - + xsi:schemaLocation="http://cayenne.apache.org/schema/10/modelMap http://cayenne.apache.org/schema/10/modelMap.xsd" + project-version="10"> @@ -37,10 +37,10 @@ - + - + diff --git a/tutorials/tutorial-rop-server/pom.xml b/tutorials/tutorial-rop-server/pom.xml index 4bde8ec613..ae48e8ff08 100644 --- a/tutorials/tutorial-rop-server/pom.xml +++ b/tutorials/tutorial-rop-server/pom.xml @@ -31,11 +31,6 @@ cayenne-rop-server ${project.version} - - javax.servlet - servlet-api - compile - org.apache.derby derby From 40001f6c2ca0273db5422ee7bccfa3bffa02ff01 Mon Sep 17 00:00:00 2001 From: Arseni Bulatski Date: Tue, 13 Feb 2018 13:00:16 +0300 Subject: [PATCH 2/2] Upgrade rop-tutorials --- .../cayenne/tutorial/persistent/client/Main.java | 1 - .../org/apache/cayenne/tutorial/Http2Server.java | 12 ++++++++++-- 2 files changed, 10 insertions(+), 3 deletions(-) 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 83c78fdba5..bc8fc0d4e0 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 static void main(String[] args) { Map 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"); 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 ab0656eeb4..74b00630de 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 @@ 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;