Jenkins build is back to normal : cayenne-master » hsql,JDK 1.8 (latest),ubuntu #801

2018-02-13 Thread Apache Jenkins Server 
See

[jira] [Closed] (CAY-2376) Review tutorials and docs code for compatibility with 4.1 version

2018-02-13 Thread Nikita Timofeev (JIRA) 

 [ 
https://issues.apache.org/jira/browse/CAY-2376?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
 ]

Nikita Timofeev closed CAY-2376.

Resolution: Fixed
  Assignee: Nikita Timofeev

> Review tutorials and docs code for compatibility with 4.1 version
> -
>
> Key: CAY-2376
> URL: https://issues.apache.org/jira/browse/CAY-2376
> Project: Cayenne
>  Issue Type: Improvement
>Reporter: Nikita Timofeev
>Assignee: Nikita Timofeev
>Priority: Major
> Fix For: 4.1.M2
>
>
> * Java 8 / Java 7
> * Deprecated _Java8Module_
> * New _cgen_ templates (change in /tutorial/ projects and if visible in 
> tutorial docs)



--
This message was sent by Atlassian JIRA
(v7.6.3#76005)

[GitHub] cayenne pull request #272: Upgrade tutorials

2018-02-13 Thread asfgit 
Github user asfgit closed the pull request at:

https://github.com/apache/cayenne/pull/272


---

[1/3] cayenne git commit: Upgrade tutorials

2018-02-13 Thread ntimofeev 
Repository: cayenne
Updated Branches:
  refs/heads/master 1525bc740 -> 7a2fb98f9


Upgrade tutorials


Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/42bcdb67
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/42bcdb67
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/42bcdb67

Branch: refs/heads/master
Commit: 42bcdb67b363cf74ce20cb01491aa9bdefba62cc
Parents: 1525bc7
Author: Arseni Bulatski 
Authored: Tue Feb 13 14:36:48 2018 +0300
Committer: Arseni Bulatski 
Committed: Tue Feb 13 14:36:48 2018 +0300

--
 .../src/docs/asciidoc/_getting-started-guide/webapp.adoc   | 2 +-
 tutorials/tutorial-rop-client-http2/pom.xml| 5 +
 .../src/main/java/org/apache/cayenne/tutorial/Http2Client.java | 1 -
 tutorials/tutorial-rop-client/pom.xml  | 5 +
 .../org/apache/cayenne/tutorial/persistent/client/Main.java| 1 -
 tutorials/tutorial-rop-server-http2/pom.xml| 6 ++
 tutorials/tutorial-rop-server/pom.xml  | 5 +
 tutorials/tutorial/pom.xml | 1 +
 8 files changed, 23 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cayenne/blob/42bcdb67/docs/asciidoc/getting-started-guide/src/docs/asciidoc/_getting-started-guide/webapp.adoc
--
diff --git 
a/docs/asciidoc/getting-started-guide/src/docs/asciidoc/_getting-started-guide/webapp.adoc
 
b/docs/asciidoc/getting-started-guide/src/docs/asciidoc/_getting-started-guide/webapp.adoc
index cc4eb86..32434a5 100644
--- 
a/docs/asciidoc/getting-started-guide/src/docs/asciidoc/_getting-started-guide/webapp.adoc
+++ 
b/docs/asciidoc/getting-started-guide/src/docs/asciidoc/_getting-started-guide/webapp.adoc
@@ -213,7 +213,7 @@ section and save the POM:
 
 org.eclipse.jetty
 jetty-maven-plugin
-9.3.14.v20161028
+9.4.8.v20171121
 
 
 

http://git-wip-us.apache.org/repos/asf/cayenne/blob/42bcdb67/tutorials/tutorial-rop-client-http2/pom.xml
--
diff --git a/tutorials/tutorial-rop-client-http2/pom.xml 
b/tutorials/tutorial-rop-client-http2/pom.xml
index 077a124..e1f3d95 100644
--- a/tutorials/tutorial-rop-client-http2/pom.xml
+++ b/tutorials/tutorial-rop-client-http2/pom.xml
@@ -40,6 +40,11 @@
 cayenne-protostuff
 ${project.version}
 
+
+org.slf4j
+slf4j-simple
+compile
+
 
 
 
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/cayenne/blob/42bcdb67/tutorials/tutorial-rop-client-http2/src/main/java/org/apache/cayenne/tutorial/Http2Client.java
--
diff --git 
a/tutorials/tutorial-rop-client-http2/src/main/java/org/apache/cayenne/tutorial/Http2Client.java
 
b/tutorials/tutorial-rop-client-http2/src/main/java/org/apache/cayenne/tutorial/Http2Client.java
index fdf9e03..5cf74a2 100644
--- 
a/tutorials/tutorial-rop-client-http2/src/main/java/org/apache/cayenne/tutorial/Http2Client.java
+++ 
b/tutorials/tutorial-rop-client-http2/src/main/java/org/apache/cayenne/tutorial/Http2Client.java
@@ -69,7 +69,6 @@ public class Http2Client {
 ClientRuntime runtime = ClientRuntime.builder()
 .properties(properties)
 .addModule(new ClientJettyHttp2Module())
-.addModule(new ProtostuffModule())
 .build();
 
 ObjectContext context = runtime.newContext();

http://git-wip-us.apache.org/repos/asf/cayenne/blob/42bcdb67/tutorials/tutorial-rop-client/pom.xml
--
diff --git a/tutorials/tutorial-rop-client/pom.xml 
b/tutorials/tutorial-rop-client/pom.xml
index 9554c56..d3e8ab9 100644
--- a/tutorials/tutorial-rop-client/pom.xml
+++ b/tutorials/tutorial-rop-client/pom.xml
@@ -35,6 +35,11 @@
 hessian
compile

+   
+   org.slf4j
+   slf4j-simple
+   compile
+   

 


http://git-wip-us.apache.org/repos/asf/cayenne/blob/42bcdb67/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

[2/3] cayenne git commit: Merge remote-tracking branch 'remotes/parent/pr/272' into asf-master

2018-02-13 Thread ntimofeev 
Merge remote-tracking branch 'remotes/parent/pr/272' 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/e9406153
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/e9406153
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/e9406153

Branch: refs/heads/master
Commit: e9406153f19d2101f316966bb6f8d1614cb4b578
Parents: 1525bc7 42bcdb6
Author: Nikita Timofeev 
Authored: Tue Feb 13 14:40:24 2018 +0300
Committer: Nikita Timofeev 
Committed: Tue Feb 13 14:40:24 2018 +0300

--
 .../src/docs/asciidoc/_getting-started-guide/webapp.adoc   | 2 +-
 tutorials/tutorial-rop-client-http2/pom.xml| 5 +
 .../src/main/java/org/apache/cayenne/tutorial/Http2Client.java | 1 -
 tutorials/tutorial-rop-client/pom.xml  | 5 +
 .../org/apache/cayenne/tutorial/persistent/client/Main.java| 1 -
 tutorials/tutorial-rop-server-http2/pom.xml| 6 ++
 tutorials/tutorial-rop-server/pom.xml  | 5 +
 tutorials/tutorial/pom.xml | 1 +
 8 files changed, 23 insertions(+), 3 deletions(-)
--

[3/3] cayenne git commit: Update ROP tutorial screenshot

2018-02-13 Thread ntimofeev 
Update ROP tutorial screenshot


Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/7a2fb98f
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/7a2fb98f
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/7a2fb98f

Branch: refs/heads/master
Commit: 7a2fb98f9ea7dc91cd206cd023ad5aa46f5b2954
Parents: e940615
Author: Nikita Timofeev 
Authored: Tue Feb 13 14:42:18 2018 +0300
Committer: Nikita Timofeev 
Committed: Tue Feb 13 14:42:18 2018 +0300

--
 .../asciidoc/images/datamap-enableclient.png| Bin 104778 -> 98756 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cayenne/blob/7a2fb98f/docs/asciidoc/getting-started-rop/src/docs/asciidoc/images/datamap-enableclient.png
--
diff --git 
a/docs/asciidoc/getting-started-rop/src/docs/asciidoc/images/datamap-enableclient.png
 
b/docs/asciidoc/getting-started-rop/src/docs/asciidoc/images/datamap-enableclient.png
index 62a2af2..4e57a5e 100644
Binary files 
a/docs/asciidoc/getting-started-rop/src/docs/asciidoc/images/datamap-enableclient.png
 and 
b/docs/asciidoc/getting-started-rop/src/docs/asciidoc/images/datamap-enableclient.png
 differ

[GitHub] cayenne pull request #272: Upgrade tutorials

2018-02-13 Thread aarrsseni 
GitHub user aarrsseni opened a pull request:

https://github.com/apache/cayenne/pull/272

Upgrade tutorials



You can merge this pull request into a Git repository by running:

$ git pull https://github.com/aarrsseni/cayenne clean-tutorial

Alternatively you can review and apply these changes as the patch at:

https://github.com/apache/cayenne/pull/272.patch

To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:

This closes #272


commit 42bcdb67b363cf74ce20cb01491aa9bdefba62cc
Author: Arseni Bulatski 
Date:   2018-02-13T11:36:48Z

Upgrade tutorials




---

Build failed in Jenkins: cayenne-master » hsql,JDK 1.8 (latest),ubuntu #800

2018-02-13 Thread Apache Jenkins Server 
See 


Changes:

[ancarseni] Upgrade rop-tutorials

[ancarseni] Upgrade rop-tutorials

[ancarseni] Upgrade rop-tutorial doc

--
[...truncated 9.41 MB...]
:clean
:compileJava
:licenseFiles
:pluginDescriptors
:versionFile
:processResources
:classes
:jar
:assemble
:pluginUnderTestMetadata
:compileTestJava
:processTestResources
:testClasses
:test

org.apache.cayenne.tools.DbImportIT > emptyDbTaskSuccess FAILED
org.gradle.testkit.runner.InvalidRunnerConfigurationException at 
DbImportIT.java:62

org.apache.cayenne.tools.DbImportIT > simpleDbTaskSuccess FAILED
org.gradle.testkit.runner.InvalidRunnerConfigurationException at 
DbImportIT.java:80

org.apache.cayenne.tools.DbImportIT > withProjectTaskSuccess FAILED
org.gradle.testkit.runner.InvalidRunnerConfigurationException at 
DbImportIT.java:127

org.apache.cayenne.tools.DbImportIT > notConfiguredTaskFailure FAILED
org.gradle.testkit.runner.InvalidRunnerConfigurationException at 
DbImportIT.java:49

org.apache.cayenne.tools.DbImportIT > excludeRelDbTaskSuccess FAILED
org.gradle.testkit.runner.InvalidRunnerConfigurationException at 
DbImportIT.java:105

org.apache.cayenne.tools.GradlePluginIT > testGradleVersionsCompatibility FAILED
java.lang.AssertionError at GradlePluginIT.java:78

org.apache.cayenne.tools.DbGenerateTaskIT > defaultConfigTaskSuccess FAILED
org.gradle.testkit.runner.InvalidRunnerConfigurationException at 
DbGenerateTaskIT.java:65

org.apache.cayenne.tools.DbGenerateTaskIT > notConfiguredTaskFailure FAILED
org.gradle.testkit.runner.InvalidRunnerConfigurationException at 
DbGenerateTaskIT.java:43

org.apache.cayenne.tools.DbGenerateTaskIT > customConfigTaskSuccess FAILED
org.gradle.testkit.runner.InvalidRunnerConfigurationException at 
DbGenerateTaskIT.java:91

org.apache.cayenne.tools.CgenTaskIT > classGeneratingWithCustomConfigSuccess 
FAILED
org.gradle.testkit.runner.InvalidRunnerConfigurationException at 
CgenTaskIT.java:70

org.apache.cayenne.tools.CgenTaskIT > classGeneratingWithDefaultConfigSuccess 
FAILED
org.gradle.testkit.runner.InvalidRunnerConfigurationException at 
CgenTaskIT.java:48

32 tests completed, 11 failed
:test FAILED

FAILURE: Build failed with an exception.

* What went wrong:
Execution failed for task ':test'.
> There were failing tests. See the report at: 
> file:///home/jenkins/jenkins-slave/workspace/cayenne-master/cayenneTestConnection/hsql/jdk/JDK%201.8%20(latest)/slave/ubuntu/cayenne-gradle-plugin/build/reports/tests/test/index.html

* Try:
Run with --stacktrace option to get the stack trace. Run with --info or --debug 
option to get more log output.

* Get more help at https://help.gradle.org

BUILD FAILED in 51s
11 actionable tasks: 11 executed
[ERROR] Command execution failed.
org.apache.commons.exec.ExecuteException: Process exited with an error: 1 (Exit 
value: 1)
at org.apache.commons.exec.DefaultExecutor.executeInternal 
(DefaultExecutor.java:404)
at org.apache.commons.exec.DefaultExecutor.execute 
(DefaultExecutor.java:166)
at org.codehaus.mojo.exec.ExecMojo.executeCommandLine (ExecMojo.java:804)
at org.codehaus.mojo.exec.ExecMojo.executeCommandLine (ExecMojo.java:751)
at org.codehaus.mojo.exec.ExecMojo.execute (ExecMojo.java:313)
at org.apache.maven.plugin.DefaultBuildPluginManager.executeMojo 
(DefaultBuildPluginManager.java:134)
at org.apache.maven.lifecycle.internal.MojoExecutor.execute 
(MojoExecutor.java:208)
at org.apache.maven.lifecycle.internal.MojoExecutor.execute 
(MojoExecutor.java:154)
at org.apache.maven.lifecycle.internal.MojoExecutor.execute 
(MojoExecutor.java:146)
at org.apache.maven.lifecycle.internal.LifecycleModuleBuilder.buildProject 
(LifecycleModuleBuilder.java:117)
at org.apache.maven.lifecycle.internal.LifecycleModuleBuilder.buildProject 
(LifecycleModuleBuilder.java:81)
at 
org.apache.maven.lifecycle.internal.builder.singlethreaded.SingleThreadedBuilder.build
 (SingleThreadedBuilder.java:51)
at org.apache.maven.lifecycle.internal.LifecycleStarter.execute 
(LifecycleStarter.java:128)
at org.apache.maven.DefaultMaven.doExecute (DefaultMaven.java:309)
at org.apache.maven.DefaultMaven.doExecute (DefaultMaven.java:194)
at org.apache.maven.DefaultMaven.execute (DefaultMaven.java:107)
at org.apache.maven.cli.MavenCli.execute (MavenCli.java:955)
at org.apache.maven.cli.MavenCli.doMain (MavenCli.java:290)
at org.apache.maven.cli.MavenCli.main (MavenCli.java:194)
at sun.reflect.NativeMethodAccessorImpl.invoke0 (Native Method)
at sun.reflect.NativeMethodAccessorImpl.invoke 
(NativeMethodAccessorImpl.java:62)
at sun.reflect.DelegatingMethodAccessorImpl.invoke 
(DelegatingMethodAccessorImpl.java:43)
at java.lang.reflect.Method.invoke (Method.java:498)
at

Jenkins build is back to normal : Cayenne pull requests #403

2018-02-13 Thread Apache Jenkins Server 
See

[GitHub] cayenne pull request #270: Rop tutorial

2018-02-13 Thread asfgit 
Github user asfgit closed the pull request at:

https://github.com/apache/cayenne/pull/270


---

[1/5] cayenne git commit: Upgrade rop-tutorials

2018-02-13 Thread ntimofeev 
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 
Authored: Tue Feb 13 12:58:28 2018 +0300
Committer: Arseni Bulatski 
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 @@

 

-   9.3.19.v20170502
+   9.4.8.v20171121

 


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 @@


org.apache.cayenne
-   cayenne-client
+   cayenne-client-jetty
${project.version}


@@ -36,7 +36,7 @@
compile


-   
+




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 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
---

[5/5] cayenne git commit: Merge remote-tracking branch 'remotes/parent/pr/271' into asf-master

2018-02-13 Thread ntimofeev 
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 
Authored: Tue Feb 13 14:10:24 2018 +0300
Committer: Nikita Timofeev 
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(-)
--

[4/5] cayenne git commit: Merge remote-tracking branch 'remotes/parent/pr/270' into asf-master

2018-02-13 Thread ntimofeev 
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 
Authored: Tue Feb 13 14:10:11 2018 +0300
Committer: Nikita Timofeev 
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(-)
--

[GitHub] cayenne pull request #271: Upgrade rop-tutorial doc

2018-02-13 Thread asfgit 
Github user asfgit closed the pull request at:

https://github.com/apache/cayenne/pull/271


---

[2/5] cayenne git commit: Upgrade rop-tutorials

2018-02-13 Thread ntimofeev 
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 
Authored: Tue Feb 13 13:00:16 2018 +0300
Committer: Arseni Bulatski 
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 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

2018-02-13 Thread ntimofeev 
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 
Authored: Tue Feb 13 14:02:38 2018 +0300
Committer: Arseni Bulatski 
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]
 
 
-org.mortbay.jetty
+org.eclipse.jetty
 maven-jetty-plugin
-6.1.22
+9.4.8.v20171121
 
 
 
-
+
 
 Cayenne Realm
 realm.properties
@@ -121,11 +121,15 @@ So change the line in Main.java where we obtained an ROP 
connection to this:
 [source, java]
 
 Map 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 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

[GitHub] cayenne pull request #271: Upgrade rop-tutorial doc

2018-02-13 Thread aarrsseni 
GitHub user aarrsseni opened a pull request:

https://github.com/apache/cayenne/pull/271

Upgrade rop-tutorial doc



You can merge this pull request into a Git repository by running:

$ git pull https://github.com/aarrsseni/cayenne tutorial-docs-upgrade

Alternatively you can review and apply these changes as the patch at:

https://github.com/apache/cayenne/pull/271.patch

To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:

This closes #271


commit d7eb7a98dc129ebf03142333ce6e2640a61c906f
Author: Arseni Bulatski 
Date:   2018-02-13T11:02:38Z

Upgrade rop-tutorial doc




---

[GitHub] cayenne pull request #270: Rop tutorial

2018-02-13 Thread aarrsseni 
GitHub user aarrsseni opened a pull request:

https://github.com/apache/cayenne/pull/270

Rop tutorial

Upgrade rop-tutorial, replace cayenne-client to cayenne-client-jetty

You can merge this pull request into a Git repository by running:

$ git pull https://github.com/aarrsseni/cayenne rop-tutorial

Alternatively you can review and apply these changes as the patch at:

https://github.com/apache/cayenne/pull/270.patch

To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:

This closes #270


commit edcfb7b1f46624dc9bdc6133a4e87d410076c23a
Author: Arseni Bulatski 
Date:   2018-02-13T09:58:28Z

Upgrade rop-tutorials

commit 40001f6c2ca0273db5422ee7bccfa3bffa02ff01
Author: Arseni Bulatski 
Date:   2018-02-13T10:00:16Z

Upgrade rop-tutorials




---