This is an automated email from the ASF dual-hosted git repository.
asf-gitbox-commits 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 e874765c9 adressing Ant/Maven assertions regressions, flipping to v12
e874765c9 is described below
commit e874765c9397d5db7ce9b920a863faa7027e681c
Author: Andrus Adamchik <[email protected]>
AuthorDate: Sat Jul 25 10:14:01 2026 +0200
adressing Ant/Maven assertions regressions, flipping to v12
---
.../apache/cayenne/tools/DbImporterTaskTest.java | 14 +-
.../tools/build-include-table.map.xml-result | 6 +-
.../testExcludeRelationshipFirst.map.xml-result | 6 +-
.../apache/cayenne/tools/DbImporterMojoTest.java | 11 +-
.../testAddedFlattenedRelationship.map.xml-result | 67 +++----
.../dbimport/testComplexChangeOrder.map.xml-result | 6 +-
.../dbimport/testConfigFromDataMap.map.xml-result | 14 +-
.../testCustomObjectLayerSettings.map.xml-result | 6 +-
.../dbimport/testDbAttributeChange.map.xml-result | 6 +-
.../dbimport/testDefaultPackage.map.xml-result | 6 +-
.../tools/dbimport/testDropProcedure.map.xml | 2 +-
.../dbimport/testDropProcedure.map.xml-result | 6 +-
.../testExcludeRelationship.map.xml-result | 209 +++++++++------------
.../testExcludeRelationshipFirst.map.xml-result | 6 +-
.../testFilteringWithSchema.map.xml-result | 6 +-
.../dbimport/testFkAttributeRename.map.xml-result | 47 +++--
...ttensManyToManyWithRecursiveLink.map.xml-result | 55 +++---
.../dbimport/testForceDataMapSchema.map.xml-result | 6 +-
.../testImportAddTableAndColumn.map.xml-result | 6 +-
.../dbimport/testImportNewDataMap.map.xml-result | 6 +-
.../testImportNewRelationship.map.xml-result | 90 ++++-----
.../tools/dbimport/testImportProcedure.map.xml | 2 +-
.../dbimport/testImportProcedure.map.xml-result | 6 +-
.../testImportWithoutChanges.map.xml-result | 6 +-
.../tools/dbimport/testInheritance.map.xml-result | 6 +-
.../tools/dbimport/testJava7Types.map.xml-result | 6 +-
.../tools/dbimport/testJava8Types.map.xml-result | 6 +-
.../dbimport/testNamingStrategy.map.xml-result | 6 +-
.../tools/dbimport/testOneToOne.map.xml-result | 22 +--
.../dbimport/testPreserveCustomObjMappings.map.xml | 2 +-
.../testPreserveCustomObjMappings.map.xml-result | 8 +-
.../testPreserveRelationships.map.xml-result | 6 +-
.../tools/dbimport/testSameProcedure.map.xml | 2 +-
.../dbimport/testSameProcedure.map.xml-result | 6 +-
.../testSchemasAndTableExclude.map.xml-result | 6 +-
.../testSkipPrimaryKeyLoading.map.xml-result | 32 ++--
.../testSkipRelationshipsLoading.map.xml-result | 6 +-
.../tools/dbimport/testTableTypes.map.xml-result | 6 +-
.../dbimport/testTableTypesMap.map.xml-result | 8 +-
.../testUnFlattensManyToMany.map.xml-result | 130 ++++++-------
.../tools/dbimport/testViewsExclude.map.xml-result | 6 +-
.../configuration/xml/cayenne-testConfig5.xml | 4 +-
42 files changed, 408 insertions(+), 455 deletions(-)
diff --git
a/cayenne-ant/src/test/java/org/apache/cayenne/tools/DbImporterTaskTest.java
b/cayenne-ant/src/test/java/org/apache/cayenne/tools/DbImporterTaskTest.java
index 990035a06..935a6670e 100644
--- a/cayenne-ant/src/test/java/org/apache/cayenne/tools/DbImporterTaskTest.java
+++ b/cayenne-ant/src/test/java/org/apache/cayenne/tools/DbImporterTaskTest.java
@@ -29,7 +29,6 @@ import org.junit.jupiter.api.io.TempDir;
import org.xmlunit.matchers.CompareMatcher;
import java.io.File;
-import java.io.FileReader;
import java.io.IOException;
import java.net.URL;
import java.nio.file.Files;
@@ -173,12 +172,13 @@ public class DbImporterTaskTest {
}
}
- @SuppressWarnings("unchecked")
- private void verifyResult(File map, File mapFileCopy) throws IOException {
- try (FileReader control = new FileReader(map.getAbsolutePath() +
"-result");
- FileReader test = new FileReader(mapFileCopy)) {
- assertThat(test,
CompareMatcher.isSimilarTo(control).ignoreWhitespace());
- }
+ private void verifyResult(File map, File mapFileCopy) {
+ // compare Files, not Readers: XMLUnit's Input.from() has no Reader
branch and would silently fall back to
+ // its JAXB builder, making the comparison a no-op. Comments are
ignored, as the "-result" files carry an
+ // ASF license header that the DataMap writer does not emit.
+ File control = new File(map.getAbsolutePath() + "-result");
+
+ assertThat(mapFileCopy,
CompareMatcher.isSimilarTo(control).ignoreWhitespace().ignoreComments());
}
private void prepareDatabase(String sqlFile, DbImportConfiguration
dbImportConfiguration) throws Exception {
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 8c86e4bb3..96c69338b 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/11/modelMap";
+<data-map xmlns="http://cayenne.apache.org/schema/12/modelMap";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="http://cayenne.apache.org/schema/11/modelMap
http://cayenne.apache.org/schema/11/modelMap.xsd";
- project-version="11">
+ xsi:schemaLocation="http://cayenne.apache.org/schema/12/modelMap
https://cayenne.apache.org/schema/12/modelMap.xsd";
+ project-version="12">
<db-entity name="PARENT" schema="APP">
<db-attribute name="COL2" type="CHAR" length="25"/>
<db-attribute name="COL3" type="DECIMAL" length="10" scale="2"/>
diff --git
a/cayenne-ant/src/test/resources/org/apache/cayenne/tools/testExcludeRelationshipFirst.map.xml-result
b/cayenne-ant/src/test/resources/org/apache/cayenne/tools/testExcludeRelationshipFirst.map.xml-result
index 423f81963..7bac8e37f 100644
---
a/cayenne-ant/src/test/resources/org/apache/cayenne/tools/testExcludeRelationshipFirst.map.xml-result
+++
b/cayenne-ant/src/test/resources/org/apache/cayenne/tools/testExcludeRelationshipFirst.map.xml-result
@@ -17,10 +17,10 @@
specific language governing permissions and limitations
under the License.
-->
-<data-map xmlns="http://cayenne.apache.org/schema/11/modelMap";
+<data-map xmlns="http://cayenne.apache.org/schema/12/modelMap";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="http://cayenne.apache.org/schema/11/modelMap
http://cayenne.apache.org/schema/11/modelMap.xsd";
- project-version="11">
+ xsi:schemaLocation="http://cayenne.apache.org/schema/12/modelMap
https://cayenne.apache.org/schema/12/modelMap.xsd";
+ project-version="12">
<property name="defaultSchema" value="SCHEMA_01"/>
<db-entity name="TEST1" schema="SCHEMA_01">
diff --git
a/cayenne-maven-plugin/src/test/java/org/apache/cayenne/tools/DbImporterMojoTest.java
b/cayenne-maven-plugin/src/test/java/org/apache/cayenne/tools/DbImporterMojoTest.java
index 8431ffd9f..7af3d8107 100644
---
a/cayenne-maven-plugin/src/test/java/org/apache/cayenne/tools/DbImporterMojoTest.java
+++
b/cayenne-maven-plugin/src/test/java/org/apache/cayenne/tools/DbImporterMojoTest.java
@@ -29,13 +29,11 @@ import org.apache.maven.plugin.MojoExecutionException;
import org.codehaus.plexus.util.FileUtils;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll;
-import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import org.slf4j.Logger;
import org.xmlunit.matchers.CompareMatcher;
import java.io.File;
-import java.io.FileReader;
import java.io.IOException;
import java.net.URL;
import java.sql.Connection;
@@ -302,7 +300,6 @@ public class DbImporterMojoTest {
* collection attributes in both directions
*/
@Test
- @Disabled("Investigate why on different environment entity relationships
order are different.")
public void flattensManyToManyWithRecursiveLink(
@InjectMojo(goal = "cdbimport", pom =
"src/test/resources/org/apache/cayenne/tools/dbimport/testFlattensManyToManyWithRecursiveLink-pom.xml")
DbImporterMojo mojo) throws Exception {
@@ -521,10 +518,12 @@ public class DbImporterMojoTest {
}
private void verifyResult(File map, File mapFileCopy) throws Exception {
- FileReader control = new FileReader(map.getAbsolutePath() + "-result");
- FileReader test = new FileReader(mapFileCopy);
+ // compare Files, not Readers: XMLUnit's Input.from() has no Reader
branch and would silently fall back to
+ // its JAXB builder, making the comparison a no-op. Comments are
ignored, as the "-result" files carry an
+ // ASF license header that the DataMap writer does not emit.
+ File control = new File(map.getAbsolutePath() + "-result");
- assertThat(test,
CompareMatcher.isSimilarTo(control).ignoreWhitespace());
+ assertThat(mapFileCopy,
CompareMatcher.isSimilarTo(control).ignoreWhitespace().ignoreComments());
}
private void prepareDatabase(String sqlFile, DbImportDataSourceConfig
dataSource) throws Exception {
diff --git
a/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testAddedFlattenedRelationship.map.xml-result
b/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testAddedFlattenedRelationship.map.xml-result
index b4f848ce2..90e038e1c 100644
---
a/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testAddedFlattenedRelationship.map.xml-result
+++
b/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testAddedFlattenedRelationship.map.xml-result
@@ -17,39 +17,34 @@
~ specific language governing permissions and limitations
~ under the License.
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
-<data-map xmlns="http://cayenne.apache.org/schema/11/modelMap";
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="http://cayenne.apache.org/schema/11/modelMap
http://cayenne.apache.org/schema/11/modelMap.xsd";
- project-version="11">
-
- <db-entity name="A" schema="SCHEMA_01">
- <db-attribute name="ID" type="INTEGER" isPrimaryKey="true"
isMandatory="true" length="10"/>
- </db-entity>
- <db-entity name="A_B" schema="SCHEMA_01">
- <db-attribute name="A_ID" type="INTEGER" isPrimaryKey="true"
isMandatory="true" length="10"/>
- <db-attribute name="B_ID" type="INTEGER" isPrimaryKey="true"
isMandatory="true" length="10"/>
- </db-entity>
- <db-entity name="B" schema="SCHEMA_01">
- <db-attribute name="ID" type="INTEGER" isPrimaryKey="true"
isMandatory="true" length="10"/>
- </db-entity>
-
- <obj-entity name="A" className="A" dbEntityName="A"/>
- <obj-entity name="B" className="B" dbEntityName="B"/>
-
- <db-relationship name="aBs" source="A" target="A_B" toDependentPK="true"
toMany="true">
- <db-attribute-pair source="ID" target="A_ID"/>
- </db-relationship>
- <db-relationship name="a" source="A_B" target="A">
- <db-attribute-pair source="A_ID" target="ID"/>
- </db-relationship>
-
- <db-relationship name="aBs" source="B" target="A_B" toDependentPK="true"
toMany="true">
- <db-attribute-pair source="ID" target="B_ID"/>
- </db-relationship>
- <db-relationship name="b" source="A_B" target="B">
- <db-attribute-pair source="B_ID" target="ID"/>
- </db-relationship>
-
- <obj-relationship name="bs" source="A" target="B"
db-relationship-path="aBs.b"/>
- <obj-relationship name="as" source="B" target="A"
db-relationship-path="aBs.a"/>
-</data-map>
\ No newline at end of file
+<data-map xmlns="http://cayenne.apache.org/schema/12/modelMap";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://cayenne.apache.org/schema/12/modelMap
https://cayenne.apache.org/schema/12/modelMap.xsd";
+ project-version="12">
+ <db-entity name="A" schema="SCHEMA_01">
+ <db-attribute name="ID" type="INTEGER" isPrimaryKey="true"
isMandatory="true" length="10"/>
+ </db-entity>
+ <db-entity name="A_B" schema="SCHEMA_01">
+ <db-attribute name="A_ID" type="INTEGER" isPrimaryKey="true"
isMandatory="true" length="10"/>
+ <db-attribute name="B_ID" type="INTEGER" isPrimaryKey="true"
isMandatory="true" length="10"/>
+ </db-entity>
+ <db-entity name="B" schema="SCHEMA_01">
+ <db-attribute name="ID" type="INTEGER" isPrimaryKey="true"
isMandatory="true" length="10"/>
+ </db-entity>
+ <obj-entity name="A" className="A" dbEntityName="A"/>
+ <obj-entity name="B" className="B" dbEntityName="B"/>
+ <db-relationship name="aBs" source="A" target="A_B"
toDependentPK="true" toMany="true">
+ <db-attribute-pair source="ID" target="A_ID"/>
+ </db-relationship>
+ <db-relationship name="a" source="A_B" target="A">
+ <db-attribute-pair source="A_ID" target="ID"/>
+ </db-relationship>
+ <db-relationship name="b" source="A_B" target="B">
+ <db-attribute-pair source="B_ID" target="ID"/>
+ </db-relationship>
+ <db-relationship name="aBs" source="B" target="A_B"
toDependentPK="true" toMany="true">
+ <db-attribute-pair source="ID" target="B_ID"/>
+ </db-relationship>
+ <obj-relationship name="bs" source="A" target="B"
db-relationship-path="aBs.b"/>
+ <obj-relationship name="as" source="B" target="A"
db-relationship-path="aBs.a"/>
+</data-map>
diff --git
a/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testComplexChangeOrder.map.xml-result
b/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testComplexChangeOrder.map.xml-result
index 78ce0d1a2..a18a63a1e 100644
---
a/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testComplexChangeOrder.map.xml-result
+++
b/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/11/modelMap";
+<data-map xmlns="http://cayenne.apache.org/schema/12/modelMap";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="http://cayenne.apache.org/schema/11/modelMap
http://cayenne.apache.org/schema/11/modelMap.xsd";
- project-version="11">
+ xsi:schemaLocation="http://cayenne.apache.org/schema/12/modelMap
https://cayenne.apache.org/schema/12/modelMap.xsd";
+ project-version="12">
<property name="defaultSchema" value="SCHEMA_01"/>
<db-entity name="ADDRESS" schema="SCHEMA_01">
diff --git
a/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testConfigFromDataMap.map.xml-result
b/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testConfigFromDataMap.map.xml-result
index cc8142a62..bc4784b3a 100644
---
a/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testConfigFromDataMap.map.xml-result
+++
b/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testConfigFromDataMap.map.xml-result
@@ -17,10 +17,10 @@
specific language governing permissions and limitations
under the License.
-->
-<data-map xmlns="http://cayenne.apache.org/schema/11/modelMap";
+<data-map xmlns="http://cayenne.apache.org/schema/12/modelMap";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="http://cayenne.apache.org/schema/11/modelMap
https://cayenne.apache.org/schema/11/modelMap.xsd";
- project-version="11">
+ xsi:schemaLocation="http://cayenne.apache.org/schema/12/modelMap
https://cayenne.apache.org/schema/12/modelMap.xsd";
+ project-version="12">
<db-entity name="PARENT">
<db-attribute name="COL2" type="CHAR" length="20"/>
<db-attribute name="COL3" type="DECIMAL" length="10" scale="2"/>
@@ -32,11 +32,11 @@
<obj-attribute name="col3" type="java.math.BigDecimal"
db-attribute-path="COL3"/>
<obj-attribute name="col4" type="java.lang.String"
db-attribute-path="COL4"/>
</obj-entity>
- <dbImport xmlns="http://cayenne.apache.org/schema/11/dbimport";>
+ <dbImport xmlns="http://cayenne.apache.org/schema/12/dbimport";>
<schema>
- <name>SCHEMA_01</name>
- <excludeColumn>COL5</excludeColumn>
- </schema>
+ <excludeColumn>COL5</excludeColumn>
+ <name>SCHEMA_01</name>
+ </schema>
<forceDataMapCatalog>false</forceDataMapCatalog>
<forceDataMapSchema>true</forceDataMapSchema>
<namingStrategy>org.apache.cayenne.dbsync.naming.DefaultObjectNameGenerator</namingStrategy>
diff --git
a/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testCustomObjectLayerSettings.map.xml-result
b/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testCustomObjectLayerSettings.map.xml-result
index 508f166c3..0a5eda05d 100644
---
a/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testCustomObjectLayerSettings.map.xml-result
+++
b/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/11/modelMap";
+<data-map xmlns="http://cayenne.apache.org/schema/12/modelMap";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="http://cayenne.apache.org/schema/11/modelMap
http://cayenne.apache.org/schema/11/modelMap.xsd";
- project-version="11">
+ xsi:schemaLocation="http://cayenne.apache.org/schema/12/modelMap
https://cayenne.apache.org/schema/12/modelMap.xsd";
+ project-version="12">
<property name="defaultSchema" value="SCHEMA_01"/>
<db-entity name="EXISTING_TABLE" schema="SCHEMA_01">
<db-attribute name="COL2" type="INTEGER" length="10"/>
diff --git
a/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testDbAttributeChange.map.xml-result
b/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testDbAttributeChange.map.xml-result
index 008b0edfe..1dc19f693 100644
---
a/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testDbAttributeChange.map.xml-result
+++
b/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testDbAttributeChange.map.xml-result
@@ -18,10 +18,10 @@
~ specific language governing permissions and limitations
~ under the License.
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
-<data-map xmlns="http://cayenne.apache.org/schema/11/modelMap";
+<data-map xmlns="http://cayenne.apache.org/schema/12/modelMap";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="http://cayenne.apache.org/schema/11/modelMap
http://cayenne.apache.org/schema/11/modelMap.xsd";
- project-version="11">
+ xsi:schemaLocation="http://cayenne.apache.org/schema/12/modelMap
https://cayenne.apache.org/schema/12/modelMap.xsd";
+ project-version="12">
<db-entity name="CHILD" schema="SCHEMA_01">
<db-attribute name="COL3" type="DECIMAL" length="5" scale="1"/>
diff --git
a/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testDefaultPackage.map.xml-result
b/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testDefaultPackage.map.xml-result
index 97a177a36..0da792432 100644
---
a/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testDefaultPackage.map.xml-result
+++
b/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testDefaultPackage.map.xml-result
@@ -17,10 +17,10 @@
specific language governing permissions and limitations
under the License.
-->
-<data-map xmlns="http://cayenne.apache.org/schema/11/modelMap";
+<data-map xmlns="http://cayenne.apache.org/schema/12/modelMap";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="http://cayenne.apache.org/schema/11/modelMap
http://cayenne.apache.org/schema/11/modelMap.xsd";
- project-version="11">
+ xsi:schemaLocation="http://cayenne.apache.org/schema/12/modelMap
https://cayenne.apache.org/schema/12/modelMap.xsd";
+ project-version="12">
<property name="defaultPackage" value="com.example.test"/>
<property name="defaultSchema" value="SCHEMA_01"/>
<db-entity name="CHILD" schema="SCHEMA_01">
diff --git
a/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testDropProcedure.map.xml
b/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testDropProcedure.map.xml
index 40977a17f..f1deea92b 100644
---
a/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testDropProcedure.map.xml
+++
b/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testDropProcedure.map.xml
@@ -19,7 +19,7 @@
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
<data-map xmlns="http://cayenne.apache.org/schema/12/modelMap";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="http://cayenne.apache.org/schema/12/modelMap
https://cayenne.apache.org/schema/10/modelMap.xsd";
+ xsi:schemaLocation="http://cayenne.apache.org/schema/12/modelMap
https://cayenne.apache.org/schema/12/modelMap.xsd";
project-version="12">
<procedure name="PROC" schema="SCHEMA_01"/>
<db-entity name="TABLE1" schema="SCHEMA_01">
diff --git
a/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testDropProcedure.map.xml-result
b/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testDropProcedure.map.xml-result
index 7141fad2b..ed768a7fe 100644
---
a/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testDropProcedure.map.xml-result
+++
b/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testDropProcedure.map.xml-result
@@ -17,10 +17,10 @@
~ specific language governing permissions and limitations
~ under the License.
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
-<data-map xmlns="http://cayenne.apache.org/schema/11/modelMap";
+<data-map xmlns="http://cayenne.apache.org/schema/12/modelMap";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="http://cayenne.apache.org/schema/11/modelMap
https://cayenne.apache.org/schema/10/modelMap.xsd";
- project-version="11">
+ xsi:schemaLocation="http://cayenne.apache.org/schema/12/modelMap
https://cayenne.apache.org/schema/12/modelMap.xsd";
+ project-version="12">
<db-entity name="TABLE2" schema="SCHEMA_01">
<db-attribute name="ID" type="INTEGER" isPrimaryKey="true"
isMandatory="true" length="10"/>
<db-attribute name="T1_NAME" type="VARCHAR" length="45"/>
diff --git
a/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testExcludeRelationship.map.xml-result
b/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testExcludeRelationship.map.xml-result
index f204139fb..407b73d95 100644
---
a/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testExcludeRelationship.map.xml-result
+++
b/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testExcludeRelationship.map.xml-result
@@ -17,122 +17,95 @@
specific language governing permissions and limitations
under the License.
-->
-<data-map xmlns="http://cayenne.apache.org/schema/11/modelMap";
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="http://cayenne.apache.org/schema/11/modelMap
http://cayenne.apache.org/schema/11/modelMap.xsd";
- project-version="11">
- <property name="defaultSchema" value="SCHEMA_01"/>
- <db-entity name="TEST1" schema="SCHEMA_01">
- <db-attribute name="ID" type="INTEGER" isPrimaryKey="true"
isMandatory="true" length="10"/>
- </db-entity>
- <db-entity name="TEST2" schema="SCHEMA_01">
- <db-attribute name="ID" type="INTEGER" isPrimaryKey="true"
isMandatory="true" length="10"/>
- <db-attribute name="TEST1_ID" type="INTEGER"/>
- </db-entity>
-
- <db-entity name="TEST3" schema="SCHEMA_01">
- <db-attribute name="ID" type="INTEGER" isPrimaryKey="true"
isMandatory="true" length="10"/>
- </db-entity>
- <db-entity name="TEST4" schema="SCHEMA_01">
- <db-attribute name="ID" type="INTEGER" isPrimaryKey="true"
isMandatory="true" length="10"/>
- <db-attribute name="TEST3_ID" type="INTEGER"/>
- </db-entity>
-
- <db-entity name="TEST5" schema="SCHEMA_01">
- <db-attribute name="ID" type="INTEGER" isPrimaryKey="true"
isMandatory="true" length="10"/>
- </db-entity>
- <db-entity name="TEST6" schema="SCHEMA_01">
- <db-attribute name="ID" type="INTEGER" isPrimaryKey="true"
isMandatory="true" length="10"/>
- <db-attribute name="TEST5_ID" type="INTEGER"/>
- </db-entity>
-
- <db-entity name="TEST7" schema="SCHEMA_01">
- <db-attribute name="ID" type="INTEGER" isPrimaryKey="true"
isMandatory="true" length="10"/>
- </db-entity>
- <db-entity name="TEST8" schema="SCHEMA_01">
- <db-attribute name="ID" type="INTEGER" isPrimaryKey="true"
isMandatory="true" length="10"/>
- <db-attribute name="TEST7_ID" type="INTEGER"/>
- </db-entity>
-
- <db-entity name="TEST9" schema="SCHEMA_01">
- <db-attribute name="ID" type="INTEGER" isPrimaryKey="true"
isMandatory="true" length="10"/>
- </db-entity>
- <db-entity name="TEST10" schema="SCHEMA_01">
- <db-attribute name="ID" type="INTEGER" isPrimaryKey="true"
isMandatory="true" length="10"/>
- <db-attribute name="TEST9_ID" type="INTEGER"/>
- </db-entity>
-
- <db-entity name="TEST11" schema="SCHEMA_01">
- <db-attribute name="ID" type="INTEGER" isPrimaryKey="true"
isMandatory="true" length="10"/>
- </db-entity>
- <db-entity name="TEST12" schema="SCHEMA_01">
- <db-attribute name="ID" type="INTEGER" isPrimaryKey="true"
isMandatory="true" length="10"/>
- <db-attribute name="TEST11_ID" type="INTEGER"/>
- </db-entity>
-
- <obj-entity name="Test1" className="Test1" dbEntityName="TEST1">
- </obj-entity>
- <obj-entity name="Test2" className="Test2" dbEntityName="TEST2">
- </obj-entity>
-
- <obj-entity name="Test3" className="Test3" dbEntityName="TEST3">
- </obj-entity>
- <obj-entity name="Test4" className="Test4" dbEntityName="TEST4">
- </obj-entity>
-
- <obj-entity name="Test5" className="Test5" dbEntityName="TEST5">
- </obj-entity>
- <obj-entity name="Test6" className="Test6" dbEntityName="TEST6">
- </obj-entity>
-
- <obj-entity name="Test7" className="Test7" dbEntityName="TEST7">
- </obj-entity>
- <obj-entity name="Test8" className="Test8" dbEntityName="TEST8">
- </obj-entity>
-
- <obj-entity name="Test9" className="Test9" dbEntityName="TEST9">
- </obj-entity>
- <obj-entity name="Test10" className="Test10" dbEntityName="TEST10">
- </obj-entity>
-
- <obj-entity name="Test11" className="Test11" dbEntityName="TEST11">
- </obj-entity>
- <obj-entity name="Test12" className="Test12" dbEntityName="TEST12">
- </obj-entity>
-
- <db-relationship name="TEST1_TO_TEST2" source="TEST1" target="TEST2"
toMany="true">
- <db-attribute-pair source="ID" target="TEST1_ID"/>
- </db-relationship>
- <db-relationship name="TEST2_TO_TEST1" source="TEST2" target="TEST1">
- <db-attribute-pair source="TEST1_ID" target="ID"/>
- </db-relationship>
- <obj-relationship name="test1ToTest2" source="Test1" target="Test2"
deleteRule="Deny" db-relationship-path="TEST1_TO_TEST2"/>
- <obj-relationship name="test2ToTest1" source="Test2" target="Test1"
deleteRule="Nullify" db-relationship-path="TEST2_TO_TEST1"/>
-
- <db-relationship name="test4s" source="TEST3" target="TEST4" toMany="true">
- <db-attribute-pair source="ID" target="TEST3_ID"/>
- </db-relationship>
- <db-relationship name="test3" source="TEST4" target="TEST3">
- <db-attribute-pair source="TEST3_ID" target="ID"/>
- </db-relationship>
- <obj-relationship name="test4s" source="Test3" target="Test4"
deleteRule="Deny" db-relationship-path="test4s"/>
- <obj-relationship name="test3" source="Test4" target="Test3"
deleteRule="Nullify" db-relationship-path="test3"/>
-
- <db-relationship name="test8s" source="TEST7" target="TEST8" toMany="true">
- <db-attribute-pair source="ID" target="TEST7_ID"/>
- </db-relationship>
- <db-relationship name="test7" source="TEST8" target="TEST7">
- <db-attribute-pair source="TEST7_ID" target="ID"/>
- </db-relationship>
- <obj-relationship name="test8s" source="Test7" target="Test8"
deleteRule="Deny" db-relationship-path="test8s"/>
- <obj-relationship name="test7" source="Test8" target="Test7"
deleteRule="Nullify" db-relationship-path="test7"/>
-
- <db-relationship name="test12s" source="TEST11" target="TEST12"
toMany="true">
- <db-attribute-pair source="ID" target="TEST11_ID"/>
- </db-relationship>
- <db-relationship name="test11" source="TEST12" target="TEST11">
- <db-attribute-pair source="TEST11_ID" target="ID"/>
- </db-relationship>
- <obj-relationship name="test12s" source="Test11" target="Test12"
deleteRule="Deny" db-relationship-path="test12s"/>
- <obj-relationship name="test1" source="Test12" target="Test11"
deleteRule="Nullify" db-relationship-path="test11"/>
+<data-map xmlns="http://cayenne.apache.org/schema/12/modelMap";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://cayenne.apache.org/schema/12/modelMap
https://cayenne.apache.org/schema/12/modelMap.xsd";
+ project-version="12">
+ <property name="defaultSchema" value="SCHEMA_01"/>
+ <db-entity name="TEST1" schema="SCHEMA_01">
+ <db-attribute name="ID" type="INTEGER" isPrimaryKey="true"
isMandatory="true" length="10"/>
+ </db-entity>
+ <db-entity name="TEST10" schema="SCHEMA_01">
+ <db-attribute name="ID" type="INTEGER" isPrimaryKey="true"
isMandatory="true" length="10"/>
+ <db-attribute name="TEST9_ID" type="INTEGER"/>
+ </db-entity>
+ <db-entity name="TEST11" schema="SCHEMA_01">
+ <db-attribute name="ID" type="INTEGER" isPrimaryKey="true"
isMandatory="true" length="10"/>
+ </db-entity>
+ <db-entity name="TEST12" schema="SCHEMA_01">
+ <db-attribute name="ID" type="INTEGER" isPrimaryKey="true"
isMandatory="true" length="10"/>
+ <db-attribute name="TEST11_ID" type="INTEGER"/>
+ </db-entity>
+ <db-entity name="TEST2" schema="SCHEMA_01">
+ <db-attribute name="ID" type="INTEGER" isPrimaryKey="true"
isMandatory="true" length="10"/>
+ <db-attribute name="TEST1_ID" type="INTEGER"/>
+ </db-entity>
+ <db-entity name="TEST3" schema="SCHEMA_01">
+ <db-attribute name="ID" type="INTEGER" isPrimaryKey="true"
isMandatory="true" length="10"/>
+ </db-entity>
+ <db-entity name="TEST4" schema="SCHEMA_01">
+ <db-attribute name="ID" type="INTEGER" isPrimaryKey="true"
isMandatory="true" length="10"/>
+ <db-attribute name="TEST3_ID" type="INTEGER"/>
+ </db-entity>
+ <db-entity name="TEST5" schema="SCHEMA_01">
+ <db-attribute name="ID" type="INTEGER" isPrimaryKey="true"
isMandatory="true" length="10"/>
+ </db-entity>
+ <db-entity name="TEST6" schema="SCHEMA_01">
+ <db-attribute name="ID" type="INTEGER" isPrimaryKey="true"
isMandatory="true" length="10"/>
+ <db-attribute name="TEST5_ID" type="INTEGER"/>
+ </db-entity>
+ <db-entity name="TEST7" schema="SCHEMA_01">
+ <db-attribute name="ID" type="INTEGER" isPrimaryKey="true"
isMandatory="true" length="10"/>
+ </db-entity>
+ <db-entity name="TEST8" schema="SCHEMA_01">
+ <db-attribute name="ID" type="INTEGER" isPrimaryKey="true"
isMandatory="true" length="10"/>
+ <db-attribute name="TEST7_ID" type="INTEGER"/>
+ </db-entity>
+ <db-entity name="TEST9" schema="SCHEMA_01">
+ <db-attribute name="ID" type="INTEGER" isPrimaryKey="true"
isMandatory="true" length="10"/>
+ </db-entity>
+ <obj-entity name="Test1" className="Test1" dbEntityName="TEST1"/>
+ <obj-entity name="Test10" className="Test10" dbEntityName="TEST10"/>
+ <obj-entity name="Test11" className="Test11" dbEntityName="TEST11"/>
+ <obj-entity name="Test12" className="Test12" dbEntityName="TEST12"/>
+ <obj-entity name="Test2" className="Test2" dbEntityName="TEST2"/>
+ <obj-entity name="Test3" className="Test3" dbEntityName="TEST3"/>
+ <obj-entity name="Test4" className="Test4" dbEntityName="TEST4"/>
+ <obj-entity name="Test5" className="Test5" dbEntityName="TEST5"/>
+ <obj-entity name="Test6" className="Test6" dbEntityName="TEST6"/>
+ <obj-entity name="Test7" className="Test7" dbEntityName="TEST7"/>
+ <obj-entity name="Test8" className="Test8" dbEntityName="TEST8"/>
+ <obj-entity name="Test9" className="Test9" dbEntityName="TEST9"/>
+ <db-relationship name="TEST1_TO_TEST2" source="TEST1" target="TEST2"
toMany="true">
+ <db-attribute-pair source="ID" target="TEST1_ID"/>
+ </db-relationship>
+ <db-relationship name="test12s" source="TEST11" target="TEST12"
toMany="true">
+ <db-attribute-pair source="ID" target="TEST11_ID"/>
+ </db-relationship>
+ <db-relationship name="test11" source="TEST12" target="TEST11">
+ <db-attribute-pair source="TEST11_ID" target="ID"/>
+ </db-relationship>
+ <db-relationship name="TEST2_TO_TEST1" source="TEST2" target="TEST1">
+ <db-attribute-pair source="TEST1_ID" target="ID"/>
+ </db-relationship>
+ <db-relationship name="test4s" source="TEST3" target="TEST4"
toMany="true">
+ <db-attribute-pair source="ID" target="TEST3_ID"/>
+ </db-relationship>
+ <db-relationship name="test3" source="TEST4" target="TEST3">
+ <db-attribute-pair source="TEST3_ID" target="ID"/>
+ </db-relationship>
+ <db-relationship name="test8s" source="TEST7" target="TEST8"
toMany="true">
+ <db-attribute-pair source="ID" target="TEST7_ID"/>
+ </db-relationship>
+ <db-relationship name="test7" source="TEST8" target="TEST7">
+ <db-attribute-pair source="TEST7_ID" target="ID"/>
+ </db-relationship>
+ <obj-relationship name="test1ToTest2" source="Test1" target="Test2"
deleteRule="Deny" db-relationship-path="TEST1_TO_TEST2"/>
+ <obj-relationship name="test12s" source="Test11" target="Test12"
deleteRule="Deny" db-relationship-path="test12s"/>
+ <obj-relationship name="test1" source="Test12" target="Test11"
deleteRule="Nullify" db-relationship-path="test11"/>
+ <obj-relationship name="test2ToTest1" source="Test2" target="Test1"
deleteRule="Nullify" db-relationship-path="TEST2_TO_TEST1"/>
+ <obj-relationship name="test4s" source="Test3" target="Test4"
deleteRule="Deny" db-relationship-path="test4s"/>
+ <obj-relationship name="test3" source="Test4" target="Test3"
deleteRule="Nullify" db-relationship-path="test3"/>
+ <obj-relationship name="test8s" source="Test7" target="Test8"
deleteRule="Deny" db-relationship-path="test8s"/>
+ <obj-relationship name="test7" source="Test8" target="Test7"
deleteRule="Nullify" db-relationship-path="test7"/>
</data-map>
diff --git
a/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testExcludeRelationshipFirst.map.xml-result
b/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testExcludeRelationshipFirst.map.xml-result
index 284f981ac..7e43bb362 100644
---
a/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testExcludeRelationshipFirst.map.xml-result
+++
b/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testExcludeRelationshipFirst.map.xml-result
@@ -17,10 +17,10 @@
specific language governing permissions and limitations
under the License.
-->
-<data-map xmlns="http://cayenne.apache.org/schema/11/modelMap";
+<data-map xmlns="http://cayenne.apache.org/schema/12/modelMap";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="http://cayenne.apache.org/schema/11/modelMap
http://cayenne.apache.org/schema/11/modelMap.xsd";
- project-version="11">
+ xsi:schemaLocation="http://cayenne.apache.org/schema/12/modelMap
https://cayenne.apache.org/schema/12/modelMap.xsd";
+ project-version="12">
<property name="defaultSchema" value="SCHEMA_01"/>
<db-entity name="TEST1" schema="SCHEMA_01">
diff --git
a/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testFilteringWithSchema.map.xml-result
b/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testFilteringWithSchema.map.xml-result
index 361062ca4..59c165428 100644
---
a/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testFilteringWithSchema.map.xml-result
+++
b/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testFilteringWithSchema.map.xml-result
@@ -17,10 +17,10 @@
specific language governing permissions and limitations
under the License.
-->
-<data-map xmlns="http://cayenne.apache.org/schema/11/modelMap";
+<data-map xmlns="http://cayenne.apache.org/schema/12/modelMap";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="http://cayenne.apache.org/schema/11/modelMap
http://cayenne.apache.org/schema/11/modelMap.xsd";
- project-version="11">
+ xsi:schemaLocation="http://cayenne.apache.org/schema/12/modelMap
https://cayenne.apache.org/schema/12/modelMap.xsd";
+ project-version="12">
<property name="defaultSchema" value="SCHEMA_01"/>
<db-entity name="CHILD" schema="SCHEMA_01">
<db-attribute name="COL3" type="DECIMAL" length="10" scale="2"/>
diff --git
a/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testFkAttributeRename.map.xml-result
b/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testFkAttributeRename.map.xml-result
index 514da4dd6..25ee92568 100644
---
a/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testFkAttributeRename.map.xml-result
+++
b/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testFkAttributeRename.map.xml-result
@@ -18,28 +18,25 @@
~ specific language governing permissions and limitations
~ under the License.
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
-<data-map xmlns="http://cayenne.apache.org/schema/11/modelMap";
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="http://cayenne.apache.org/schema/11/modelMap
http://cayenne.apache.org/schema/11/modelMap.xsd";
- project-version="11">
-
- <db-entity name="CHILD" schema="SCHEMA_01">
- <db-attribute name="PAR" type="INTEGER" length="10"/>
- <db-attribute name="id" type="INTEGER" length="10"/>
- </db-entity>
- <db-entity name="PARENT" schema="SCHEMA_01">
- <db-attribute name="id" type="INTEGER" isPrimaryKey="true"
isMandatory="true" length="10"/>
- </db-entity>
- <obj-entity name="Child" className="Child" dbEntityName="CHILD">
- </obj-entity>
- <obj-entity name="Parent" className="Parent" dbEntityName="PARENT">
- </obj-entity>
- <db-relationship name="parent" source="CHILD" target="PARENT">
- <db-attribute-pair source="PAR" target="id"/>
- </db-relationship>
- <db-relationship name="children" source="PARENT" target="CHILD"
toMany="true">
- <db-attribute-pair source="id" target="PAR"/>
- </db-relationship>
- <obj-relationship name="parent" source="Child" target="Parent"
deleteRule="Nullify" db-relationship-path="parent"/>
- <obj-relationship name="children" source="Parent" target="Child"
deleteRule="Deny" db-relationship-path="children"/>
-</data-map>
\ No newline at end of file
+<data-map xmlns="http://cayenne.apache.org/schema/12/modelMap";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://cayenne.apache.org/schema/12/modelMap
https://cayenne.apache.org/schema/12/modelMap.xsd";
+ project-version="12">
+ <db-entity name="CHILD" schema="SCHEMA_01">
+ <db-attribute name="PAR" type="INTEGER" length="10"/>
+ <db-attribute name="id" type="INTEGER" length="10"/>
+ </db-entity>
+ <db-entity name="PARENT" schema="SCHEMA_01">
+ <db-attribute name="id" type="INTEGER" isPrimaryKey="true"
isMandatory="true" length="10"/>
+ </db-entity>
+ <obj-entity name="Child" className="Child" dbEntityName="CHILD"/>
+ <obj-entity name="Parent" className="Parent" dbEntityName="PARENT"/>
+ <db-relationship name="par" source="CHILD" target="PARENT">
+ <db-attribute-pair source="PAR" target="id"/>
+ </db-relationship>
+ <db-relationship name="children" source="PARENT" target="CHILD"
toMany="true">
+ <db-attribute-pair source="id" target="PAR"/>
+ </db-relationship>
+ <obj-relationship name="par1" source="Child" target="Parent"
deleteRule="Nullify" db-relationship-path="par"/>
+ <obj-relationship name="children" source="Parent" target="Child"
deleteRule="Deny" db-relationship-path="children"/>
+</data-map>
diff --git
a/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testFlattensManyToManyWithRecursiveLink.map.xml-result
b/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testFlattensManyToManyWithRecursiveLink.map.xml-result
index 5086b5c1a..5b87c6ef7 100644
---
a/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testFlattensManyToManyWithRecursiveLink.map.xml-result
+++
b/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testFlattensManyToManyWithRecursiveLink.map.xml-result
@@ -17,32 +17,31 @@
specific language governing permissions and limitations
under the License.
-->
-<data-map xmlns="http://cayenne.apache.org/schema/11/modelMap";
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="http://cayenne.apache.org/schema/11/modelMap
http://cayenne.apache.org/schema/11/modelMap.xsd";
- project-version="11">
- <property name="defaultPackage" value="org.not.my.home"/>
- <db-entity name="A" schema="APP">
- <db-attribute name="ID" type="INTEGER" isPrimaryKey="true"
isMandatory="true" length="10"/>
- </db-entity>
- <db-entity name="A_A" schema="APP">
- <db-attribute name="A1_ID" type="INTEGER" isPrimaryKey="true"
isMandatory="true" length="10"/>
- <db-attribute name="A2_ID" type="INTEGER" isPrimaryKey="true"
isMandatory="true" length="10"/>
- </db-entity>
- <obj-entity name="A" className="org.not.my.home.A" dbEntityName="A">
- </obj-entity>
- <db-relationship name="aAArray" source="A" target="A_A"
toDependentPK="true" toMany="true">
- <db-attribute-pair source="ID" target="A1_ID"/>
- </db-relationship>
- <db-relationship name="aAArray1" source="A" target="A_A"
toDependentPK="true" toMany="true">
- <db-attribute-pair source="ID" target="A2_ID"/>
- </db-relationship>
- <db-relationship name="toA" source="A_A" target="A">
- <db-attribute-pair source="A1_ID" target="ID"/>
- </db-relationship>
- <db-relationship name="toA1" source="A_A" target="A">
- <db-attribute-pair source="A2_ID" target="ID"/>
- </db-relationship>
- <obj-relationship name="aArray" source="A" target="A"
db-relationship-path="aAArray.toA1"/>
- <obj-relationship name="aArray1" source="A" target="A"
db-relationship-path="aAArray1.toA"/>
+<data-map xmlns="http://cayenne.apache.org/schema/12/modelMap";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://cayenne.apache.org/schema/12/modelMap
https://cayenne.apache.org/schema/12/modelMap.xsd";
+ project-version="12">
+ <property name="defaultPackage" value="org.not.my.home"/>
+ <db-entity name="A" schema="APP">
+ <db-attribute name="ID" type="INTEGER" isPrimaryKey="true"
isMandatory="true" length="10"/>
+ </db-entity>
+ <db-entity name="A_A" schema="APP">
+ <db-attribute name="A1_ID" type="INTEGER" isPrimaryKey="true"
isMandatory="true" length="10"/>
+ <db-attribute name="A2_ID" type="INTEGER" isPrimaryKey="true"
isMandatory="true" length="10"/>
+ </db-entity>
+ <obj-entity name="A" className="org.not.my.home.A" dbEntityName="A"/>
+ <db-relationship name="aAs" source="A" target="A_A"
toDependentPK="true" toMany="true">
+ <db-attribute-pair source="ID" target="A2_ID"/>
+ </db-relationship>
+ <db-relationship name="aAs1" source="A" target="A_A"
toDependentPK="true" toMany="true">
+ <db-attribute-pair source="ID" target="A1_ID"/>
+ </db-relationship>
+ <db-relationship name="a1" source="A_A" target="A">
+ <db-attribute-pair source="A1_ID" target="ID"/>
+ </db-relationship>
+ <db-relationship name="a2" source="A_A" target="A">
+ <db-attribute-pair source="A2_ID" target="ID"/>
+ </db-relationship>
+ <obj-relationship name="a1s" source="A" target="A"
db-relationship-path="aAs.a1"/>
+ <obj-relationship name="a2s" source="A" target="A"
db-relationship-path="aAs1.a2"/>
</data-map>
diff --git
a/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testForceDataMapSchema.map.xml-result
b/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testForceDataMapSchema.map.xml-result
index e6bd87039..1bcc0550f 100644
---
a/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testForceDataMapSchema.map.xml-result
+++
b/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testForceDataMapSchema.map.xml-result
@@ -17,10 +17,10 @@
specific language governing permissions and limitations
under the License.
-->
-<data-map xmlns="http://cayenne.apache.org/schema/11/modelMap";
+<data-map xmlns="http://cayenne.apache.org/schema/12/modelMap";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="http://cayenne.apache.org/schema/11/modelMap
http://cayenne.apache.org/schema/11/modelMap.xsd";
- project-version="11">
+ xsi:schemaLocation="http://cayenne.apache.org/schema/12/modelMap
https://cayenne.apache.org/schema/12/modelMap.xsd";
+ project-version="12">
<property name="defaultPackage" value="com.example.test"/>
<property name="defaultCatalog" value="XCATALOG"/>
<db-entity name="CHILD" catalog="XCATALOG">
diff --git
a/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testImportAddTableAndColumn.map.xml-result
b/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testImportAddTableAndColumn.map.xml-result
index 43696e745..b5daf1d71 100644
---
a/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testImportAddTableAndColumn.map.xml-result
+++
b/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testImportAddTableAndColumn.map.xml-result
@@ -17,10 +17,10 @@
specific language governing permissions and limitations
under the License.
-->
-<data-map xmlns="http://cayenne.apache.org/schema/11/modelMap";
+<data-map xmlns="http://cayenne.apache.org/schema/12/modelMap";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="http://cayenne.apache.org/schema/11/modelMap
http://cayenne.apache.org/schema/11/modelMap.xsd";
- project-version="11">
+ xsi:schemaLocation="http://cayenne.apache.org/schema/12/modelMap
https://cayenne.apache.org/schema/12/modelMap.xsd";
+ project-version="12">
<db-entity name="CHILD" schema="APP">
<db-attribute name="COL3" type="DECIMAL" length="10" scale="2"/>
<db-attribute name="COL4" type="VARCHAR" length="25"/>
diff --git
a/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testImportNewDataMap.map.xml-result
b/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testImportNewDataMap.map.xml-result
index 8bbbaa7f1..2db431855 100644
---
a/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testImportNewDataMap.map.xml-result
+++
b/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testImportNewDataMap.map.xml-result
@@ -17,10 +17,10 @@
specific language governing permissions and limitations
under the License.
-->
-<data-map xmlns="http://cayenne.apache.org/schema/11/modelMap";
+<data-map xmlns="http://cayenne.apache.org/schema/12/modelMap";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="http://cayenne.apache.org/schema/11/modelMap
http://cayenne.apache.org/schema/11/modelMap.xsd";
- project-version="11">
+ xsi:schemaLocation="http://cayenne.apache.org/schema/12/modelMap
https://cayenne.apache.org/schema/12/modelMap.xsd";
+ project-version="12">
<db-entity name="TEST_TABLE" schema="APP">
<db-attribute name="COL1" type="INTEGER" isPrimaryKey="true"
isMandatory="true" length="10"/>
<db-attribute name="COL2" type="CHAR" length="25"/>
diff --git
a/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testImportNewRelationship.map.xml-result
b/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testImportNewRelationship.map.xml-result
index dd1cb4f61..416f09b81 100644
---
a/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testImportNewRelationship.map.xml-result
+++
b/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testImportNewRelationship.map.xml-result
@@ -17,48 +17,48 @@
~ specific language governing permissions and limitations
~ under the License.
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
-<data-map xmlns="http://cayenne.apache.org/schema/11/modelMap";
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="http://cayenne.apache.org/schema/11/modelMap
http://cayenne.apache.org/schema/11/modelMap.xsd";
- project-version="11">
- <property name="defaultSchema" value="SCHEMA_01"/>
- <db-entity name="TABLE1" schema="SCHEMA_01">
- <db-attribute name="ID" type="INTEGER" isPrimaryKey="true"
isMandatory="true" length="10"/>
- <db-attribute name="T1_NAME" type="VARCHAR" length="45"/>
- </db-entity>
- <db-entity name="TABLE2" schema="SCHEMA_01">
- <db-attribute name="ID" type="INTEGER" isPrimaryKey="true"
isMandatory="true" length="10"/>
- <db-attribute name="T2_NAME" type="VARCHAR" length="45"/>
- <db-attribute name="TABLE1_ID" type="INTEGER" isMandatory="true"
length="10"/>
- </db-entity>
- <db-entity name="TABLE3" schema="SCHEMA_01">
- <db-attribute name="ID" type="INTEGER" isPrimaryKey="true"
isMandatory="true" length="10"/>
- <db-attribute name="T3_NAME" type="VARCHAR" length="45"/>
- <db-attribute name="TABLE1_ID" type="INTEGER" isMandatory="true"
length="10"/>
- </db-entity>
- <obj-entity name="Table1" className="Table1" dbEntityName="TABLE1">
- <obj-attribute name="t1Name" type="java.lang.String"
db-attribute-path="T1_NAME"/>
- </obj-entity>
- <obj-entity name="Table2" className="Table2" dbEntityName="TABLE2">
- <obj-attribute name="t2Name" type="java.lang.String"
db-attribute-path="T2_NAME"/>
- </obj-entity>
- <obj-entity name="Table3" className="Table3" dbEntityName="TABLE3">
- <obj-attribute name="t3Name" type="java.lang.String"
db-attribute-path="T3_NAME"/>
- </obj-entity>
- <db-relationship name="table3s" source="TABLE1" target="TABLE3"
toMany="true">
- <db-attribute-pair source="ID" target="TABLE1_ID"/>
- </db-relationship>
- <db-relationship name="table2s" source="TABLE1" target="TABLE2"
toMany="true">
- <db-attribute-pair source="ID" target="TABLE1_ID"/>
- </db-relationship>
- <db-relationship name="table1" source="TABLE2" target="TABLE1">
- <db-attribute-pair source="TABLE1_ID" target="ID"/>
- </db-relationship>
- <db-relationship name="table1" source="TABLE3" target="TABLE1">
- <db-attribute-pair source="TABLE1_ID" target="ID"/>
- </db-relationship>
- <obj-relationship name="table3s" source="Table1" target="Table3"
deleteRule="Deny" db-relationship-path="table3s"/>
- <obj-relationship name="table2s" source="Table1" target="Table2"
deleteRule="Deny" db-relationship-path="table2s"/>
- <obj-relationship name="table1" source="Table2" target="Table1"
deleteRule="Nullify" db-relationship-path="table1"/>
- <obj-relationship name="table1" source="Table3" target="Table1"
deleteRule="Nullify" db-relationship-path="table1"/>
-</data-map>
\ No newline at end of file
+<data-map xmlns="http://cayenne.apache.org/schema/12/modelMap";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://cayenne.apache.org/schema/12/modelMap
https://cayenne.apache.org/schema/12/modelMap.xsd";
+ project-version="12">
+ <property name="defaultSchema" value="SCHEMA_01"/>
+ <db-entity name="TABLE1" schema="SCHEMA_01">
+ <db-attribute name="ID" type="INTEGER" isPrimaryKey="true"
isMandatory="true" length="10"/>
+ <db-attribute name="T1_NAME" type="VARCHAR" length="45"/>
+ </db-entity>
+ <db-entity name="TABLE2" schema="SCHEMA_01">
+ <db-attribute name="ID" type="INTEGER" isPrimaryKey="true"
isMandatory="true" length="10"/>
+ <db-attribute name="T2_NAME" type="VARCHAR" length="45"/>
+ <db-attribute name="TABLE1_ID" type="INTEGER"
isMandatory="true" length="10"/>
+ </db-entity>
+ <db-entity name="TABLE3" schema="SCHEMA_01">
+ <db-attribute name="ID" type="INTEGER" isPrimaryKey="true"
isMandatory="true" length="10"/>
+ <db-attribute name="T3_NAME" type="VARCHAR" length="45"/>
+ <db-attribute name="TABLE1_ID" type="INTEGER"
isMandatory="true" length="10"/>
+ </db-entity>
+ <obj-entity name="Table1" className="Table1" dbEntityName="TABLE1">
+ <obj-attribute name="t1Name" type="java.lang.String"
db-attribute-path="T1_NAME"/>
+ </obj-entity>
+ <obj-entity name="Table2" className="Table2" dbEntityName="TABLE2">
+ <obj-attribute name="t2Name" type="java.lang.String"
db-attribute-path="T2_NAME"/>
+ </obj-entity>
+ <obj-entity name="Table3" className="Table3" dbEntityName="TABLE3">
+ <obj-attribute name="t3Name" type="java.lang.String"
db-attribute-path="T3_NAME"/>
+ </obj-entity>
+ <db-relationship name="table2s" source="TABLE1" target="TABLE2"
toMany="true">
+ <db-attribute-pair source="ID" target="TABLE1_ID"/>
+ </db-relationship>
+ <db-relationship name="table3s" source="TABLE1" target="TABLE3"
toMany="true">
+ <db-attribute-pair source="ID" target="TABLE1_ID"/>
+ </db-relationship>
+ <db-relationship name="table1" source="TABLE2" target="TABLE1">
+ <db-attribute-pair source="TABLE1_ID" target="ID"/>
+ </db-relationship>
+ <db-relationship name="table1" source="TABLE3" target="TABLE1">
+ <db-attribute-pair source="TABLE1_ID" target="ID"/>
+ </db-relationship>
+ <obj-relationship name="table2s" source="Table1" target="Table2"
deleteRule="Deny" db-relationship-path="table2s"/>
+ <obj-relationship name="table3s" source="Table1" target="Table3"
deleteRule="Deny" db-relationship-path="table3s"/>
+ <obj-relationship name="table1" source="Table2" target="Table1"
deleteRule="Nullify" db-relationship-path="table1"/>
+ <obj-relationship name="table1" source="Table3" target="Table1"
deleteRule="Nullify" db-relationship-path="table1"/>
+</data-map>
diff --git
a/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testImportProcedure.map.xml
b/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testImportProcedure.map.xml
index da7b48a6a..a7b59565f 100644
---
a/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testImportProcedure.map.xml
+++
b/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testImportProcedure.map.xml
@@ -19,7 +19,7 @@
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
<data-map xmlns="http://cayenne.apache.org/schema/12/modelMap";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="http://cayenne.apache.org/schema/12/modelMap
https://cayenne.apache.org/schema/10/modelMap.xsd";
+ xsi:schemaLocation="http://cayenne.apache.org/schema/12/modelMap
https://cayenne.apache.org/schema/12/modelMap.xsd";
project-version="12">
<db-entity name="TABLE1" schema="SCHEMA_01">
<db-attribute name="ID" type="INTEGER" isPrimaryKey="true"
isMandatory="true" length="10"/>
diff --git
a/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testImportProcedure.map.xml-result
b/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testImportProcedure.map.xml-result
index d1d3176dd..1454c6eff 100644
---
a/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testImportProcedure.map.xml-result
+++
b/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testImportProcedure.map.xml-result
@@ -17,10 +17,10 @@
~ specific language governing permissions and limitations
~ under the License.
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
-<data-map xmlns="http://cayenne.apache.org/schema/11/modelMap";
+<data-map xmlns="http://cayenne.apache.org/schema/12/modelMap";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="http://cayenne.apache.org/schema/11/modelMap
https://cayenne.apache.org/schema/10/modelMap.xsd";
- project-version="11">
+ xsi:schemaLocation="http://cayenne.apache.org/schema/12/modelMap
https://cayenne.apache.org/schema/12/modelMap.xsd";
+ project-version="12">
<procedure name="PROC" schema="SCHEMA_01">
<procedure-parameter name="TEST" type="INTEGER" length="4"
direction="in"/>
<procedure-parameter name="TOTAL" type="DECIMAL" length="24"
precision="2" direction="out"/>
diff --git
a/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testImportWithoutChanges.map.xml-result
b/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testImportWithoutChanges.map.xml-result
index 3402bacb0..a54e58239 100644
---
a/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testImportWithoutChanges.map.xml-result
+++
b/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testImportWithoutChanges.map.xml-result
@@ -17,10 +17,10 @@
specific language governing permissions and limitations
under the License.
-->
-<data-map xmlns="http://cayenne.apache.org/schema/11/modelMap";
+<data-map xmlns="http://cayenne.apache.org/schema/12/modelMap";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="http://cayenne.apache.org/schema/11/modelMap
http://cayenne.apache.org/schema/11/modelMap.xsd";
- project-version="11">
+ xsi:schemaLocation="http://cayenne.apache.org/schema/12/modelMap
https://cayenne.apache.org/schema/12/modelMap.xsd";
+ project-version="12">
<db-entity name="testImportWithoutChanges" schema="APP">
<db-attribute name="COL1" type="INTEGER" isPrimaryKey="true"
isMandatory="true" length="10"/>
<db-attribute name="COL2" type="CHAR" length="25"/>
diff --git
a/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testInheritance.map.xml-result
b/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testInheritance.map.xml-result
index 5e7be28ae..b40268a4c 100644
---
a/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testInheritance.map.xml-result
+++
b/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testInheritance.map.xml-result
@@ -17,10 +17,10 @@
~ specific language governing permissions and limitations
~ under the License.
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
-<data-map xmlns="http://cayenne.apache.org/schema/11/modelMap";
+<data-map xmlns="http://cayenne.apache.org/schema/12/modelMap";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="http://cayenne.apache.org/schema/11/modelMap
http://cayenne.apache.org/schema/11/modelMap.xsd";
- project-version="11">
+ xsi:schemaLocation="http://cayenne.apache.org/schema/12/modelMap
https://cayenne.apache.org/schema/12/modelMap.xsd";
+ project-version="12">
<db-entity name="CHILD" schema="SCHEMA_01">
<db-attribute name="id" type="INTEGER" isPrimaryKey="true"
isMandatory="true" length="10"/>
diff --git
a/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testJava7Types.map.xml-result
b/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testJava7Types.map.xml-result
index 6ef1888ec..9bee7b197 100644
---
a/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testJava7Types.map.xml-result
+++
b/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testJava7Types.map.xml-result
@@ -18,10 +18,10 @@
~ specific language governing permissions and limitations
~ under the License.
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
-<data-map xmlns="http://cayenne.apache.org/schema/11/modelMap";
+<data-map xmlns="http://cayenne.apache.org/schema/12/modelMap";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="http://cayenne.apache.org/schema/11/modelMap
http://cayenne.apache.org/schema/11/modelMap.xsd";
- project-version="11">
+ xsi:schemaLocation="http://cayenne.apache.org/schema/12/modelMap
https://cayenne.apache.org/schema/12/modelMap.xsd";
+ project-version="12">
<property name="defaultSchema" value="SCHEMA_01"/>
<db-entity name="CHILD" schema="SCHEMA_01">
diff --git
a/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testJava8Types.map.xml-result
b/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testJava8Types.map.xml-result
index 7907d0d27..1efe5162e 100644
---
a/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testJava8Types.map.xml-result
+++
b/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testJava8Types.map.xml-result
@@ -18,10 +18,10 @@
~ specific language governing permissions and limitations
~ under the License.
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
-<data-map xmlns="http://cayenne.apache.org/schema/11/modelMap";
+<data-map xmlns="http://cayenne.apache.org/schema/12/modelMap";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="http://cayenne.apache.org/schema/11/modelMap
http://cayenne.apache.org/schema/11/modelMap.xsd";
- project-version="11">
+ xsi:schemaLocation="http://cayenne.apache.org/schema/12/modelMap
https://cayenne.apache.org/schema/12/modelMap.xsd";
+ project-version="12">
<property name="defaultSchema" value="SCHEMA_01"/>
<db-entity name="CHILD" schema="SCHEMA_01">
diff --git
a/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testNamingStrategy.map.xml-result
b/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testNamingStrategy.map.xml-result
index c9beb8119..44d9eeb99 100644
---
a/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testNamingStrategy.map.xml-result
+++
b/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testNamingStrategy.map.xml-result
@@ -17,10 +17,10 @@
specific language governing permissions and limitations
under the License.
-->
-<data-map xmlns="http://cayenne.apache.org/schema/11/modelMap";
+<data-map xmlns="http://cayenne.apache.org/schema/12/modelMap";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="http://cayenne.apache.org/schema/11/modelMap
http://cayenne.apache.org/schema/11/modelMap.xsd";
- project-version="11">
+ xsi:schemaLocation="http://cayenne.apache.org/schema/12/modelMap
https://cayenne.apache.org/schema/12/modelMap.xsd";
+ project-version="12">
<db-entity name="TEST_TABLE" schema="APP">
<db-attribute name="COL1" type="INTEGER" isPrimaryKey="true"
isMandatory="true" length="10"/>
<db-attribute name="COL2" type="CHAR" length="25"/>
diff --git
a/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testOneToOne.map.xml-result
b/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testOneToOne.map.xml-result
index 623e058ab..4610c1e5f 100644
---
a/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testOneToOne.map.xml-result
+++
b/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testOneToOne.map.xml-result
@@ -17,10 +17,10 @@
specific language governing permissions and limitations
under the License.
-->
-<data-map xmlns="http://cayenne.apache.org/schema/11/modelMap";
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="http://cayenne.apache.org/schema/11/modelMap
http://cayenne.apache.org/schema/11/modelMap.xsd";
- project-version="11">
+<data-map xmlns="http://cayenne.apache.org/schema/12/modelMap";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://cayenne.apache.org/schema/12/modelMap
https://cayenne.apache.org/schema/12/modelMap.xsd";
+ project-version="12">
<db-entity name="PICK_SCHEDULE" schema="APP">
<db-attribute name="ID" type="INTEGER" isPrimaryKey="true"
isMandatory="true" length="10"/>
<db-attribute name="OWNER_ID" type="INTEGER" length="10"/>
@@ -35,24 +35,22 @@
<obj-entity name="PickSchedule" className="PickSchedule"
dbEntityName="PICK_SCHEDULE">
<obj-attribute name="ownerId" type="java.lang.Integer"
db-attribute-path="OWNER_ID"/>
</obj-entity>
- <obj-entity name="Player" className="Player" dbEntityName="PLAYER">
- </obj-entity>
- <obj-entity name="PlayerInfo" className="PlayerInfo"
dbEntityName="PLAYER_INFO">
- </obj-entity>
+ <obj-entity name="Player" className="Player" dbEntityName="PLAYER"/>
+ <obj-entity name="PlayerInfo" className="PlayerInfo"
dbEntityName="PLAYER_INFO"/>
<db-relationship name="selectedPlayer" source="PICK_SCHEDULE"
target="PLAYER">
<db-attribute-pair source="SELECTED_PLAYER_ID" target="ID"/>
</db-relationship>
+ <db-relationship name="id" source="PLAYER" target="PLAYER_INFO"
toDependentPK="true">
+ <db-attribute-pair source="ID" target="PLAYER_ID"/>
+ </db-relationship>
<db-relationship name="selectedPickSchedules" source="PLAYER"
target="PICK_SCHEDULE" toMany="true">
<db-attribute-pair source="ID" target="SELECTED_PLAYER_ID"/>
</db-relationship>
- <db-relationship name="playerInfo" source="PLAYER" target="PLAYER_INFO"
toDependentPK="true">
- <db-attribute-pair source="ID" target="PLAYER_ID"/>
- </db-relationship>
<db-relationship name="player" source="PLAYER_INFO" target="PLAYER">
<db-attribute-pair source="PLAYER_ID" target="ID"/>
</db-relationship>
<obj-relationship name="selectedPlayer" source="PickSchedule"
target="Player" deleteRule="Nullify" db-relationship-path="selectedPlayer"/>
+ <obj-relationship name="id" source="Player" target="PlayerInfo"
deleteRule="Nullify" db-relationship-path="id"/>
<obj-relationship name="selectedPickSchedules" source="Player"
target="PickSchedule" deleteRule="Deny"
db-relationship-path="selectedPickSchedules"/>
- <obj-relationship name="playerInfo" source="Player" target="PlayerInfo"
deleteRule="Nullify" db-relationship-path="playerInfo"/>
<obj-relationship name="player" source="PlayerInfo" target="Player"
deleteRule="Nullify" db-relationship-path="player"/>
</data-map>
diff --git
a/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testPreserveCustomObjMappings.map.xml
b/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testPreserveCustomObjMappings.map.xml
index 9b8b160ad..014cc57e0 100644
---
a/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testPreserveCustomObjMappings.map.xml
+++
b/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testPreserveCustomObjMappings.map.xml
@@ -29,6 +29,6 @@
</db-entity>
<obj-entity name="Parent" className="Parent" dbEntityName="PARENT">
<obj-attribute name="col2" type="java.lang.String"
db-attribute-path="COL2"/>
- <info:property xmlns:info="http://cayenne.apache.org/schema/10/info";
name="comment" value="test"/>
+ <info:property xmlns:info="http://cayenne.apache.org/schema/12/info";
name="comment" value="test"/>
</obj-entity>
</data-map>
diff --git
a/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testPreserveCustomObjMappings.map.xml-result
b/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testPreserveCustomObjMappings.map.xml-result
index 247f2d244..c6a0a9856 100644
---
a/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testPreserveCustomObjMappings.map.xml-result
+++
b/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testPreserveCustomObjMappings.map.xml-result
@@ -17,10 +17,10 @@
specific language governing permissions and limitations
under the License.
-->
-<data-map xmlns="http://cayenne.apache.org/schema/11/modelMap";
+<data-map xmlns="http://cayenne.apache.org/schema/12/modelMap";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="http://cayenne.apache.org/schema/11/modelMap
http://cayenne.apache.org/schema/11/modelMap.xsd";
- project-version="11">
+ xsi:schemaLocation="http://cayenne.apache.org/schema/12/modelMap
https://cayenne.apache.org/schema/12/modelMap.xsd";
+ project-version="12">
<property name="defaultSchema" value="SCHEMA_01"/>
<db-entity name="PARENT" schema="SCHEMA_01">
<db-attribute name="COL2" type="CHAR" length="25"/>
@@ -31,6 +31,6 @@
<obj-entity name="Parent" className="Parent" dbEntityName="PARENT">
<obj-attribute name="col2" type="java.lang.String"
db-attribute-path="COL2"/>
<obj-attribute name="col4" type="java.lang.String"
db-attribute-path="COL4"/>
- <info:property xmlns:info="http://cayenne.apache.org/schema/10/info";
name="comment" value="test"/>
+ <info:property xmlns:info="http://cayenne.apache.org/schema/12/info";
name="comment" value="test"/>
</obj-entity>
</data-map>
diff --git
a/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testPreserveRelationships.map.xml-result
b/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testPreserveRelationships.map.xml-result
index dc5209546..d56897961 100644
---
a/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testPreserveRelationships.map.xml-result
+++
b/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testPreserveRelationships.map.xml-result
@@ -17,10 +17,10 @@
specific language governing permissions and limitations
under the License.
-->
-<data-map xmlns="http://cayenne.apache.org/schema/11/modelMap";
+<data-map xmlns="http://cayenne.apache.org/schema/12/modelMap";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="http://cayenne.apache.org/schema/11/modelMap
http://cayenne.apache.org/schema/11/modelMap.xsd";
- project-version="11">
+ xsi:schemaLocation="http://cayenne.apache.org/schema/12/modelMap
https://cayenne.apache.org/schema/12/modelMap.xsd";
+ project-version="12">
<db-entity name="CHILD" schema="APP">
<db-attribute name="ID" type="INTEGER" isPrimaryKey="true"
isMandatory="true" length="10"/>
</db-entity>
diff --git
a/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testSameProcedure.map.xml
b/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testSameProcedure.map.xml
index 40977a17f..f1deea92b 100644
---
a/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testSameProcedure.map.xml
+++
b/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testSameProcedure.map.xml
@@ -19,7 +19,7 @@
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
<data-map xmlns="http://cayenne.apache.org/schema/12/modelMap";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="http://cayenne.apache.org/schema/12/modelMap
https://cayenne.apache.org/schema/10/modelMap.xsd";
+ xsi:schemaLocation="http://cayenne.apache.org/schema/12/modelMap
https://cayenne.apache.org/schema/12/modelMap.xsd";
project-version="12">
<procedure name="PROC" schema="SCHEMA_01"/>
<db-entity name="TABLE1" schema="SCHEMA_01">
diff --git
a/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testSameProcedure.map.xml-result
b/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testSameProcedure.map.xml-result
index d1d3176dd..1454c6eff 100644
---
a/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testSameProcedure.map.xml-result
+++
b/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testSameProcedure.map.xml-result
@@ -17,10 +17,10 @@
~ specific language governing permissions and limitations
~ under the License.
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
-<data-map xmlns="http://cayenne.apache.org/schema/11/modelMap";
+<data-map xmlns="http://cayenne.apache.org/schema/12/modelMap";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="http://cayenne.apache.org/schema/11/modelMap
https://cayenne.apache.org/schema/10/modelMap.xsd";
- project-version="11">
+ xsi:schemaLocation="http://cayenne.apache.org/schema/12/modelMap
https://cayenne.apache.org/schema/12/modelMap.xsd";
+ project-version="12">
<procedure name="PROC" schema="SCHEMA_01">
<procedure-parameter name="TEST" type="INTEGER" length="4"
direction="in"/>
<procedure-parameter name="TOTAL" type="DECIMAL" length="24"
precision="2" direction="out"/>
diff --git
a/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testSchemasAndTableExclude.map.xml-result
b/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testSchemasAndTableExclude.map.xml-result
index 2228d265f..9b405a77b 100644
---
a/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testSchemasAndTableExclude.map.xml-result
+++
b/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testSchemasAndTableExclude.map.xml-result
@@ -17,10 +17,10 @@
specific language governing permissions and limitations
under the License.
-->
-<data-map xmlns="http://cayenne.apache.org/schema/11/modelMap";
+<data-map xmlns="http://cayenne.apache.org/schema/12/modelMap";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="http://cayenne.apache.org/schema/11/modelMap
http://cayenne.apache.org/schema/11/modelMap.xsd";
- project-version="11">
+ xsi:schemaLocation="http://cayenne.apache.org/schema/12/modelMap
https://cayenne.apache.org/schema/12/modelMap.xsd";
+ project-version="12">
<property name="defaultSchema" value="SCHEMA_01"/>
<db-entity name="PARENT" schema="SCHEMA_01">
<db-attribute name="COL2" type="CHAR" length="25"/>
diff --git
a/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testSkipPrimaryKeyLoading.map.xml-result
b/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testSkipPrimaryKeyLoading.map.xml-result
index f715f1004..40a47ced4 100644
---
a/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testSkipPrimaryKeyLoading.map.xml-result
+++
b/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testSkipPrimaryKeyLoading.map.xml-result
@@ -17,25 +17,23 @@
specific language governing permissions and limitations
under the License.
-->
-<data-map xmlns="http://cayenne.apache.org/schema/11/modelMap";
+<data-map xmlns="http://cayenne.apache.org/schema/12/modelMap";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="http://cayenne.apache.org/schema/11/modelMap
http://cayenne.apache.org/schema/11/modelMap.xsd";
- project-version="11">
- <property name="defaultPackage" value="com.my.home"/>
- <db-entity name="A" schema="APP">
- <db-attribute name="ID" type="INTEGER" isPrimaryKey="true"
isMandatory="true" length="10"/>
- </db-entity>
- <db-entity name="B" schema="APP">
- <db-attribute name="ID" type="INTEGER" isPrimaryKey="true"
isMandatory="true" length="10"/>
- </db-entity>
- <db-entity name="C" schema="APP">
+ xsi:schemaLocation="http://cayenne.apache.org/schema/12/modelMap
https://cayenne.apache.org/schema/12/modelMap.xsd";
+ project-version="12">
+ <property name="defaultPackage" value="com.my.home"/>
+ <db-entity name="A" schema="APP">
+ <db-attribute name="ID" type="INTEGER" isPrimaryKey="true"
isMandatory="true" length="10"/>
+ </db-entity>
+ <db-entity name="B" schema="APP">
+ <db-attribute name="ID" type="INTEGER" isPrimaryKey="true"
isMandatory="true" length="10"/>
+ </db-entity>
+ <db-entity name="C" schema="APP">
<db-attribute name="ID" type="INTEGER" isMandatory="true"
length="10"/>
- </db-entity>
- <obj-entity name="NewName" className="NewName" dbEntityName="A">
- </obj-entity>
- <obj-entity name="B" className="B" dbEntityName="B">
- </obj-entity>
+ </db-entity>
+ <obj-entity name="B" className="B" dbEntityName="B"/>
<obj-entity name="C" className="com.my.home.C" dbEntityName="C">
<obj-attribute name="id" type="int" db-attribute-path="ID"/>
- </obj-entity>
+ </obj-entity>
+ <obj-entity name="NewName" className="NewName" dbEntityName="A"/>
</data-map>
diff --git
a/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testSkipRelationshipsLoading.map.xml-result
b/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testSkipRelationshipsLoading.map.xml-result
index 1aaf8aba4..8196a02fe 100644
---
a/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testSkipRelationshipsLoading.map.xml-result
+++
b/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testSkipRelationshipsLoading.map.xml-result
@@ -17,10 +17,10 @@
specific language governing permissions and limitations
under the License.
-->
-<data-map xmlns="http://cayenne.apache.org/schema/11/modelMap";
+<data-map xmlns="http://cayenne.apache.org/schema/12/modelMap";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="http://cayenne.apache.org/schema/11/modelMap
http://cayenne.apache.org/schema/11/modelMap.xsd";
- project-version="11">
+ xsi:schemaLocation="http://cayenne.apache.org/schema/12/modelMap
https://cayenne.apache.org/schema/12/modelMap.xsd";
+ project-version="12">
<property name="defaultPackage" value="com.my.home"/>
<db-entity name="A" schema="APP">
<db-attribute name="ID" type="INTEGER" isPrimaryKey="true"
isMandatory="true" length="10"/>
diff --git
a/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testTableTypes.map.xml-result
b/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testTableTypes.map.xml-result
index b30391510..21deb9f6a 100644
---
a/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testTableTypes.map.xml-result
+++
b/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testTableTypes.map.xml-result
@@ -17,10 +17,10 @@
specific language governing permissions and limitations
under the License.
-->
-<data-map xmlns="http://cayenne.apache.org/schema/11/modelMap";
+<data-map xmlns="http://cayenne.apache.org/schema/12/modelMap";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="http://cayenne.apache.org/schema/11/modelMap
https://cayenne.apache.org/schema/11/modelMap.xsd";
- project-version="11">
+ xsi:schemaLocation="http://cayenne.apache.org/schema/12/modelMap
https://cayenne.apache.org/schema/12/modelMap.xsd";
+ project-version="12">
<db-entity name="PERSON" schema="APP">
<db-attribute name="ID" type="INTEGER" isPrimaryKey="true"
isMandatory="true" length="10"/>
</db-entity>
diff --git
a/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testTableTypesMap.map.xml-result
b/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testTableTypesMap.map.xml-result
index 3ca344899..2a433ff1a 100644
---
a/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testTableTypesMap.map.xml-result
+++
b/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testTableTypesMap.map.xml-result
@@ -17,16 +17,16 @@
specific language governing permissions and limitations
under the License.
-->
-<data-map xmlns="http://cayenne.apache.org/schema/11/modelMap";
+<data-map xmlns="http://cayenne.apache.org/schema/12/modelMap";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="http://cayenne.apache.org/schema/11/modelMap
https://cayenne.apache.org/schema/11/modelMap.xsd";
- project-version="11">
+ xsi:schemaLocation="http://cayenne.apache.org/schema/12/modelMap
https://cayenne.apache.org/schema/12/modelMap.xsd";
+ project-version="12">
<db-entity name="PERSON" schema="APP">
<db-attribute name="ID" type="INTEGER" isPrimaryKey="true"
isMandatory="true" length="10"/>
</db-entity>
<obj-entity name="Person" className="Person" dbEntityName="PERSON">
</obj-entity>
- <dbImport xmlns="http://cayenne.apache.org/schema/11/dbimport";>
+ <dbImport xmlns="http://cayenne.apache.org/schema/12/dbimport";>
<tableTypes>
<tableType>TABLE</tableType>
</tableTypes>
diff --git
a/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testUnFlattensManyToMany.map.xml-result
b/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testUnFlattensManyToMany.map.xml-result
index 67f667ade..940c5420c 100644
---
a/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testUnFlattensManyToMany.map.xml-result
+++
b/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testUnFlattensManyToMany.map.xml-result
@@ -17,72 +17,66 @@
specific language governing permissions and limitations
under the License.
-->
-<data-map xmlns="http://cayenne.apache.org/schema/11/modelMap";
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="http://cayenne.apache.org/schema/11/modelMap
http://cayenne.apache.org/schema/11/modelMap.xsd";
- project-version="11">
- <property name="defaultPackage" value="org.not.my.home"/>
- <db-entity name="A" schema="APP">
- <db-attribute name="ID" type="INTEGER" isPrimaryKey="true"
isMandatory="true" length="10"/>
- </db-entity>
- <db-entity name="A_B" schema="APP">
- <db-attribute name="A_ID" type="INTEGER" isPrimaryKey="true"
isMandatory="true" length="10"/>
- <db-attribute name="B_ID" type="INTEGER" isPrimaryKey="true"
isMandatory="true" length="10"/>
- </db-entity>
- <db-entity name="B" schema="APP">
- <db-attribute name="ID" type="INTEGER" isPrimaryKey="true"
isMandatory="true" length="10"/>
- </db-entity>
- <db-entity name="C" schema="APP">
- <db-attribute name="ID" type="INTEGER" isPrimaryKey="true"
isMandatory="true" length="10"/>
- </db-entity>
- <db-entity name="X" schema="APP">
- <db-attribute name="ID" type="INTEGER" isPrimaryKey="true"
isMandatory="true" length="10"/>
- </db-entity>
- <db-entity name="X_Y" schema="APP">
- <db-attribute name="X_ID" type="INTEGER" isPrimaryKey="true"
isMandatory="true" length="10"/>
- <db-attribute name="Y_ID" type="INTEGER" isPrimaryKey="true"
isMandatory="true" length="10"/>
- </db-entity>
- <db-entity name="Y" schema="APP">
- <db-attribute name="ID" type="INTEGER" isPrimaryKey="true"
isMandatory="true" length="10"/>
- </db-entity>
- <obj-entity name="A" className="A" dbEntityName="A">
- </obj-entity>
- <obj-entity name="AB" className="AB" dbEntityName="A_B">
- </obj-entity>
- <obj-entity name="B" className="B" dbEntityName="B">
- </obj-entity>
- <obj-entity name="C" className="org.not.my.home.C" dbEntityName="C">
- </obj-entity>
- <obj-entity name="X" className="org.not.my.home.X" dbEntityName="X">
- </obj-entity>
- <obj-entity name="Y" className="org.not.my.home.Y" dbEntityName="Y">
- </obj-entity>
- <db-relationship name="aBs" source="A" target="A_B" toDependentPK="true"
toMany="true">
- <db-attribute-pair source="ID" target="A_ID"/>
- </db-relationship>
- <db-relationship name="toA" source="A_B" target="A">
- <db-attribute-pair source="A_ID" target="ID"/>
- </db-relationship>
- <db-relationship name="toB" source="A_B" target="B">
- <db-attribute-pair source="B_ID" target="ID"/>
- </db-relationship>
- <db-relationship name="aBs" source="B" target="A_B" toDependentPK="true"
toMany="true">
- <db-attribute-pair source="ID" target="B_ID"/>
- </db-relationship>
- <db-relationship name="xIes" source="X" target="X_Y" toDependentPK="true"
toMany="true">
- <db-attribute-pair source="ID" target="X_ID"/>
- </db-relationship>
- <db-relationship name="x" source="X_Y" target="X">
- <db-attribute-pair source="X_ID" target="ID"/>
- </db-relationship>
- <db-relationship name="y" source="X_Y" target="Y">
- <db-attribute-pair source="Y_ID" target="ID"/>
- </db-relationship>
- <db-relationship name="xIes" source="Y" target="X_Y" toDependentPK="true"
toMany="true">
- <db-attribute-pair source="ID" target="Y_ID"/>
- </db-relationship>
- <obj-relationship name="toA" source="AB" target="A" deleteRule="Nullify"
db-relationship-path="toA"/>
- <obj-relationship name="aBs" source="B" target="AB" deleteRule="Deny"
db-relationship-path="aBs"/>
- <obj-relationship name="ies" source="X" target="Y"
db-relationship-path="xIes.y"/>
- <obj-relationship name="xes" source="Y" target="X"
db-relationship-path="xIes.x"/>
+<data-map xmlns="http://cayenne.apache.org/schema/12/modelMap";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://cayenne.apache.org/schema/12/modelMap
https://cayenne.apache.org/schema/12/modelMap.xsd";
+ project-version="12">
+ <property name="defaultPackage" value="org.not.my.home"/>
+ <db-entity name="A" schema="APP">
+ <db-attribute name="ID" type="INTEGER" isPrimaryKey="true"
isMandatory="true" length="10"/>
+ </db-entity>
+ <db-entity name="A_B" schema="APP">
+ <db-attribute name="A_ID" type="INTEGER" isPrimaryKey="true"
isMandatory="true" length="10"/>
+ <db-attribute name="B_ID" type="INTEGER" isPrimaryKey="true"
isMandatory="true" length="10"/>
+ </db-entity>
+ <db-entity name="B" schema="APP">
+ <db-attribute name="ID" type="INTEGER" isPrimaryKey="true"
isMandatory="true" length="10"/>
+ </db-entity>
+ <db-entity name="C" schema="APP">
+ <db-attribute name="ID" type="INTEGER" isPrimaryKey="true"
isMandatory="true" length="10"/>
+ </db-entity>
+ <db-entity name="X" schema="APP">
+ <db-attribute name="ID" type="INTEGER" isPrimaryKey="true"
isMandatory="true" length="10"/>
+ </db-entity>
+ <db-entity name="X_Y" schema="APP">
+ <db-attribute name="X_ID" type="INTEGER" isPrimaryKey="true"
isMandatory="true" length="10"/>
+ <db-attribute name="Y_ID" type="INTEGER" isPrimaryKey="true"
isMandatory="true" length="10"/>
+ </db-entity>
+ <db-entity name="Y" schema="APP">
+ <db-attribute name="ID" type="INTEGER" isPrimaryKey="true"
isMandatory="true" length="10"/>
+ </db-entity>
+ <obj-entity name="A" className="A" dbEntityName="A"/>
+ <obj-entity name="AB" className="AB" dbEntityName="A_B"/>
+ <obj-entity name="B" className="B" dbEntityName="B"/>
+ <obj-entity name="C" className="org.not.my.home.C" dbEntityName="C"/>
+ <obj-entity name="X" className="org.not.my.home.X" dbEntityName="X"/>
+ <obj-entity name="Y" className="org.not.my.home.Y" dbEntityName="Y"/>
+ <db-relationship name="aBs" source="A" target="A_B"
toDependentPK="true" toMany="true">
+ <db-attribute-pair source="ID" target="A_ID"/>
+ </db-relationship>
+ <db-relationship name="toA" source="A_B" target="A">
+ <db-attribute-pair source="A_ID" target="ID"/>
+ </db-relationship>
+ <db-relationship name="toB" source="A_B" target="B">
+ <db-attribute-pair source="B_ID" target="ID"/>
+ </db-relationship>
+ <db-relationship name="aBs" source="B" target="A_B"
toDependentPK="true" toMany="true">
+ <db-attribute-pair source="ID" target="B_ID"/>
+ </db-relationship>
+ <db-relationship name="xIes" source="X" target="X_Y"
toDependentPK="true" toMany="true">
+ <db-attribute-pair source="ID" target="X_ID"/>
+ </db-relationship>
+ <db-relationship name="x" source="X_Y" target="X">
+ <db-attribute-pair source="X_ID" target="ID"/>
+ </db-relationship>
+ <db-relationship name="y" source="X_Y" target="Y">
+ <db-attribute-pair source="Y_ID" target="ID"/>
+ </db-relationship>
+ <db-relationship name="xIes" source="Y" target="X_Y"
toDependentPK="true" toMany="true">
+ <db-attribute-pair source="ID" target="Y_ID"/>
+ </db-relationship>
+ <obj-relationship name="toA" source="AB" target="A"
deleteRule="Nullify" db-relationship-path="toA"/>
+ <obj-relationship name="aBs" source="B" target="AB" deleteRule="Deny"
db-relationship-path="aBs"/>
+ <obj-relationship name="ys" source="X" target="Y"
db-relationship-path="xIes.y"/>
+ <obj-relationship name="xes" source="Y" target="X"
db-relationship-path="xIes.x"/>
</data-map>
diff --git
a/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testViewsExclude.map.xml-result
b/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testViewsExclude.map.xml-result
index f10a86c53..88a35f4ca 100644
---
a/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testViewsExclude.map.xml-result
+++
b/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testViewsExclude.map.xml-result
@@ -17,10 +17,10 @@
specific language governing permissions and limitations
under the License.
-->
-<data-map xmlns="http://cayenne.apache.org/schema/11/modelMap";
+<data-map xmlns="http://cayenne.apache.org/schema/12/modelMap";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="http://cayenne.apache.org/schema/11/modelMap
http://cayenne.apache.org/schema/11/modelMap.xsd";
- project-version="11">
+ xsi:schemaLocation="http://cayenne.apache.org/schema/12/modelMap
https://cayenne.apache.org/schema/12/modelMap.xsd";
+ project-version="12">
<db-entity name="GIRL" schema="APP">
<db-attribute name="ID" type="INTEGER" isMandatory="true" length="10"/>
</db-entity>
diff --git
a/cayenne/src/test/resources/org/apache/cayenne/configuration/xml/cayenne-testConfig5.xml
b/cayenne/src/test/resources/org/apache/cayenne/configuration/xml/cayenne-testConfig5.xml
index c3a424da6..8512ae410 100644
---
a/cayenne/src/test/resources/org/apache/cayenne/configuration/xml/cayenne-testConfig5.xml
+++
b/cayenne/src/test/resources/org/apache/cayenne/configuration/xml/cayenne-testConfig5.xml
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
-<domain project-version="11"
xmlns="http://cayenne.apache.org/schema/11/domains";>
-
+<domain project-version="12"
xmlns="http://cayenne.apache.org/schema/12/domains";>
+
</domain>
