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/08/27 14:27:01 UTC
[3/4] cayenne git commit: Docs update
Docs update
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/ec58009b
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/ec58009b
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/ec58009b
Branch: refs/heads/master
Commit: ec58009b7eba8524489c1cff2520cd4e41a130b0
Parents: 3d35395
Author: Nikita Timofeev <st...@gmail.com>
Authored: Mon Aug 27 17:11:22 2018 +0300
Committer: Nikita Timofeev <st...@gmail.com>
Committed: Mon Aug 27 17:11:22 2018 +0300
----------------------------------------------------------------------
.../_cayenne-guide/part5/cayenneRopServer.adoc | 2 +-
.../docs/asciidoc/_cayenne-guide/part5/cayenneWeb.adoc | 2 +-
.../_getting-started-db-first/part2-rr-setup.adoc | 13 ++-----------
3 files changed, 4 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cayenne/blob/ec58009b/docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part5/cayenneRopServer.adoc
----------------------------------------------------------------------
diff --git a/docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part5/cayenneRopServer.adoc b/docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part5/cayenneRopServer.adoc
index ab943f4..cbc67ae 100644
--- a/docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part5/cayenneRopServer.adoc
+++ b/docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part5/cayenneRopServer.adoc
@@ -18,7 +18,7 @@ include::../var.adoc[]
==== Description
-The goal of this module is to create services for the server-side of an ROP application based on Caucho Hessian.
+This module creates services for the server side of an xref:introduction-to-rop[ROP] application.
==== Including in a project
http://git-wip-us.apache.org/repos/asf/cayenne/blob/ec58009b/docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part5/cayenneWeb.adoc
----------------------------------------------------------------------
diff --git a/docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part5/cayenneWeb.adoc b/docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part5/cayenneWeb.adoc
index 87c7f0d..d2847a4 100644
--- a/docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part5/cayenneWeb.adoc
+++ b/docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part5/cayenneWeb.adoc
@@ -18,7 +18,7 @@ include::../var.adoc[]
==== Description
-The goal of this module is to create web application with Cayenne service in it.
+This module provides basic utilities to bootstrap Cayenne service inside web application.
==== Including in a project
http://git-wip-us.apache.org/repos/asf/cayenne/blob/ec58009b/docs/asciidoc/getting-started-db-first/src/docs/asciidoc/_getting-started-db-first/part2-rr-setup.adoc
----------------------------------------------------------------------
diff --git a/docs/asciidoc/getting-started-db-first/src/docs/asciidoc/_getting-started-db-first/part2-rr-setup.adoc b/docs/asciidoc/getting-started-db-first/src/docs/asciidoc/_getting-started-db-first/part2-rr-setup.adoc
index 5f8455c..07e89a7 100644
--- a/docs/asciidoc/getting-started-db-first/src/docs/asciidoc/_getting-started-db-first/part2-rr-setup.adoc
+++ b/docs/asciidoc/getting-started-db-first/src/docs/asciidoc/_getting-started-db-first/part2-rr-setup.adoc
@@ -42,24 +42,15 @@ So let's begin, here is sample settings for the data source:
NOTE: Don't forget to set your actual MySQL login and password
-We have told plugin where cayenne-project.xml will be located.
+We have told plugin where it should load data from, now let's set where it should store Cayenne model:
[source,xml]
----
<configuration>
...
</dataSource>
<cayenneProject>${project.basedir}/src/main/resources/cayenne/cayenne-project.xml</cayenneProject>
-----
-- Without cayenneProject option you should create project file manually via Cayenne Modeler.
-- If cayenneProject is set but no file exists it will be created and DataMap linked to it.
-- If cayenneProject is and file already exists then DataMap should be linked to it (if it is new) or update existing one.
-
-We have told plugin where it should load data from, now let's set where it should store Cayenne model:
-[source,xml]
-----
-<configuration>
- ...</cayenneProject>
<map>${project.basedir}/src/main/resources/datamap.map.xml</map>
+ ...
----
And a last small step we need to do is to set default package where our model classes will be