This is an automated email from the ASF dual-hosted git repository.
aadamchik pushed a commit to branch STABLE-4.1
in repository https://gitbox.apache.org/repos/asf/cayenne.git
commit 35d234449b8c8dd11ff847ac5ca618a5df0267d8
Author: Andrus Adamchik <and...@objectstyle.com>
AuthorDate: Wed Nov 6 10:29:04 2019 +0300
wrapping long lines, minor edits
---
.../src/docs/asciidoc/_cayenne-guide/part1/setup.adoc | 14 +++++++++++---
.../src/docs/asciidoc/_cayenne-guide/part2/customize.adoc | 4 ++--
2 files changed, 13 insertions(+), 5 deletions(-)
diff --git
a/docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part1/setup.adoc
b/docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part1/setup.adoc
index 2edd2f0..b4131f0 100644
---
a/docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part1/setup.adoc
+++
b/docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part1/setup.adoc
@@ -59,18 +59,26 @@ include::../var.adoc[]
[[runModeler]]
==== Running CayenneModeler
-CayenneModeler GUI tool is intended to work with object relational mapping
projects. While you can edit your XML by hand, it is rarely needed, as the
Modeler is a pretty advanced tool included in Cayenne distribution. To obtain
CayenneModeler, download Cayenne distribution archive from
http://cayenne.apache.org/download.html matching the OS you are using. Of
course Java needs to be installed on the machine where you are going to run the
Modeler.
+CayenneModeler GUI tool is intended to work with object relational mapping
projects. While you can edit your XML by
+hand, it is rarely needed, as the Modeler is a pretty advanced tool included
in Cayenne distribution. To obtain
+CayenneModeler, download Cayenne distribution archive from
http://cayenne.apache.org/download.html matching the OS you
+are using. Of course Java needs to be installed on the machine where you are
going to run the Modeler.
- OS X distribution contains CayenneModeler.app at the root of the
distribution disk image.
- Windows distribution contains CayenneModeler.exe file in the bin directory.
-- Cross-platform distribution (targeting Linux, but as the name implies,
compatible with any OS) contains a runnable CayenneModeler.jar in the bin
directory. It can be executed either by double-clicking, or if the environment
is not configured to execute jars, by running from command-line:
+- Cross-platform distribution (targeting Linux, but as the name implies,
compatible with any OS) contains a runnable
+CayenneModeler.jar in the bin directory. It can be executed either by
double-clicking, or if the environment is not
+configured to execute jars, by running from command-line:
[source]
----
$ java -jar CayenneModeler.jar
----
-The Modeler can also be started from Maven. While it may look like an exotic
way to start a GUI application, it has its benefits - no need to download
Cayenne distribution, the version of the Modeler always matches the version of
the framework, the plugin can find mapping files in the project automatically.
So it is an attractive option to some developers. Maven option requires a
declaration in the POM:
+The Modeler can also be started from Maven. While it may look like an exotic
way to start a GUI application, it has
+its benefits - no need to download Cayenne distribution, the version of the
Modeler always matches the version of
+the framework, the plugin can find mapping files in the project automatically.
So it is an attractive option to
+some developers. Maven option requires a declaration in the POM:
[source,xml,subs="verbatim,attributes"]
----
<build>
diff --git
a/docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part2/customize.adoc
b/docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part2/customize.adoc
index a9b1149..9f84d15 100644
---
a/docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part2/customize.adoc
+++
b/docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part2/customize.adoc
@@ -31,14 +31,14 @@ To have a working DI container, we need three things:
service interfaces and cla
[source, Java]
----
public interface Service1 {
- public String getString();
+ String getString();
}
----
[source, Java]
----
public interface Service2 {
- public int getInt();
+ int getInt();
}
----
