You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by nt...@apache.org on 2018/02/13 11:11:29 UTC
[1/5] cayenne git commit: Upgrade rop-tutorials
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 <an...@gmail.com>
Authored: Tue Feb 13 12:58:28 2018 +0300
Committer: Arseni Bulatski <an...@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>
[2/5] cayenne git commit: Upgrade rop-tutorials
Posted by nt...@apache.org.
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 <an...@gmail.com>
Authored: Tue Feb 13 13:00:16 2018 +0300
Committer: Arseni Bulatski <an...@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;
[3/5] cayenne git commit: Upgrade rop-tutorial doc
Posted by nt...@apache.org.
Upgrade rop-tutorial doc
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/d7eb7a98
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/d7eb7a98
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/d7eb7a98
Branch: refs/heads/master
Commit: d7eb7a98dc129ebf03142333ce6e2640a61c906f
Parents: 750d3d5
Author: Arseni Bulatski <an...@gmail.com>
Authored: Tue Feb 13 14:02:38 2018 +0300
Committer: Arseni Bulatski <an...@gmail.com>
Committed: Tue Feb 13 14:02:38 2018 +0300
----------------------------------------------------------------------
.../_getting-started-rop/part2/adding.adoc | 20 ++++++++++++--------
.../_getting-started-rop/part2/connect.adoc | 13 +++++++++----
.../_getting-started-rop/part2/starting.adoc | 4 ++--
3 files changed, 23 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cayenne/blob/d7eb7a98/docs/asciidoc/getting-started-rop/src/docs/asciidoc/_getting-started-rop/part2/adding.adoc
----------------------------------------------------------------------
diff --git a/docs/asciidoc/getting-started-rop/src/docs/asciidoc/_getting-started-rop/part2/adding.adoc b/docs/asciidoc/getting-started-rop/src/docs/asciidoc/_getting-started-rop/part2/adding.adoc
index ae1d04b..b08a1f1 100644
--- a/docs/asciidoc/getting-started-rop/src/docs/asciidoc/_getting-started-rop/part2/adding.adoc
+++ b/docs/asciidoc/getting-started-rop/src/docs/asciidoc/_getting-started-rop/part2/adding.adoc
@@ -56,13 +56,13 @@ Open pom.xml in the server project and configure a "userRealm" for the Jetty plu
[source, XML]
----
<plugin>
- <groupId>org.mortbay.jetty</groupId>
+ <groupId>org.eclipse.jetty</groupId>
<artifactId>maven-jetty-plugin</artifactId>
- <version>6.1.22</version>
+ <version>9.4.8.v20171121</version>
<!-- adding configuration below: -->
<configuration>
<userRealms>
- <userRealm implementation="org.mortbay.jetty.security.HashUserRealm">
+ <userRealm implementation="org.eclipse.jetty.security.HashLoginService">
<!-- this name must match the realm-name in web.xml -->
<name>Cayenne Realm</name>
<config>realm.properties</config>
@@ -121,11 +121,15 @@ So change the line in Main.java where we obtained an ROP connection to this:
[source, java]
----
Map<String,String> properties = new HashMap<>();
-properties.put(Constants.ROP_SERVICE_URL_PROPERTY, "http://localhost:8080/tutorial/cayenne-service");
-properties.put(Constants.ROP_SERVICE_USERNAME_PROPERTY, "cayenne-user");
-properties.put(Constants.ROP_SERVICE_PASSWORD_PROPERTY, "secret");
-
-ClientRuntime runtime = new ClientRuntime(properties);
+properties.put(ClientConstants.ROP_SERVICE_URL_PROPERTY, "http://localhost:8080/cayenne-service");
+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();
----
Try running again, and everything should work as before. Obviously in production environment,
http://git-wip-us.apache.org/repos/asf/cayenne/blob/d7eb7a98/docs/asciidoc/getting-started-rop/src/docs/asciidoc/_getting-started-rop/part2/connect.adoc
----------------------------------------------------------------------
diff --git a/docs/asciidoc/getting-started-rop/src/docs/asciidoc/_getting-started-rop/part2/connect.adoc b/docs/asciidoc/getting-started-rop/src/docs/asciidoc/_getting-started-rop/part2/connect.adoc
index da6ef00..590ac65 100644
--- a/docs/asciidoc/getting-started-rop/src/docs/asciidoc/_getting-started-rop/part2/connect.adoc
+++ b/docs/asciidoc/getting-started-rop/src/docs/asciidoc/_getting-started-rop/part2/connect.adoc
@@ -41,11 +41,16 @@ obtaining the ObjectContext:
[source, java]
----
Map<String, String> properties = new HashMap<>();
-properties.put(Constants.ROP_SERVICE_URL_PROPERTY, "http://localhost:8080/tutorial/cayenne-service");
-properties.put(Constants.ROP_SERVICE_USERNAME_PROPERTY, "cayenne-user");
-properties.put(Constants.ROP_SERVICE_PASSWORD_PROPERTY, "secret");
+properties.put(ClientConstants.ROP_SERVICE_URL_PROPERTY, "http://localhost:8080/cayenne-service");
+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 = new ClientRuntime(properties);
+
+ClientRuntime runtime = ClientRuntime.builder()
+ .properties(properties)
+ .addModule(new ClientJettyHttpModule())
+ .build();
ObjectContext context = runtime.newContext();
----
http://git-wip-us.apache.org/repos/asf/cayenne/blob/d7eb7a98/docs/asciidoc/getting-started-rop/src/docs/asciidoc/_getting-started-rop/part2/starting.adoc
----------------------------------------------------------------------
diff --git a/docs/asciidoc/getting-started-rop/src/docs/asciidoc/_getting-started-rop/part2/starting.adoc b/docs/asciidoc/getting-started-rop/src/docs/asciidoc/_getting-started-rop/part2/starting.adoc
index d0e905a..42af594 100644
--- a/docs/asciidoc/getting-started-rop/src/docs/asciidoc/_getting-started-rop/part2/starting.adoc
+++ b/docs/asciidoc/getting-started-rop/src/docs/asciidoc/_getting-started-rop/part2/starting.adoc
@@ -58,7 +58,7 @@ image::../images/datamap-enableclient.png[align="center"]
Now go back to Eclipse, right click on "tutorial-rop-client" project and select "Refresh" - you should see pairs
of classes generated for each mapped entity, same as on the server. And again, we see a bunch of errors in those classes.
-Let's fix it now by adding two dependencies, "cayenne-client" and "resin-hessian", in the bottom of the pom.xml file.
+Let's fix it now by adding two dependencies, "cayenne-client" and "hessian", in the bottom of the pom.xml file.
We also need to add Caucho M2 repository to pull Hessian jar files. The resulting POM should look like this:
[source, XML,subs="verbatim,attributes"]
@@ -73,7 +73,7 @@ We also need to add Caucho M2 repository to pull Hessian jar files. The resultin
<dependencies>
<dependency>
<groupId>org.apache.cayenne</groupId>
- <artifactId>cayenne-client</artifactId>
+ <artifactId>cayenne-client-jetty</artifactId>
<!-- Here specify the version of Cayenne you are actually using -->
<version>{version}</version>
</dependency>
[4/5] cayenne git commit: Merge remote-tracking branch
'remotes/parent/pr/270' into asf-master
Posted by nt...@apache.org.
Merge remote-tracking branch 'remotes/parent/pr/270' into asf-master
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/90e97a34
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/90e97a34
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/90e97a34
Branch: refs/heads/master
Commit: 90e97a341449370f5257033c2e5933304c10276a
Parents: 8dd8b1d 40001f6
Author: Nikita Timofeev <st...@gmail.com>
Authored: Tue Feb 13 14:10:11 2018 +0300
Committer: Nikita Timofeev <st...@gmail.com>
Committed: Tue Feb 13 14:10:11 2018 +0300
----------------------------------------------------------------------
tutorials/pom.xml | 2 +-
tutorials/tutorial-rop-client/pom.xml | 4 ++--
.../apache/cayenne/tutorial/persistent/client/Main.java | 4 ++++
.../java/org/apache/cayenne/tutorial/Http2Server.java | 11 +++++++++--
.../src/main/resources/cayenne-project.xml | 9 +++++----
.../src/main/resources/datamap.map.xml | 10 +++++-----
tutorials/tutorial-rop-server/pom.xml | 5 -----
7 files changed, 26 insertions(+), 19 deletions(-)
----------------------------------------------------------------------
[5/5] cayenne git commit: Merge remote-tracking branch
'remotes/parent/pr/271' into asf-master
Posted by nt...@apache.org.
Merge remote-tracking branch 'remotes/parent/pr/271' into asf-master
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/1525bc74
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/1525bc74
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/1525bc74
Branch: refs/heads/master
Commit: 1525bc740fa0f61b77ce7f865be28aa7b0a576dd
Parents: 90e97a3 d7eb7a9
Author: Nikita Timofeev <st...@gmail.com>
Authored: Tue Feb 13 14:10:24 2018 +0300
Committer: Nikita Timofeev <st...@gmail.com>
Committed: Tue Feb 13 14:10:24 2018 +0300
----------------------------------------------------------------------
.../_getting-started-rop/part2/adding.adoc | 20 ++++++++++++--------
.../_getting-started-rop/part2/connect.adoc | 13 +++++++++----
.../_getting-started-rop/part2/starting.adoc | 4 ++--
3 files changed, 23 insertions(+), 14 deletions(-)
----------------------------------------------------------------------