Repository: cayenne Updated Branches: refs/heads/master 8dd8b1d1a -> 1525bc740
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/edcfb7b1 Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/edcfb7b1 Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/edcfb7b1 Branch: refs/heads/master Commit: edcfb7b1f46624dc9bdc6133a4e87d410076c23a Parents: 750d3d5 Author: Arseni Bulatski <ancars...@gmail.com> Authored: Tue Feb 13 12:58:28 2018 +0300 Committer: Arseni Bulatski <ancars...@gmail.com> Committed: Tue Feb 13 12:58:28 2018 +0300 ---------------------------------------------------------------------- tutorials/pom.xml | 2 +- tutorials/tutorial-rop-client/pom.xml | 4 ++-- .../apache/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(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cayenne/blob/edcfb7b1/tutorials/pom.xml ---------------------------------------------------------------------- diff --git a/tutorials/pom.xml b/tutorials/pom.xml index 4478ff6..9b81a69 100644 --- a/tutorials/pom.xml +++ b/tutorials/pom.xml @@ -39,7 +39,7 @@ </modules> <properties> - <jetty.version>9.3.19.v20170502</jetty.version> + <jetty.version>9.4.8.v20171121</jetty.version> </properties> <build> http://git-wip-us.apache.org/repos/asf/cayenne/blob/edcfb7b1/tutorials/tutorial-rop-client/pom.xml ---------------------------------------------------------------------- diff --git a/tutorials/tutorial-rop-client/pom.xml b/tutorials/tutorial-rop-client/pom.xml index 14cb686..9554c56 100644 --- a/tutorials/tutorial-rop-client/pom.xml +++ b/tutorials/tutorial-rop-client/pom.xml @@ -27,7 +27,7 @@ <dependencies> <dependency> <groupId>org.apache.cayenne</groupId> - <artifactId>cayenne-client</artifactId> + <artifactId>cayenne-client-jetty</artifactId> <version>${project.version}</version> </dependency> <dependency> @@ -36,7 +36,7 @@ <scope>compile</scope> </dependency> </dependencies> - + <build> <plugins> <plugin> http://git-wip-us.apache.org/repos/asf/cayenne/blob/edcfb7b1/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 d70843c..83c78fd 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 @@ package org.apache.cayenne.tutorial.persistent.client; 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 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"); ClientRuntime runtime = ClientRuntime.builder() .properties(properties) + .addModule(new ClientJettyHttpModule()) .build(); ObjectContext context = runtime.newContext(); http://git-wip-us.apache.org/repos/asf/cayenne/blob/edcfb7b1/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 20028fd..ab0656e 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 @@ package org.apache.cayenne.tutorial; 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 class Http2Server { 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(); http://git-wip-us.apache.org/repos/asf/cayenne/blob/edcfb7b1/tutorials/tutorial-rop-server-http2/src/main/resources/cayenne-project.xml ---------------------------------------------------------------------- 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 1c7f367..27b1c1b 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 @@ <?xml version="1.0" encoding="utf-8"?> -<domain project-version="9"> +<domain xmlns="http://cayenne.apache.org/schema/10/domain"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://cayenne.apache.org/schema/10/domain http://cayenne.apache.org/schema/10/domain.xsd"; + project-version="10"> <map name="datamap"/> - <node name="datanode" factory="org.apache.cayenne.configuration.server.XMLPoolingDataSourceFactory" - schema-update-strategy="org.apache.cayenne.access.dbsync.CreateIfNoSchemaStrategy" - > + schema-update-strategy="org.apache.cayenne.access.dbsync.CreateIfNoSchemaStrategy"> <map-ref name="datamap"/> <data-source> <driver value="org.apache.derby.jdbc.EmbeddedDriver"/> http://git-wip-us.apache.org/repos/asf/cayenne/blob/edcfb7b1/tutorials/tutorial-rop-server-http2/src/main/resources/datamap.map.xml ---------------------------------------------------------------------- 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 e0a7e3f..f879288 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 @@ <?xml version="1.0" encoding="utf-8"?> -<data-map xmlns="http://cayenne.apache.org/schema/9/modelMap"; +<data-map xmlns="http://cayenne.apache.org/schema/10/modelMap"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://cayenne.apache.org/schema/9/modelMap http://cayenne.apache.org/schema/9/modelMap.xsd"; - project-version="9"> + xsi:schemaLocation="http://cayenne.apache.org/schema/10/modelMap http://cayenne.apache.org/schema/10/modelMap.xsd"; + project-version="10"> <property name="defaultPackage" value="org.apache.cayenne.tutorial.persistent"/> <property name="clientSupported" value="true"/> <property name="defaultClientPackage" value="org.apache.cayenne.tutorial.persistent.client"/> @@ -37,10 +37,10 @@ <db-relationship name="paintings" source="GALLERY" target="PAINTING" toMany="true"> <db-attribute-pair source="ID" target="GALLERY_ID"/> </db-relationship> - <db-relationship name="artist" source="PAINTING" target="ARTIST" toMany="false"> + <db-relationship name="artist" source="PAINTING" target="ARTIST"> <db-attribute-pair source="ARTIST_ID" target="ID"/> </db-relationship> - <db-relationship name="gallery" source="PAINTING" target="GALLERY" toMany="false"> + <db-relationship name="gallery" source="PAINTING" target="GALLERY"> <db-attribute-pair source="GALLERY_ID" target="ID"/> </db-relationship> <obj-relationship name="paintings" source="Artist" target="Painting" deleteRule="Cascade" db-relationship-path="paintings"/> http://git-wip-us.apache.org/repos/asf/cayenne/blob/edcfb7b1/tutorials/tutorial-rop-server/pom.xml ---------------------------------------------------------------------- diff --git a/tutorials/tutorial-rop-server/pom.xml b/tutorials/tutorial-rop-server/pom.xml index 4bde8ec..ae48e8f 100644 --- a/tutorials/tutorial-rop-server/pom.xml +++ b/tutorials/tutorial-rop-server/pom.xml @@ -32,11 +32,6 @@ <version>${project.version}</version> </dependency> <dependency> - <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - <scope>compile</scope> - </dependency> - <dependency> <groupId>org.apache.derby</groupId> <artifactId>derby</artifactId> <scope>compile</scope>
