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/03/26 12:00:11 UTC
cayenne-website git commit: Minor docs update
Repository: cayenne-website
Updated Branches:
refs/heads/master 5712bbdb3 -> 85fce34fa
Minor docs update
Project: http://git-wip-us.apache.org/repos/asf/cayenne-website/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne-website/commit/85fce34f
Tree: http://git-wip-us.apache.org/repos/asf/cayenne-website/tree/85fce34f
Diff: http://git-wip-us.apache.org/repos/asf/cayenne-website/diff/85fce34f
Branch: refs/heads/master
Commit: 85fce34fa33434612123e792bb4d62fdb8841576
Parents: 5712bbd
Author: Nikita Timofeev <st...@gmail.com>
Authored: Mon Mar 26 15:00:05 2018 +0300
Committer: Nikita Timofeev <st...@gmail.com>
Committed: Mon Mar 26 15:00:05 2018 +0300
----------------------------------------------------------------------
build-docs.sh | 2 +-
src/main/assets/images/modeler-screen.png | Bin 0 -> 78255 bytes
.../content/docs/4.1/getting-started-guide.html | 2 +-
.../content/docs/4.1/getting-started-rop.html | 35 ++++++++++++-------
.../images/datamap-enableclient.png | Bin 104778 -> 98756 bytes
5 files changed, 24 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cayenne-website/blob/85fce34f/build-docs.sh
----------------------------------------------------------------------
diff --git a/build-docs.sh b/build-docs.sh
index db38fae..3be0fb7 100755
--- a/build-docs.sh
+++ b/build-docs.sh
@@ -96,7 +96,7 @@ cd "$CAYENNE_TMP_DIR"
# build it
echo "Running Maven build... it can take a while..."
-mvn install -q -DskipTests > /dev/null 2>&1
+mvn install -Passembly -q -DskipTests > /dev/null 2>&1
echo "Maven build complete"
# copy JavaDoc
http://git-wip-us.apache.org/repos/asf/cayenne-website/blob/85fce34f/src/main/assets/images/modeler-screen.png
----------------------------------------------------------------------
diff --git a/src/main/assets/images/modeler-screen.png b/src/main/assets/images/modeler-screen.png
new file mode 100644
index 0000000..0c71839
Binary files /dev/null and b/src/main/assets/images/modeler-screen.png differ
http://git-wip-us.apache.org/repos/asf/cayenne-website/blob/85fce34f/src/main/site/content/docs/4.1/getting-started-guide.html
----------------------------------------------------------------------
diff --git a/src/main/site/content/docs/4.1/getting-started-guide.html b/src/main/site/content/docs/4.1/getting-started-guide.html
index 8dccd22..a74179c 100644
--- a/src/main/site/content/docs/4.1/getting-started-guide.html
+++ b/src/main/site/content/docs/4.1/getting-started-guide.html
@@ -934,7 +934,7 @@ INFO: +++ transaction committed.</pre>
<plugin>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-maven-plugin</artifactId>
- <version>9.3.14.v20161028</version>
+ <version>9.4.8.v20171121</version>
</plugin>
</plugins>
</build></code></pre>
http://git-wip-us.apache.org/repos/asf/cayenne-website/blob/85fce34f/src/main/site/content/docs/4.1/getting-started-rop.html
----------------------------------------------------------------------
diff --git a/src/main/site/content/docs/4.1/getting-started-rop.html b/src/main/site/content/docs/4.1/getting-started-rop.html
index cf93e98..5a4cce7 100644
--- a/src/main/site/content/docs/4.1/getting-started-rop.html
+++ b/src/main/site/content/docs/4.1/getting-started-rop.html
@@ -89,7 +89,7 @@ weight: 40
</ul>
</div>
<div class="paragraph">
- <p>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. We also need to add Caucho M2 repository to pull Hessian jar files. The resulting POM should look like this:</p>
+ <p>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 "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:</p>
</div>
<div class="listingblock">
<div class="content">
@@ -103,7 +103,7 @@ weight: 40
<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>4.1.M2-SNAPSHOT</version>
</dependency>
@@ -305,11 +305,16 @@ public class Main {
<div class="listingblock">
<div class="content">
<pre class="highlight"><code class="language-java java" data-lang="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();</code></pre>
</div>
</div>
@@ -501,13 +506,13 @@ INFO: +++ transaction committed.</pre>
<div class="listingblock">
<div class="content">
<pre class="highlight"><code class="language-XML XML" data-lang="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>
@@ -569,11 +574,15 @@ java.rmi.RemoteException: Server returned HTTP response code: 401 for URL: http:
<div class="listingblock">
<div class="content">
<pre class="highlight"><code class="language-java java" data-lang="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);</code></pre>
+ClientRuntime runtime = ClientRuntime.builder()
+ .properties(properties)
+ .addModule(new ClientJettyHttpModule())
+ .build();</code></pre>
</div>
</div>
<div class="paragraph">
http://git-wip-us.apache.org/repos/asf/cayenne-website/blob/85fce34f/src/main/site/content/docs/4.1/getting-started-rop/images/datamap-enableclient.png
----------------------------------------------------------------------
diff --git a/src/main/site/content/docs/4.1/getting-started-rop/images/datamap-enableclient.png b/src/main/site/content/docs/4.1/getting-started-rop/images/datamap-enableclient.png
index 62a2af2..4e57a5e 100644
Binary files a/src/main/site/content/docs/4.1/getting-started-rop/images/datamap-enableclient.png and b/src/main/site/content/docs/4.1/getting-started-rop/images/datamap-enableclient.png differ