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
The following commit(s) were added to refs/heads/STABLE-4.1 by this push:
new b99af07 Asciidoc: angle bracket syntax is recognized by IDEA, while
"xref" is not
b99af07 is described below
commit b99af07a31e34fccb77d49b08bd0ea81413bf491
Author: Andrus Adamchik <and...@objectstyle.com>
AuthorDate: Sat Nov 2 12:37:49 2019 +0300
Asciidoc: angle bracket syntax is recognized by IDEA, while "xref" is not
---
.../src/docs/asciidoc/_cayenne-guide/part2/expressions.adoc | 6 ++----
.../src/docs/asciidoc/_cayenne-guide/part4/introduction.adoc | 2 +-
.../src/docs/asciidoc/_cayenne-guide/part5/apacheVelocity.adoc | 2 +-
3 files changed, 4 insertions(+), 6 deletions(-)
diff --git
a/docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part2/expressions.adoc
b/docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part2/expressions.adoc
index 4098b7a..3503bdc 100644
---
a/docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part2/expressions.adoc
+++
b/docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part2/expressions.adoc
@@ -14,8 +14,6 @@
=== Expressions
-==== Expressions Overview
-
Cayenne provides a simple yet powerful object-based expression language. The
most common use of expressions are to build
qualifiers and orderings of queries that are later converted to SQL by Cayenne
and to evaluate in-memory against specific
objects (to access certain values in the object graph or to perform in-memory
object filtering and sorting).
@@ -258,7 +256,7 @@ Expression e2 =
Painting.ARTIST.dot(Artist.NAME).eq("Pablo");
Property objects provide the API mostly analogius to ExpressionFactory, though
it is significantly shorter and is aware of the value types.
It provides compile-time checks of both property names and types of arguments
in conditions. We will use Property-based API in further examples.
-[[evaluete]]
+[[evaluate]]
==== Evaluating Expressions in Memory
When used in a query, an expression is converted to SQL WHERE clause (or ORDER
BY clause) by Cayenne during query execution.
@@ -299,7 +297,7 @@ NOTE: Current limitation of in-memory expressions is that
no collections are per
==== Translating Expressions to EJBQL
-xref:ejbql[EJBQL] is a textual query language that can be used with Cayenne.
In some situations,
+<<ejbql,EJBQL>> is a textual query language that can be used with Cayenne. In
some situations,
it is convenient to be able to convert Expression instances into EJBQL.
Expressions support this conversion. An example is shown below.
[source, java]
diff --git
a/docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part4/introduction.adoc
b/docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part4/introduction.adoc
index 209156c..1153be0 100644
---
a/docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part4/introduction.adoc
+++
b/docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part4/introduction.adoc
@@ -35,7 +35,7 @@ Here is simple maven configuration to start with:
==== Introduction to "cdbimport"
-Here is a simple Maven configuration of "cdbimport" (for details see
xref:mavenCdbimort[cayenne-maven-plugin] documentation)
+Here is a simple Maven configuration of "cdbimport" (for details see
<<mavenCdbimort,cayenne-maven-plugin>> documentation)
[source, XML,subs="verbatim,attributes"]
----
diff --git
a/docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part5/apacheVelocity.adoc
b/docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part5/apacheVelocity.adoc
index bba21e3..dbd4abc 100644
---
a/docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part5/apacheVelocity.adoc
+++
b/docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part5/apacheVelocity.adoc
@@ -45,7 +45,7 @@ compile 'org.apache.cayenne:cayenne-velocity:{version}'
This module doesn't require any additional setup.
-In addition of directives mentioned in xref:directives[this chapter], this
module enables `#chain` and `#chunk` directives.
+In addition of directives mentioned in <<directives,this chapter>>, this
module enables `#chain` and `#chunk` directives.
`#chain` and `#chunk` directives are used for conditional inclusion of SQL
code. They are used together with `#chain` wrapping multiple `#chunks`. A chunk
evaluates its parameter expression and if it is NULL suppresses rendering of
the enclosed SQL block. A chain renders its prefix and its chunks joined by the
operator. If all the chunks are suppressed, the chain itself is suppressed.
This allows to work with otherwise hard to script SQL semantics. E.g. a WHERE
clause can contain multipl [...]
