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 2017/07/25 12:25:29 UTC
[14/16] cayenne git commit: CAY-2335: New XML loading/saving
mechanics with support of plugable handlers - updated test projects version
in all modules
CAY-2335: New XML loading/saving mechanics with support of plugable handlers
- updated test projects version in all modules
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/aab05f3c
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/aab05f3c
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/aab05f3c
Branch: refs/heads/master
Commit: aab05f3c0e591f55aeeff3a7eb08cd50ca5a5256
Parents: 38553b1
Author: Nikita Timofeev <st...@gmail.com>
Authored: Tue Jul 25 12:42:46 2017 +0300
Committer: Nikita Timofeev <st...@gmail.com>
Committed: Tue Jul 25 12:42:46 2017 +0300
----------------------------------------------------------------------
.../src/test/resources/embeddable.map.xml | 6 +-
.../tools/build-include-table.map.xml-result | 6 +-
.../apache/cayenne/tools/cgen-dependent.map.xml | 6 +-
.../org/apache/cayenne/tools/cgen.map.xml | 6 +-
cayenne-ant/src/test/resources/testmap.map.xml | 17 +---
.../src/test/resources/cayenne-lifecycle.xml | 2 +-
.../src/test/resources/lifecycle-map.map.xml | 6 +-
.../src/test/resources/cayenne-lifecycle.xml | 7 +-
.../src/test/resources/lifecycle-map.map.xml | 47 +++--------
.../src/test/resources/cayenne-crypto.xml | 7 +-
.../src/test/resources/datamap.map.xml | 6 +-
.../cayenne-relationship-optimisation.xml | 2 +-
.../dbimport/relationship-optimisation.map.xml | 6 +-
.../apache/cayenne/tools/test_datamap.map.xml | 6 +-
.../src/test/resources/cayenne-java8.xml | 7 +-
cayenne-java8/src/test/resources/java8.map.xml | 14 ++--
.../src/test/resources/cayenne-joda.xml | 7 +-
cayenne-joda/src/test/resources/joda.map.xml | 6 +-
.../src/test/resources/cayenne-lifecycle.xml | 7 +-
.../src/test/resources/lifecycle-map.map.xml | 36 ++++----
.../persistent/auto/_ClientMtTable1.java | 51 ++++--------
.../persistent/auto/_ClientMtTable2.java | 20 ++---
.../src/test/resources/cayenne-protostuff.xml | 9 +-
.../src/test/resources/protostuff.map.xml | 8 +-
.../src/test/resources/cayenne-client.xml | 3 +-
.../src/test/resources/embeddable.map.xml | 6 +-
.../apache/cayenne/tools/cgen-dependent.map.xml | 4 +-
.../org/apache/cayenne/tools/cgen.map.xml | 6 +-
.../src/test/resources/testmap-client.map.xml | 88 ++++++++------------
.../src/test/resources/testmap.map.xml | 17 +---
.../test/resources/cgen/cayenne-testDomain.xml | 5 +-
.../resources/cgen/testAdditionalMap.map.xml | 34 ++++----
.../test/resources/cgen/testDomainMap.map.xml | 10 ++-
.../dbimport/testComplexChangeOrder.map.xml | 8 +-
.../testComplexChangeOrder.map.xml-result | 8 +-
.../testCustomObjectLayerSettings.map.xml | 6 +-
...testCustomObjectLayerSettings.map.xml-result | 6 +-
.../dbimport/testDbAttributeChange.map.xml | 8 +-
.../testDbAttributeChange.map.xml-result | 8 +-
.../dbimport/testDefaultPackage.map.xml-result | 6 +-
.../testFilteringWithSchema.map.xml-result | 6 +-
.../dbimport/testFkAttributeRename.map.xml | 8 +-
.../testFkAttributeRename.map.xml-result | 8 +-
...nsManyToManyWithRecursiveLink.map.xml-result | 10 +--
.../dbimport/testForceDataMapSchema.map.xml | 6 +-
.../testForceDataMapSchema.map.xml-result | 6 +-
.../testImportAddTableAndColumn.map.xml | 6 +-
.../testImportAddTableAndColumn.map.xml-result | 6 +-
.../testImportNewDataMap.map.xml-result | 6 +-
.../dbimport/testImportNewRelationship.map.xml | 6 +-
.../testImportNewRelationship.map.xml-result | 8 +-
.../dbimport/testImportWithoutChanges.map.xml | 6 +-
.../testImportWithoutChanges.map.xml-result | 6 +-
.../tools/dbimport/testInheritance.map.xml | 6 +-
.../dbimport/testInheritance.map.xml-result | 8 +-
.../tools/dbimport/testJava7Types.map.xml | 6 +-
.../dbimport/testJava7Types.map.xml-result | 6 +-
.../tools/dbimport/testJava8Types.map.xml | 6 +-
.../dbimport/testJava8Types.map.xml-result | 6 +-
.../tools/dbimport/testOneToOne.map.xml-result | 12 +--
.../testPreserveCustomObjMappings.map.xml | 6 +-
...testPreserveCustomObjMappings.map.xml-result | 6 +-
.../dbimport/testPreserveRelationships.map.xml | 10 +--
.../testPreserveRelationships.map.xml-result | 6 +-
.../testSchemasAndTableExclude.map.xml-result | 6 +-
.../dbimport/testSkipPrimaryKeyLoading.map.xml | 6 +-
.../testSkipPrimaryKeyLoading.map.xml-result | 6 +-
.../testSkipRelationshipsLoading.map.xml | 10 +--
.../testSkipRelationshipsLoading.map.xml-result | 10 +--
.../dbimport/testTableTypes.map.xml-result | 6 +-
.../dbimport/testUnFlattensManyToMany.map.xml | 10 +--
.../testUnFlattensManyToMany.map.xml-result | 14 ++--
.../dbimport/testViewsExclude.map.xml-result | 6 +-
.../test/resources/cgen/cayenne-testDomain.xml | 2 +-
.../resources/cgen/testAdditionalMap.map.xml | 6 +-
.../test/resources/cgen/testDomainMap.map.xml | 6 +-
76 files changed, 338 insertions(+), 434 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cayenne/blob/aab05f3c/cayenne-ant/src/test/resources/embeddable.map.xml
----------------------------------------------------------------------
diff --git a/cayenne-ant/src/test/resources/embeddable.map.xml b/cayenne-ant/src/test/resources/embeddable.map.xml
index 0b5c0b8..10c4db6 100644
--- a/cayenne-ant/src/test/resources/embeddable.map.xml
+++ b/cayenne-ant/src/test/resources/embeddable.map.xml
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
-<data-map xmlns="http://cayenne.apache.org/schema/3.0/modelMap"
+<data-map xmlns="http://cayenne.apache.org/schema/10/modelMap"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://cayenne.apache.org/schema/3.0/modelMap http://cayenne.apache.org/schema/3.0/modelMap.xsd"
- project-version="6">
+ xsi:schemaLocation="http://cayenne.apache.org/schema/10/modelMap http://cayenne.apache.org/schema/10/modelMap.xsd"
+ project-version="10">
<property name="defaultPackage" value="org.apache.cayenne.testdo.embeddable"/>
<embeddable className="org.apache.cayenne.testdo.embeddable.Embeddable1">
<embeddable-attribute name="embedded10" type="java.lang.String" db-attribute-name="EMBEDDED10"/>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/aab05f3c/cayenne-ant/src/test/resources/org/apache/cayenne/tools/build-include-table.map.xml-result
----------------------------------------------------------------------
diff --git a/cayenne-ant/src/test/resources/org/apache/cayenne/tools/build-include-table.map.xml-result b/cayenne-ant/src/test/resources/org/apache/cayenne/tools/build-include-table.map.xml-result
index 050561f..11fb74e 100644
--- a/cayenne-ant/src/test/resources/org/apache/cayenne/tools/build-include-table.map.xml-result
+++ b/cayenne-ant/src/test/resources/org/apache/cayenne/tools/build-include-table.map.xml-result
@@ -17,10 +17,10 @@
specific language governing permissions and limitations
under the License.
-->
-<data-map xmlns="http://cayenne.apache.org/schema/9/modelMap"
+<data-map xmlns="http://cayenne.apache.org/schema/10/modelMap"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://cayenne.apache.org/schema/9/modelMap http://cayenne.apache.org/schema/9/modelMap.xsd"
- project-version="9">
+ xsi:schemaLocation="http://cayenne.apache.org/schema/10/modelMap http://cayenne.apache.org/schema/10/modelMap.xsd"
+ project-version="10">
<db-entity name="PARENT" schema="APP">
<db-attribute name="COL2" type="CHAR" length="25"/>
<db-attribute name="COL3" type="DECIMAL" length="10" scale="2"/>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/aab05f3c/cayenne-ant/src/test/resources/org/apache/cayenne/tools/cgen-dependent.map.xml
----------------------------------------------------------------------
diff --git a/cayenne-ant/src/test/resources/org/apache/cayenne/tools/cgen-dependent.map.xml b/cayenne-ant/src/test/resources/org/apache/cayenne/tools/cgen-dependent.map.xml
index d06be70..40b3dc5a 100644
--- a/cayenne-ant/src/test/resources/org/apache/cayenne/tools/cgen-dependent.map.xml
+++ b/cayenne-ant/src/test/resources/org/apache/cayenne/tools/cgen-dependent.map.xml
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
-<data-map xmlns="http://cayenne.apache.org/schema/3.0/modelMap"
+<data-map xmlns="http://cayenne.apache.org/schema/10/modelMap"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://cayenne.apache.org/schema/3.0/modelMap ../../main/resources/org/apache/cayenne/schema/3.0/modelMap.xsd"
- project-version="1.1">
+ xsi:schemaLocation="http://cayenne.apache.org/schema/10/modelMap http://cayenne.apache.org/schema/10/modelMap.xsd"
+ project-version="10">
<property name="defaultPackage" value="org.apache.cayenne.testdo.cgen2"/>
<db-entity name="MYARTGROUP">
<db-attribute name="MY_GROUP_ID" type="INTEGER" isPrimaryKey="true" isMandatory="true"/>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/aab05f3c/cayenne-ant/src/test/resources/org/apache/cayenne/tools/cgen.map.xml
----------------------------------------------------------------------
diff --git a/cayenne-ant/src/test/resources/org/apache/cayenne/tools/cgen.map.xml b/cayenne-ant/src/test/resources/org/apache/cayenne/tools/cgen.map.xml
index 1c378cf..8f6c005 100644
--- a/cayenne-ant/src/test/resources/org/apache/cayenne/tools/cgen.map.xml
+++ b/cayenne-ant/src/test/resources/org/apache/cayenne/tools/cgen.map.xml
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
-<data-map xmlns="http://cayenne.apache.org/schema/3.0/modelMap"
+<data-map xmlns="http://cayenne.apache.org/schema/10/modelMap"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://cayenne.apache.org/schema/3.0/modelMap http://cayenne.apache.org/schema/3.0/modelMap.xsd"
- project-version="6">
+ xsi:schemaLocation="http://cayenne.apache.org/schema/10/modelMap http://cayenne.apache.org/schema/10/modelMap.xsd"
+ project-version="10">
<db-entity name="ARTGROUP">
<db-attribute name="GROUP_ID" type="INTEGER" isPrimaryKey="true" isMandatory="true"/>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/aab05f3c/cayenne-ant/src/test/resources/testmap.map.xml
----------------------------------------------------------------------
diff --git a/cayenne-ant/src/test/resources/testmap.map.xml b/cayenne-ant/src/test/resources/testmap.map.xml
index 60b94a6..e426dda 100644
--- a/cayenne-ant/src/test/resources/testmap.map.xml
+++ b/cayenne-ant/src/test/resources/testmap.map.xml
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
-<data-map xmlns="http://cayenne.apache.org/schema/3.0/modelMap"
+<data-map xmlns="http://cayenne.apache.org/schema/10/modelMap"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://cayenne.apache.org/schema/3.0/modelMap http://cayenne.apache.org/schema/3.0/modelMap.xsd"
- project-version="6">
+ xsi:schemaLocation="http://cayenne.apache.org/schema/10/modelMap http://cayenne.apache.org/schema/10/modelMap.xsd"
+ project-version="10">
<property name="defaultPackage" value="org.apache.cayenne.testdo.testmap"/>
<property name="defaultSuperclass" value="org.apache.cayenne.CayenneDataObject"/>
<property name="clientSupported" value="true"/>
@@ -290,18 +290,9 @@
<obj-attribute name="artistName" type="java.lang.String" db-attribute-path="ARTIST_NAME"/>
<obj-attribute name="dateOfBirth" type="java.util.Date" db-attribute-path="DATE_OF_BIRTH"/>
</obj-entity>
- <obj-entity name="ArtistCallbackTest" className="org.apache.cayenne.testdo.testmap.ArtistCallbackTest" dbEntityName="ARTIST_CT" exclude-superclass-listeners="true" exclude-default-listeners="true">
+ <obj-entity name="ArtistCallbackTest" className="org.apache.cayenne.testdo.testmap.ArtistCallbackTest" dbEntityName="ARTIST_CT">
<obj-attribute name="artistName" type="java.lang.String"/>
<obj-attribute name="dateOfBirth" type="java.util.Date"/>
- <entity-listener class="org.apache.cayenne.testdo.testmap.EntityListenerObjEntity">
- <post-add method-name="prePersistEntityListener"/>
- <post-persist method-name="postPersistEntityListener"/>
- <pre-update method-name="preUpdateEntityListener"/>
- <post-update method-name="postUpdateEntityListener"/>
- <pre-remove method-name="preRemoveEntityListener"/>
- <post-remove method-name="postRemoveEntityListener"/>
- <post-load method-name="postLoadEntityListener"/>
- </entity-listener>
<post-add method-name="prePersistEntityObjEntity"/>
<post-persist method-name="postPersistEntityObjEntity"/>
<pre-update method-name="preUpdateEntityObjEntity"/>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/aab05f3c/cayenne-cache-invalidation/src/test/resources/cayenne-lifecycle.xml
----------------------------------------------------------------------
diff --git a/cayenne-cache-invalidation/src/test/resources/cayenne-lifecycle.xml b/cayenne-cache-invalidation/src/test/resources/cayenne-lifecycle.xml
index 5b9a83e..98ab346 100644
--- a/cayenne-cache-invalidation/src/test/resources/cayenne-lifecycle.xml
+++ b/cayenne-cache-invalidation/src/test/resources/cayenne-lifecycle.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<domain project-version="9">
+<domain project-version="10">
<map name="lifecycle-map"/>
<node name="lifecycle-db"
http://git-wip-us.apache.org/repos/asf/cayenne/blob/aab05f3c/cayenne-cache-invalidation/src/test/resources/lifecycle-map.map.xml
----------------------------------------------------------------------
diff --git a/cayenne-cache-invalidation/src/test/resources/lifecycle-map.map.xml b/cayenne-cache-invalidation/src/test/resources/lifecycle-map.map.xml
index 04e767e..5704316 100644
--- a/cayenne-cache-invalidation/src/test/resources/lifecycle-map.map.xml
+++ b/cayenne-cache-invalidation/src/test/resources/lifecycle-map.map.xml
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
-<data-map xmlns="http://cayenne.apache.org/schema/9/modelMap"
+<data-map xmlns="http://cayenne.apache.org/schema/10/modelMap"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://cayenne.apache.org/schema/9/modelMap http://cayenne.apache.org/schema/9/modelMap.xsd"
- project-version="9">
+ xsi:schemaLocation="http://cayenne.apache.org/schema/10/modelMap http://cayenne.apache.org/schema/10/modelMap.xsd"
+ project-version="10">
<property name="defaultPackage" value="org.apache.cayenne.lifecycle.db"/>
<db-entity name="E1">
<db-attribute name="ID" type="BIGINT" isPrimaryKey="true" isMandatory="true"/>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/aab05f3c/cayenne-commitlog/src/test/resources/cayenne-lifecycle.xml
----------------------------------------------------------------------
diff --git a/cayenne-commitlog/src/test/resources/cayenne-lifecycle.xml b/cayenne-commitlog/src/test/resources/cayenne-lifecycle.xml
index 5b9a83e..4144737 100644
--- a/cayenne-commitlog/src/test/resources/cayenne-lifecycle.xml
+++ b/cayenne-commitlog/src/test/resources/cayenne-lifecycle.xml
@@ -1,11 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
-<domain project-version="9">
+<domain xmlns="http://cayenne.apache.org/schema/10/domain"
+ project-version="10">
<map name="lifecycle-map"/>
-
<node name="lifecycle-db"
factory="org.apache.cayenne.configuration.server.XMLPoolingDataSourceFactory"
- schema-update-strategy="org.apache.cayenne.access.dbsync.CreateIfNoSchemaStrategy"
- >
+ schema-update-strategy="org.apache.cayenne.access.dbsync.CreateIfNoSchemaStrategy">
<map-ref name="lifecycle-map"/>
<data-source>
<driver value="org.hsqldb.jdbcDriver"/>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/aab05f3c/cayenne-commitlog/src/test/resources/lifecycle-map.map.xml
----------------------------------------------------------------------
diff --git a/cayenne-commitlog/src/test/resources/lifecycle-map.map.xml b/cayenne-commitlog/src/test/resources/lifecycle-map.map.xml
index 89905e7..db86a62 100644
--- a/cayenne-commitlog/src/test/resources/lifecycle-map.map.xml
+++ b/cayenne-commitlog/src/test/resources/lifecycle-map.map.xml
@@ -1,27 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
-<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- ~ Licensed to the Apache Software Foundation (ASF) under one
- ~ or more contributor license agreements. See the NOTICE file
- ~ distributed with this work for additional information
- ~ regarding copyright ownership. The ASF licenses this file
- ~ to you under the Apache License, Version 2.0 (the
- ~ "License"); you may not use this file except in compliance
- ~ with the License. You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing,
- ~ software distributed under the License is distributed on an
- ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- ~ KIND, either express or implied. See the License for the
- ~ specific language governing permissions and limitations
- ~ under the License.
- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
-
-<data-map xmlns="http://cayenne.apache.org/schema/9/modelMap"
+<data-map xmlns="http://cayenne.apache.org/schema/10/modelMap"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://cayenne.apache.org/schema/9/modelMap http://cayenne.apache.org/schema/9/modelMap.xsd"
- project-version="9">
+ xsi:schemaLocation="http://cayenne.apache.org/schema/10/modelMap http://cayenne.apache.org/schema/10/modelMap.xsd"
+ project-version="10">
<property name="defaultPackage" value="org.apache.cayenne.commitlog.db"/>
<db-entity name="AUDITABLE1">
<db-attribute name="CHAR_PROPERTY1" type="VARCHAR" length="200"/>
@@ -99,14 +80,10 @@
<obj-attribute name="charProperty1" type="java.lang.String" db-attribute-path="CHAR_PROPERTY1"/>
<obj-attribute name="charProperty2" type="java.lang.String" db-attribute-path="CHAR_PROPERTY2"/>
</obj-entity>
- <obj-entity name="E1" className="org.apache.cayenne.commitlog.db.E1" dbEntityName="E1">
- </obj-entity>
- <obj-entity name="E2" className="org.apache.cayenne.commitlog.db.E2" dbEntityName="E2">
- </obj-entity>
- <obj-entity name="E3" className="org.apache.cayenne.commitlog.db.E3" dbEntityName="E3">
- </obj-entity>
- <obj-entity name="E4" className="org.apache.cayenne.commitlog.db.E4" dbEntityName="E4">
- </obj-entity>
+ <obj-entity name="E1" className="org.apache.cayenne.commitlog.db.E1" dbEntityName="E1"/>
+ <obj-entity name="E2" className="org.apache.cayenne.commitlog.db.E2" dbEntityName="E2"/>
+ <obj-entity name="E3" className="org.apache.cayenne.commitlog.db.E3" dbEntityName="E3"/>
+ <obj-entity name="E4" className="org.apache.cayenne.commitlog.db.E4" dbEntityName="E4"/>
<db-relationship name="children1" source="AUDITABLE1" target="AUDITABLE_CHILD1" toMany="true">
<db-attribute-pair source="ID" target="AUDITABLE1_ID"/>
</db-relationship>
@@ -116,22 +93,22 @@
<db-relationship name="auditable4s" source="AUDITABLE3" target="AUDITABLE4" toMany="true">
<db-attribute-pair source="ID" target="AUDITABLE3_ID"/>
</db-relationship>
- <db-relationship name="auditable3" source="AUDITABLE4" target="AUDITABLE3" toMany="false">
+ <db-relationship name="auditable3" source="AUDITABLE4" target="AUDITABLE3">
<db-attribute-pair source="AUDITABLE3_ID" target="ID"/>
</db-relationship>
- <db-relationship name="parent" source="AUDITABLE_CHILD1" target="AUDITABLE1" toMany="false">
+ <db-relationship name="parent" source="AUDITABLE_CHILD1" target="AUDITABLE1">
<db-attribute-pair source="AUDITABLE1_ID" target="ID"/>
</db-relationship>
- <db-relationship name="parent" source="AUDITABLE_CHILD3" target="AUDITABLE2" toMany="false">
+ <db-relationship name="parent" source="AUDITABLE_CHILD3" target="AUDITABLE2">
<db-attribute-pair source="AUDITABLE2_ID" target="ID"/>
</db-relationship>
<db-relationship name="e34s" source="E3" target="E34" toDependentPK="true" toMany="true">
<db-attribute-pair source="ID" target="E3_ID"/>
</db-relationship>
- <db-relationship name="e3" source="E34" target="E3" toMany="false">
+ <db-relationship name="e3" source="E34" target="E3">
<db-attribute-pair source="E3_ID" target="ID"/>
</db-relationship>
- <db-relationship name="e4" source="E34" target="E4" toMany="false">
+ <db-relationship name="e4" source="E34" target="E4">
<db-attribute-pair source="E4_ID" target="ID"/>
</db-relationship>
<db-relationship name="e34s" source="E4" target="E34" toDependentPK="true" toMany="true">
http://git-wip-us.apache.org/repos/asf/cayenne/blob/aab05f3c/cayenne-crypto/src/test/resources/cayenne-crypto.xml
----------------------------------------------------------------------
diff --git a/cayenne-crypto/src/test/resources/cayenne-crypto.xml b/cayenne-crypto/src/test/resources/cayenne-crypto.xml
index bd98b69..1680c10 100644
--- a/cayenne-crypto/src/test/resources/cayenne-crypto.xml
+++ b/cayenne-crypto/src/test/resources/cayenne-crypto.xml
@@ -1,11 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
-<domain project-version="9">
+<domain xmlns="http://cayenne.apache.org/schema/10/domain"
+ project-version="10">
<map name="datamap"/>
-
<node name="datanode"
factory="org.apache.cayenne.configuration.server.XMLPoolingDataSourceFactory"
- schema-update-strategy="org.apache.cayenne.access.dbsync.CreateIfNoSchemaStrategy"
- >
+ schema-update-strategy="org.apache.cayenne.access.dbsync.CreateIfNoSchemaStrategy">
<map-ref name="datamap"/>
<data-source>
<driver value="org.hsqldb.jdbcDriver"/>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/aab05f3c/cayenne-crypto/src/test/resources/datamap.map.xml
----------------------------------------------------------------------
diff --git a/cayenne-crypto/src/test/resources/datamap.map.xml b/cayenne-crypto/src/test/resources/datamap.map.xml
index df8c422..fd572a8 100644
--- a/cayenne-crypto/src/test/resources/datamap.map.xml
+++ b/cayenne-crypto/src/test/resources/datamap.map.xml
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
-<data-map xmlns="http://cayenne.apache.org/schema/9/modelMap"
+<data-map xmlns="http://cayenne.apache.org/schema/10/modelMap"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://cayenne.apache.org/schema/9/modelMap http://cayenne.apache.org/schema/9/modelMap.xsd"
- project-version="9">
+ xsi:schemaLocation="http://cayenne.apache.org/schema/10/modelMap http://cayenne.apache.org/schema/10/modelMap.xsd"
+ project-version="10">
<property name="defaultPackage" value="org.apache.cayenne.crypto.db"/>
<db-entity name="TABLE1">
<db-attribute name="CRYPTO_INT" type="BLOB"/>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/aab05f3c/cayenne-dbsync/src/test/resources/org/apache/cayenne/dbsync/reverse/dbimport/cayenne-relationship-optimisation.xml
----------------------------------------------------------------------
diff --git a/cayenne-dbsync/src/test/resources/org/apache/cayenne/dbsync/reverse/dbimport/cayenne-relationship-optimisation.xml b/cayenne-dbsync/src/test/resources/org/apache/cayenne/dbsync/reverse/dbimport/cayenne-relationship-optimisation.xml
index d4fea49..166a67d 100644
--- a/cayenne-dbsync/src/test/resources/org/apache/cayenne/dbsync/reverse/dbimport/cayenne-relationship-optimisation.xml
+++ b/cayenne-dbsync/src/test/resources/org/apache/cayenne/dbsync/reverse/dbimport/cayenne-relationship-optimisation.xml
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
-<domain project-version="6">
+<domain project-version="10">
<map name="relationship-optimisation"/>
</domain>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/aab05f3c/cayenne-dbsync/src/test/resources/org/apache/cayenne/dbsync/reverse/dbimport/relationship-optimisation.map.xml
----------------------------------------------------------------------
diff --git a/cayenne-dbsync/src/test/resources/org/apache/cayenne/dbsync/reverse/dbimport/relationship-optimisation.map.xml b/cayenne-dbsync/src/test/resources/org/apache/cayenne/dbsync/reverse/dbimport/relationship-optimisation.map.xml
index e68645f..280ec56 100644
--- a/cayenne-dbsync/src/test/resources/org/apache/cayenne/dbsync/reverse/dbimport/relationship-optimisation.map.xml
+++ b/cayenne-dbsync/src/test/resources/org/apache/cayenne/dbsync/reverse/dbimport/relationship-optimisation.map.xml
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
-<data-map xmlns="http://cayenne.apache.org/schema/3.0/modelMap"
+<data-map xmlns="http://cayenne.apache.org/schema/10/modelMap"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://cayenne.apache.org/schema/3.0/modelMap http://cayenne.apache.org/schema/3.0/modelMap.xsd"
- project-version="6">
+ xsi:schemaLocation="http://cayenne.apache.org/schema/10/modelMap http://cayenne.apache.org/schema/10/modelMap.xsd"
+ project-version="10">
<property name="defaultPackage" value="com.objectstyle"/>
<db-entity name="table1" catalog="many_to_many_test">
<db-attribute name="id1" type="INTEGER" isPrimaryKey="true" isMandatory="true" length="10"/>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/aab05f3c/cayenne-gradle-plugin/src/test/resources/org/apache/cayenne/tools/test_datamap.map.xml
----------------------------------------------------------------------
diff --git a/cayenne-gradle-plugin/src/test/resources/org/apache/cayenne/tools/test_datamap.map.xml b/cayenne-gradle-plugin/src/test/resources/org/apache/cayenne/tools/test_datamap.map.xml
index 507875f..1fc3742 100644
--- a/cayenne-gradle-plugin/src/test/resources/org/apache/cayenne/tools/test_datamap.map.xml
+++ b/cayenne-gradle-plugin/src/test/resources/org/apache/cayenne/tools/test_datamap.map.xml
@@ -17,10 +17,10 @@
specific language governing permissions and limitations
under the License.
-->
-<data-map xmlns="http://cayenne.apache.org/schema/9/modelMap"
+<data-map xmlns="http://cayenne.apache.org/schema/10/modelMap"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://cayenne.apache.org/schema/9/modelMap http://cayenne.apache.org/schema/9/modelMap.xsd"
- project-version="9">
+ xsi:schemaLocation="http://cayenne.apache.org/schema/10/modelMap http://cayenne.apache.org/schema/10/modelMap.xsd"
+ project-version="10">
<property name="defaultPackage" value="org.example.cayenne.persistent"/>
<property name="defaultClientPackage" value="tmp"/>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/aab05f3c/cayenne-java8/src/test/resources/cayenne-java8.xml
----------------------------------------------------------------------
diff --git a/cayenne-java8/src/test/resources/cayenne-java8.xml b/cayenne-java8/src/test/resources/cayenne-java8.xml
index 93f67fd..cd4a0c4 100644
--- a/cayenne-java8/src/test/resources/cayenne-java8.xml
+++ b/cayenne-java8/src/test/resources/cayenne-java8.xml
@@ -1,11 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
-<domain project-version="9">
+<domain xmlns="http://cayenne.apache.org/schema/10/domain"
+ project-version="10">
<map name="java8"/>
-
<node name="datanode"
factory="org.apache.cayenne.configuration.server.XMLPoolingDataSourceFactory"
- schema-update-strategy="org.apache.cayenne.access.dbsync.CreateIfNoSchemaStrategy"
- >
+ schema-update-strategy="org.apache.cayenne.access.dbsync.CreateIfNoSchemaStrategy">
<map-ref name="java8"/>
<data-source>
<driver value="org.hsqldb.jdbcDriver"/>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/aab05f3c/cayenne-java8/src/test/resources/java8.map.xml
----------------------------------------------------------------------
diff --git a/cayenne-java8/src/test/resources/java8.map.xml b/cayenne-java8/src/test/resources/java8.map.xml
index 734c915..42f6e86 100644
--- a/cayenne-java8/src/test/resources/java8.map.xml
+++ b/cayenne-java8/src/test/resources/java8.map.xml
@@ -1,17 +1,17 @@
<?xml version="1.0" encoding="utf-8"?>
-<data-map xmlns="http://cayenne.apache.org/schema/9/modelMap"
+<data-map xmlns="http://cayenne.apache.org/schema/10/modelMap"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://cayenne.apache.org/schema/9/modelMap http://cayenne.apache.org/schema/9/modelMap.xsd"
- project-version="9">
+ xsi:schemaLocation="http://cayenne.apache.org/schema/10/modelMap http://cayenne.apache.org/schema/10/modelMap.xsd"
+ project-version="10">
<property name="defaultPackage" value="org.apache.cayenne.java8.db"/>
- <db-entity name="LOCAL_DATE_TEST">
- <db-attribute name="Date" type="DATE"/>
- <db-attribute name="ID" type="INTEGER" isPrimaryKey="true" isMandatory="true"/>
- </db-entity>
<db-entity name="LOCAL_DATETIME_TEST">
<db-attribute name="ID" type="INTEGER" isPrimaryKey="true" isMandatory="true"/>
<db-attribute name="Timestamp" type="TIMESTAMP"/>
</db-entity>
+ <db-entity name="LOCAL_DATE_TEST">
+ <db-attribute name="Date" type="DATE"/>
+ <db-attribute name="ID" type="INTEGER" isPrimaryKey="true" isMandatory="true"/>
+ </db-entity>
<db-entity name="LOCAL_TIME_TEST">
<db-attribute name="ID" type="INTEGER" isPrimaryKey="true" isMandatory="true"/>
<db-attribute name="Time" type="TIME"/>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/aab05f3c/cayenne-joda/src/test/resources/cayenne-joda.xml
----------------------------------------------------------------------
diff --git a/cayenne-joda/src/test/resources/cayenne-joda.xml b/cayenne-joda/src/test/resources/cayenne-joda.xml
index 68673f9..7474d44 100644
--- a/cayenne-joda/src/test/resources/cayenne-joda.xml
+++ b/cayenne-joda/src/test/resources/cayenne-joda.xml
@@ -1,11 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
-<domain project-version="9">
+<domain xmlns="http://cayenne.apache.org/schema/10/domain"
+ project-version="10">
<map name="joda"/>
-
<node name="datanode"
factory="org.apache.cayenne.configuration.server.XMLPoolingDataSourceFactory"
- schema-update-strategy="org.apache.cayenne.access.dbsync.CreateIfNoSchemaStrategy"
- >
+ schema-update-strategy="org.apache.cayenne.access.dbsync.CreateIfNoSchemaStrategy">
<map-ref name="joda"/>
<data-source>
<driver value="org.hsqldb.jdbcDriver"/>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/aab05f3c/cayenne-joda/src/test/resources/joda.map.xml
----------------------------------------------------------------------
diff --git a/cayenne-joda/src/test/resources/joda.map.xml b/cayenne-joda/src/test/resources/joda.map.xml
index b1021f8..9fd6c9b 100644
--- a/cayenne-joda/src/test/resources/joda.map.xml
+++ b/cayenne-joda/src/test/resources/joda.map.xml
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
-<data-map xmlns="http://cayenne.apache.org/schema/9/modelMap"
+<data-map xmlns="http://cayenne.apache.org/schema/10/modelMap"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://cayenne.apache.org/schema/9/modelMap http://cayenne.apache.org/schema/9/modelMap.xsd"
- project-version="9">
+ xsi:schemaLocation="http://cayenne.apache.org/schema/10/modelMap http://cayenne.apache.org/schema/10/modelMap.xsd"
+ project-version="10">
<property name="defaultPackage" value="org.apache.cayenne.joda.db"/>
<db-entity name="DATE_TIME_TEST">
<db-attribute name="ID" type="INTEGER" isPrimaryKey="true" isMandatory="true"/>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/aab05f3c/cayenne-lifecycle/src/test/resources/cayenne-lifecycle.xml
----------------------------------------------------------------------
diff --git a/cayenne-lifecycle/src/test/resources/cayenne-lifecycle.xml b/cayenne-lifecycle/src/test/resources/cayenne-lifecycle.xml
index 5b9a83e..4144737 100644
--- a/cayenne-lifecycle/src/test/resources/cayenne-lifecycle.xml
+++ b/cayenne-lifecycle/src/test/resources/cayenne-lifecycle.xml
@@ -1,11 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
-<domain project-version="9">
+<domain xmlns="http://cayenne.apache.org/schema/10/domain"
+ project-version="10">
<map name="lifecycle-map"/>
-
<node name="lifecycle-db"
factory="org.apache.cayenne.configuration.server.XMLPoolingDataSourceFactory"
- schema-update-strategy="org.apache.cayenne.access.dbsync.CreateIfNoSchemaStrategy"
- >
+ schema-update-strategy="org.apache.cayenne.access.dbsync.CreateIfNoSchemaStrategy">
<map-ref name="lifecycle-map"/>
<data-source>
<driver value="org.hsqldb.jdbcDriver"/>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/aab05f3c/cayenne-lifecycle/src/test/resources/lifecycle-map.map.xml
----------------------------------------------------------------------
diff --git a/cayenne-lifecycle/src/test/resources/lifecycle-map.map.xml b/cayenne-lifecycle/src/test/resources/lifecycle-map.map.xml
index 4a95313..d6763ab 100644
--- a/cayenne-lifecycle/src/test/resources/lifecycle-map.map.xml
+++ b/cayenne-lifecycle/src/test/resources/lifecycle-map.map.xml
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
-<data-map xmlns="http://cayenne.apache.org/schema/9/modelMap"
+<data-map xmlns="http://cayenne.apache.org/schema/10/modelMap"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://cayenne.apache.org/schema/9/modelMap http://cayenne.apache.org/schema/9/modelMap.xsd"
- project-version="9">
+ xsi:schemaLocation="http://cayenne.apache.org/schema/10/modelMap http://cayenne.apache.org/schema/10/modelMap.xsd"
+ project-version="10">
<property name="defaultPackage" value="org.apache.cayenne.lifecycle.db"/>
<db-entity name="AUDITABLE1">
<db-attribute name="CHAR_PROPERTY1" type="VARCHAR" length="200"/>
@@ -84,18 +84,12 @@
<obj-attribute name="charProperty2" type="java.lang.String" db-attribute-path="CHAR_PROPERTY2"/>
<obj-attribute name="uuid" type="java.lang.String" db-attribute-path="UUID"/>
</obj-entity>
- <obj-entity name="E1" className="org.apache.cayenne.lifecycle.db.E1" dbEntityName="E1">
- </obj-entity>
- <obj-entity name="E2" className="org.apache.cayenne.lifecycle.db.E2" dbEntityName="E2">
- </obj-entity>
- <obj-entity name="E3" className="org.apache.cayenne.lifecycle.db.E3" dbEntityName="E3">
- </obj-entity>
- <obj-entity name="E4" className="org.apache.cayenne.lifecycle.db.E4" dbEntityName="E4">
- </obj-entity>
- <obj-entity name="SortDep" className="org.apache.cayenne.lifecycle.db.SortDep" dbEntityName="SORT_DEP">
- </obj-entity>
- <obj-entity name="SortRoot" className="org.apache.cayenne.lifecycle.db.SortRoot" dbEntityName="SORT_ROOT">
- </obj-entity>
+ <obj-entity name="E1" className="org.apache.cayenne.lifecycle.db.E1" dbEntityName="E1"/>
+ <obj-entity name="E2" className="org.apache.cayenne.lifecycle.db.E2" dbEntityName="E2"/>
+ <obj-entity name="E3" className="org.apache.cayenne.lifecycle.db.E3" dbEntityName="E3"/>
+ <obj-entity name="E4" className="org.apache.cayenne.lifecycle.db.E4" dbEntityName="E4"/>
+ <obj-entity name="SortDep" className="org.apache.cayenne.lifecycle.db.SortDep" dbEntityName="SORT_DEP"/>
+ <obj-entity name="SortRoot" className="org.apache.cayenne.lifecycle.db.SortRoot" dbEntityName="SORT_ROOT"/>
<obj-entity name="UuidRoot1" className="org.apache.cayenne.lifecycle.db.UuidRoot1" dbEntityName="UUID_ROOT1">
<obj-attribute name="uuid" type="java.lang.String" db-attribute-path="UUID"/>
</obj-entity>
@@ -108,28 +102,28 @@
<db-relationship name="children" source="AUDITABLE2" target="AUDITABLE_CHILD3" toMany="true">
<db-attribute-pair source="ID" target="AUDITABLE2_ID"/>
</db-relationship>
- <db-relationship name="parent" source="AUDITABLE_CHILD1" target="AUDITABLE1" toMany="false">
+ <db-relationship name="parent" source="AUDITABLE_CHILD1" target="AUDITABLE1">
<db-attribute-pair source="AUDITABLE1_ID" target="ID"/>
</db-relationship>
- <db-relationship name="parent" source="AUDITABLE_CHILD2" target="AUDITABLE1" toMany="false">
+ <db-relationship name="parent" source="AUDITABLE_CHILD2" target="AUDITABLE1">
<db-attribute-pair source="AUDITABLE1_ID" target="ID"/>
</db-relationship>
- <db-relationship name="parent" source="AUDITABLE_CHILD3" target="AUDITABLE2" toMany="false">
+ <db-relationship name="parent" source="AUDITABLE_CHILD3" target="AUDITABLE2">
<db-attribute-pair source="AUDITABLE2_ID" target="ID"/>
</db-relationship>
<db-relationship name="e34s" source="E3" target="E34" toDependentPK="true" toMany="true">
<db-attribute-pair source="ID" target="E3_ID"/>
</db-relationship>
- <db-relationship name="e3" source="E34" target="E3" toMany="false">
+ <db-relationship name="e3" source="E34" target="E3">
<db-attribute-pair source="E3_ID" target="ID"/>
</db-relationship>
- <db-relationship name="e4" source="E34" target="E4" toMany="false">
+ <db-relationship name="e4" source="E34" target="E4">
<db-attribute-pair source="E4_ID" target="ID"/>
</db-relationship>
<db-relationship name="e34s" source="E4" target="E34" toDependentPK="true" toMany="true">
<db-attribute-pair source="ID" target="E4_ID"/>
</db-relationship>
- <db-relationship name="root" source="SORT_DEP" target="SORT_ROOT" toMany="false">
+ <db-relationship name="root" source="SORT_DEP" target="SORT_ROOT">
<db-attribute-pair source="ROOT_ID" target="ID"/>
</db-relationship>
<db-relationship name="deps" source="SORT_ROOT" target="SORT_DEP" toMany="true">
http://git-wip-us.apache.org/repos/asf/cayenne/blob/aab05f3c/cayenne-protostuff/src/test/java/org/apache/cayenne/rop/protostuff/persistent/auto/_ClientMtTable1.java
----------------------------------------------------------------------
diff --git a/cayenne-protostuff/src/test/java/org/apache/cayenne/rop/protostuff/persistent/auto/_ClientMtTable1.java b/cayenne-protostuff/src/test/java/org/apache/cayenne/rop/protostuff/persistent/auto/_ClientMtTable1.java
index f471aa6..e7178e0 100644
--- a/cayenne-protostuff/src/test/java/org/apache/cayenne/rop/protostuff/persistent/auto/_ClientMtTable1.java
+++ b/cayenne-protostuff/src/test/java/org/apache/cayenne/rop/protostuff/persistent/auto/_ClientMtTable1.java
@@ -41,15 +41,11 @@ public abstract class _ClientMtTable1 extends PersistentObject {
return dateAttribute;
}
+
public void setDateAttribute(LocalDate dateAttribute) {
if(objectContext != null) {
objectContext.prepareForAccess(this, "dateAttribute", false);
- }
-
- Object oldValue = this.dateAttribute;
- // notify objectContext about simple property change
- if(objectContext != null) {
- objectContext.propertyChanged(this, "dateAttribute", oldValue, dateAttribute);
+ objectContext.propertyChanged(this, "dateAttribute", this.dateAttribute, dateAttribute);
}
this.dateAttribute = dateAttribute;
@@ -62,15 +58,11 @@ public abstract class _ClientMtTable1 extends PersistentObject {
return globalAttribute;
}
+
public void setGlobalAttribute(String globalAttribute) {
if(objectContext != null) {
objectContext.prepareForAccess(this, "globalAttribute", false);
- }
-
- Object oldValue = this.globalAttribute;
- // notify objectContext about simple property change
- if(objectContext != null) {
- objectContext.propertyChanged(this, "globalAttribute", oldValue, globalAttribute);
+ objectContext.propertyChanged(this, "globalAttribute", this.globalAttribute, globalAttribute);
}
this.globalAttribute = globalAttribute;
@@ -83,15 +75,11 @@ public abstract class _ClientMtTable1 extends PersistentObject {
return oldDateAttribute;
}
+
public void setOldDateAttribute(Date oldDateAttribute) {
if(objectContext != null) {
objectContext.prepareForAccess(this, "oldDateAttribute", false);
- }
-
- Object oldValue = this.oldDateAttribute;
- // notify objectContext about simple property change
- if(objectContext != null) {
- objectContext.propertyChanged(this, "oldDateAttribute", oldValue, oldDateAttribute);
+ objectContext.propertyChanged(this, "oldDateAttribute", this.oldDateAttribute, oldDateAttribute);
}
this.oldDateAttribute = oldDateAttribute;
@@ -104,15 +92,11 @@ public abstract class _ClientMtTable1 extends PersistentObject {
return serverAttribute;
}
+
public void setServerAttribute(String serverAttribute) {
if(objectContext != null) {
objectContext.prepareForAccess(this, "serverAttribute", false);
- }
-
- Object oldValue = this.serverAttribute;
- // notify objectContext about simple property change
- if(objectContext != null) {
- objectContext.propertyChanged(this, "serverAttribute", oldValue, serverAttribute);
+ objectContext.propertyChanged(this, "serverAttribute", this.serverAttribute, serverAttribute);
}
this.serverAttribute = serverAttribute;
@@ -125,15 +109,11 @@ public abstract class _ClientMtTable1 extends PersistentObject {
return timeAttribute;
}
+
public void setTimeAttribute(LocalTime timeAttribute) {
if(objectContext != null) {
objectContext.prepareForAccess(this, "timeAttribute", false);
- }
-
- Object oldValue = this.timeAttribute;
- // notify objectContext about simple property change
- if(objectContext != null) {
- objectContext.propertyChanged(this, "timeAttribute", oldValue, timeAttribute);
+ objectContext.propertyChanged(this, "timeAttribute", this.timeAttribute, timeAttribute);
}
this.timeAttribute = timeAttribute;
@@ -146,15 +126,11 @@ public abstract class _ClientMtTable1 extends PersistentObject {
return timestampAttribute;
}
+
public void setTimestampAttribute(LocalDateTime timestampAttribute) {
if(objectContext != null) {
objectContext.prepareForAccess(this, "timestampAttribute", false);
- }
-
- Object oldValue = this.timestampAttribute;
- // notify objectContext about simple property change
- if(objectContext != null) {
- objectContext.propertyChanged(this, "timestampAttribute", oldValue, timestampAttribute);
+ objectContext.propertyChanged(this, "timestampAttribute", this.timestampAttribute, timestampAttribute);
}
this.timestampAttribute = timestampAttribute;
@@ -169,6 +145,7 @@ public abstract class _ClientMtTable1 extends PersistentObject {
return table2Array;
}
+
public void addToTable2Array(ClientMtTable2 object) {
if(objectContext != null) {
objectContext.prepareForAccess(this, "table2Array", true);
@@ -178,6 +155,7 @@ public abstract class _ClientMtTable1 extends PersistentObject {
this.table2Array.add(object);
}
+
public void removeFromTable2Array(ClientMtTable2 object) {
if(objectContext != null) {
objectContext.prepareForAccess(this, "table2Array", true);
@@ -187,5 +165,4 @@ public abstract class _ClientMtTable1 extends PersistentObject {
this.table2Array.remove(object);
}
-
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/aab05f3c/cayenne-protostuff/src/test/java/org/apache/cayenne/rop/protostuff/persistent/auto/_ClientMtTable2.java
----------------------------------------------------------------------
diff --git a/cayenne-protostuff/src/test/java/org/apache/cayenne/rop/protostuff/persistent/auto/_ClientMtTable2.java b/cayenne-protostuff/src/test/java/org/apache/cayenne/rop/protostuff/persistent/auto/_ClientMtTable2.java
index 598fcdf..a6c8c37 100644
--- a/cayenne-protostuff/src/test/java/org/apache/cayenne/rop/protostuff/persistent/auto/_ClientMtTable2.java
+++ b/cayenne-protostuff/src/test/java/org/apache/cayenne/rop/protostuff/persistent/auto/_ClientMtTable2.java
@@ -14,7 +14,7 @@ import org.apache.cayenne.util.PersistentObjectHolder;
public abstract class _ClientMtTable2 extends PersistentObject {
public static final Property<String> GLOBAL_ATTRIBUTE = Property.create("globalAttribute", String.class);
- public static final Property<org.apache.cayenne.rop.protostuff.persistent.MtTable1> TABLE1 = Property.create("table1", org.apache.cayenne.rop.protostuff.persistent.MtTable1.class);
+ public static final Property<ClientMtTable1> TABLE1 = Property.create("table1", ClientMtTable1.class);
protected String globalAttribute;
protected ValueHolder table1;
@@ -26,15 +26,11 @@ public abstract class _ClientMtTable2 extends PersistentObject {
return globalAttribute;
}
+
public void setGlobalAttribute(String globalAttribute) {
if(objectContext != null) {
objectContext.prepareForAccess(this, "globalAttribute", false);
- }
-
- Object oldValue = this.globalAttribute;
- // notify objectContext about simple property change
- if(objectContext != null) {
- objectContext.propertyChanged(this, "globalAttribute", oldValue, globalAttribute);
+ objectContext.propertyChanged(this, "globalAttribute", this.globalAttribute, globalAttribute);
}
this.globalAttribute = globalAttribute;
@@ -49,21 +45,15 @@ public abstract class _ClientMtTable2 extends PersistentObject {
return (ClientMtTable1) table1.getValue();
}
+
public void setTable1(ClientMtTable1 table1) {
if(objectContext != null) {
objectContext.prepareForAccess(this, "table1", true);
+ objectContext.propertyChanged(this, "table1", this.table1.getValueDirectly(), table1);
} else if (this.table1 == null) {
this.table1 = new PersistentObjectHolder(this, "table1");
}
-
- // note how we notify ObjectContext of change BEFORE the object is actually
- // changed... this is needed to take a valid current snapshot
- Object oldValue = this.table1.getValueDirectly();
- if (objectContext != null) {
- objectContext.propertyChanged(this, "table1", oldValue, table1);
- }
this.table1.setValue(table1);
}
-
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/aab05f3c/cayenne-protostuff/src/test/resources/cayenne-protostuff.xml
----------------------------------------------------------------------
diff --git a/cayenne-protostuff/src/test/resources/cayenne-protostuff.xml b/cayenne-protostuff/src/test/resources/cayenne-protostuff.xml
index 08d85b1..c5fe84e 100644
--- a/cayenne-protostuff/src/test/resources/cayenne-protostuff.xml
+++ b/cayenne-protostuff/src/test/resources/cayenne-protostuff.xml
@@ -1,11 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
-<domain project-version="9">
+<domain xmlns="http://cayenne.apache.org/schema/10/domain"
+ project-version="10">
<map name="protostuff"/>
-
<node name="datanode"
- factory="org.apache.cayenne.configuration.server.XMLPoolingDataSourceFactory"
- schema-update-strategy="org.apache.cayenne.access.dbsync.CreateIfNoSchemaStrategy"
- >
+ factory="org.apache.cayenne.configuration.server.XMLPoolingDataSourceFactory"
+ schema-update-strategy="org.apache.cayenne.access.dbsync.CreateIfNoSchemaStrategy">
<map-ref name="protostuff"/>
<data-source>
<driver value="org.hsqldb.jdbcDriver"/>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/aab05f3c/cayenne-protostuff/src/test/resources/protostuff.map.xml
----------------------------------------------------------------------
diff --git a/cayenne-protostuff/src/test/resources/protostuff.map.xml b/cayenne-protostuff/src/test/resources/protostuff.map.xml
index d3277bf..a421e26 100644
--- a/cayenne-protostuff/src/test/resources/protostuff.map.xml
+++ b/cayenne-protostuff/src/test/resources/protostuff.map.xml
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
-<data-map xmlns="http://cayenne.apache.org/schema/9/modelMap"
+<data-map xmlns="http://cayenne.apache.org/schema/10/modelMap"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://cayenne.apache.org/schema/9/modelMap http://cayenne.apache.org/schema/9/modelMap.xsd"
- project-version="9">
+ xsi:schemaLocation="http://cayenne.apache.org/schema/10/modelMap http://cayenne.apache.org/schema/10/modelMap.xsd"
+ project-version="10">
<property name="defaultPackage" value="org.apache.cayenne.rop.protostuff.persistent"/>
<property name="clientSupported" value="true"/>
<property name="defaultClientPackage" value="org.apache.cayenne.rop.protostuff.persistent"/>
@@ -34,7 +34,7 @@
<db-relationship name="table2Array" source="MT_TABLE1" target="MT_TABLE2" toMany="true">
<db-attribute-pair source="TABLE1_ID" target="TABLE1_ID"/>
</db-relationship>
- <db-relationship name="table1" source="MT_TABLE2" target="MT_TABLE1" toMany="false">
+ <db-relationship name="table1" source="MT_TABLE2" target="MT_TABLE1">
<db-attribute-pair source="TABLE1_ID" target="TABLE1_ID"/>
</db-relationship>
<obj-relationship name="table2Array" source="MtTable1" target="MtTable2" deleteRule="Deny" db-relationship-path="table2Array"/>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/aab05f3c/itests/cayenne-tools-itest/src/test/resources/cayenne-client.xml
----------------------------------------------------------------------
diff --git a/itests/cayenne-tools-itest/src/test/resources/cayenne-client.xml b/itests/cayenne-tools-itest/src/test/resources/cayenne-client.xml
index 1e26e2a..355ac28 100644
--- a/itests/cayenne-tools-itest/src/test/resources/cayenne-client.xml
+++ b/itests/cayenne-tools-itest/src/test/resources/cayenne-client.xml
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<domain project-version="6">
+<domain xmlns="http://cayenne.apache.org/schema/10/domain"
+ project-version="10">
<map name="testmap-client"/>
</domain>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/aab05f3c/itests/cayenne-tools-itest/src/test/resources/embeddable.map.xml
----------------------------------------------------------------------
diff --git a/itests/cayenne-tools-itest/src/test/resources/embeddable.map.xml b/itests/cayenne-tools-itest/src/test/resources/embeddable.map.xml
index 0b5c0b8..10c4db6 100644
--- a/itests/cayenne-tools-itest/src/test/resources/embeddable.map.xml
+++ b/itests/cayenne-tools-itest/src/test/resources/embeddable.map.xml
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
-<data-map xmlns="http://cayenne.apache.org/schema/3.0/modelMap"
+<data-map xmlns="http://cayenne.apache.org/schema/10/modelMap"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://cayenne.apache.org/schema/3.0/modelMap http://cayenne.apache.org/schema/3.0/modelMap.xsd"
- project-version="6">
+ xsi:schemaLocation="http://cayenne.apache.org/schema/10/modelMap http://cayenne.apache.org/schema/10/modelMap.xsd"
+ project-version="10">
<property name="defaultPackage" value="org.apache.cayenne.testdo.embeddable"/>
<embeddable className="org.apache.cayenne.testdo.embeddable.Embeddable1">
<embeddable-attribute name="embedded10" type="java.lang.String" db-attribute-name="EMBEDDED10"/>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/aab05f3c/itests/cayenne-tools-itest/src/test/resources/org/apache/cayenne/tools/cgen-dependent.map.xml
----------------------------------------------------------------------
diff --git a/itests/cayenne-tools-itest/src/test/resources/org/apache/cayenne/tools/cgen-dependent.map.xml b/itests/cayenne-tools-itest/src/test/resources/org/apache/cayenne/tools/cgen-dependent.map.xml
index d06be70..b72f320 100644
--- a/itests/cayenne-tools-itest/src/test/resources/org/apache/cayenne/tools/cgen-dependent.map.xml
+++ b/itests/cayenne-tools-itest/src/test/resources/org/apache/cayenne/tools/cgen-dependent.map.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
-<data-map xmlns="http://cayenne.apache.org/schema/3.0/modelMap"
+<data-map xmlns="http://cayenne.apache.org/schema/9/modelMap"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://cayenne.apache.org/schema/3.0/modelMap ../../main/resources/org/apache/cayenne/schema/3.0/modelMap.xsd"
+ xsi:schemaLocation="http://cayenne.apache.org/schema/9/modelMap http://cayenne.apache.org/schema/9/modelMap.xsd"
project-version="1.1">
<property name="defaultPackage" value="org.apache.cayenne.testdo.cgen2"/>
<db-entity name="MYARTGROUP">
http://git-wip-us.apache.org/repos/asf/cayenne/blob/aab05f3c/itests/cayenne-tools-itest/src/test/resources/org/apache/cayenne/tools/cgen.map.xml
----------------------------------------------------------------------
diff --git a/itests/cayenne-tools-itest/src/test/resources/org/apache/cayenne/tools/cgen.map.xml b/itests/cayenne-tools-itest/src/test/resources/org/apache/cayenne/tools/cgen.map.xml
index 1c378cf..56a2d92 100644
--- a/itests/cayenne-tools-itest/src/test/resources/org/apache/cayenne/tools/cgen.map.xml
+++ b/itests/cayenne-tools-itest/src/test/resources/org/apache/cayenne/tools/cgen.map.xml
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
-<data-map xmlns="http://cayenne.apache.org/schema/3.0/modelMap"
+<data-map xmlns="http://cayenne.apache.org/schema/9/modelMap"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://cayenne.apache.org/schema/3.0/modelMap http://cayenne.apache.org/schema/3.0/modelMap.xsd"
- project-version="6">
+ xsi:schemaLocation="http://cayenne.apache.org/schema/9/modelMap http://cayenne.apache.org/schema/9/modelMap.xsd"
+ project-version="9">
<db-entity name="ARTGROUP">
<db-attribute name="GROUP_ID" type="INTEGER" isPrimaryKey="true" isMandatory="true"/>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/aab05f3c/itests/cayenne-tools-itest/src/test/resources/testmap-client.map.xml
----------------------------------------------------------------------
diff --git a/itests/cayenne-tools-itest/src/test/resources/testmap-client.map.xml b/itests/cayenne-tools-itest/src/test/resources/testmap-client.map.xml
index 21fadf7..87145d5 100644
--- a/itests/cayenne-tools-itest/src/test/resources/testmap-client.map.xml
+++ b/itests/cayenne-tools-itest/src/test/resources/testmap-client.map.xml
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
-<data-map xmlns="http://cayenne.apache.org/schema/3.0/modelMap"
+<data-map xmlns="http://cayenne.apache.org/schema/10/modelMap"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://cayenne.apache.org/schema/3.0/modelMap http://cayenne.apache.org/schema/3.0/modelMap.xsd"
- project-version="6">
+ xsi:schemaLocation="http://cayenne.apache.org/schema/10/modelMap http://cayenne.apache.org/schema/10/modelMap.xsd"
+ project-version="10">
<property name="defaultPackage" value="org.apache.cayenne.testdo.testmap"/>
<property name="defaultSuperclass" value="org.apache.cayenne.CayenneDataObject"/>
<property name="clientSupported" value="true"/>
@@ -19,8 +19,7 @@
<procedure name="cayenne_tst_upd_proc">
<procedure-parameter name="paintingPrice" type="INTEGER" direction="in"/>
</procedure>
- <procedure name="cayenne_tst_upd_proc2">
- </procedure>
+ <procedure name="cayenne_tst_upd_proc2"/>
<db-entity name="ARRAYS_ENTITY">
<db-attribute name="BYTE_ARRAY" type="VARBINARY" length="200"/>
<db-attribute name="BYTE_WRAPPER_ARRAY" type="VARBINARY" length="200"/>
@@ -290,18 +289,9 @@
<obj-attribute name="artistName" type="java.lang.String" db-attribute-path="ARTIST_NAME"/>
<obj-attribute name="dateOfBirth" type="java.util.Date" db-attribute-path="DATE_OF_BIRTH"/>
</obj-entity>
- <obj-entity name="ArtistCallbackTest" className="org.apache.cayenne.testdo.testmap.ArtistCallbackTest" clientClassName="org.apache.cayenne.testdo.testmap.client.ArtistCallbackTest" dbEntityName="ARTIST_CT" exclude-superclass-listeners="true" exclude-default-listeners="true">
+ <obj-entity name="ArtistCallbackTest" className="org.apache.cayenne.testdo.testmap.ArtistCallbackTest" clientClassName="org.apache.cayenne.testdo.testmap.client.ArtistCallbackTest" dbEntityName="ARTIST_CT">
<obj-attribute name="artistName" type="java.lang.String"/>
<obj-attribute name="dateOfBirth" type="java.util.Date"/>
- <entity-listener class="org.apache.cayenne.testdo.testmap.EntityListenerObjEntity">
- <post-add method-name="prePersistEntityListener"/>
- <post-persist method-name="postPersistEntityListener"/>
- <pre-update method-name="preUpdateEntityListener"/>
- <post-update method-name="postUpdateEntityListener"/>
- <pre-remove method-name="preRemoveEntityListener"/>
- <post-remove method-name="postRemoveEntityListener"/>
- <post-load method-name="postLoadEntityListener"/>
- </entity-listener>
<post-add method-name="prePersistEntityObjEntity"/>
<post-persist method-name="postPersistEntityObjEntity"/>
<pre-update method-name="preUpdateEntityObjEntity"/>
@@ -310,8 +300,7 @@
<post-remove method-name="postRemoveEntityObjEntity"/>
<post-load method-name="postLoadEntityObjEntity"/>
</obj-entity>
- <obj-entity name="ArtistExhibit" className="org.apache.cayenne.testdo.testmap.ArtistExhibit" clientClassName="org.apache.cayenne.testdo.testmap.client.ArtistExhibit" dbEntityName="ARTIST_EXHIBIT">
- </obj-entity>
+ <obj-entity name="ArtistExhibit" className="org.apache.cayenne.testdo.testmap.ArtistExhibit" clientClassName="org.apache.cayenne.testdo.testmap.client.ArtistExhibit" dbEntityName="ARTIST_EXHIBIT"/>
<obj-entity name="BigDecimalEntity" className="org.apache.cayenne.testdo.numeric_types.BigDecimalEntity" clientClassName="org.apache.cayenne.testdo.testmap.client.BigDecimalEntity" dbEntityName="BIGDECIMAL_ENTITY">
<obj-attribute name="bigDecimalField" type="java.math.BigDecimal" db-attribute-path="BIGDECIMAL_FIELD"/>
</obj-entity>
@@ -412,10 +401,8 @@
<obj-entity name="GeneratedColumnTestEntity" className="org.apache.cayenne.testdo.generated.GeneratedColumnTestEntity" clientClassName="org.apache.cayenne.testdo.testmap.client.GeneratedColumnTestEntity" dbEntityName="GENERATED_COLUMN_TEST">
<obj-attribute name="name" type="java.lang.String" db-attribute-path="NAME"/>
</obj-entity>
- <obj-entity name="GeneratedF1" className="org.apache.cayenne.testdo.generated.GeneratedF1" clientClassName="org.apache.cayenne.testdo.testmap.client.GeneratedF1" dbEntityName="GENERATED_F1" superClassName="org.apache.cayenne.CayenneDataObject" clientSuperClassName="org.apache.cayenne.PersistentObject">
- </obj-entity>
- <obj-entity name="GeneratedF2" className="org.apache.cayenne.testdo.generated.GeneratedF2" clientClassName="org.apache.cayenne.testdo.testmap.client.GeneratedF2" dbEntityName="GENERATED_F2" superClassName="org.apache.cayenne.CayenneDataObject" clientSuperClassName="org.apache.cayenne.PersistentObject">
- </obj-entity>
+ <obj-entity name="GeneratedF1" className="org.apache.cayenne.testdo.generated.GeneratedF1" clientClassName="org.apache.cayenne.testdo.testmap.client.GeneratedF1" dbEntityName="GENERATED_F1" superClassName="org.apache.cayenne.CayenneDataObject" clientSuperClassName="org.apache.cayenne.PersistentObject"/>
+ <obj-entity name="GeneratedF2" className="org.apache.cayenne.testdo.generated.GeneratedF2" clientClassName="org.apache.cayenne.testdo.testmap.client.GeneratedF2" dbEntityName="GENERATED_F2" superClassName="org.apache.cayenne.CayenneDataObject" clientSuperClassName="org.apache.cayenne.PersistentObject"/>
<obj-entity name="LongEntity" className="org.apache.cayenne.testdo.numeric_types.LongEntity" clientClassName="org.apache.cayenne.testdo.testmap.client.LongEntity" dbEntityName="LONG_ENTITY">
<obj-attribute name="longField" type="java.lang.Long" db-attribute-path="LONG_FIELD"/>
</obj-entity>
@@ -517,7 +504,7 @@
<db-relationship name="toChildGroups" source="ARTGROUP" target="ARTGROUP" toMany="true">
<db-attribute-pair source="GROUP_ID" target="PARENT_GROUP_ID"/>
</db-relationship>
- <db-relationship name="toParentGroup" source="ARTGROUP" target="ARTGROUP" toMany="false">
+ <db-relationship name="toParentGroup" source="ARTGROUP" target="ARTGROUP">
<db-attribute-pair source="PARENT_GROUP_ID" target="GROUP_ID"/>
</db-relationship>
<db-relationship name="artistExhibitArray" source="ARTIST" target="ARTIST_EXHIBIT" toDependentPK="true" toMany="true">
@@ -529,25 +516,25 @@
<db-relationship name="paintingArray" source="ARTIST" target="PAINTING" toMany="true">
<db-attribute-pair source="ARTIST_ID" target="ARTIST_ID"/>
</db-relationship>
- <db-relationship name="toArtist" source="ARTIST_EXHIBIT" target="ARTIST" toMany="false">
+ <db-relationship name="toArtist" source="ARTIST_EXHIBIT" target="ARTIST">
<db-attribute-pair source="ARTIST_ID" target="ARTIST_ID"/>
</db-relationship>
- <db-relationship name="toExhibit" source="ARTIST_EXHIBIT" target="EXHIBIT" toMany="false">
+ <db-relationship name="toExhibit" source="ARTIST_EXHIBIT" target="EXHIBIT">
<db-attribute-pair source="EXHIBIT_ID" target="EXHIBIT_ID"/>
</db-relationship>
- <db-relationship name="toArtist" source="ARTIST_GROUP" target="ARTIST" toMany="false">
+ <db-relationship name="toArtist" source="ARTIST_GROUP" target="ARTIST">
<db-attribute-pair source="ARTIST_ID" target="ARTIST_ID"/>
</db-relationship>
- <db-relationship name="toGroup" source="ARTIST_GROUP" target="ARTGROUP" toMany="false">
+ <db-relationship name="toGroup" source="ARTIST_GROUP" target="ARTGROUP">
<db-attribute-pair source="GROUP_ID" target="GROUP_ID"/>
</db-relationship>
<db-relationship name="binaryPKDetails" source="BINARY_PK_TEST1" target="BINARY_PK_TEST2" toMany="true">
<db-attribute-pair source="BIN_ID" target="FK_ID"/>
</db-relationship>
- <db-relationship name="toBinaryPKMaster" source="BINARY_PK_TEST2" target="BINARY_PK_TEST1" toMany="false">
+ <db-relationship name="toBinaryPKMaster" source="BINARY_PK_TEST2" target="BINARY_PK_TEST1">
<db-attribute-pair source="FK_ID" target="BIN_ID"/>
</db-relationship>
- <db-relationship name="toCharPK" source="CHAR_FK_TEST" target="CHAR_PK_TEST" toMany="false">
+ <db-relationship name="toCharPK" source="CHAR_FK_TEST" target="CHAR_PK_TEST">
<db-attribute-pair source="FK_COL" target="PK_COL"/>
</db-relationship>
<db-relationship name="charFKs" source="CHAR_PK_TEST" target="CHAR_FK_TEST" toMany="true">
@@ -556,10 +543,10 @@
<db-relationship name="clob" source="CLOB_TEST" target="CLOB_TEST_RELATION" toMany="true">
<db-attribute-pair source="CLOB_TEST_ID" target="ID_CLOB"/>
</db-relationship>
- <db-relationship name="CLOB_REL" source="CLOB_TEST_RELATION" target="CLOB_TEST" toMany="false">
+ <db-relationship name="CLOB_REL" source="CLOB_TEST_RELATION" target="CLOB_TEST">
<db-attribute-pair source="ID_CLOB" target="CLOB_TEST_ID"/>
</db-relationship>
- <db-relationship name="toCompoundPk" source="COMPOUND_FK_TEST" target="COMPOUND_PK_TEST" toMany="false">
+ <db-relationship name="toCompoundPk" source="COMPOUND_FK_TEST" target="COMPOUND_PK_TEST">
<db-attribute-pair source="F_KEY1" target="KEY1"/>
<db-attribute-pair source="F_KEY2" target="KEY2"/>
</db-relationship>
@@ -570,7 +557,7 @@
<db-relationship name="artistExhibitArray" source="EXHIBIT" target="ARTIST_EXHIBIT" toDependentPK="true" toMany="true">
<db-attribute-pair source="EXHIBIT_ID" target="EXHIBIT_ID"/>
</db-relationship>
- <db-relationship name="toGallery" source="EXHIBIT" target="GALLERY" toMany="false">
+ <db-relationship name="toGallery" source="EXHIBIT" target="GALLERY">
<db-attribute-pair source="GALLERY_ID" target="GALLERY_ID"/>
</db-relationship>
<db-relationship name="exhibitArray" source="GALLERY" target="EXHIBIT" toMany="true">
@@ -579,16 +566,16 @@
<db-relationship name="paintingArray" source="GALLERY" target="PAINTING" toMany="true">
<db-attribute-pair source="GALLERY_ID" target="GALLERY_ID"/>
</db-relationship>
- <db-relationship name="toMaster" source="GENERATED_COLUMN_COMP_KEY" target="GENERATED_COLUMN_COMP_M" toMany="false">
+ <db-relationship name="toMaster" source="GENERATED_COLUMN_COMP_KEY" target="GENERATED_COLUMN_COMP_M">
<db-attribute-pair source="PROPAGATED_PK" target="ID"/>
</db-relationship>
<db-relationship name="toDetail" source="GENERATED_COLUMN_COMP_M" target="GENERATED_COLUMN_COMP_KEY" toDependentPK="true" toMany="true">
<db-attribute-pair source="ID" target="PROPAGATED_PK"/>
</db-relationship>
- <db-relationship name="toMaster" source="GENERATED_COLUMN_DEP" target="GENERATED_COLUMN_TEST" toMany="false">
+ <db-relationship name="toMaster" source="GENERATED_COLUMN_DEP" target="GENERATED_COLUMN_TEST">
<db-attribute-pair source="GENERATED_COLUMN_FK" target="GENERATED_COLUMN"/>
</db-relationship>
- <db-relationship name="toDep" source="GENERATED_COLUMN_TEST" target="GENERATED_COLUMN_DEP" toDependentPK="true" toMany="false">
+ <db-relationship name="toDep" source="GENERATED_COLUMN_TEST" target="GENERATED_COLUMN_DEP" toDependentPK="true">
<db-attribute-pair source="GENERATED_COLUMN" target="GENERATED_COLUMN_FK"/>
</db-relationship>
<db-relationship name="join" source="GENERATED_F1" target="GENERATED_JOIN" toMany="true">
@@ -597,13 +584,13 @@
<db-relationship name="join" source="GENERATED_F2" target="GENERATED_JOIN" toMany="true">
<db-attribute-pair source="ID" target="ID2"/>
</db-relationship>
- <db-relationship name="f1" source="GENERATED_JOIN" target="GENERATED_F1" toMany="false">
+ <db-relationship name="f1" source="GENERATED_JOIN" target="GENERATED_F1">
<db-attribute-pair source="ID1" target="ID"/>
</db-relationship>
- <db-relationship name="f2" source="GENERATED_JOIN" target="GENERATED_F2" toMany="false">
+ <db-relationship name="f2" source="GENERATED_JOIN" target="GENERATED_F2">
<db-attribute-pair source="ID2" target="ID"/>
</db-relationship>
- <db-relationship name="toMeaningfulPK" source="MEANINGFUL_PK_DEP" target="MEANINGFUL_PK_TEST1" toMany="false">
+ <db-relationship name="toMeaningfulPK" source="MEANINGFUL_PK_DEP" target="MEANINGFUL_PK_TEST1">
<db-attribute-pair source="MASTER_PK" target="PK_ATTRIBUTE"/>
</db-relationship>
<db-relationship name="meaningfulPKDepArray" source="MEANINGFUL_PK_TEST1" target="MEANINGFUL_PK_DEP" toMany="true">
@@ -612,22 +599,22 @@
<db-relationship name="details" source="MIXED_PERSISTENCE_STRATEGY" target="MIXED_PERSISTENCE_STRATEGY2" toMany="true">
<db-attribute-pair source="ID" target="MASTER_ID"/>
</db-relationship>
- <db-relationship name="master" source="MIXED_PERSISTENCE_STRATEGY2" target="MIXED_PERSISTENCE_STRATEGY" toMany="false">
+ <db-relationship name="master" source="MIXED_PERSISTENCE_STRATEGY2" target="MIXED_PERSISTENCE_STRATEGY">
<db-attribute-pair source="MASTER_ID" target="ID"/>
</db-relationship>
- <db-relationship name="toArtist" source="PAINTING" target="ARTIST" toMany="false">
+ <db-relationship name="toArtist" source="PAINTING" target="ARTIST">
<db-attribute-pair source="ARTIST_ID" target="ARTIST_ID"/>
</db-relationship>
- <db-relationship name="toGallery" source="PAINTING" target="GALLERY" toMany="false">
+ <db-relationship name="toGallery" source="PAINTING" target="GALLERY">
<db-attribute-pair source="GALLERY_ID" target="GALLERY_ID"/>
</db-relationship>
- <db-relationship name="toPaintingInfo" source="PAINTING" target="PAINTING_INFO" toDependentPK="true" toMany="false">
+ <db-relationship name="toPaintingInfo" source="PAINTING" target="PAINTING_INFO" toDependentPK="true">
<db-attribute-pair source="PAINTING_ID" target="PAINTING_ID"/>
</db-relationship>
- <db-relationship name="toArtist" source="PAINTING1" target="ARTIST" toMany="false">
+ <db-relationship name="toArtist" source="PAINTING1" target="ARTIST">
<db-attribute-pair source="ARTIST_ID" target="ARTIST_ID"/>
</db-relationship>
- <db-relationship name="painting" source="PAINTING_INFO" target="PAINTING" toMany="false">
+ <db-relationship name="painting" source="PAINTING_INFO" target="PAINTING">
<db-attribute-pair source="PAINTING_ID" target="PAINTING_ID"/>
</db-relationship>
<obj-relationship name="artistArray" source="ArtGroup" target="Artist" deleteRule="Nullify" db-relationship-path="artistGroupArray.toArtist"/>
@@ -671,8 +658,8 @@
<obj-relationship name="paintingArray" source="ROArtist" target="Painting" deleteRule="Deny" db-relationship-path="paintingArray"/>
<obj-relationship name="toArtist" source="ROPainting" target="Artist" deleteRule="Nullify" db-relationship-path="toArtist"/>
<query name="EjbqlQueryTest" type="EJBQLQuery">
- <property name="cayenne.GenericSelectQuery.fetchingDataRows" value="true"/>
<property name="cayenne.GenericSelectQuery.cacheStrategy" value="SHARED_CACHE"/>
+ <property name="cayenne.GenericSelectQuery.fetchingDataRows" value="true"/>
<ejbql><![CDATA[select a from Artist a]]></ejbql>
</query>
<query name="NonSelectingQuery" type="SQLTemplate" root="data-map" root-name="testmap-client">
@@ -698,8 +685,7 @@ VALUES (#bind($id), #bind($title), #bind($price))]]></sql>
<property name="cayenne.GenericSelectQuery.cacheStrategy" value="SHARED_CACHE"/>
<qualifier><![CDATA[artistName like $name]]></qualifier>
</query>
- <query name="ProcedureQuery" type="ProcedureQuery" root="procedure" root-name="cayenne_tst_select_proc" result-entity="Artist">
- </query>
+ <query name="ProcedureQuery" type="ProcedureQuery" root="procedure" root-name="cayenne_tst_select_proc" result-entity="Artist"/>
<query name="QueryWithLocalCache" type="SelectQuery" root="obj-entity" root-name="Artist">
<property name="cayenne.GenericSelectQuery.cacheStrategy" value="LOCAL_CACHE"/>
</query>
@@ -717,28 +703,28 @@ VALUES (#bind($id), #bind($title), #bind($price))]]></sql>
<property name="cayenne.GenericSelectQuery.cacheStrategy" value="SHARED_CACHE"/>
</query>
<query name="SelectDateTest" type="SQLTemplate" root="data-map" root-name="testmap-client">
- <property name="cayenne.GenericSelectQuery.fetchingDataRows" value="true"/>
<property name="cayenne.SQLTemplate.columnNameCapitalization" value="UPPER"/>
+ <property name="cayenne.GenericSelectQuery.fetchingDataRows" value="true"/>
<sql><![CDATA[SELECT * FROM DATE_TEST]]></sql>
</query>
<query name="SelectReturnTypesMap1" type="SQLTemplate" root="data-map" root-name="testmap-client">
- <property name="cayenne.GenericSelectQuery.fetchingDataRows" value="true"/>
<property name="cayenne.SQLTemplate.columnNameCapitalization" value="UPPER"/>
+ <property name="cayenne.GenericSelectQuery.fetchingDataRows" value="true"/>
<sql><![CDATA[SELECT * FROM TYPES_MAPPING_TEST1]]></sql>
</query>
<query name="SelectReturnTypesMap2" type="SQLTemplate" root="data-map" root-name="testmap-client">
- <property name="cayenne.GenericSelectQuery.fetchingDataRows" value="true"/>
<property name="cayenne.SQLTemplate.columnNameCapitalization" value="UPPER"/>
+ <property name="cayenne.GenericSelectQuery.fetchingDataRows" value="true"/>
<sql><![CDATA[SELECT * FROM TYPES_MAPPING_TEST2]]></sql>
</query>
<query name="SelectTestLower" type="SQLTemplate" root="data-map" root-name="testmap-client">
- <property name="cayenne.GenericSelectQuery.fetchingDataRows" value="true"/>
<property name="cayenne.SQLTemplate.columnNameCapitalization" value="LOWER"/>
+ <property name="cayenne.GenericSelectQuery.fetchingDataRows" value="true"/>
<sql><![CDATA[select * from ARTIST]]></sql>
</query>
<query name="SelectTestUpper" type="SQLTemplate" root="data-map" root-name="testmap-client">
- <property name="cayenne.GenericSelectQuery.fetchingDataRows" value="true"/>
<property name="cayenne.SQLTemplate.columnNameCapitalization" value="UPPER"/>
+ <property name="cayenne.GenericSelectQuery.fetchingDataRows" value="true"/>
<sql><![CDATA[select * from ARTIST]]></sql>
</query>
</data-map>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/aab05f3c/itests/cayenne-tools-itest/src/test/resources/testmap.map.xml
----------------------------------------------------------------------
diff --git a/itests/cayenne-tools-itest/src/test/resources/testmap.map.xml b/itests/cayenne-tools-itest/src/test/resources/testmap.map.xml
index 60b94a6..e426dda 100644
--- a/itests/cayenne-tools-itest/src/test/resources/testmap.map.xml
+++ b/itests/cayenne-tools-itest/src/test/resources/testmap.map.xml
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
-<data-map xmlns="http://cayenne.apache.org/schema/3.0/modelMap"
+<data-map xmlns="http://cayenne.apache.org/schema/10/modelMap"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://cayenne.apache.org/schema/3.0/modelMap http://cayenne.apache.org/schema/3.0/modelMap.xsd"
- project-version="6">
+ xsi:schemaLocation="http://cayenne.apache.org/schema/10/modelMap http://cayenne.apache.org/schema/10/modelMap.xsd"
+ project-version="10">
<property name="defaultPackage" value="org.apache.cayenne.testdo.testmap"/>
<property name="defaultSuperclass" value="org.apache.cayenne.CayenneDataObject"/>
<property name="clientSupported" value="true"/>
@@ -290,18 +290,9 @@
<obj-attribute name="artistName" type="java.lang.String" db-attribute-path="ARTIST_NAME"/>
<obj-attribute name="dateOfBirth" type="java.util.Date" db-attribute-path="DATE_OF_BIRTH"/>
</obj-entity>
- <obj-entity name="ArtistCallbackTest" className="org.apache.cayenne.testdo.testmap.ArtistCallbackTest" dbEntityName="ARTIST_CT" exclude-superclass-listeners="true" exclude-default-listeners="true">
+ <obj-entity name="ArtistCallbackTest" className="org.apache.cayenne.testdo.testmap.ArtistCallbackTest" dbEntityName="ARTIST_CT">
<obj-attribute name="artistName" type="java.lang.String"/>
<obj-attribute name="dateOfBirth" type="java.util.Date"/>
- <entity-listener class="org.apache.cayenne.testdo.testmap.EntityListenerObjEntity">
- <post-add method-name="prePersistEntityListener"/>
- <post-persist method-name="postPersistEntityListener"/>
- <pre-update method-name="preUpdateEntityListener"/>
- <post-update method-name="postUpdateEntityListener"/>
- <pre-remove method-name="preRemoveEntityListener"/>
- <post-remove method-name="postRemoveEntityListener"/>
- <post-load method-name="postLoadEntityListener"/>
- </entity-listener>
<post-add method-name="prePersistEntityObjEntity"/>
<post-persist method-name="postPersistEntityObjEntity"/>
<pre-update method-name="preUpdateEntityObjEntity"/>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/aab05f3c/maven-plugins/cayenne-maven-plugin/src/test/resources/cgen/cayenne-testDomain.xml
----------------------------------------------------------------------
diff --git a/maven-plugins/cayenne-maven-plugin/src/test/resources/cgen/cayenne-testDomain.xml b/maven-plugins/cayenne-maven-plugin/src/test/resources/cgen/cayenne-testDomain.xml
index 3f63c14..6a82e48 100644
--- a/maven-plugins/cayenne-maven-plugin/src/test/resources/cgen/cayenne-testDomain.xml
+++ b/maven-plugins/cayenne-maven-plugin/src/test/resources/cgen/cayenne-testDomain.xml
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
-<domain project-version="6">
+<domain xmlns="http://cayenne.apache.org/schema/10/domain"
+ project-version="10">
+ <map name="testAdditionalMap"/>
<map name="testDomainMap"/>
- <map name="testAdditionalMap"/>
</domain>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/aab05f3c/maven-plugins/cayenne-maven-plugin/src/test/resources/cgen/testAdditionalMap.map.xml
----------------------------------------------------------------------
diff --git a/maven-plugins/cayenne-maven-plugin/src/test/resources/cgen/testAdditionalMap.map.xml b/maven-plugins/cayenne-maven-plugin/src/test/resources/cgen/testAdditionalMap.map.xml
index f9a80fb..8d3fb13 100644
--- a/maven-plugins/cayenne-maven-plugin/src/test/resources/cgen/testAdditionalMap.map.xml
+++ b/maven-plugins/cayenne-maven-plugin/src/test/resources/cgen/testAdditionalMap.map.xml
@@ -1,18 +1,18 @@
<?xml version="1.0" encoding="utf-8"?>
-<data-map xmlns="http://cayenne.apache.org/schema/3.0/modelMap"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://cayenne.apache.org/schema/3.0/modelMap http://cayenne.apache.org/schema/3.0/modelMap.xsd"
- project-version="6">
- <property name="defaultPackage" value="pack"/>
- <db-entity name="TestRelEntity">
- <db-attribute name="ID" type="INTEGER" isPrimaryKey="true" isMandatory="true"/>
- <db-attribute name="NAME" type="VARCHAR" length="200"/>
- </db-entity>
- <obj-entity name="TestRelEntity" className="pack.TestRelEntity" dbEntityName="TestRelEntity">
- <obj-attribute name="name" type="java.lang.String" db-attribute-path="NAME"/>
- </obj-entity>
- <db-relationship name="additionalRel" source="TestRelEntity" target="TestEntity" toMany="false">
- <db-attribute-pair source="ID" target="TestRelEntity_ID"/>
- </db-relationship>
- <obj-relationship name="additionalRel" source="TestRelEntity" target="TestEntity" deleteRule="Nullify" db-relationship-path="additionalRel"/>
-</data-map>
\ No newline at end of file
+<data-map xmlns="http://cayenne.apache.org/schema/10/modelMap"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://cayenne.apache.org/schema/10/modelMap http://cayenne.apache.org/schema/10/modelMap.xsd"
+ project-version="10">
+ <property name="defaultPackage" value="pack"/>
+ <db-entity name="TestRelEntity">
+ <db-attribute name="ID" type="INTEGER" isPrimaryKey="true" isMandatory="true"/>
+ <db-attribute name="NAME" type="VARCHAR" length="200"/>
+ </db-entity>
+ <obj-entity name="TestRelEntity" className="pack.TestRelEntity" dbEntityName="TestRelEntity">
+ <obj-attribute name="name" type="java.lang.String" db-attribute-path="NAME"/>
+ </obj-entity>
+ <db-relationship name="additionalRel" source="TestRelEntity" target="TestEntity">
+ <db-attribute-pair source="ID" target="TestRelEntity_ID"/>
+ </db-relationship>
+ <obj-relationship name="additionalRel" source="TestRelEntity" target="TestEntity" deleteRule="Nullify" db-relationship-path="additionalRel"/>
+</data-map>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/aab05f3c/maven-plugins/cayenne-maven-plugin/src/test/resources/cgen/testDomainMap.map.xml
----------------------------------------------------------------------
diff --git a/maven-plugins/cayenne-maven-plugin/src/test/resources/cgen/testDomainMap.map.xml b/maven-plugins/cayenne-maven-plugin/src/test/resources/cgen/testDomainMap.map.xml
index d0ff3f5..f9d7e31 100644
--- a/maven-plugins/cayenne-maven-plugin/src/test/resources/cgen/testDomainMap.map.xml
+++ b/maven-plugins/cayenne-maven-plugin/src/test/resources/cgen/testDomainMap.map.xml
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
-<data-map xmlns="http://cayenne.apache.org/schema/3.0/modelMap"
+<data-map xmlns="http://cayenne.apache.org/schema/10/modelMap"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://cayenne.apache.org/schema/3.0/modelMap http://cayenne.apache.org/schema/3.0/modelMap.xsd"
- project-version="6">
+ xsi:schemaLocation="http://cayenne.apache.org/schema/10/modelMap http://cayenne.apache.org/schema/10/modelMap.xsd"
+ project-version="10">
<property name="defaultPackage" value="pack"/>
<embeddable className="pack.Embeddable">
<embeddable-attribute name="embAttr" type="java.lang.String" db-attribute-name="EMB_ATTR"/>
@@ -25,7 +25,9 @@
</obj-entity>
<obj-entity name="TestEntity" className="pack.TestEntity" dbEntityName="TestEntity">
<embedded-attribute name="embeddedAtr" type="pack.Embeddable"/>
- <obj-attribute name="testAttr" type="java.lang.String" db-attribute-path="testAttr"/>
+ <obj-attribute name="testAttr" type="java.lang.String" db-attribute-path="testAttr">
+ <info:property xmlns:info="http://cayenne.apache.org/schema/10/info" name="comment" value="comment for test attribute"/>
+ </obj-attribute>
</obj-entity>
<obj-entity name="TestExcludedEntity" className="pack.TestExcludedEntity" dbEntityName="TestExcludedEntity">
<obj-attribute name="name" type="java.lang.String" db-attribute-path="name"/>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/aab05f3c/maven-plugins/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testComplexChangeOrder.map.xml
----------------------------------------------------------------------
diff --git a/maven-plugins/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testComplexChangeOrder.map.xml b/maven-plugins/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testComplexChangeOrder.map.xml
index 20ccc69..e4cac0a 100644
--- a/maven-plugins/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testComplexChangeOrder.map.xml
+++ b/maven-plugins/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testComplexChangeOrder.map.xml
@@ -17,10 +17,10 @@
specific language governing permissions and limitations
under the License.
-->
-<data-map xmlns="http://cayenne.apache.org/schema/9/modelMap"
+<data-map xmlns="http://cayenne.apache.org/schema/10/modelMap"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://cayenne.apache.org/schema/9/modelMap http://cayenne.apache.org/schema/9/modelMap.xsd"
- project-version="9">
+ xsi:schemaLocation="http://cayenne.apache.org/schema/10/modelMap http://cayenne.apache.org/schema/10/modelMap.xsd"
+ project-version="10">
<property name="defaultSchema" value="SCHEMA_01"/>
@@ -50,7 +50,7 @@
</obj-entity>
- <db-relationship name="parent" source="CHILD" target="PARENT" toMany="false">
+ <db-relationship name="parent" source="CHILD" target="PARENT">
<db-attribute-pair source="parent_id" target="id"/>
</db-relationship>
<db-relationship name="children" source="PARENT" target="CHILD" toMany="true">
http://git-wip-us.apache.org/repos/asf/cayenne/blob/aab05f3c/maven-plugins/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testComplexChangeOrder.map.xml-result
----------------------------------------------------------------------
diff --git a/maven-plugins/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testComplexChangeOrder.map.xml-result b/maven-plugins/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testComplexChangeOrder.map.xml-result
index d68faf1..79cb6de 100644
--- a/maven-plugins/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testComplexChangeOrder.map.xml-result
+++ b/maven-plugins/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testComplexChangeOrder.map.xml-result
@@ -17,10 +17,10 @@
~ specific language governing permissions and limitations
~ under the License.
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
-<data-map xmlns="http://cayenne.apache.org/schema/9/modelMap"
+<data-map xmlns="http://cayenne.apache.org/schema/10/modelMap"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://cayenne.apache.org/schema/9/modelMap http://cayenne.apache.org/schema/9/modelMap.xsd"
- project-version="9">
+ xsi:schemaLocation="http://cayenne.apache.org/schema/10/modelMap http://cayenne.apache.org/schema/10/modelMap.xsd"
+ project-version="10">
<property name="defaultSchema" value="SCHEMA_01"/>
<db-entity name="ADDRESS" schema="SCHEMA_01">
@@ -44,7 +44,7 @@
<db-relationship name="children" source="ADDRESS" target="CHILD" toMany="true">
<db-attribute-pair source="id" target="ADDRESS_ID"/>
</db-relationship>
- <db-relationship name="address" source="CHILD" target="ADDRESS" toMany="false">
+ <db-relationship name="address" source="CHILD" target="ADDRESS">
<db-attribute-pair source="ADDRESS_ID" target="id"/>
</db-relationship>
<obj-relationship name="children" source="Address" target="Child" deleteRule="Deny" db-relationship-path="children"/>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/aab05f3c/maven-plugins/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testCustomObjectLayerSettings.map.xml
----------------------------------------------------------------------
diff --git a/maven-plugins/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testCustomObjectLayerSettings.map.xml b/maven-plugins/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testCustomObjectLayerSettings.map.xml
index acbc62c..dc8b01e 100644
--- a/maven-plugins/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testCustomObjectLayerSettings.map.xml
+++ b/maven-plugins/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testCustomObjectLayerSettings.map.xml
@@ -17,10 +17,10 @@
specific language governing permissions and limitations
under the License.
-->
-<data-map xmlns="http://cayenne.apache.org/schema/9/modelMap"
+<data-map xmlns="http://cayenne.apache.org/schema/10/modelMap"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://cayenne.apache.org/schema/9/modelMap http://cayenne.apache.org/schema/9/modelMap.xsd"
- project-version="9">
+ xsi:schemaLocation="http://cayenne.apache.org/schema/10/modelMap http://cayenne.apache.org/schema/10/modelMap.xsd"
+ project-version="10">
<property name="defaultSchema" value="SCHEMA_01"/>
<db-entity name="EXISTING_TABLE" schema="SCHEMA_01">
<db-attribute name="ID" type="INTEGER" isPrimaryKey="true" isMandatory="true" length="10"/>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/aab05f3c/maven-plugins/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testCustomObjectLayerSettings.map.xml-result
----------------------------------------------------------------------
diff --git a/maven-plugins/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testCustomObjectLayerSettings.map.xml-result b/maven-plugins/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testCustomObjectLayerSettings.map.xml-result
index 9f36c0f..882922d 100644
--- a/maven-plugins/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testCustomObjectLayerSettings.map.xml-result
+++ b/maven-plugins/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testCustomObjectLayerSettings.map.xml-result
@@ -17,10 +17,10 @@
specific language governing permissions and limitations
under the License.
-->
-<data-map xmlns="http://cayenne.apache.org/schema/9/modelMap"
+<data-map xmlns="http://cayenne.apache.org/schema/10/modelMap"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://cayenne.apache.org/schema/9/modelMap http://cayenne.apache.org/schema/9/modelMap.xsd"
- project-version="9">
+ xsi:schemaLocation="http://cayenne.apache.org/schema/10/modelMap http://cayenne.apache.org/schema/10/modelMap.xsd"
+ project-version="10">
<property name="defaultSchema" value="SCHEMA_01"/>
<db-entity name="EXISTING_TABLE" schema="SCHEMA_01">
<db-attribute name="COL2" type="INTEGER" length="10"/>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/aab05f3c/maven-plugins/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testDbAttributeChange.map.xml
----------------------------------------------------------------------
diff --git a/maven-plugins/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testDbAttributeChange.map.xml b/maven-plugins/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testDbAttributeChange.map.xml
index 759090a..48ddac1 100644
--- a/maven-plugins/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testDbAttributeChange.map.xml
+++ b/maven-plugins/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testDbAttributeChange.map.xml
@@ -17,10 +17,10 @@
~ specific language governing permissions and limitations
~ under the License.
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
-<data-map xmlns="http://cayenne.apache.org/schema/9/modelMap"
+<data-map xmlns="http://cayenne.apache.org/schema/10/modelMap"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://cayenne.apache.org/schema/9/modelMap http://cayenne.apache.org/schema/9/modelMap.xsd"
- project-version="9">
+ xsi:schemaLocation="http://cayenne.apache.org/schema/10/modelMap http://cayenne.apache.org/schema/10/modelMap.xsd"
+ project-version="10">
<db-entity name="parent" schema="SCHEMA_01">
<db-attribute name="COL2" type="CHAR" length="25"/>
@@ -50,7 +50,7 @@
<obj-attribute name="col5" type="java.util.Date" db-attribute-path="COL5"/>
</obj-entity>
- <db-relationship name="parent" source="CHILD" target="parent" toMany="false">
+ <db-relationship name="parent" source="CHILD" target="parent">
<db-attribute-pair source="parent_id" target="ID"/>
</db-relationship>
<db-relationship name="children" source="parent" target="CHILD" toMany="true">