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 2023/11/27 08:02:03 UTC
(cayenne) branch master updated: CAY-2820 Remove `server` from the components naming - minor fixes
This is an automated email from the ASF dual-hosted git repository.
ntimofeev pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cayenne.git
The following commit(s) were added to refs/heads/master by this push:
new b7a0e22e2 CAY-2820 Remove `server` from the components naming - minor fixes
b7a0e22e2 is described below
commit b7a0e22e2b6d082a7ee55756fdbddcb085df26e1
Author: stariy95 <st...@gmail.com>
AuthorDate: Mon Nov 27 12:02:52 2023 +0400
CAY-2820 Remove `server` from the components naming
- minor fixes
---
.../org/apache/cayenne/configuration/xml/testConfigMap4.map.xml | 2 +-
.../cayenne-guide/src/docs/asciidoc/_cayenne-guide/part2/customize.adoc | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/cayenne/src/test/resources/org/apache/cayenne/configuration/xml/testConfigMap4.map.xml b/cayenne/src/test/resources/org/apache/cayenne/configuration/xml/testConfigMap4.map.xml
index 9513b1cb0..8711f4e07 100644
--- a/cayenne/src/test/resources/org/apache/cayenne/configuration/xml/testConfigMap4.map.xml
+++ b/cayenne/src/test/resources/org/apache/cayenne/configuration/xml/testConfigMap4.map.xml
@@ -165,7 +165,7 @@
<obj-attribute name="paintingTitle" type="java.lang.String" db-attribute-path="PAINTING_TITLE"/>
<obj-attribute name="textReview" type="java.lang.String" db-attribute-path="toPaintingInfo.TEXT_REVIEW"/>
</obj-entity>
- <obj-entity name="SubPainting" superEntityName="Painting" abstract="true" serverOnly="true" className="org.apache.cayenne.testdo.testmap.SubPainting" lock-type="optimistic">
+ <obj-entity name="SubPainting" superEntityName="Painting" abstract="true" className="org.apache.cayenne.testdo.testmap.SubPainting" lock-type="optimistic">
<attribute-override name="paintingTitle" db-attribute-path="PAINTING_TITLE"/>
</obj-entity>
<db-relationship name="artistGroupArray" source="ARTGROUP" target="ARTIST_GROUP" toMany="true">
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 ce9da1e92..d96d009b2 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
@@ -236,7 +236,7 @@ The map value will be ignored. This way Cayenne runtime can be reconfigured duri
Cayenne can be extended by adding custom objects to named maps or lists bound in DI. We are calling these lists/maps "service collections".
A service collection allows things like appending a custom strategy to a list of built-in strategies.
E.g. an application that needs to install a custom DbAdapter for some database type may contribute an instance of custom
-DbAdapterDetector to a `o.a.c.configuration.server.DefaultDbAdapterFactory.detectors` list:
+DbAdapterDetector to a `o.a.c.configuration.runtime.DefaultDbAdapterFactory.detectors` list:
[source, Java]
----