CAY-2060 Update schema version from 7 to 8 in all XML config files throughout the project.
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/8049c968 Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/8049c968 Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/8049c968 Branch: refs/heads/master Commit: 8049c9682793fc5bb6fa75482c56699fcacd5a3a Parents: e099a21 Author: Dzmitry Kazimirchyk <dkazimirc...@gmail.com> Authored: Thu Feb 18 19:36:33 2016 +0300 Committer: Dzmitry Kazimirchyk <dkazimirc...@gmail.com> Committed: Fri Feb 19 16:57:19 2016 +0300 ---------------------------------------------------------------------- cayenne-crypto/src/test/resources/cayenne-crypto.xml | 2 +- cayenne-crypto/src/test/resources/datamap.map.xml | 6 +++--- cayenne-java8/src/test/resources/cayenne-java8.xml | 2 +- cayenne-java8/src/test/resources/java8.map.xml | 6 +++--- cayenne-joda/src/test/resources/cayenne-joda.xml | 2 +- cayenne-joda/src/test/resources/joda.map.xml | 6 +++--- cayenne-lifecycle/src/test/resources/cayenne-lifecycle.xml | 2 +- cayenne-lifecycle/src/test/resources/lifecycle-map.map.xml | 6 +++--- cayenne-server/src/test/resources/array-type.map.xml | 8 ++++---- cayenne-server/src/test/resources/binary-pk.map.xml | 8 ++++---- cayenne-server/src/test/resources/cay743/cayenne-domain.xml | 2 +- cayenne-server/src/test/resources/cay743/map1.map.xml | 6 +++--- cayenne-server/src/test/resources/cay743/map2.map.xml | 6 +++--- cayenne-server/src/test/resources/cayenne-array-type.xml | 4 ++-- cayenne-server/src/test/resources/cayenne-binary-pk.xml | 4 ++-- cayenne-server/src/test/resources/cayenne-compound.xml | 4 ++-- cayenne-server/src/test/resources/cayenne-date-time.xml | 4 ++-- cayenne-server/src/test/resources/cayenne-delete-rules.xml | 2 +- cayenne-server/src/test/resources/cayenne-embeddable.xml | 4 ++-- cayenne-server/src/test/resources/cayenne-empty.xml | 4 ++-- cayenne-server/src/test/resources/cayenne-enum.xml | 4 ++-- cayenne-server/src/test/resources/cayenne-extended-type.xml | 4 ++-- cayenne-server/src/test/resources/cayenne-generated.xml | 4 ++-- cayenne-server/src/test/resources/cayenne-generic.xml | 4 ++-- .../src/test/resources/cayenne-inheritance-single-table1.xml | 2 +- .../src/test/resources/cayenne-inheritance-vertical.xml | 2 +- cayenne-server/src/test/resources/cayenne-inheritance.xml | 4 ++-- .../src/test/resources/cayenne-lifecycle-callbacks-order.xml | 2 +- cayenne-server/src/test/resources/cayenne-lifecycles.xml | 2 +- cayenne-server/src/test/resources/cayenne-lob.xml | 4 ++-- cayenne-server/src/test/resources/cayenne-locking.xml | 2 +- cayenne-server/src/test/resources/cayenne-map-to-many.xml | 4 ++-- cayenne-server/src/test/resources/cayenne-meaningful-pk.xml | 4 ++-- cayenne-server/src/test/resources/cayenne-misc-types.xml | 4 ++-- .../test/resources/cayenne-mixed-persistence-strategy.xml | 4 ++-- cayenne-server/src/test/resources/cayenne-multi-tier.xml | 2 +- cayenne-server/src/test/resources/cayenne-multinode.xml | 2 +- cayenne-server/src/test/resources/cayenne-no-pk.xml | 4 ++-- cayenne-server/src/test/resources/cayenne-numeric-types.xml | 4 ++-- cayenne-server/src/test/resources/cayenne-oneway-rels.xml | 2 +- ...g.apache.cayenne.configuration.rop.server.test-config.xml | 2 +- cayenne-server/src/test/resources/cayenne-people.xml | 2 +- cayenne-server/src/test/resources/cayenne-persistent.xml | 4 ++-- cayenne-server/src/test/resources/cayenne-primitive.xml | 4 ++-- cayenne-server/src/test/resources/cayenne-qualified.xml | 2 +- .../src/test/resources/cayenne-quoted-identifiers.xml | 2 +- cayenne-server/src/test/resources/cayenne-reflexive.xml | 4 ++-- .../src/test/resources/cayenne-relationships-activity.xml | 2 +- .../test/resources/cayenne-relationships-child-master.xml | 4 ++-- .../src/test/resources/cayenne-relationships-clob.xml | 4 ++-- .../resources/cayenne-relationships-collection-to-many.xml | 4 ++-- .../test/resources/cayenne-relationships-delete-rules.xml | 4 ++-- .../src/test/resources/cayenne-relationships-flattened.xml | 4 ++-- .../src/test/resources/cayenne-relationships-set-to-many.xml | 4 ++-- .../src/test/resources/cayenne-relationships-to-many-fk.xml | 4 ++-- .../src/test/resources/cayenne-relationships-to-one-fk.xml | 4 ++-- cayenne-server/src/test/resources/cayenne-relationships.xml | 2 +- cayenne-server/src/test/resources/cayenne-return-types.xml | 4 ++-- cayenne-server/src/test/resources/cayenne-small-testmap.xml | 2 +- cayenne-server/src/test/resources/cayenne-soft-delete.xml | 4 ++-- cayenne-server/src/test/resources/cayenne-sus.xml | 2 +- .../src/test/resources/cayenne-table-primitives.xml | 4 ++-- cayenne-server/src/test/resources/cayenne-testmap.xml | 2 +- cayenne-server/src/test/resources/cayenne-things.xml | 4 ++-- cayenne-server/src/test/resources/cayenne-toone.xml | 4 ++-- .../test/resources/cayenne-unsupported-distinct-types.xml | 2 +- cayenne-server/src/test/resources/cayenne-uuid.xml | 4 ++-- cayenne-server/src/test/resources/compound.map.xml | 8 ++++---- cayenne-server/src/test/resources/date-time.map.xml | 8 ++++---- cayenne-server/src/test/resources/delete-rules.map.xml | 8 ++++---- cayenne-server/src/test/resources/embeddable.map.xml | 6 +++--- cayenne-server/src/test/resources/empty.map.xml | 8 ++++---- cayenne-server/src/test/resources/enum.map.xml | 8 ++++---- cayenne-server/src/test/resources/extended-type.map.xml | 8 ++++---- cayenne-server/src/test/resources/generated.map.xml | 8 ++++---- cayenne-server/src/test/resources/generic.map.xml | 6 +++--- .../src/test/resources/inheritance-single-table1.map.xml | 6 +++--- .../src/test/resources/inheritance-vertical.map.xml | 6 +++--- cayenne-server/src/test/resources/inheritance.map.xml | 8 ++++---- .../src/test/resources/lifecycle-callbacks-order.map.xml | 8 ++++---- cayenne-server/src/test/resources/lifecycles.map.xml | 8 ++++---- cayenne-server/src/test/resources/lob.map.xml | 8 ++++---- cayenne-server/src/test/resources/locking.map.xml | 6 +++--- cayenne-server/src/test/resources/map-db1.map.xml | 6 +++--- cayenne-server/src/test/resources/map-db2.map.xml | 6 +++--- cayenne-server/src/test/resources/map-to-many.map.xml | 8 ++++---- cayenne-server/src/test/resources/meaningful-pk.map.xml | 8 ++++---- cayenne-server/src/test/resources/misc-types.map.xml | 8 ++++---- .../src/test/resources/mixed-persistence-strategy.map.xml | 8 ++++---- cayenne-server/src/test/resources/multi-tier.map.xml | 6 +++--- cayenne-server/src/test/resources/no-pk.map.xml | 8 ++++---- cayenne-server/src/test/resources/numeric-types.map.xml | 8 ++++---- cayenne-server/src/test/resources/oneway-rels.map.xml | 6 +++--- cayenne-server/src/test/resources/people.map.xml | 6 +++--- cayenne-server/src/test/resources/persistent.map.xml | 8 ++++---- cayenne-server/src/test/resources/primitive.map.xml | 8 ++++---- cayenne-server/src/test/resources/qualified.map.xml | 6 +++--- cayenne-server/src/test/resources/quoted-identifiers.map.xml | 6 +++--- cayenne-server/src/test/resources/reflexive.map.xml | 8 ++++---- .../src/test/resources/relationships-activity.map.xml | 6 +++--- .../src/test/resources/relationships-child-master.map.xml | 8 ++++---- cayenne-server/src/test/resources/relationships-clob.map.xml | 8 ++++---- .../test/resources/relationships-collection-to-many.map.xml | 8 ++++---- .../src/test/resources/relationships-delete-rules.map.xml | 8 ++++---- .../src/test/resources/relationships-flattened.map.xml | 8 ++++---- .../src/test/resources/relationships-set-to-many.map.xml | 8 ++++---- .../src/test/resources/relationships-to-many-fk.map.xml | 8 ++++---- .../src/test/resources/relationships-to-one-fk.map.xml | 8 ++++---- cayenne-server/src/test/resources/relationships.map.xml | 6 +++--- cayenne-server/src/test/resources/return-types.map.xml | 8 ++++---- cayenne-server/src/test/resources/soft-delete.map.xml | 8 ++++---- cayenne-server/src/test/resources/sus-map.map.xml | 6 +++--- cayenne-server/src/test/resources/table-primitives.map.xml | 8 ++++---- cayenne-server/src/test/resources/testmap.map.xml | 6 +++--- cayenne-server/src/test/resources/things.map.xml | 8 ++++---- cayenne-server/src/test/resources/toone.map.xml | 8 ++++---- .../src/test/resources/unsupported-distinct-types.map.xml | 6 +++--- cayenne-server/src/test/resources/uuid.map.xml | 8 ++++---- .../tools/dbimport/build-include-table.map.xml-result | 6 +++--- .../cayenne/tools/dbimport/testDefaultPackage.map.xml-result | 6 +++--- .../tools/dbimport/testFilteringWithSchema.map.xml-result | 6 +++--- .../testFlattensManyToManyWithRecursiveLink.map.xml-result | 6 +++--- .../tools/dbimport/testImportAddTableAndColumn.map.xml | 6 +++--- .../dbimport/testImportAddTableAndColumn.map.xml-result | 6 +++--- .../tools/dbimport/testImportNewDataMap.map.xml-result | 6 +++--- .../cayenne/tools/dbimport/testImportWithoutChanges.map.xml | 6 +++--- .../tools/dbimport/testImportWithoutChanges.map.xml-result | 6 +++--- .../testOldParamsSchemasAndTableExclude.map.xml-result | 6 +++--- .../cayenne/tools/dbimport/testOneToOne.map.xml-result | 6 +++--- .../cayenne/tools/dbimport/testPreserveRelationships.map.xml | 6 +++--- .../tools/dbimport/testPreserveRelationships.map.xml-result | 6 +++--- .../tools/dbimport/testSchemasAndTableExclude.map.xml-result | 6 +++--- .../tools/dbimport/testSimpleFiltering.map.xml-result | 6 +++--- .../cayenne/tools/dbimport/testSkipPrimaryKeyLoading.map.xml | 6 +++--- .../tools/dbimport/testSkipPrimaryKeyLoading.map.xml-result | 6 +++--- .../tools/dbimport/testSkipRelationshipsLoading.map.xml | 6 +++--- .../dbimport/testSkipRelationshipsLoading.map.xml-result | 6 +++--- .../testSupportsCatalogsOnReverseEngineering.map.xml | 8 ++++---- .../cayenne/tools/dbimport/testTableTypes.map.xml-result | 6 +++--- .../cayenne/tools/dbimport/testUnFlattensManyToMany.map.xml | 6 +++--- .../tools/dbimport/testUnFlattensManyToMany.map.xml-result | 6 +++--- .../cayenne/tools/dbimport/testViewsExclude.map.xml-result | 6 +++--- 142 files changed, 380 insertions(+), 380 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cayenne/blob/8049c968/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 64f283b..cf7e20f 100644 --- a/cayenne-crypto/src/test/resources/cayenne-crypto.xml +++ b/cayenne-crypto/src/test/resources/cayenne-crypto.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<domain project-version="7"> +<domain project-version="8"> <map name="datamap"/> <node name="datanode" http://git-wip-us.apache.org/repos/asf/cayenne/blob/8049c968/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 6aa3683..2a20be2 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/7/modelMap"; +<data-map xmlns="http://cayenne.apache.org/schema/8/modelMap"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://cayenne.apache.org/schema/7/modelMap http://cayenne.apache.org/schema/7/modelMap.xsd"; - project-version="7"> + xsi:schemaLocation="http://cayenne.apache.org/schema/8/modelMap http://cayenne.apache.org/schema/8/modelMap.xsd"; + project-version="8"> <property name="defaultPackage" value="org.apache.cayenne.crypto.db"/> <db-entity name="TABLE1"> <db-attribute name="CRYPTO_STRING" type="CLOB"/> http://git-wip-us.apache.org/repos/asf/cayenne/blob/8049c968/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 8e07370..d4ad35d 100644 --- a/cayenne-java8/src/test/resources/cayenne-java8.xml +++ b/cayenne-java8/src/test/resources/cayenne-java8.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<domain project-version="7"> +<domain project-version="8"> <map name="java8"/> <node name="datanode" http://git-wip-us.apache.org/repos/asf/cayenne/blob/8049c968/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 ac170f9..1d8a274 100644 --- a/cayenne-java8/src/test/resources/java8.map.xml +++ b/cayenne-java8/src/test/resources/java8.map.xml @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> -<data-map xmlns="http://cayenne.apache.org/schema/7/modelMap"; +<data-map xmlns="http://cayenne.apache.org/schema/8/modelMap"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://cayenne.apache.org/schema/7/modelMap http://cayenne.apache.org/schema/7/modelMap.xsd"; - project-version="7"> + xsi:schemaLocation="http://cayenne.apache.org/schema/8/modelMap http://cayenne.apache.org/schema/8/modelMap.xsd"; + project-version="8"> <property name="defaultPackage" value="org.apache.cayenne.java8.db"/> <db-entity name="LOCAL_DATE_TEST"> <db-attribute name="Date" type="DATE"/> http://git-wip-us.apache.org/repos/asf/cayenne/blob/8049c968/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 0ba8345..7c7ef9d 100644 --- a/cayenne-joda/src/test/resources/cayenne-joda.xml +++ b/cayenne-joda/src/test/resources/cayenne-joda.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<domain project-version="7"> +<domain project-version="8"> <map name="joda"/> <node name="datanode" http://git-wip-us.apache.org/repos/asf/cayenne/blob/8049c968/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 afb9c7a..0234bf8 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/7/modelMap"; +<data-map xmlns="http://cayenne.apache.org/schema/8/modelMap"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://cayenne.apache.org/schema/7/modelMap http://cayenne.apache.org/schema/7/modelMap.xsd"; - project-version="7"> + xsi:schemaLocation="http://cayenne.apache.org/schema/8/modelMap http://cayenne.apache.org/schema/8/modelMap.xsd"; + project-version="8"> <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/8049c968/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 5bfd0a3..cffc16b 100644 --- a/cayenne-lifecycle/src/test/resources/cayenne-lifecycle.xml +++ b/cayenne-lifecycle/src/test/resources/cayenne-lifecycle.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<domain project-version="7"> +<domain project-version="8"> <map name="lifecycle-map"/> <node name="lifecycle-db" http://git-wip-us.apache.org/repos/asf/cayenne/blob/8049c968/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 92a6ab5..312b7ac 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/7/modelMap"; +<data-map xmlns="http://cayenne.apache.org/schema/8/modelMap"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://cayenne.apache.org/schema/7/modelMap http://cayenne.apache.org/schema/7/modelMap.xsd"; - project-version="7"> + xsi:schemaLocation="http://cayenne.apache.org/schema/8/modelMap http://cayenne.apache.org/schema/8/modelMap.xsd"; + project-version="8"> <property name="defaultPackage" value="org.apache.cayenne.lifecycle.db"/> <db-entity name="AUDITABLE1"> <db-attribute name="CHAR_PROPERTY1" type="VARCHAR" length="200"/> http://git-wip-us.apache.org/repos/asf/cayenne/blob/8049c968/cayenne-server/src/test/resources/array-type.map.xml ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/resources/array-type.map.xml b/cayenne-server/src/test/resources/array-type.map.xml index dda7920..dcceed0 100644 --- a/cayenne-server/src/test/resources/array-type.map.xml +++ b/cayenne-server/src/test/resources/array-type.map.xml @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> -<data-map xmlns="http://cayenne.apache.org/schema/7/modelMap"; +<data-map xmlns="http://cayenne.apache.org/schema/8/modelMap"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://cayenne.apache.org/schema/7/modelMap http://cayenne.apache.org/schema/7/modelMap.xsd"; - project-version="7"> + xsi:schemaLocation="http://cayenne.apache.org/schema/8/modelMap http://cayenne.apache.org/schema/8/modelMap.xsd"; + project-version="8"> <property name="defaultPackage" value="org.apache.cayenne.testdo.array_type"/> <property name="defaultSuperclass" value="org.apache.cayenne.CayenneDataObject"/> <property name="clientSupported" value="true"/> @@ -15,4 +15,4 @@ <obj-entity name="ArrayTestEntity" className="org.apache.cayenne.testdo.array_type.ArrayTestEntity" dbEntityName="ARRAY_TEST"> <obj-attribute name="doubleArray" type="java.lang.Double[]" db-attribute-path="DOUBLE_ARRAY"/> </obj-entity> -</data-map> \ No newline at end of file +</data-map> http://git-wip-us.apache.org/repos/asf/cayenne/blob/8049c968/cayenne-server/src/test/resources/binary-pk.map.xml ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/resources/binary-pk.map.xml b/cayenne-server/src/test/resources/binary-pk.map.xml index ce5ee57..b4f6153 100644 --- a/cayenne-server/src/test/resources/binary-pk.map.xml +++ b/cayenne-server/src/test/resources/binary-pk.map.xml @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> -<data-map xmlns="http://cayenne.apache.org/schema/7/modelMap"; +<data-map xmlns="http://cayenne.apache.org/schema/8/modelMap"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://cayenne.apache.org/schema/7/modelMap http://cayenne.apache.org/schema/7/modelMap.xsd"; - project-version="7"> + xsi:schemaLocation="http://cayenne.apache.org/schema/8/modelMap http://cayenne.apache.org/schema/8/modelMap.xsd"; + project-version="8"> <property name="defaultPackage" value="org.apache.cayenne.testdo.binary_pk"/> <property name="defaultSuperclass" value="org.apache.cayenne.CayenneDataObject"/> <property name="clientSupported" value="true"/> @@ -31,4 +31,4 @@ </db-relationship> <obj-relationship name="binaryPKDetails" source="BinaryPKTest1" target="BinaryPKTest2" db-relationship-path="binaryPKDetails"/> <obj-relationship name="toBinaryPKMaster" source="BinaryPKTest2" target="BinaryPKTest1" db-relationship-path="toBinaryPKMaster"/> -</data-map> \ No newline at end of file +</data-map> http://git-wip-us.apache.org/repos/asf/cayenne/blob/8049c968/cayenne-server/src/test/resources/cay743/cayenne-domain.xml ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/resources/cay743/cayenne-domain.xml b/cayenne-server/src/test/resources/cay743/cayenne-domain.xml index 088ee91..9c80f2a 100644 --- a/cayenne-server/src/test/resources/cay743/cayenne-domain.xml +++ b/cayenne-server/src/test/resources/cay743/cayenne-domain.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<domain project-version="7"> +<domain project-version="8"> <map name="map1"/> <map name="map2"/> </domain> http://git-wip-us.apache.org/repos/asf/cayenne/blob/8049c968/cayenne-server/src/test/resources/cay743/map1.map.xml ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/resources/cay743/map1.map.xml b/cayenne-server/src/test/resources/cay743/map1.map.xml index 4033219..b82860f 100644 --- a/cayenne-server/src/test/resources/cay743/map1.map.xml +++ b/cayenne-server/src/test/resources/cay743/map1.map.xml @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> -<data-map xmlns="http://cayenne.apache.org/schema/7/modelMap"; +<data-map xmlns="http://cayenne.apache.org/schema/8/modelMap"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://cayenne.apache.org/schema/7/modelMap http://cayenne.apache.org/schema/7/modelMap.xsd"; - project-version="7"> + xsi:schemaLocation="http://cayenne.apache.org/schema/8/modelMap http://cayenne.apache.org/schema/8/modelMap.xsd"; + project-version="8"> <obj-entity name="Entity11"> </obj-entity> <obj-entity name="Entity12" superEntityName="Entity22"> http://git-wip-us.apache.org/repos/asf/cayenne/blob/8049c968/cayenne-server/src/test/resources/cay743/map2.map.xml ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/resources/cay743/map2.map.xml b/cayenne-server/src/test/resources/cay743/map2.map.xml index 3dff26a..d635364 100644 --- a/cayenne-server/src/test/resources/cay743/map2.map.xml +++ b/cayenne-server/src/test/resources/cay743/map2.map.xml @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> -<data-map xmlns="http://cayenne.apache.org/schema/7/modelMap"; +<data-map xmlns="http://cayenne.apache.org/schema/8/modelMap"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://cayenne.apache.org/schema/7/modelMap http://cayenne.apache.org/schema/7/modelMap.xsd"; - project-version="7"> + xsi:schemaLocation="http://cayenne.apache.org/schema/8/modelMap http://cayenne.apache.org/schema/8/modelMap.xsd"; + project-version="8"> <obj-entity name="Entity21" superEntityName="Entity11"> </obj-entity> <obj-entity name="Entity22"> http://git-wip-us.apache.org/repos/asf/cayenne/blob/8049c968/cayenne-server/src/test/resources/cayenne-array-type.xml ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/resources/cayenne-array-type.xml b/cayenne-server/src/test/resources/cayenne-array-type.xml index c224355..6b85e55 100644 --- a/cayenne-server/src/test/resources/cayenne-array-type.xml +++ b/cayenne-server/src/test/resources/cayenne-array-type.xml @@ -1,4 +1,4 @@ <?xml version="1.0" encoding="utf-8"?> -<domain project-version="7"> +<domain project-version="8"> <map name="array-type"/> -</domain> \ No newline at end of file +</domain> http://git-wip-us.apache.org/repos/asf/cayenne/blob/8049c968/cayenne-server/src/test/resources/cayenne-binary-pk.xml ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/resources/cayenne-binary-pk.xml b/cayenne-server/src/test/resources/cayenne-binary-pk.xml index 0922532..5ca0448 100644 --- a/cayenne-server/src/test/resources/cayenne-binary-pk.xml +++ b/cayenne-server/src/test/resources/cayenne-binary-pk.xml @@ -1,4 +1,4 @@ <?xml version="1.0" encoding="utf-8"?> -<domain project-version="7"> +<domain project-version="8"> <map name="binary-pk"/> -</domain> \ No newline at end of file +</domain> http://git-wip-us.apache.org/repos/asf/cayenne/blob/8049c968/cayenne-server/src/test/resources/cayenne-compound.xml ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/resources/cayenne-compound.xml b/cayenne-server/src/test/resources/cayenne-compound.xml index 28773ec..1dc56a5 100644 --- a/cayenne-server/src/test/resources/cayenne-compound.xml +++ b/cayenne-server/src/test/resources/cayenne-compound.xml @@ -1,4 +1,4 @@ <?xml version="1.0" encoding="utf-8"?> -<domain project-version="7"> +<domain project-version="8"> <map name="compound"/> -</domain> \ No newline at end of file +</domain> http://git-wip-us.apache.org/repos/asf/cayenne/blob/8049c968/cayenne-server/src/test/resources/cayenne-date-time.xml ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/resources/cayenne-date-time.xml b/cayenne-server/src/test/resources/cayenne-date-time.xml index 9c7e1d3..f8d47d1 100644 --- a/cayenne-server/src/test/resources/cayenne-date-time.xml +++ b/cayenne-server/src/test/resources/cayenne-date-time.xml @@ -1,4 +1,4 @@ <?xml version="1.0" encoding="utf-8"?> -<domain project-version="7"> +<domain project-version="8"> <map name="date-time"/> -</domain> \ No newline at end of file +</domain> http://git-wip-us.apache.org/repos/asf/cayenne/blob/8049c968/cayenne-server/src/test/resources/cayenne-delete-rules.xml ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/resources/cayenne-delete-rules.xml b/cayenne-server/src/test/resources/cayenne-delete-rules.xml index f6fa557..1d8e159 100644 --- a/cayenne-server/src/test/resources/cayenne-delete-rules.xml +++ b/cayenne-server/src/test/resources/cayenne-delete-rules.xml @@ -1,4 +1,4 @@ <?xml version="1.0" encoding="utf-8"?> -<domain project-version="7"> +<domain project-version="8"> <map name="delete-rules"/> </domain> http://git-wip-us.apache.org/repos/asf/cayenne/blob/8049c968/cayenne-server/src/test/resources/cayenne-embeddable.xml ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/resources/cayenne-embeddable.xml b/cayenne-server/src/test/resources/cayenne-embeddable.xml index 9ffb2e3..32ab708 100644 --- a/cayenne-server/src/test/resources/cayenne-embeddable.xml +++ b/cayenne-server/src/test/resources/cayenne-embeddable.xml @@ -1,4 +1,4 @@ <?xml version="1.0" encoding="utf-8"?> -<domain project-version="7"> +<domain project-version="8"> <map name="embeddable"/> -</domain> \ No newline at end of file +</domain> http://git-wip-us.apache.org/repos/asf/cayenne/blob/8049c968/cayenne-server/src/test/resources/cayenne-empty.xml ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/resources/cayenne-empty.xml b/cayenne-server/src/test/resources/cayenne-empty.xml index 00778a5..e3ed459 100644 --- a/cayenne-server/src/test/resources/cayenne-empty.xml +++ b/cayenne-server/src/test/resources/cayenne-empty.xml @@ -1,4 +1,4 @@ <?xml version="1.0" encoding="utf-8"?> -<domain project-version="7"> +<domain project-version="8"> <map name="empty"/> -</domain> \ No newline at end of file +</domain> http://git-wip-us.apache.org/repos/asf/cayenne/blob/8049c968/cayenne-server/src/test/resources/cayenne-enum.xml ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/resources/cayenne-enum.xml b/cayenne-server/src/test/resources/cayenne-enum.xml index 4b94cd1..a62ba39 100644 --- a/cayenne-server/src/test/resources/cayenne-enum.xml +++ b/cayenne-server/src/test/resources/cayenne-enum.xml @@ -1,4 +1,4 @@ <?xml version="1.0" encoding="utf-8"?> -<domain project-version="7"> +<domain project-version="8"> <map name="enum"/> -</domain> \ No newline at end of file +</domain> http://git-wip-us.apache.org/repos/asf/cayenne/blob/8049c968/cayenne-server/src/test/resources/cayenne-extended-type.xml ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/resources/cayenne-extended-type.xml b/cayenne-server/src/test/resources/cayenne-extended-type.xml index 84b0670..71ce19f 100644 --- a/cayenne-server/src/test/resources/cayenne-extended-type.xml +++ b/cayenne-server/src/test/resources/cayenne-extended-type.xml @@ -1,4 +1,4 @@ <?xml version="1.0" encoding="utf-8"?> -<domain project-version="7"> +<domain project-version="8"> <map name="extended-type"/> -</domain> \ No newline at end of file +</domain> http://git-wip-us.apache.org/repos/asf/cayenne/blob/8049c968/cayenne-server/src/test/resources/cayenne-generated.xml ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/resources/cayenne-generated.xml b/cayenne-server/src/test/resources/cayenne-generated.xml index 57bd957..e10820d 100644 --- a/cayenne-server/src/test/resources/cayenne-generated.xml +++ b/cayenne-server/src/test/resources/cayenne-generated.xml @@ -1,4 +1,4 @@ <?xml version="1.0" encoding="utf-8"?> -<domain project-version="7"> +<domain project-version="8"> <map name="generated"/> -</domain> \ No newline at end of file +</domain> http://git-wip-us.apache.org/repos/asf/cayenne/blob/8049c968/cayenne-server/src/test/resources/cayenne-generic.xml ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/resources/cayenne-generic.xml b/cayenne-server/src/test/resources/cayenne-generic.xml index 0cacadc..4eaaf7b 100644 --- a/cayenne-server/src/test/resources/cayenne-generic.xml +++ b/cayenne-server/src/test/resources/cayenne-generic.xml @@ -1,4 +1,4 @@ <?xml version="1.0" encoding="utf-8"?> -<domain project-version="7"> +<domain project-version="8"> <map name="generic"/> -</domain> \ No newline at end of file +</domain> http://git-wip-us.apache.org/repos/asf/cayenne/blob/8049c968/cayenne-server/src/test/resources/cayenne-inheritance-single-table1.xml ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/resources/cayenne-inheritance-single-table1.xml b/cayenne-server/src/test/resources/cayenne-inheritance-single-table1.xml index 6578fb6..97c6a53 100644 --- a/cayenne-server/src/test/resources/cayenne-inheritance-single-table1.xml +++ b/cayenne-server/src/test/resources/cayenne-inheritance-single-table1.xml @@ -1,4 +1,4 @@ <?xml version="1.0" encoding="utf-8"?> -<domain project-version="7"> +<domain project-version="8"> <map name="inheritance-single-table1"/> </domain> http://git-wip-us.apache.org/repos/asf/cayenne/blob/8049c968/cayenne-server/src/test/resources/cayenne-inheritance-vertical.xml ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/resources/cayenne-inheritance-vertical.xml b/cayenne-server/src/test/resources/cayenne-inheritance-vertical.xml index a482fde..00e60dd 100644 --- a/cayenne-server/src/test/resources/cayenne-inheritance-vertical.xml +++ b/cayenne-server/src/test/resources/cayenne-inheritance-vertical.xml @@ -1,4 +1,4 @@ <?xml version="1.0" encoding="utf-8"?> -<domain project-version="7"> +<domain project-version="8"> <map name="inheritance-vertical"/> </domain> http://git-wip-us.apache.org/repos/asf/cayenne/blob/8049c968/cayenne-server/src/test/resources/cayenne-inheritance.xml ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/resources/cayenne-inheritance.xml b/cayenne-server/src/test/resources/cayenne-inheritance.xml index a76c22c..f6fea51 100644 --- a/cayenne-server/src/test/resources/cayenne-inheritance.xml +++ b/cayenne-server/src/test/resources/cayenne-inheritance.xml @@ -1,4 +1,4 @@ <?xml version="1.0" encoding="utf-8"?> -<domain project-version="7"> +<domain project-version="8"> <map name="inheritance"/> -</domain> \ No newline at end of file +</domain> http://git-wip-us.apache.org/repos/asf/cayenne/blob/8049c968/cayenne-server/src/test/resources/cayenne-lifecycle-callbacks-order.xml ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/resources/cayenne-lifecycle-callbacks-order.xml b/cayenne-server/src/test/resources/cayenne-lifecycle-callbacks-order.xml index 2764943..b9191a4 100644 --- a/cayenne-server/src/test/resources/cayenne-lifecycle-callbacks-order.xml +++ b/cayenne-server/src/test/resources/cayenne-lifecycle-callbacks-order.xml @@ -1,4 +1,4 @@ <?xml version="1.0" encoding="utf-8"?> -<domain project-version="7"> +<domain project-version="8"> <map name="lifecycle-callbacks-order"/> </domain> http://git-wip-us.apache.org/repos/asf/cayenne/blob/8049c968/cayenne-server/src/test/resources/cayenne-lifecycles.xml ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/resources/cayenne-lifecycles.xml b/cayenne-server/src/test/resources/cayenne-lifecycles.xml index 0509c40..bcaa2e3 100644 --- a/cayenne-server/src/test/resources/cayenne-lifecycles.xml +++ b/cayenne-server/src/test/resources/cayenne-lifecycles.xml @@ -1,4 +1,4 @@ <?xml version="1.0" encoding="utf-8"?> -<domain project-version="7"> +<domain project-version="8"> <map name="lifecycles"/> </domain> http://git-wip-us.apache.org/repos/asf/cayenne/blob/8049c968/cayenne-server/src/test/resources/cayenne-lob.xml ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/resources/cayenne-lob.xml b/cayenne-server/src/test/resources/cayenne-lob.xml index 0bca9f9..f575f1b 100644 --- a/cayenne-server/src/test/resources/cayenne-lob.xml +++ b/cayenne-server/src/test/resources/cayenne-lob.xml @@ -1,4 +1,4 @@ <?xml version="1.0" encoding="utf-8"?> -<domain project-version="7"> +<domain project-version="8"> <map name="lob"/> -</domain> \ No newline at end of file +</domain> http://git-wip-us.apache.org/repos/asf/cayenne/blob/8049c968/cayenne-server/src/test/resources/cayenne-locking.xml ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/resources/cayenne-locking.xml b/cayenne-server/src/test/resources/cayenne-locking.xml index cdbe852..b58f8fd 100644 --- a/cayenne-server/src/test/resources/cayenne-locking.xml +++ b/cayenne-server/src/test/resources/cayenne-locking.xml @@ -1,4 +1,4 @@ <?xml version="1.0" encoding="utf-8"?> -<domain project-version="7"> +<domain project-version="8"> <map name="locking"/> </domain> http://git-wip-us.apache.org/repos/asf/cayenne/blob/8049c968/cayenne-server/src/test/resources/cayenne-map-to-many.xml ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/resources/cayenne-map-to-many.xml b/cayenne-server/src/test/resources/cayenne-map-to-many.xml index abbb675..f15587b 100644 --- a/cayenne-server/src/test/resources/cayenne-map-to-many.xml +++ b/cayenne-server/src/test/resources/cayenne-map-to-many.xml @@ -1,4 +1,4 @@ <?xml version="1.0" encoding="utf-8"?> -<domain project-version="7"> +<domain project-version="8"> <map name="map-to-many"/> -</domain> \ No newline at end of file +</domain> http://git-wip-us.apache.org/repos/asf/cayenne/blob/8049c968/cayenne-server/src/test/resources/cayenne-meaningful-pk.xml ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/resources/cayenne-meaningful-pk.xml b/cayenne-server/src/test/resources/cayenne-meaningful-pk.xml index d8b9204..1326169 100644 --- a/cayenne-server/src/test/resources/cayenne-meaningful-pk.xml +++ b/cayenne-server/src/test/resources/cayenne-meaningful-pk.xml @@ -1,4 +1,4 @@ <?xml version="1.0" encoding="utf-8"?> -<domain project-version="7"> +<domain project-version="8"> <map name="meaningful-pk"/> -</domain> \ No newline at end of file +</domain> http://git-wip-us.apache.org/repos/asf/cayenne/blob/8049c968/cayenne-server/src/test/resources/cayenne-misc-types.xml ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/resources/cayenne-misc-types.xml b/cayenne-server/src/test/resources/cayenne-misc-types.xml index bbc06f2..4821482 100644 --- a/cayenne-server/src/test/resources/cayenne-misc-types.xml +++ b/cayenne-server/src/test/resources/cayenne-misc-types.xml @@ -1,4 +1,4 @@ <?xml version="1.0" encoding="utf-8"?> -<domain project-version="7"> +<domain project-version="8"> <map name="misc-types"/> -</domain> \ No newline at end of file +</domain> http://git-wip-us.apache.org/repos/asf/cayenne/blob/8049c968/cayenne-server/src/test/resources/cayenne-mixed-persistence-strategy.xml ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/resources/cayenne-mixed-persistence-strategy.xml b/cayenne-server/src/test/resources/cayenne-mixed-persistence-strategy.xml index 84ebf37..b68da04 100644 --- a/cayenne-server/src/test/resources/cayenne-mixed-persistence-strategy.xml +++ b/cayenne-server/src/test/resources/cayenne-mixed-persistence-strategy.xml @@ -1,4 +1,4 @@ <?xml version="1.0" encoding="utf-8"?> -<domain project-version="7"> +<domain project-version="8"> <map name="mixed-persistence-strategy"/> -</domain> \ No newline at end of file +</domain> http://git-wip-us.apache.org/repos/asf/cayenne/blob/8049c968/cayenne-server/src/test/resources/cayenne-multi-tier.xml ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/resources/cayenne-multi-tier.xml b/cayenne-server/src/test/resources/cayenne-multi-tier.xml index 3673faf..afd9699 100644 --- a/cayenne-server/src/test/resources/cayenne-multi-tier.xml +++ b/cayenne-server/src/test/resources/cayenne-multi-tier.xml @@ -1,4 +1,4 @@ <?xml version="1.0" encoding="utf-8"?> -<domain project-version="7"> +<domain project-version="8"> <map name="multi-tier"/> </domain> http://git-wip-us.apache.org/repos/asf/cayenne/blob/8049c968/cayenne-server/src/test/resources/cayenne-multinode.xml ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/resources/cayenne-multinode.xml b/cayenne-server/src/test/resources/cayenne-multinode.xml index 7fb7a50..002aebd 100644 --- a/cayenne-server/src/test/resources/cayenne-multinode.xml +++ b/cayenne-server/src/test/resources/cayenne-multinode.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<domain project-version="7"> +<domain project-version="8"> <map name="map-db1"/> <map name="map-db2"/> </domain> http://git-wip-us.apache.org/repos/asf/cayenne/blob/8049c968/cayenne-server/src/test/resources/cayenne-no-pk.xml ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/resources/cayenne-no-pk.xml b/cayenne-server/src/test/resources/cayenne-no-pk.xml index 3a65de0..523a90b 100644 --- a/cayenne-server/src/test/resources/cayenne-no-pk.xml +++ b/cayenne-server/src/test/resources/cayenne-no-pk.xml @@ -1,4 +1,4 @@ <?xml version="1.0" encoding="utf-8"?> -<domain project-version="7"> +<domain project-version="8"> <map name="no-pk"/> -</domain> \ No newline at end of file +</domain> http://git-wip-us.apache.org/repos/asf/cayenne/blob/8049c968/cayenne-server/src/test/resources/cayenne-numeric-types.xml ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/resources/cayenne-numeric-types.xml b/cayenne-server/src/test/resources/cayenne-numeric-types.xml index 52d63c3..9bc5084 100644 --- a/cayenne-server/src/test/resources/cayenne-numeric-types.xml +++ b/cayenne-server/src/test/resources/cayenne-numeric-types.xml @@ -1,4 +1,4 @@ <?xml version="1.0" encoding="utf-8"?> -<domain project-version="7"> +<domain project-version="8"> <map name="numeric-types"/> -</domain> \ No newline at end of file +</domain> http://git-wip-us.apache.org/repos/asf/cayenne/blob/8049c968/cayenne-server/src/test/resources/cayenne-oneway-rels.xml ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/resources/cayenne-oneway-rels.xml b/cayenne-server/src/test/resources/cayenne-oneway-rels.xml index 71af8d9..74f1cbe 100644 --- a/cayenne-server/src/test/resources/cayenne-oneway-rels.xml +++ b/cayenne-server/src/test/resources/cayenne-oneway-rels.xml @@ -1,4 +1,4 @@ <?xml version="1.0" encoding="utf-8"?> -<domain project-version="7"> +<domain project-version="8"> <map name="oneway-rels"/> </domain> http://git-wip-us.apache.org/repos/asf/cayenne/blob/8049c968/cayenne-server/src/test/resources/cayenne-org.apache.cayenne.configuration.rop.server.test-config.xml ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/resources/cayenne-org.apache.cayenne.configuration.rop.server.test-config.xml b/cayenne-server/src/test/resources/cayenne-org.apache.cayenne.configuration.rop.server.test-config.xml index 940d7ec..431d9af 100644 --- a/cayenne-server/src/test/resources/cayenne-org.apache.cayenne.configuration.rop.server.test-config.xml +++ b/cayenne-server/src/test/resources/cayenne-org.apache.cayenne.configuration.rop.server.test-config.xml @@ -1,3 +1,3 @@ <?xml version="1.0" encoding="utf-8"?> -<domain project-version="7"> +<domain project-version="8"> </domain> http://git-wip-us.apache.org/repos/asf/cayenne/blob/8049c968/cayenne-server/src/test/resources/cayenne-people.xml ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/resources/cayenne-people.xml b/cayenne-server/src/test/resources/cayenne-people.xml index 8e10faf..2909c65 100644 --- a/cayenne-server/src/test/resources/cayenne-people.xml +++ b/cayenne-server/src/test/resources/cayenne-people.xml @@ -1,4 +1,4 @@ <?xml version="1.0" encoding="utf-8"?> -<domain project-version="7"> +<domain project-version="8"> <map name="people"/> </domain> http://git-wip-us.apache.org/repos/asf/cayenne/blob/8049c968/cayenne-server/src/test/resources/cayenne-persistent.xml ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/resources/cayenne-persistent.xml b/cayenne-server/src/test/resources/cayenne-persistent.xml index bc6e543..4411149 100644 --- a/cayenne-server/src/test/resources/cayenne-persistent.xml +++ b/cayenne-server/src/test/resources/cayenne-persistent.xml @@ -1,4 +1,4 @@ <?xml version="1.0" encoding="utf-8"?> -<domain project-version="7"> +<domain project-version="8"> <map name="persistent"/> -</domain> \ No newline at end of file +</domain> http://git-wip-us.apache.org/repos/asf/cayenne/blob/8049c968/cayenne-server/src/test/resources/cayenne-primitive.xml ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/resources/cayenne-primitive.xml b/cayenne-server/src/test/resources/cayenne-primitive.xml index a63d770..8940525 100644 --- a/cayenne-server/src/test/resources/cayenne-primitive.xml +++ b/cayenne-server/src/test/resources/cayenne-primitive.xml @@ -1,4 +1,4 @@ <?xml version="1.0" encoding="utf-8"?> -<domain project-version="7"> +<domain project-version="8"> <map name="primitive"/> -</domain> \ No newline at end of file +</domain> http://git-wip-us.apache.org/repos/asf/cayenne/blob/8049c968/cayenne-server/src/test/resources/cayenne-qualified.xml ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/resources/cayenne-qualified.xml b/cayenne-server/src/test/resources/cayenne-qualified.xml index 812b244..d82657f 100644 --- a/cayenne-server/src/test/resources/cayenne-qualified.xml +++ b/cayenne-server/src/test/resources/cayenne-qualified.xml @@ -1,4 +1,4 @@ <?xml version="1.0" encoding="utf-8"?> -<domain project-version="7"> +<domain project-version="8"> <map name="qualified"/> </domain> http://git-wip-us.apache.org/repos/asf/cayenne/blob/8049c968/cayenne-server/src/test/resources/cayenne-quoted-identifiers.xml ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/resources/cayenne-quoted-identifiers.xml b/cayenne-server/src/test/resources/cayenne-quoted-identifiers.xml index 368da77..642885a 100644 --- a/cayenne-server/src/test/resources/cayenne-quoted-identifiers.xml +++ b/cayenne-server/src/test/resources/cayenne-quoted-identifiers.xml @@ -1,4 +1,4 @@ <?xml version="1.0" encoding="utf-8"?> -<domain project-version="7"> +<domain project-version="8"> <map name="quoted-identifiers"/> </domain> http://git-wip-us.apache.org/repos/asf/cayenne/blob/8049c968/cayenne-server/src/test/resources/cayenne-reflexive.xml ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/resources/cayenne-reflexive.xml b/cayenne-server/src/test/resources/cayenne-reflexive.xml index 7e05dcf..389cdcf 100644 --- a/cayenne-server/src/test/resources/cayenne-reflexive.xml +++ b/cayenne-server/src/test/resources/cayenne-reflexive.xml @@ -1,4 +1,4 @@ <?xml version="1.0" encoding="utf-8"?> -<domain project-version="7"> +<domain project-version="8"> <map name="reflexive"/> -</domain> \ No newline at end of file +</domain> http://git-wip-us.apache.org/repos/asf/cayenne/blob/8049c968/cayenne-server/src/test/resources/cayenne-relationships-activity.xml ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/resources/cayenne-relationships-activity.xml b/cayenne-server/src/test/resources/cayenne-relationships-activity.xml index d655ac5..36b039c 100644 --- a/cayenne-server/src/test/resources/cayenne-relationships-activity.xml +++ b/cayenne-server/src/test/resources/cayenne-relationships-activity.xml @@ -1,4 +1,4 @@ <?xml version="1.0" encoding="utf-8"?> -<domain project-version="7"> +<domain project-version="8"> <map name="relationships-activity"/> </domain> http://git-wip-us.apache.org/repos/asf/cayenne/blob/8049c968/cayenne-server/src/test/resources/cayenne-relationships-child-master.xml ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/resources/cayenne-relationships-child-master.xml b/cayenne-server/src/test/resources/cayenne-relationships-child-master.xml index bda49f7..4c59d65 100644 --- a/cayenne-server/src/test/resources/cayenne-relationships-child-master.xml +++ b/cayenne-server/src/test/resources/cayenne-relationships-child-master.xml @@ -1,4 +1,4 @@ <?xml version="1.0" encoding="utf-8"?> -<domain project-version="7"> +<domain project-version="8"> <map name="relationships-child-master"/> -</domain> \ No newline at end of file +</domain> http://git-wip-us.apache.org/repos/asf/cayenne/blob/8049c968/cayenne-server/src/test/resources/cayenne-relationships-clob.xml ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/resources/cayenne-relationships-clob.xml b/cayenne-server/src/test/resources/cayenne-relationships-clob.xml index a28c631..88196ad 100644 --- a/cayenne-server/src/test/resources/cayenne-relationships-clob.xml +++ b/cayenne-server/src/test/resources/cayenne-relationships-clob.xml @@ -1,4 +1,4 @@ <?xml version="1.0" encoding="utf-8"?> -<domain project-version="7"> +<domain project-version="8"> <map name="relationships-clob"/> -</domain> \ No newline at end of file +</domain> http://git-wip-us.apache.org/repos/asf/cayenne/blob/8049c968/cayenne-server/src/test/resources/cayenne-relationships-collection-to-many.xml ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/resources/cayenne-relationships-collection-to-many.xml b/cayenne-server/src/test/resources/cayenne-relationships-collection-to-many.xml index c8ca293..0398dc7 100644 --- a/cayenne-server/src/test/resources/cayenne-relationships-collection-to-many.xml +++ b/cayenne-server/src/test/resources/cayenne-relationships-collection-to-many.xml @@ -1,4 +1,4 @@ <?xml version="1.0" encoding="utf-8"?> -<domain project-version="7"> +<domain project-version="8"> <map name="relationships-collection-to-many"/> -</domain> \ No newline at end of file +</domain> http://git-wip-us.apache.org/repos/asf/cayenne/blob/8049c968/cayenne-server/src/test/resources/cayenne-relationships-delete-rules.xml ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/resources/cayenne-relationships-delete-rules.xml b/cayenne-server/src/test/resources/cayenne-relationships-delete-rules.xml index 7f170a6..6cea4e1 100644 --- a/cayenne-server/src/test/resources/cayenne-relationships-delete-rules.xml +++ b/cayenne-server/src/test/resources/cayenne-relationships-delete-rules.xml @@ -1,4 +1,4 @@ <?xml version="1.0" encoding="utf-8"?> -<domain project-version="7"> +<domain project-version="8"> <map name="relationships-delete-rules"/> -</domain> \ No newline at end of file +</domain> http://git-wip-us.apache.org/repos/asf/cayenne/blob/8049c968/cayenne-server/src/test/resources/cayenne-relationships-flattened.xml ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/resources/cayenne-relationships-flattened.xml b/cayenne-server/src/test/resources/cayenne-relationships-flattened.xml index 9452a56..7cdccc6 100644 --- a/cayenne-server/src/test/resources/cayenne-relationships-flattened.xml +++ b/cayenne-server/src/test/resources/cayenne-relationships-flattened.xml @@ -1,4 +1,4 @@ <?xml version="1.0" encoding="utf-8"?> -<domain project-version="7"> +<domain project-version="8"> <map name="relationships-flattened"/> -</domain> \ No newline at end of file +</domain> http://git-wip-us.apache.org/repos/asf/cayenne/blob/8049c968/cayenne-server/src/test/resources/cayenne-relationships-set-to-many.xml ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/resources/cayenne-relationships-set-to-many.xml b/cayenne-server/src/test/resources/cayenne-relationships-set-to-many.xml index 10881da..7e92d95 100644 --- a/cayenne-server/src/test/resources/cayenne-relationships-set-to-many.xml +++ b/cayenne-server/src/test/resources/cayenne-relationships-set-to-many.xml @@ -1,4 +1,4 @@ <?xml version="1.0" encoding="utf-8"?> -<domain project-version="7"> +<domain project-version="8"> <map name="relationships-set-to-many"/> -</domain> \ No newline at end of file +</domain> http://git-wip-us.apache.org/repos/asf/cayenne/blob/8049c968/cayenne-server/src/test/resources/cayenne-relationships-to-many-fk.xml ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/resources/cayenne-relationships-to-many-fk.xml b/cayenne-server/src/test/resources/cayenne-relationships-to-many-fk.xml index 94792c3..d9e563c 100644 --- a/cayenne-server/src/test/resources/cayenne-relationships-to-many-fk.xml +++ b/cayenne-server/src/test/resources/cayenne-relationships-to-many-fk.xml @@ -1,4 +1,4 @@ <?xml version="1.0" encoding="utf-8"?> -<domain project-version="7"> +<domain project-version="8"> <map name="relationships-to-many-fk"/> -</domain> \ No newline at end of file +</domain> http://git-wip-us.apache.org/repos/asf/cayenne/blob/8049c968/cayenne-server/src/test/resources/cayenne-relationships-to-one-fk.xml ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/resources/cayenne-relationships-to-one-fk.xml b/cayenne-server/src/test/resources/cayenne-relationships-to-one-fk.xml index 46da7b9..82dcd6e 100644 --- a/cayenne-server/src/test/resources/cayenne-relationships-to-one-fk.xml +++ b/cayenne-server/src/test/resources/cayenne-relationships-to-one-fk.xml @@ -1,4 +1,4 @@ <?xml version="1.0" encoding="utf-8"?> -<domain project-version="7"> +<domain project-version="8"> <map name="relationships-to-one-fk"/> -</domain> \ No newline at end of file +</domain> http://git-wip-us.apache.org/repos/asf/cayenne/blob/8049c968/cayenne-server/src/test/resources/cayenne-relationships.xml ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/resources/cayenne-relationships.xml b/cayenne-server/src/test/resources/cayenne-relationships.xml index b7750ef..24f0c37 100644 --- a/cayenne-server/src/test/resources/cayenne-relationships.xml +++ b/cayenne-server/src/test/resources/cayenne-relationships.xml @@ -1,4 +1,4 @@ <?xml version="1.0" encoding="utf-8"?> -<domain project-version="7"> +<domain project-version="8"> <map name="relationships"/> </domain> http://git-wip-us.apache.org/repos/asf/cayenne/blob/8049c968/cayenne-server/src/test/resources/cayenne-return-types.xml ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/resources/cayenne-return-types.xml b/cayenne-server/src/test/resources/cayenne-return-types.xml index b03bf5d..95d67fb 100644 --- a/cayenne-server/src/test/resources/cayenne-return-types.xml +++ b/cayenne-server/src/test/resources/cayenne-return-types.xml @@ -1,4 +1,4 @@ <?xml version="1.0" encoding="utf-8"?> -<domain project-version="7"> +<domain project-version="8"> <map name="return-types"/> -</domain> \ No newline at end of file +</domain> http://git-wip-us.apache.org/repos/asf/cayenne/blob/8049c968/cayenne-server/src/test/resources/cayenne-small-testmap.xml ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/resources/cayenne-small-testmap.xml b/cayenne-server/src/test/resources/cayenne-small-testmap.xml index 24c2209..d11cf45 100644 --- a/cayenne-server/src/test/resources/cayenne-small-testmap.xml +++ b/cayenne-server/src/test/resources/cayenne-small-testmap.xml @@ -1,4 +1,4 @@ <?xml version="1.0" encoding="utf-8"?> -<domain project-version="7"> +<domain project-version="8"> <map name="small-testmap"/> </domain> http://git-wip-us.apache.org/repos/asf/cayenne/blob/8049c968/cayenne-server/src/test/resources/cayenne-soft-delete.xml ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/resources/cayenne-soft-delete.xml b/cayenne-server/src/test/resources/cayenne-soft-delete.xml index 15dfc25..f4a4bdc 100644 --- a/cayenne-server/src/test/resources/cayenne-soft-delete.xml +++ b/cayenne-server/src/test/resources/cayenne-soft-delete.xml @@ -1,4 +1,4 @@ <?xml version="1.0" encoding="utf-8"?> -<domain project-version="7"> +<domain project-version="8"> <map name="soft-delete"/> -</domain> \ No newline at end of file +</domain> http://git-wip-us.apache.org/repos/asf/cayenne/blob/8049c968/cayenne-server/src/test/resources/cayenne-sus.xml ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/resources/cayenne-sus.xml b/cayenne-server/src/test/resources/cayenne-sus.xml index ff93d6c..b830baf 100644 --- a/cayenne-server/src/test/resources/cayenne-sus.xml +++ b/cayenne-server/src/test/resources/cayenne-sus.xml @@ -1,4 +1,4 @@ <?xml version="1.0" encoding="utf-8"?> -<domain project-version="7"> +<domain project-version="8"> <map name="sus-map"/> </domain> http://git-wip-us.apache.org/repos/asf/cayenne/blob/8049c968/cayenne-server/src/test/resources/cayenne-table-primitives.xml ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/resources/cayenne-table-primitives.xml b/cayenne-server/src/test/resources/cayenne-table-primitives.xml index 642c18b..d87ef95 100644 --- a/cayenne-server/src/test/resources/cayenne-table-primitives.xml +++ b/cayenne-server/src/test/resources/cayenne-table-primitives.xml @@ -1,4 +1,4 @@ <?xml version="1.0" encoding="utf-8"?> -<domain project-version="7"> +<domain project-version="8"> <map name="table-primitives"/> -</domain> \ No newline at end of file +</domain> http://git-wip-us.apache.org/repos/asf/cayenne/blob/8049c968/cayenne-server/src/test/resources/cayenne-testmap.xml ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/resources/cayenne-testmap.xml b/cayenne-server/src/test/resources/cayenne-testmap.xml index 4028207..8253020 100644 --- a/cayenne-server/src/test/resources/cayenne-testmap.xml +++ b/cayenne-server/src/test/resources/cayenne-testmap.xml @@ -1,4 +1,4 @@ <?xml version="1.0" encoding="utf-8"?> -<domain project-version="7"> +<domain project-version="8"> <map name="testmap"/> </domain> http://git-wip-us.apache.org/repos/asf/cayenne/blob/8049c968/cayenne-server/src/test/resources/cayenne-things.xml ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/resources/cayenne-things.xml b/cayenne-server/src/test/resources/cayenne-things.xml index 8e9e1de..a5e13c0 100644 --- a/cayenne-server/src/test/resources/cayenne-things.xml +++ b/cayenne-server/src/test/resources/cayenne-things.xml @@ -1,4 +1,4 @@ <?xml version="1.0" encoding="utf-8"?> -<domain project-version="7"> +<domain project-version="8"> <map name="things"/> -</domain> \ No newline at end of file +</domain> http://git-wip-us.apache.org/repos/asf/cayenne/blob/8049c968/cayenne-server/src/test/resources/cayenne-toone.xml ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/resources/cayenne-toone.xml b/cayenne-server/src/test/resources/cayenne-toone.xml index b856947..f46c8ac 100644 --- a/cayenne-server/src/test/resources/cayenne-toone.xml +++ b/cayenne-server/src/test/resources/cayenne-toone.xml @@ -1,4 +1,4 @@ <?xml version="1.0" encoding="utf-8"?> -<domain project-version="7"> +<domain project-version="8"> <map name="toone"/> -</domain> \ No newline at end of file +</domain> http://git-wip-us.apache.org/repos/asf/cayenne/blob/8049c968/cayenne-server/src/test/resources/cayenne-unsupported-distinct-types.xml ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/resources/cayenne-unsupported-distinct-types.xml b/cayenne-server/src/test/resources/cayenne-unsupported-distinct-types.xml index 9f0ab1d..6de977f 100644 --- a/cayenne-server/src/test/resources/cayenne-unsupported-distinct-types.xml +++ b/cayenne-server/src/test/resources/cayenne-unsupported-distinct-types.xml @@ -1,4 +1,4 @@ <?xml version="1.0" encoding="utf-8"?> -<domain project-version="7"> +<domain project-version="8"> <map name="unsupported-distinct-types"/> </domain> http://git-wip-us.apache.org/repos/asf/cayenne/blob/8049c968/cayenne-server/src/test/resources/cayenne-uuid.xml ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/resources/cayenne-uuid.xml b/cayenne-server/src/test/resources/cayenne-uuid.xml index f3bd2e1..a821d12 100644 --- a/cayenne-server/src/test/resources/cayenne-uuid.xml +++ b/cayenne-server/src/test/resources/cayenne-uuid.xml @@ -1,4 +1,4 @@ <?xml version="1.0" encoding="utf-8"?> -<domain project-version="7"> +<domain project-version="8"> <map name="uuid"/> -</domain> \ No newline at end of file +</domain> http://git-wip-us.apache.org/repos/asf/cayenne/blob/8049c968/cayenne-server/src/test/resources/compound.map.xml ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/resources/compound.map.xml b/cayenne-server/src/test/resources/compound.map.xml index 47ebbdb..f53832b 100644 --- a/cayenne-server/src/test/resources/compound.map.xml +++ b/cayenne-server/src/test/resources/compound.map.xml @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> -<data-map xmlns="http://cayenne.apache.org/schema/7/modelMap"; +<data-map xmlns="http://cayenne.apache.org/schema/8/modelMap"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://cayenne.apache.org/schema/7/modelMap http://cayenne.apache.org/schema/7/modelMap.xsd"; - project-version="7"> + xsi:schemaLocation="http://cayenne.apache.org/schema/8/modelMap http://cayenne.apache.org/schema/8/modelMap.xsd"; + project-version="8"> <property name="defaultPackage" value="org.apache.cayenne.testdo.compound"/> <property name="defaultSuperclass" value="org.apache.cayenne.CayenneDataObject"/> <property name="clientSupported" value="true"/> @@ -61,4 +61,4 @@ <obj-relationship name="charFKs" source="CharPkTestEntity" target="CharFkTestEntity" db-relationship-path="charFKs"/> <obj-relationship name="toCompoundPk" source="CompoundFkTestEntity" target="CompoundPkTestEntity" db-relationship-path="toCompoundPk"/> <obj-relationship name="compoundFkArray" source="CompoundPkTestEntity" target="CompoundFkTestEntity" db-relationship-path="compoundFkArray"/> -</data-map> \ No newline at end of file +</data-map> http://git-wip-us.apache.org/repos/asf/cayenne/blob/8049c968/cayenne-server/src/test/resources/date-time.map.xml ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/resources/date-time.map.xml b/cayenne-server/src/test/resources/date-time.map.xml index 07b7aa7..69fd0ff 100644 --- a/cayenne-server/src/test/resources/date-time.map.xml +++ b/cayenne-server/src/test/resources/date-time.map.xml @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> -<data-map xmlns="http://cayenne.apache.org/schema/7/modelMap"; +<data-map xmlns="http://cayenne.apache.org/schema/8/modelMap"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://cayenne.apache.org/schema/7/modelMap http://cayenne.apache.org/schema/7/modelMap.xsd"; - project-version="7"> + xsi:schemaLocation="http://cayenne.apache.org/schema/8/modelMap http://cayenne.apache.org/schema/8/modelMap.xsd"; + project-version="8"> <property name="defaultPackage" value="org.apache.cayenne.testdo.date_time"/> <property name="defaultSuperclass" value="org.apache.cayenne.CayenneDataObject"/> <property name="clientSupported" value="true"/> @@ -31,4 +31,4 @@ <property name="cayenne.SQLTemplate.columnNameCapitalization" value="UPPER"/> <sql><![CDATA[SELECT * FROM DATE_TEST]]></sql> </query> -</data-map> \ No newline at end of file +</data-map> http://git-wip-us.apache.org/repos/asf/cayenne/blob/8049c968/cayenne-server/src/test/resources/delete-rules.map.xml ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/resources/delete-rules.map.xml b/cayenne-server/src/test/resources/delete-rules.map.xml index 9d6f5ed..85cf165 100644 --- a/cayenne-server/src/test/resources/delete-rules.map.xml +++ b/cayenne-server/src/test/resources/delete-rules.map.xml @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> -<data-map xmlns="http://cayenne.apache.org/schema/7/modelMap"; +<data-map xmlns="http://cayenne.apache.org/schema/8/modelMap"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://cayenne.apache.org/schema/7/modelMap http://cayenne.apache.org/schema/7/modelMap.xsd"; - project-version="7"> + xsi:schemaLocation="http://cayenne.apache.org/schema/8/modelMap http://cayenne.apache.org/schema/8/modelMap.xsd"; + project-version="8"> <property name="defaultPackage" value="org.apache.cayenne.testdo.deleterules"/> <property name="clientSupported" value="true"/> <property name="defaultClientPackage" value="org.apache.cayenne.testdo.deleterules"/> @@ -61,4 +61,4 @@ <obj-relationship name="fromCascade" source="DeleteRule" target="DeleteCascade" db-relationship-path="fromCascade"/> <obj-relationship name="fromDeny" source="DeleteRule" target="DeleteDeny" db-relationship-path="fromDeny"/> <obj-relationship name="fromNullify" source="DeleteRule" target="DeleteNullify" db-relationship-path="fromNullify"/> -</data-map> \ No newline at end of file +</data-map> http://git-wip-us.apache.org/repos/asf/cayenne/blob/8049c968/cayenne-server/src/test/resources/embeddable.map.xml ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/resources/embeddable.map.xml b/cayenne-server/src/test/resources/embeddable.map.xml index 50fa2c4..62c245d 100644 --- a/cayenne-server/src/test/resources/embeddable.map.xml +++ b/cayenne-server/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/7/modelMap"; +<data-map xmlns="http://cayenne.apache.org/schema/8/modelMap"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://cayenne.apache.org/schema/7/modelMap http://cayenne.apache.org/schema/7/modelMap.xsd"; - project-version="7"> + xsi:schemaLocation="http://cayenne.apache.org/schema/8/modelMap http://cayenne.apache.org/schema/8/modelMap.xsd"; + project-version="8"> <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/8049c968/cayenne-server/src/test/resources/empty.map.xml ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/resources/empty.map.xml b/cayenne-server/src/test/resources/empty.map.xml index 20ffbc78..7b88c75 100644 --- a/cayenne-server/src/test/resources/empty.map.xml +++ b/cayenne-server/src/test/resources/empty.map.xml @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> -<data-map xmlns="http://cayenne.apache.org/schema/7/modelMap"; +<data-map xmlns="http://cayenne.apache.org/schema/8/modelMap"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://cayenne.apache.org/schema/7/modelMap http://cayenne.apache.org/schema/7/modelMap.xsd"; - project-version="7"> + xsi:schemaLocation="http://cayenne.apache.org/schema/8/modelMap http://cayenne.apache.org/schema/8/modelMap.xsd"; + project-version="8"> <db-entity name="EMPTY"> <db-attribute name="ID" type="INTEGER" isPrimaryKey="true" isMandatory="true"/> </db-entity> -</data-map> \ No newline at end of file +</data-map> http://git-wip-us.apache.org/repos/asf/cayenne/blob/8049c968/cayenne-server/src/test/resources/enum.map.xml ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/resources/enum.map.xml b/cayenne-server/src/test/resources/enum.map.xml index 9233e86..8f6197c 100644 --- a/cayenne-server/src/test/resources/enum.map.xml +++ b/cayenne-server/src/test/resources/enum.map.xml @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> -<data-map xmlns="http://cayenne.apache.org/schema/7/modelMap"; +<data-map xmlns="http://cayenne.apache.org/schema/8/modelMap"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://cayenne.apache.org/schema/7/modelMap http://cayenne.apache.org/schema/7/modelMap.xsd"; - project-version="7"> + xsi:schemaLocation="http://cayenne.apache.org/schema/8/modelMap http://cayenne.apache.org/schema/8/modelMap.xsd"; + project-version="8"> <property name="defaultPackage" value="org.apache.cayenne.testdo.enum"/> <property name="defaultSuperclass" value="org.apache.cayenne.CayenneDataObject"/> <property name="clientSupported" value="true"/> @@ -15,4 +15,4 @@ <obj-entity name="EnumEntity" className="org.apache.cayenne.testdo.enum_test.EnumEntity" dbEntityName="ENUM_ENTITY"> <obj-attribute name="enumAttribute" type="org.apache.cayenne.testdo.enum_test.Enum1" db-attribute-path="ENUM_ATTRIBUTE"/> </obj-entity> -</data-map> \ No newline at end of file +</data-map> http://git-wip-us.apache.org/repos/asf/cayenne/blob/8049c968/cayenne-server/src/test/resources/extended-type.map.xml ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/resources/extended-type.map.xml b/cayenne-server/src/test/resources/extended-type.map.xml index cc2a5ee..e743d0b 100644 --- a/cayenne-server/src/test/resources/extended-type.map.xml +++ b/cayenne-server/src/test/resources/extended-type.map.xml @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> -<data-map xmlns="http://cayenne.apache.org/schema/7/modelMap"; +<data-map xmlns="http://cayenne.apache.org/schema/8/modelMap"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://cayenne.apache.org/schema/7/modelMap http://cayenne.apache.org/schema/7/modelMap.xsd"; - project-version="7"> + xsi:schemaLocation="http://cayenne.apache.org/schema/8/modelMap http://cayenne.apache.org/schema/8/modelMap.xsd"; + project-version="8"> <property name="defaultPackage" value="org.apache.cayenne.testdo.extended_type"/> <property name="defaultSuperclass" value="org.apache.cayenne.CayenneDataObject"/> <property name="clientSupported" value="true"/> @@ -15,4 +15,4 @@ <obj-entity name="ExtendedTypeEntity" className="org.apache.cayenne.testdo.extended_type.ExtendedTypeEntity" dbEntityName="EXTENDED_TYPE_TEST"> <obj-attribute name="name" type="org.apache.cayenne.testdo.extended_type.StringET1" db-attribute-path="NAME"/> </obj-entity> -</data-map> \ No newline at end of file +</data-map> http://git-wip-us.apache.org/repos/asf/cayenne/blob/8049c968/cayenne-server/src/test/resources/generated.map.xml ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/resources/generated.map.xml b/cayenne-server/src/test/resources/generated.map.xml index 8c0a947..958a1d0 100644 --- a/cayenne-server/src/test/resources/generated.map.xml +++ b/cayenne-server/src/test/resources/generated.map.xml @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> -<data-map xmlns="http://cayenne.apache.org/schema/7/modelMap"; +<data-map xmlns="http://cayenne.apache.org/schema/8/modelMap"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://cayenne.apache.org/schema/7/modelMap http://cayenne.apache.org/schema/7/modelMap.xsd"; - project-version="7"> + xsi:schemaLocation="http://cayenne.apache.org/schema/8/modelMap http://cayenne.apache.org/schema/8/modelMap.xsd"; + project-version="8"> <property name="defaultPackage" value="org.apache.cayenne.testdo.generated"/> <property name="defaultSuperclass" value="org.apache.cayenne.CayenneDataObject"/> <property name="clientSupported" value="true"/> @@ -90,4 +90,4 @@ <obj-relationship name="toDep" source="GeneratedColumnTestEntity" target="GeneratedColumnDep" db-relationship-path="toDep"/> <obj-relationship name="f2" source="GeneratedF1" target="GeneratedF2" deleteRule="Nullify" db-relationship-path="join.f2"/> <obj-relationship name="f1" source="GeneratedF2" target="GeneratedF1" deleteRule="Nullify" db-relationship-path="join.f1"/> -</data-map> \ No newline at end of file +</data-map> http://git-wip-us.apache.org/repos/asf/cayenne/blob/8049c968/cayenne-server/src/test/resources/generic.map.xml ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/resources/generic.map.xml b/cayenne-server/src/test/resources/generic.map.xml index a77e23f..184a91d 100644 --- a/cayenne-server/src/test/resources/generic.map.xml +++ b/cayenne-server/src/test/resources/generic.map.xml @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> -<data-map xmlns="http://cayenne.apache.org/schema/7/modelMap"; +<data-map xmlns="http://cayenne.apache.org/schema/8/modelMap"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://cayenne.apache.org/schema/7/modelMap http://cayenne.apache.org/schema/7/modelMap.xsd"; - project-version="7"> + xsi:schemaLocation="http://cayenne.apache.org/schema/8/modelMap http://cayenne.apache.org/schema/8/modelMap.xsd"; + project-version="8"> <property name="defaultPackage" value="org.apache.cayenne.testdo.generic"/> <db-entity name="GENERIC1"> <db-attribute name="ID" type="INTEGER" isPrimaryKey="true" isMandatory="true"/> http://git-wip-us.apache.org/repos/asf/cayenne/blob/8049c968/cayenne-server/src/test/resources/inheritance-single-table1.map.xml ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/resources/inheritance-single-table1.map.xml b/cayenne-server/src/test/resources/inheritance-single-table1.map.xml index ac28b94..865cced 100644 --- a/cayenne-server/src/test/resources/inheritance-single-table1.map.xml +++ b/cayenne-server/src/test/resources/inheritance-single-table1.map.xml @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> -<data-map xmlns="http://cayenne.apache.org/schema/7/modelMap"; +<data-map xmlns="http://cayenne.apache.org/schema/8/modelMap"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://cayenne.apache.org/schema/7/modelMap http://cayenne.apache.org/schema/7/modelMap.xsd"; - project-version="7"> + xsi:schemaLocation="http://cayenne.apache.org/schema/8/modelMap http://cayenne.apache.org/schema/8/modelMap.xsd"; + project-version="8"> <property name="defaultPackage" value="org.apache.cayenne.testdo.inheritance_flat"/> <db-entity name="GROUP_MEMBERS"> <db-attribute name="group_id" type="BIGINT" isMandatory="true"/> http://git-wip-us.apache.org/repos/asf/cayenne/blob/8049c968/cayenne-server/src/test/resources/inheritance-vertical.map.xml ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/resources/inheritance-vertical.map.xml b/cayenne-server/src/test/resources/inheritance-vertical.map.xml index 7bacee6..78da56e 100644 --- a/cayenne-server/src/test/resources/inheritance-vertical.map.xml +++ b/cayenne-server/src/test/resources/inheritance-vertical.map.xml @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> -<data-map xmlns="http://cayenne.apache.org/schema/7/modelMap"; +<data-map xmlns="http://cayenne.apache.org/schema/8/modelMap"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://cayenne.apache.org/schema/7/modelMap http://cayenne.apache.org/schema/7/modelMap.xsd"; - project-version="7"> + xsi:schemaLocation="http://cayenne.apache.org/schema/8/modelMap http://cayenne.apache.org/schema/8/modelMap.xsd"; + project-version="8"> <property name="defaultPackage" value="org.apache.cayenne.testdo.inheritance.vertical"/> <db-entity name="IV1_ROOT"> <db-attribute name="DISCRIMINATOR" type="VARCHAR" length="10"/> http://git-wip-us.apache.org/repos/asf/cayenne/blob/8049c968/cayenne-server/src/test/resources/inheritance.map.xml ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/resources/inheritance.map.xml b/cayenne-server/src/test/resources/inheritance.map.xml index b74a97f..a23d40e 100644 --- a/cayenne-server/src/test/resources/inheritance.map.xml +++ b/cayenne-server/src/test/resources/inheritance.map.xml @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> -<data-map xmlns="http://cayenne.apache.org/schema/7/modelMap"; +<data-map xmlns="http://cayenne.apache.org/schema/8/modelMap"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://cayenne.apache.org/schema/7/modelMap http://cayenne.apache.org/schema/7/modelMap.xsd"; - project-version="7"> + xsi:schemaLocation="http://cayenne.apache.org/schema/8/modelMap http://cayenne.apache.org/schema/8/modelMap.xsd"; + project-version="8"> <property name="defaultPackage" value="org.apache.cayenne.testdo.inheritance"/> <db-entity name="BASE_ENTITY"> <db-attribute name="BASE_ENTITY_ID" type="INTEGER" isPrimaryKey="true" isMandatory="true"/> @@ -43,4 +43,4 @@ <obj-relationship name="subEntities" source="DirectToSubEntity" target="SubEntity" db-relationship-path="subEntity"/> <obj-relationship name="baseEntities" source="RelatedEntity" target="BaseEntity" db-relationship-path="entities"/> <obj-relationship name="subEntities" source="RelatedEntity" target="SubEntity" db-relationship-path="entities"/> -</data-map> \ No newline at end of file +</data-map> http://git-wip-us.apache.org/repos/asf/cayenne/blob/8049c968/cayenne-server/src/test/resources/lifecycle-callbacks-order.map.xml ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/resources/lifecycle-callbacks-order.map.xml b/cayenne-server/src/test/resources/lifecycle-callbacks-order.map.xml index 6ca4768..78d2594 100644 --- a/cayenne-server/src/test/resources/lifecycle-callbacks-order.map.xml +++ b/cayenne-server/src/test/resources/lifecycle-callbacks-order.map.xml @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> -<data-map xmlns="http://cayenne.apache.org/schema/7/modelMap"; +<data-map xmlns="http://cayenne.apache.org/schema/8/modelMap"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://cayenne.apache.org/schema/7/modelMap http://cayenne.apache.org/schema/7/modelMap.xsd"; - project-version="7"> + xsi:schemaLocation="http://cayenne.apache.org/schema/8/modelMap http://cayenne.apache.org/schema/8/modelMap.xsd"; + project-version="8"> <property name="defaultPackage" value="org.apache.cayenne.testdo.lifecycle_callbacks_order"/> <property name="clientSupported" value="true"/> <property name="defaultClientPackage" value="org.apache.cayenne.testdo.lifecycle_callbacks_order"/> @@ -13,4 +13,4 @@ <obj-entity name="Lifecycle" className="org.apache.cayenne.testdo.lifecycle_callbacks_order.Lifecycle" dbEntityName="LIFECYCLE"> <obj-attribute name="name" type="java.lang.String" db-attribute-path="NAME"/> </obj-entity> -</data-map> \ No newline at end of file +</data-map> http://git-wip-us.apache.org/repos/asf/cayenne/blob/8049c968/cayenne-server/src/test/resources/lifecycles.map.xml ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/resources/lifecycles.map.xml b/cayenne-server/src/test/resources/lifecycles.map.xml index fdbfc7e..62c902a 100644 --- a/cayenne-server/src/test/resources/lifecycles.map.xml +++ b/cayenne-server/src/test/resources/lifecycles.map.xml @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> -<data-map xmlns="http://cayenne.apache.org/schema/7/modelMap"; +<data-map xmlns="http://cayenne.apache.org/schema/8/modelMap"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://cayenne.apache.org/schema/7/modelMap http://cayenne.apache.org/schema/7/modelMap.xsd"; - project-version="7"> + xsi:schemaLocation="http://cayenne.apache.org/schema/8/modelMap http://cayenne.apache.org/schema/8/modelMap.xsd"; + project-version="8"> <property name="defaultPackage" value="org.apache.cayenne.testdo.lifecycles"/> <property name="clientSupported" value="true"/> <property name="defaultClientPackage" value="org.apache.cayenne.testdo.lifecycles"/> @@ -13,4 +13,4 @@ <obj-entity name="Lifecycles" className="org.apache.cayenne.testdo.lifecycles.Lifecycles" clientClassName="org.apache.cayenne.testdo.lifecycles.ClientLifecycles" dbEntityName="LIFECYCLES"> <obj-attribute name="name" type="java.lang.String" db-attribute-path="NAME"/> </obj-entity> -</data-map> \ No newline at end of file +</data-map> http://git-wip-us.apache.org/repos/asf/cayenne/blob/8049c968/cayenne-server/src/test/resources/lob.map.xml ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/resources/lob.map.xml b/cayenne-server/src/test/resources/lob.map.xml index 6f44ec7..3ae8644 100644 --- a/cayenne-server/src/test/resources/lob.map.xml +++ b/cayenne-server/src/test/resources/lob.map.xml @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> -<data-map xmlns="http://cayenne.apache.org/schema/7/modelMap"; +<data-map xmlns="http://cayenne.apache.org/schema/8/modelMap"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://cayenne.apache.org/schema/7/modelMap http://cayenne.apache.org/schema/7/modelMap.xsd"; - project-version="7"> + xsi:schemaLocation="http://cayenne.apache.org/schema/8/modelMap http://cayenne.apache.org/schema/8/modelMap.xsd"; + project-version="8"> <property name="defaultPackage" value="org.apache.cayenne.testdo.lob"/> <property name="defaultSuperclass" value="org.apache.cayenne.CayenneDataObject"/> <property name="clientSupported" value="true"/> @@ -50,4 +50,4 @@ </db-relationship> <obj-relationship name="clobValue" source="ClobTestEntity" target="ClobTestRelation" db-relationship-path="clob"/> <obj-relationship name="clobId" source="ClobTestRelation" target="ClobTestEntity" db-relationship-path="CLOB_REL"/> -</data-map> \ No newline at end of file +</data-map> http://git-wip-us.apache.org/repos/asf/cayenne/blob/8049c968/cayenne-server/src/test/resources/locking.map.xml ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/resources/locking.map.xml b/cayenne-server/src/test/resources/locking.map.xml index 6bc80f1..9b84cf3 100644 --- a/cayenne-server/src/test/resources/locking.map.xml +++ b/cayenne-server/src/test/resources/locking.map.xml @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> -<data-map xmlns="http://cayenne.apache.org/schema/7/modelMap"; +<data-map xmlns="http://cayenne.apache.org/schema/8/modelMap"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://cayenne.apache.org/schema/7/modelMap http://cayenne.apache.org/schema/7/modelMap.xsd"; - project-version="7"> + xsi:schemaLocation="http://cayenne.apache.org/schema/8/modelMap http://cayenne.apache.org/schema/8/modelMap.xsd"; + project-version="8"> <property name="defaultPackage" value="org.apache.cayenne.testdo.locking"/> <db-entity name="LOCKING_HELPER"> <db-attribute name="LOCKING_HELPER_ID" type="INTEGER" isPrimaryKey="true" isMandatory="true"/> http://git-wip-us.apache.org/repos/asf/cayenne/blob/8049c968/cayenne-server/src/test/resources/map-db1.map.xml ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/resources/map-db1.map.xml b/cayenne-server/src/test/resources/map-db1.map.xml index deff148..eb0f60e 100644 --- a/cayenne-server/src/test/resources/map-db1.map.xml +++ b/cayenne-server/src/test/resources/map-db1.map.xml @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> -<data-map xmlns="http://cayenne.apache.org/schema/7/modelMap"; +<data-map xmlns="http://cayenne.apache.org/schema/8/modelMap"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://cayenne.apache.org/schema/7/modelMap http://cayenne.apache.org/schema/7/modelMap.xsd"; - project-version="7"> + xsi:schemaLocation="http://cayenne.apache.org/schema/8/modelMap http://cayenne.apache.org/schema/8/modelMap.xsd"; + project-version="8"> <property name="defaultPackage" value="org.apache.cayenne.testdo.db1"/> <db-entity name="CROSSDB_M1E1"> <db-attribute name="ID" type="INTEGER" isPrimaryKey="true" isMandatory="true"/> http://git-wip-us.apache.org/repos/asf/cayenne/blob/8049c968/cayenne-server/src/test/resources/map-db2.map.xml ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/resources/map-db2.map.xml b/cayenne-server/src/test/resources/map-db2.map.xml index 2c035f1..fa3fcc8 100644 --- a/cayenne-server/src/test/resources/map-db2.map.xml +++ b/cayenne-server/src/test/resources/map-db2.map.xml @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> -<data-map xmlns="http://cayenne.apache.org/schema/7/modelMap"; +<data-map xmlns="http://cayenne.apache.org/schema/8/modelMap"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://cayenne.apache.org/schema/7/modelMap http://cayenne.apache.org/schema/7/modelMap.xsd"; - project-version="7"> + xsi:schemaLocation="http://cayenne.apache.org/schema/8/modelMap http://cayenne.apache.org/schema/8/modelMap.xsd"; + project-version="8"> <property name="defaultPackage" value="org.apache.cayenne.testdo.db2"/> <db-entity name="CROSSDB_M2E1"> <db-attribute name="ID" type="INTEGER" isPrimaryKey="true" isMandatory="true"/> http://git-wip-us.apache.org/repos/asf/cayenne/blob/8049c968/cayenne-server/src/test/resources/map-to-many.map.xml ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/resources/map-to-many.map.xml b/cayenne-server/src/test/resources/map-to-many.map.xml index bdfd5a4..d3099da 100644 --- a/cayenne-server/src/test/resources/map-to-many.map.xml +++ b/cayenne-server/src/test/resources/map-to-many.map.xml @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> -<data-map xmlns="http://cayenne.apache.org/schema/7/modelMap"; +<data-map xmlns="http://cayenne.apache.org/schema/8/modelMap"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://cayenne.apache.org/schema/7/modelMap http://cayenne.apache.org/schema/7/modelMap.xsd"; - project-version="7"> + xsi:schemaLocation="http://cayenne.apache.org/schema/8/modelMap http://cayenne.apache.org/schema/8/modelMap.xsd"; + project-version="8"> <property name="defaultPackage" value="org.apache.cayenne.testdo.map_to_many"/> <property name="clientSupported" value="true"/> <property name="defaultClientPackage" value="org.apache.cayenne.testdo.map_to_many"/> @@ -54,4 +54,4 @@ <obj-relationship name="targets" source="MapToMany" target="MapToManyTarget" collection-type="java.util.Map" map-key="name" db-relationship-path="targets"/> <obj-relationship name="mapToMany" source="MapToManyTarget" target="MapToMany" db-relationship-path="mapToMany"/> -</data-map> \ No newline at end of file +</data-map> http://git-wip-us.apache.org/repos/asf/cayenne/blob/8049c968/cayenne-server/src/test/resources/meaningful-pk.map.xml ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/resources/meaningful-pk.map.xml b/cayenne-server/src/test/resources/meaningful-pk.map.xml index 77237a2..3172f04 100644 --- a/cayenne-server/src/test/resources/meaningful-pk.map.xml +++ b/cayenne-server/src/test/resources/meaningful-pk.map.xml @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> -<data-map xmlns="http://cayenne.apache.org/schema/7/modelMap"; +<data-map xmlns="http://cayenne.apache.org/schema/8/modelMap"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://cayenne.apache.org/schema/7/modelMap http://cayenne.apache.org/schema/7/modelMap.xsd"; - project-version="7"> + xsi:schemaLocation="http://cayenne.apache.org/schema/8/modelMap http://cayenne.apache.org/schema/8/modelMap.xsd"; + project-version="8"> <property name="defaultPackage" value="org.apache.cayenne.testdo.meaningful_pk"/> <property name="clientSupported" value="true"/> <property name="defaultClientPackage" value="org.apache.cayenne.testdo.meaningful_pk"/> @@ -36,4 +36,4 @@ </db-relationship> <obj-relationship name="toMeaningfulPK" source="MeaningfulPKDep" target="MeaningfulPKTest1" db-relationship-path="toMeaningfulPK"/> <obj-relationship name="meaningfulPKDepArray" source="MeaningfulPKTest1" target="MeaningfulPKDep" db-relationship-path="meaningfulPKDepArray"/> -</data-map> \ No newline at end of file +</data-map>
