http://git-wip-us.apache.org/repos/asf/cayenne/blob/c58b6f40/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 17eda24..84bdc40 100644 --- a/cayenne-server/src/test/resources/cayenne-enum.xml +++ b/cayenne-server/src/test/resources/cayenne-enum.xml @@ -1,4 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<domain project-version="9"> +<domain xmlns="http://cayenne.apache.org/schema/10/domain"; + project-version="10"> <map name="enum"/> </domain>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/c58b6f40/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 6c65720..bfaef17 100644 --- a/cayenne-server/src/test/resources/cayenne-extended-type.xml +++ b/cayenne-server/src/test/resources/cayenne-extended-type.xml @@ -1,4 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<domain project-version="9"> - <map name="extended-type"/> +<domain xmlns="http://cayenne.apache.org/schema/10/domain"; + project-version="10"> + <map name="extended-type"/> </domain> http://git-wip-us.apache.org/repos/asf/cayenne/blob/c58b6f40/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 a880717..5742090 100644 --- a/cayenne-server/src/test/resources/cayenne-generated.xml +++ b/cayenne-server/src/test/resources/cayenne-generated.xml @@ -1,4 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<domain project-version="9"> - <map name="generated"/> +<domain xmlns="http://cayenne.apache.org/schema/10/domain"; + project-version="10"> + <map name="generated"/> </domain> http://git-wip-us.apache.org/repos/asf/cayenne/blob/c58b6f40/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 7dff2a3..36652f8 100644 --- a/cayenne-server/src/test/resources/cayenne-generic.xml +++ b/cayenne-server/src/test/resources/cayenne-generic.xml @@ -1,4 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<domain project-version="9"> - <map name="generic"/> +<domain xmlns="http://cayenne.apache.org/schema/10/domain"; + project-version="10"> + <map name="generic"/> </domain> http://git-wip-us.apache.org/repos/asf/cayenne/blob/c58b6f40/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 04b98f6..415b79c 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,5 @@ <?xml version="1.0" encoding="utf-8"?> -<domain project-version="9"> +<domain xmlns="http://cayenne.apache.org/schema/10/domain"; + project-version="10"> <map name="inheritance-single-table1"/> </domain> http://git-wip-us.apache.org/repos/asf/cayenne/blob/c58b6f40/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 7edce8d..9d8da09 100644 --- a/cayenne-server/src/test/resources/cayenne-inheritance-vertical.xml +++ b/cayenne-server/src/test/resources/cayenne-inheritance-vertical.xml @@ -1,4 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<domain project-version="9"> +<domain xmlns="http://cayenne.apache.org/schema/10/domain"; + project-version="10"> <map name="inheritance-vertical"/> </domain> http://git-wip-us.apache.org/repos/asf/cayenne/blob/c58b6f40/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 818c9b2..affbae9 100644 --- a/cayenne-server/src/test/resources/cayenne-inheritance.xml +++ b/cayenne-server/src/test/resources/cayenne-inheritance.xml @@ -1,4 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<domain project-version="9"> - <map name="inheritance"/> +<domain xmlns="http://cayenne.apache.org/schema/10/domain"; + project-version="10"> + <map name="inheritance"/> </domain> http://git-wip-us.apache.org/repos/asf/cayenne/blob/c58b6f40/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 79900f9..4b4c9be 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,5 @@ <?xml version="1.0" encoding="utf-8"?> -<domain project-version="9"> - <map name="lifecycle-callbacks-order"/> +<domain xmlns="http://cayenne.apache.org/schema/10/domain"; + project-version="10"> + <map name="lifecycle-callbacks-order"/> </domain> http://git-wip-us.apache.org/repos/asf/cayenne/blob/c58b6f40/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 ba6fc19..6306561 100644 --- a/cayenne-server/src/test/resources/cayenne-lifecycles.xml +++ b/cayenne-server/src/test/resources/cayenne-lifecycles.xml @@ -1,4 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<domain project-version="9"> - <map name="lifecycles"/> +<domain xmlns="http://cayenne.apache.org/schema/10/domain"; + project-version="10"> + <map name="lifecycles"/> </domain> http://git-wip-us.apache.org/repos/asf/cayenne/blob/c58b6f40/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 dde2a47..630bb15 100644 --- a/cayenne-server/src/test/resources/cayenne-lob.xml +++ b/cayenne-server/src/test/resources/cayenne-lob.xml @@ -1,4 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<domain project-version="9"> - <map name="lob"/> +<domain xmlns="http://cayenne.apache.org/schema/10/domain"; + project-version="10"> + <map name="lob"/> </domain> http://git-wip-us.apache.org/repos/asf/cayenne/blob/c58b6f40/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 1d4f2a5..7a12f1d 100644 --- a/cayenne-server/src/test/resources/cayenne-locking.xml +++ b/cayenne-server/src/test/resources/cayenne-locking.xml @@ -1,4 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<domain project-version="9"> +<domain xmlns="http://cayenne.apache.org/schema/10/domain"; + project-version="10"> <map name="locking"/> </domain> http://git-wip-us.apache.org/repos/asf/cayenne/blob/c58b6f40/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 10709e0..117ab72 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,5 @@ <?xml version="1.0" encoding="utf-8"?> -<domain project-version="9"> - <map name="map-to-many"/> +<domain xmlns="http://cayenne.apache.org/schema/10/domain"; + project-version="10"> + <map name="map-to-many"/> </domain> http://git-wip-us.apache.org/repos/asf/cayenne/blob/c58b6f40/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 fe17e9e..feebe09 100644 --- a/cayenne-server/src/test/resources/cayenne-meaningful-pk.xml +++ b/cayenne-server/src/test/resources/cayenne-meaningful-pk.xml @@ -1,4 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<domain project-version="9"> - <map name="meaningful-pk"/> +<domain xmlns="http://cayenne.apache.org/schema/10/domain"; + project-version="10"> + <map name="meaningful-pk"/> </domain> http://git-wip-us.apache.org/repos/asf/cayenne/blob/c58b6f40/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 46adeb2..0371c40 100644 --- a/cayenne-server/src/test/resources/cayenne-misc-types.xml +++ b/cayenne-server/src/test/resources/cayenne-misc-types.xml @@ -1,4 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<domain project-version="9"> - <map name="misc-types"/> +<domain xmlns="http://cayenne.apache.org/schema/10/domain"; + project-version="10"> + <map name="misc-types"/> </domain> http://git-wip-us.apache.org/repos/asf/cayenne/blob/c58b6f40/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 0723809..2a2f901 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,5 @@ <?xml version="1.0" encoding="utf-8"?> -<domain project-version="9"> - <map name="mixed-persistence-strategy"/> +<domain xmlns="http://cayenne.apache.org/schema/10/domain"; + project-version="10"> + <map name="mixed-persistence-strategy"/> </domain> http://git-wip-us.apache.org/repos/asf/cayenne/blob/c58b6f40/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 65f4f51..af46d6e 100644 --- a/cayenne-server/src/test/resources/cayenne-multi-tier.xml +++ b/cayenne-server/src/test/resources/cayenne-multi-tier.xml @@ -1,4 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<domain project-version="9"> +<domain xmlns="http://cayenne.apache.org/schema/10/domain"; + project-version="10"> <map name="multi-tier"/> </domain> http://git-wip-us.apache.org/repos/asf/cayenne/blob/c58b6f40/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 7b23fb5..5554ac0 100644 --- a/cayenne-server/src/test/resources/cayenne-multinode.xml +++ b/cayenne-server/src/test/resources/cayenne-multinode.xml @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> -<domain project-version="9"> +<domain xmlns="http://cayenne.apache.org/schema/10/domain"; + project-version="10"> <map name="map-db1"/> <map name="map-db2"/> </domain> http://git-wip-us.apache.org/repos/asf/cayenne/blob/c58b6f40/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 2905c89..a153e9a 100644 --- a/cayenne-server/src/test/resources/cayenne-no-pk.xml +++ b/cayenne-server/src/test/resources/cayenne-no-pk.xml @@ -1,4 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<domain project-version="9"> - <map name="no-pk"/> +<domain xmlns="http://cayenne.apache.org/schema/10/domain"; + project-version="10"> + <map name="no-pk"/> </domain> http://git-wip-us.apache.org/repos/asf/cayenne/blob/c58b6f40/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 3376ad1..cb44482 100644 --- a/cayenne-server/src/test/resources/cayenne-numeric-types.xml +++ b/cayenne-server/src/test/resources/cayenne-numeric-types.xml @@ -1,4 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<domain project-version="9"> - <map name="numeric-types"/> +<domain xmlns="http://cayenne.apache.org/schema/10/domain"; + project-version="10"> + <map name="numeric-types"/> </domain> http://git-wip-us.apache.org/repos/asf/cayenne/blob/c58b6f40/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 1c23877..788d49e 100644 --- a/cayenne-server/src/test/resources/cayenne-oneway-rels.xml +++ b/cayenne-server/src/test/resources/cayenne-oneway-rels.xml @@ -1,4 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<domain project-version="9"> +<domain xmlns="http://cayenne.apache.org/schema/10/domain"; + project-version="10"> <map name="oneway-rels"/> </domain> http://git-wip-us.apache.org/repos/asf/cayenne/blob/c58b6f40/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 19c38f0..f76c39e 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="9"> -</domain> +<domain xmlns="http://cayenne.apache.org/schema/10/domain"; + project-version="10"/> http://git-wip-us.apache.org/repos/asf/cayenne/blob/c58b6f40/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 26629b4..47d3cbb 100644 --- a/cayenne-server/src/test/resources/cayenne-people.xml +++ b/cayenne-server/src/test/resources/cayenne-people.xml @@ -1,4 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<domain project-version="9"> +<domain xmlns="http://cayenne.apache.org/schema/10/domain"; + project-version="10"> <map name="people"/> </domain> http://git-wip-us.apache.org/repos/asf/cayenne/blob/c58b6f40/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 026c75c..35c4154 100644 --- a/cayenne-server/src/test/resources/cayenne-primitive.xml +++ b/cayenne-server/src/test/resources/cayenne-primitive.xml @@ -1,4 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<domain project-version="9"> - <map name="primitive"/> +<domain xmlns="http://cayenne.apache.org/schema/10/domain"; + project-version="10"> + <map name="primitive"/> </domain> http://git-wip-us.apache.org/repos/asf/cayenne/blob/c58b6f40/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 f930615..2f67cd9 100644 --- a/cayenne-server/src/test/resources/cayenne-qualified.xml +++ b/cayenne-server/src/test/resources/cayenne-qualified.xml @@ -1,4 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<domain project-version="9"> +<domain xmlns="http://cayenne.apache.org/schema/10/domain"; + project-version="10"> <map name="qualified"/> </domain> http://git-wip-us.apache.org/repos/asf/cayenne/blob/c58b6f40/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 91cfec5..0764d45 100644 --- a/cayenne-server/src/test/resources/cayenne-quoted-identifiers.xml +++ b/cayenne-server/src/test/resources/cayenne-quoted-identifiers.xml @@ -1,4 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<domain project-version="9"> +<domain xmlns="http://cayenne.apache.org/schema/10/domain"; + project-version="10"> <map name="quoted-identifiers"/> </domain> http://git-wip-us.apache.org/repos/asf/cayenne/blob/c58b6f40/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 e178d26..2bd2113 100644 --- a/cayenne-server/src/test/resources/cayenne-reflexive.xml +++ b/cayenne-server/src/test/resources/cayenne-reflexive.xml @@ -1,4 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<domain project-version="9"> - <map name="reflexive"/> +<domain xmlns="http://cayenne.apache.org/schema/10/domain"; + project-version="10"> + <map name="reflexive"/> </domain> http://git-wip-us.apache.org/repos/asf/cayenne/blob/c58b6f40/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 4eb8f9a..f6a9e52 100644 --- a/cayenne-server/src/test/resources/cayenne-relationships-activity.xml +++ b/cayenne-server/src/test/resources/cayenne-relationships-activity.xml @@ -1,4 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<domain project-version="9"> +<domain xmlns="http://cayenne.apache.org/schema/10/domain"; + project-version="10"> <map name="relationships-activity"/> </domain> http://git-wip-us.apache.org/repos/asf/cayenne/blob/c58b6f40/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 d14f075..e50106a 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,5 @@ <?xml version="1.0" encoding="utf-8"?> -<domain project-version="9"> - <map name="relationships-child-master"/> +<domain xmlns="http://cayenne.apache.org/schema/10/domain"; + project-version="10"> + <map name="relationships-child-master"/> </domain> http://git-wip-us.apache.org/repos/asf/cayenne/blob/c58b6f40/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 2d736b4..99425f9 100644 --- a/cayenne-server/src/test/resources/cayenne-relationships-clob.xml +++ b/cayenne-server/src/test/resources/cayenne-relationships-clob.xml @@ -1,4 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<domain project-version="9"> +<domain xmlns="http://cayenne.apache.org/schema/10/domain"; + project-version="10"> <map name="relationships-clob"/> </domain> http://git-wip-us.apache.org/repos/asf/cayenne/blob/c58b6f40/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 6df5be0..712aa28 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,5 @@ <?xml version="1.0" encoding="utf-8"?> -<domain project-version="9"> - <map name="relationships-collection-to-many"/> +<domain xmlns="http://cayenne.apache.org/schema/10/domain"; + project-version="10"> + <map name="relationships-collection-to-many"/> </domain> http://git-wip-us.apache.org/repos/asf/cayenne/blob/c58b6f40/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 0d9b1e8..a98b2c3 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,5 @@ <?xml version="1.0" encoding="utf-8"?> -<domain project-version="9"> - <map name="relationships-delete-rules"/> +<domain xmlns="http://cayenne.apache.org/schema/10/domain"; + project-version="10"> + <map name="relationships-delete-rules"/> </domain> http://git-wip-us.apache.org/repos/asf/cayenne/blob/c58b6f40/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 499333a..c89d35e 100644 --- a/cayenne-server/src/test/resources/cayenne-relationships-flattened.xml +++ b/cayenne-server/src/test/resources/cayenne-relationships-flattened.xml @@ -1,4 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<domain project-version="9"> +<domain xmlns="http://cayenne.apache.org/schema/10/domain"; + project-version="10"> <map name="relationships-flattened"/> </domain> http://git-wip-us.apache.org/repos/asf/cayenne/blob/c58b6f40/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 a5331ce..6ece1ba 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,5 @@ <?xml version="1.0" encoding="utf-8"?> -<domain project-version="9"> - <map name="relationships-set-to-many"/> +<domain xmlns="http://cayenne.apache.org/schema/10/domain"; + project-version="10"> + <map name="relationships-set-to-many"/> </domain> http://git-wip-us.apache.org/repos/asf/cayenne/blob/c58b6f40/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 b1e77d1..16f6835 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,5 @@ <?xml version="1.0" encoding="utf-8"?> -<domain project-version="9"> - <map name="relationships-to-many-fk"/> +<domain xmlns="http://cayenne.apache.org/schema/10/domain"; + project-version="10"> + <map name="relationships-to-many-fk"/> </domain> http://git-wip-us.apache.org/repos/asf/cayenne/blob/c58b6f40/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 c6884b8..40a6818 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,5 @@ <?xml version="1.0" encoding="utf-8"?> -<domain project-version="9"> - <map name="relationships-to-one-fk"/> +<domain xmlns="http://cayenne.apache.org/schema/10/domain"; + project-version="10"> + <map name="relationships-to-one-fk"/> </domain> http://git-wip-us.apache.org/repos/asf/cayenne/blob/c58b6f40/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 a709d2b..90524b9 100644 --- a/cayenne-server/src/test/resources/cayenne-relationships.xml +++ b/cayenne-server/src/test/resources/cayenne-relationships.xml @@ -1,4 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<domain project-version="9"> +<domain xmlns="http://cayenne.apache.org/schema/10/domain"; + project-version="10"> <map name="relationships"/> </domain> http://git-wip-us.apache.org/repos/asf/cayenne/blob/c58b6f40/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 b346de0..e5ef2d6 100644 --- a/cayenne-server/src/test/resources/cayenne-return-types.xml +++ b/cayenne-server/src/test/resources/cayenne-return-types.xml @@ -1,4 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<domain project-version="9"> - <map name="return-types"/> +<domain xmlns="http://cayenne.apache.org/schema/10/domain"; + project-version="10"> + <map name="return-types"/> </domain> http://git-wip-us.apache.org/repos/asf/cayenne/blob/c58b6f40/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 860278a..074f163 100644 --- a/cayenne-server/src/test/resources/cayenne-soft-delete.xml +++ b/cayenne-server/src/test/resources/cayenne-soft-delete.xml @@ -1,4 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<domain project-version="9"> - <map name="soft-delete"/> +<domain xmlns="http://cayenne.apache.org/schema/10/domain"; + project-version="10"> + <map name="soft-delete"/> </domain> http://git-wip-us.apache.org/repos/asf/cayenne/blob/c58b6f40/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 7031593..87da094 100644 --- a/cayenne-server/src/test/resources/cayenne-sus.xml +++ b/cayenne-server/src/test/resources/cayenne-sus.xml @@ -1,4 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<domain project-version="9"> +<domain xmlns="http://cayenne.apache.org/schema/10/domain"; + project-version="10"> <map name="sus-map"/> </domain> http://git-wip-us.apache.org/repos/asf/cayenne/blob/c58b6f40/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 b03ffb9..23109fd 100644 --- a/cayenne-server/src/test/resources/cayenne-table-primitives.xml +++ b/cayenne-server/src/test/resources/cayenne-table-primitives.xml @@ -1,4 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<domain project-version="9"> - <map name="table-primitives"/> +<domain xmlns="http://cayenne.apache.org/schema/10/domain"; + project-version="10"> + <map name="table-primitives"/> </domain> http://git-wip-us.apache.org/repos/asf/cayenne/blob/c58b6f40/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 3c44022..9d8918c 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="9"> +<domain project-version="10"> <map name="testmap"/> </domain> http://git-wip-us.apache.org/repos/asf/cayenne/blob/c58b6f40/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 10f6104..6b04b1f 100644 --- a/cayenne-server/src/test/resources/cayenne-things.xml +++ b/cayenne-server/src/test/resources/cayenne-things.xml @@ -1,4 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<domain project-version="9"> - <map name="things"/> +<domain xmlns="http://cayenne.apache.org/schema/10/domain"; + project-version="10"> + <map name="things"/> </domain> http://git-wip-us.apache.org/repos/asf/cayenne/blob/c58b6f40/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 f71983a..ba524a1 100644 --- a/cayenne-server/src/test/resources/cayenne-toone.xml +++ b/cayenne-server/src/test/resources/cayenne-toone.xml @@ -1,4 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<domain project-version="9"> - <map name="toone"/> +<domain xmlns="http://cayenne.apache.org/schema/10/domain"; + project-version="10"> + <map name="toone"/> </domain> http://git-wip-us.apache.org/repos/asf/cayenne/blob/c58b6f40/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 3a6ce3b..70734ff 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,5 @@ <?xml version="1.0" encoding="utf-8"?> -<domain project-version="9"> +<domain xmlns="http://cayenne.apache.org/schema/10/domain"; + project-version="10"> <map name="unsupported-distinct-types"/> </domain> http://git-wip-us.apache.org/repos/asf/cayenne/blob/c58b6f40/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 f654de9..8e35140 100644 --- a/cayenne-server/src/test/resources/cayenne-uuid.xml +++ b/cayenne-server/src/test/resources/cayenne-uuid.xml @@ -1,4 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<domain project-version="9"> - <map name="uuid"/> +<domain xmlns="http://cayenne.apache.org/schema/10/domain"; + project-version="10"> + <map name="uuid"/> </domain> http://git-wip-us.apache.org/repos/asf/cayenne/blob/c58b6f40/cayenne-server/src/test/resources/cayenne-weighted-sort.xml ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/resources/cayenne-weighted-sort.xml b/cayenne-server/src/test/resources/cayenne-weighted-sort.xml index cc939f7..78ce677 100644 --- a/cayenne-server/src/test/resources/cayenne-weighted-sort.xml +++ b/cayenne-server/src/test/resources/cayenne-weighted-sort.xml @@ -1,4 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<domain project-version="9"> +<domain xmlns="http://cayenne.apache.org/schema/10/domain"; + project-version="10"> <map name="weighted-sort"/> </domain> http://git-wip-us.apache.org/repos/asf/cayenne/blob/c58b6f40/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 d4210ab..616ffca 100644 --- a/cayenne-server/src/test/resources/compound.map.xml +++ b/cayenne-server/src/test/resources/compound.map.xml @@ -1,64 +1,64 @@ <?xml version="1.0" encoding="utf-8"?> -<data-map xmlns="http://cayenne.apache.org/schema/9/modelMap"; - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://cayenne.apache.org/schema/9/modelMap http://cayenne.apache.org/schema/9/modelMap.xsd"; - project-version="9"> - <property name="defaultPackage" value="org.apache.cayenne.testdo.compound"/> - <property name="defaultSuperclass" value="org.apache.cayenne.CayenneDataObject"/> - <property name="clientSupported" value="true"/> - <property name="defaultClientPackage" value="test.client"/> - <property name="defaultClientSuperclass" value="org.apache.cayenne.PersistentObject"/> - <db-entity name="CHAR_FK_TEST"> - <db-attribute name="FK_COL" type="CHAR" length="10"/> - <db-attribute name="NAME" type="VARCHAR" length="100"/> - <db-attribute name="PK" type="INTEGER" isPrimaryKey="true" isMandatory="true"/> - </db-entity> - <db-entity name="CHAR_PK_TEST"> - <db-attribute name="OTHER_COL" type="CHAR" length="10"/> - <db-attribute name="PK_COL" type="CHAR" isPrimaryKey="true" isMandatory="true" length="10"/> - </db-entity> - <db-entity name="COMPOUND_FK_TEST"> - <db-attribute name="F_KEY1" type="VARCHAR" length="20"/> - <db-attribute name="F_KEY2" type="VARCHAR" length="20"/> - <db-attribute name="NAME" type="VARCHAR" length="255"/> - <db-attribute name="PKEY" type="INTEGER" isPrimaryKey="true" isMandatory="true"/> - </db-entity> - <db-entity name="COMPOUND_PK_TEST"> - <db-attribute name="KEY1" type="VARCHAR" isPrimaryKey="true" isMandatory="true" length="20"/> - <db-attribute name="KEY2" type="VARCHAR" isPrimaryKey="true" isMandatory="true" length="20"/> - <db-attribute name="NAME" type="VARCHAR" length="255"/> - </db-entity> - <obj-entity name="CharFkTestEntity" className="org.apache.cayenne.testdo.compound.CharFkTestEntity" dbEntityName="CHAR_FK_TEST"> - <obj-attribute name="name" type="java.lang.String" db-attribute-path="NAME"/> - </obj-entity> - <obj-entity name="CharPkTestEntity" className="org.apache.cayenne.testdo.compound.CharPkTestEntity" dbEntityName="CHAR_PK_TEST"> - <obj-attribute name="otherCol" type="java.lang.String" db-attribute-path="OTHER_COL"/> - <obj-attribute name="pkCol" type="java.lang.String" db-attribute-path="PK_COL"/> - </obj-entity> - <obj-entity name="CompoundFkTestEntity" className="org.apache.cayenne.testdo.compound.CompoundFkTestEntity" dbEntityName="COMPOUND_FK_TEST"> - <obj-attribute name="name" type="java.lang.String" db-attribute-path="NAME"/> - </obj-entity> - <obj-entity name="CompoundPkTestEntity" className="org.apache.cayenne.testdo.compound.CompoundPkTestEntity" dbEntityName="COMPOUND_PK_TEST"> - <obj-attribute name="key1" type="java.lang.String" db-attribute-path="KEY1"/> - <obj-attribute name="key2" type="java.lang.String" db-attribute-path="KEY2"/> - <obj-attribute name="name" type="java.lang.String" db-attribute-path="NAME"/> - </obj-entity> - <db-relationship name="toCharPK" source="CHAR_FK_TEST" target="CHAR_PK_TEST" toMany="false"> - <db-attribute-pair source="FK_COL" target="PK_COL"/> - </db-relationship> - <db-relationship name="charFKs" source="CHAR_PK_TEST" target="CHAR_FK_TEST" toMany="true"> - <db-attribute-pair source="PK_COL" target="FK_COL"/> - </db-relationship> - <db-relationship name="toCompoundPk" source="COMPOUND_FK_TEST" target="COMPOUND_PK_TEST" toMany="false"> - <db-attribute-pair source="F_KEY1" target="KEY1"/> - <db-attribute-pair source="F_KEY2" target="KEY2"/> - </db-relationship> - <db-relationship name="compoundFkArray" source="COMPOUND_PK_TEST" target="COMPOUND_FK_TEST" toMany="true"> - <db-attribute-pair source="KEY1" target="F_KEY1"/> - <db-attribute-pair source="KEY2" target="F_KEY2"/> - </db-relationship> - <obj-relationship name="toCharPK" source="CharFkTestEntity" target="CharPkTestEntity" db-relationship-path="toCharPK"/> - <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 xmlns="http://cayenne.apache.org/schema/10/modelMap"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://cayenne.apache.org/schema/10/modelMap http://cayenne.apache.org/schema/10/modelMap.xsd"; + project-version="10"> + <property name="defaultPackage" value="org.apache.cayenne.testdo.compound"/> + <property name="defaultSuperclass" value="org.apache.cayenne.CayenneDataObject"/> + <property name="clientSupported" value="true"/> + <property name="defaultClientPackage" value="test.client"/> + <property name="defaultClientSuperclass" value="org.apache.cayenne.PersistentObject"/> + <db-entity name="CHAR_FK_TEST"> + <db-attribute name="FK_COL" type="CHAR" length="10"/> + <db-attribute name="NAME" type="VARCHAR" length="100"/> + <db-attribute name="PK" type="INTEGER" isPrimaryKey="true" isMandatory="true"/> + </db-entity> + <db-entity name="CHAR_PK_TEST"> + <db-attribute name="OTHER_COL" type="CHAR" length="10"/> + <db-attribute name="PK_COL" type="CHAR" isPrimaryKey="true" isMandatory="true" length="10"/> + </db-entity> + <db-entity name="COMPOUND_FK_TEST"> + <db-attribute name="F_KEY1" type="VARCHAR" length="20"/> + <db-attribute name="F_KEY2" type="VARCHAR" length="20"/> + <db-attribute name="NAME" type="VARCHAR" length="255"/> + <db-attribute name="PKEY" type="INTEGER" isPrimaryKey="true" isMandatory="true"/> + </db-entity> + <db-entity name="COMPOUND_PK_TEST"> + <db-attribute name="KEY1" type="VARCHAR" isPrimaryKey="true" isMandatory="true" length="20"/> + <db-attribute name="KEY2" type="VARCHAR" isPrimaryKey="true" isMandatory="true" length="20"/> + <db-attribute name="NAME" type="VARCHAR" length="255"/> + </db-entity> + <obj-entity name="CharFkTestEntity" className="org.apache.cayenne.testdo.compound.CharFkTestEntity" dbEntityName="CHAR_FK_TEST"> + <obj-attribute name="name" type="java.lang.String" db-attribute-path="NAME"/> + </obj-entity> + <obj-entity name="CharPkTestEntity" className="org.apache.cayenne.testdo.compound.CharPkTestEntity" dbEntityName="CHAR_PK_TEST"> + <obj-attribute name="otherCol" type="java.lang.String" db-attribute-path="OTHER_COL"/> + <obj-attribute name="pkCol" type="java.lang.String" db-attribute-path="PK_COL"/> + </obj-entity> + <obj-entity name="CompoundFkTestEntity" className="org.apache.cayenne.testdo.compound.CompoundFkTestEntity" dbEntityName="COMPOUND_FK_TEST"> + <obj-attribute name="name" type="java.lang.String" db-attribute-path="NAME"/> + </obj-entity> + <obj-entity name="CompoundPkTestEntity" className="org.apache.cayenne.testdo.compound.CompoundPkTestEntity" dbEntityName="COMPOUND_PK_TEST"> + <obj-attribute name="key1" type="java.lang.String" db-attribute-path="KEY1"/> + <obj-attribute name="key2" type="java.lang.String" db-attribute-path="KEY2"/> + <obj-attribute name="name" type="java.lang.String" db-attribute-path="NAME"/> + </obj-entity> + <db-relationship name="toCharPK" source="CHAR_FK_TEST" target="CHAR_PK_TEST"> + <db-attribute-pair source="FK_COL" target="PK_COL"/> + </db-relationship> + <db-relationship name="charFKs" source="CHAR_PK_TEST" target="CHAR_FK_TEST" toMany="true"> + <db-attribute-pair source="PK_COL" target="FK_COL"/> + </db-relationship> + <db-relationship name="toCompoundPk" source="COMPOUND_FK_TEST" target="COMPOUND_PK_TEST"> + <db-attribute-pair source="F_KEY1" target="KEY1"/> + <db-attribute-pair source="F_KEY2" target="KEY2"/> + </db-relationship> + <db-relationship name="compoundFkArray" source="COMPOUND_PK_TEST" target="COMPOUND_FK_TEST" toMany="true"> + <db-attribute-pair source="KEY1" target="F_KEY1"/> + <db-attribute-pair source="KEY2" target="F_KEY2"/> + </db-relationship> + <obj-relationship name="toCharPK" source="CharFkTestEntity" target="CharPkTestEntity" db-relationship-path="toCharPK"/> + <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> http://git-wip-us.apache.org/repos/asf/cayenne/blob/c58b6f40/cayenne-server/src/test/resources/custom-name-file.xml ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/resources/custom-name-file.xml b/cayenne-server/src/test/resources/custom-name-file.xml index 867126e..29b3610 100644 --- a/cayenne-server/src/test/resources/custom-name-file.xml +++ b/cayenne-server/src/test/resources/custom-name-file.xml @@ -17,6 +17,6 @@ specific language governing permissions and limitations under the License. --> -<domain project-version="9"> +<domain project-version="10"> <map name="testmap"/> </domain> http://git-wip-us.apache.org/repos/asf/cayenne/blob/c58b6f40/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 b2d825d..7a9a06a 100644 --- a/cayenne-server/src/test/resources/date-time.map.xml +++ b/cayenne-server/src/test/resources/date-time.map.xml @@ -1,34 +1,34 @@ <?xml version="1.0" encoding="utf-8"?> -<data-map xmlns="http://cayenne.apache.org/schema/9/modelMap"; - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://cayenne.apache.org/schema/9/modelMap http://cayenne.apache.org/schema/9/modelMap.xsd"; - project-version="9"> - <property name="defaultPackage" value="org.apache.cayenne.testdo.date_time"/> - <property name="defaultSuperclass" value="org.apache.cayenne.CayenneDataObject"/> - <property name="clientSupported" value="true"/> - <property name="defaultClientPackage" value="test.client"/> - <property name="defaultClientSuperclass" value="org.apache.cayenne.PersistentObject"/> - <db-entity name="CALENDAR_TEST"> - <db-attribute name="CALENDAR_FIELD" type="TIMESTAMP"/> - <db-attribute name="ID" type="INTEGER" isPrimaryKey="true" isMandatory="true"/> - </db-entity> - <db-entity name="DATE_TEST"> - <db-attribute name="DATE_COLUMN" type="DATE"/> - <db-attribute name="DATE_TEST_ID" type="INTEGER" isPrimaryKey="true" isMandatory="true"/> - <db-attribute name="TIMESTAMP_COLUMN" type="TIMESTAMP"/> - <db-attribute name="TIME_COLUMN" type="TIME"/> - </db-entity> - <obj-entity name="CalendarEntity" className="org.apache.cayenne.testdo.date_time.CalendarEntity" dbEntityName="CALENDAR_TEST"> - <obj-attribute name="calendarField" type="java.util.Calendar" db-attribute-path="CALENDAR_FIELD"/> - </obj-entity> - <obj-entity name="DateTestEntity" className="org.apache.cayenne.testdo.date_time.DateTestEntity" dbEntityName="DATE_TEST"> - <obj-attribute name="dateColumn" type="java.util.Date" db-attribute-path="DATE_COLUMN"/> - <obj-attribute name="timeColumn" type="java.util.Date" db-attribute-path="TIME_COLUMN"/> - <obj-attribute name="timestampColumn" type="java.util.Date" db-attribute-path="TIMESTAMP_COLUMN"/> - </obj-entity> - <query name="SelectDateTest" type="SQLTemplate" root="data-map" root-name="date-time"> - <property name="cayenne.GenericSelectQuery.fetchingDataRows" value="true"/> - <property name="cayenne.SQLTemplate.columnNameCapitalization" value="UPPER"/> - <sql><![CDATA[SELECT * FROM DATE_TEST]]></sql> - </query> +<data-map xmlns="http://cayenne.apache.org/schema/10/modelMap"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://cayenne.apache.org/schema/10/modelMap http://cayenne.apache.org/schema/10/modelMap.xsd"; + project-version="10"> + <property name="defaultPackage" value="org.apache.cayenne.testdo.date_time"/> + <property name="defaultSuperclass" value="org.apache.cayenne.CayenneDataObject"/> + <property name="clientSupported" value="true"/> + <property name="defaultClientPackage" value="test.client"/> + <property name="defaultClientSuperclass" value="org.apache.cayenne.PersistentObject"/> + <db-entity name="CALENDAR_TEST"> + <db-attribute name="CALENDAR_FIELD" type="TIMESTAMP"/> + <db-attribute name="ID" type="INTEGER" isPrimaryKey="true" isMandatory="true"/> + </db-entity> + <db-entity name="DATE_TEST"> + <db-attribute name="DATE_COLUMN" type="DATE"/> + <db-attribute name="DATE_TEST_ID" type="INTEGER" isPrimaryKey="true" isMandatory="true"/> + <db-attribute name="TIMESTAMP_COLUMN" type="TIMESTAMP"/> + <db-attribute name="TIME_COLUMN" type="TIME"/> + </db-entity> + <obj-entity name="CalendarEntity" className="org.apache.cayenne.testdo.date_time.CalendarEntity" dbEntityName="CALENDAR_TEST"> + <obj-attribute name="calendarField" type="java.util.Calendar" db-attribute-path="CALENDAR_FIELD"/> + </obj-entity> + <obj-entity name="DateTestEntity" className="org.apache.cayenne.testdo.date_time.DateTestEntity" dbEntityName="DATE_TEST"> + <obj-attribute name="dateColumn" type="java.util.Date" db-attribute-path="DATE_COLUMN"/> + <obj-attribute name="timeColumn" type="java.util.Date" db-attribute-path="TIME_COLUMN"/> + <obj-attribute name="timestampColumn" type="java.util.Date" db-attribute-path="TIMESTAMP_COLUMN"/> + </obj-entity> + <query name="SelectDateTest" type="SQLTemplate" root="data-map" root-name="date-time"> + <property name="cayenne.SQLTemplate.columnNameCapitalization" value="UPPER"/> + <property name="cayenne.GenericSelectQuery.fetchingDataRows" value="true"/> + <sql><![CDATA[SELECT * FROM DATE_TEST]]></sql> + </query> </data-map> http://git-wip-us.apache.org/repos/asf/cayenne/blob/c58b6f40/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 62f47aa..52080bf 100644 --- a/cayenne-server/src/test/resources/delete-rules.map.xml +++ b/cayenne-server/src/test/resources/delete-rules.map.xml @@ -1,64 +1,64 @@ <?xml version="1.0" encoding="utf-8"?> -<data-map xmlns="http://cayenne.apache.org/schema/9/modelMap"; - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://cayenne.apache.org/schema/9/modelMap http://cayenne.apache.org/schema/9/modelMap.xsd"; - project-version="9"> - <property name="defaultPackage" value="org.apache.cayenne.testdo.deleterules"/> - <property name="clientSupported" value="true"/> - <property name="defaultClientPackage" value="org.apache.cayenne.testdo.deleterules"/> - <db-entity name="DELETE_CASCADE"> - <db-attribute name="DELETE_CASCADE_ID" type="INTEGER" isPrimaryKey="true" isMandatory="true"/> - <db-attribute name="DELETE_RULE_ID" type="INTEGER"/> - <db-attribute name="NAME" type="VARCHAR" length="200"/> - </db-entity> - <db-entity name="DELETE_DENY"> - <db-attribute name="DELETE_DENY_ID" type="INTEGER" isPrimaryKey="true" isMandatory="true"/> - <db-attribute name="DELETE_RULE_ID" type="INTEGER"/> - <db-attribute name="NAME" type="VARCHAR" length="200"/> - </db-entity> - <db-entity name="DELETE_NULLIFY"> - <db-attribute name="DELETE_NULLIFY_ID" type="INTEGER" isPrimaryKey="true" isMandatory="true"/> - <db-attribute name="DELETE_RULE_ID" type="INTEGER"/> - <db-attribute name="NAME" type="VARCHAR" length="200"/> - </db-entity> - <db-entity name="DELETE_RULE"> - <db-attribute name="DELETE_RULE_ID" type="INTEGER" isPrimaryKey="true" isMandatory="true"/> - <db-attribute name="NAME" type="VARCHAR" length="200"/> - </db-entity> - <obj-entity name="DeleteCascade" className="org.apache.cayenne.testdo.deleterules.DeleteCascade" clientClassName="org.apache.cayenne.testdo.deleterules.ClientDeleteCascade" dbEntityName="DELETE_CASCADE"> - <obj-attribute name="name" type="java.lang.String" db-attribute-path="NAME"/> - </obj-entity> - <obj-entity name="DeleteDeny" className="org.apache.cayenne.testdo.deleterules.DeleteDeny" clientClassName="org.apache.cayenne.testdo.deleterules.ClientDeleteDeny" dbEntityName="DELETE_DENY"> - <obj-attribute name="name" type="java.lang.String" db-attribute-path="NAME"/> - </obj-entity> - <obj-entity name="DeleteNullify" className="org.apache.cayenne.testdo.deleterules.DeleteNullify" clientClassName="org.apache.cayenne.testdo.deleterules.ClientDeleteNullify" dbEntityName="DELETE_NULLIFY"> - <obj-attribute name="name" type="java.lang.String" db-attribute-path="NAME"/> - </obj-entity> - <obj-entity name="DeleteRule" className="org.apache.cayenne.testdo.deleterules.DeleteRule" clientClassName="org.apache.cayenne.testdo.deleterules.ClientDeleteRule" dbEntityName="DELETE_RULE"> - <obj-attribute name="name" type="java.lang.String" db-attribute-path="NAME"/> - </obj-entity> - <db-relationship name="cascade" source="DELETE_CASCADE" target="DELETE_RULE" toMany="false"> - <db-attribute-pair source="DELETE_RULE_ID" target="DELETE_RULE_ID"/> - </db-relationship> - <db-relationship name="deny" source="DELETE_DENY" target="DELETE_RULE" toMany="false"> - <db-attribute-pair source="DELETE_RULE_ID" target="DELETE_RULE_ID"/> - </db-relationship> - <db-relationship name="nullify" source="DELETE_NULLIFY" target="DELETE_RULE" toMany="false"> - <db-attribute-pair source="DELETE_RULE_ID" target="DELETE_RULE_ID"/> - </db-relationship> - <db-relationship name="fromCascade" source="DELETE_RULE" target="DELETE_CASCADE" toMany="true"> - <db-attribute-pair source="DELETE_RULE_ID" target="DELETE_RULE_ID"/> - </db-relationship> - <db-relationship name="fromDeny" source="DELETE_RULE" target="DELETE_DENY" toMany="true"> - <db-attribute-pair source="DELETE_RULE_ID" target="DELETE_RULE_ID"/> - </db-relationship> - <db-relationship name="fromNullify" source="DELETE_RULE" target="DELETE_NULLIFY" toMany="true"> - <db-attribute-pair source="DELETE_RULE_ID" target="DELETE_RULE_ID"/> - </db-relationship> - <obj-relationship name="cascade" source="DeleteCascade" target="DeleteRule" deleteRule="Cascade" db-relationship-path="cascade"/> - <obj-relationship name="deny" source="DeleteDeny" target="DeleteRule" deleteRule="Deny" db-relationship-path="deny"/> - <obj-relationship name="nullify" source="DeleteNullify" target="DeleteRule" deleteRule="Nullify" db-relationship-path="nullify"/> - <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 xmlns="http://cayenne.apache.org/schema/10/modelMap"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://cayenne.apache.org/schema/10/modelMap http://cayenne.apache.org/schema/10/modelMap.xsd"; + project-version="10"> + <property name="defaultPackage" value="org.apache.cayenne.testdo.deleterules"/> + <property name="clientSupported" value="true"/> + <property name="defaultClientPackage" value="org.apache.cayenne.testdo.deleterules"/> + <db-entity name="DELETE_CASCADE"> + <db-attribute name="DELETE_CASCADE_ID" type="INTEGER" isPrimaryKey="true" isMandatory="true"/> + <db-attribute name="DELETE_RULE_ID" type="INTEGER"/> + <db-attribute name="NAME" type="VARCHAR" length="200"/> + </db-entity> + <db-entity name="DELETE_DENY"> + <db-attribute name="DELETE_DENY_ID" type="INTEGER" isPrimaryKey="true" isMandatory="true"/> + <db-attribute name="DELETE_RULE_ID" type="INTEGER"/> + <db-attribute name="NAME" type="VARCHAR" length="200"/> + </db-entity> + <db-entity name="DELETE_NULLIFY"> + <db-attribute name="DELETE_NULLIFY_ID" type="INTEGER" isPrimaryKey="true" isMandatory="true"/> + <db-attribute name="DELETE_RULE_ID" type="INTEGER"/> + <db-attribute name="NAME" type="VARCHAR" length="200"/> + </db-entity> + <db-entity name="DELETE_RULE"> + <db-attribute name="DELETE_RULE_ID" type="INTEGER" isPrimaryKey="true" isMandatory="true"/> + <db-attribute name="NAME" type="VARCHAR" length="200"/> + </db-entity> + <obj-entity name="DeleteCascade" className="org.apache.cayenne.testdo.deleterules.DeleteCascade" clientClassName="org.apache.cayenne.testdo.deleterules.ClientDeleteCascade" dbEntityName="DELETE_CASCADE"> + <obj-attribute name="name" type="java.lang.String" db-attribute-path="NAME"/> + </obj-entity> + <obj-entity name="DeleteDeny" className="org.apache.cayenne.testdo.deleterules.DeleteDeny" clientClassName="org.apache.cayenne.testdo.deleterules.ClientDeleteDeny" dbEntityName="DELETE_DENY"> + <obj-attribute name="name" type="java.lang.String" db-attribute-path="NAME"/> + </obj-entity> + <obj-entity name="DeleteNullify" className="org.apache.cayenne.testdo.deleterules.DeleteNullify" clientClassName="org.apache.cayenne.testdo.deleterules.ClientDeleteNullify" dbEntityName="DELETE_NULLIFY"> + <obj-attribute name="name" type="java.lang.String" db-attribute-path="NAME"/> + </obj-entity> + <obj-entity name="DeleteRule" className="org.apache.cayenne.testdo.deleterules.DeleteRule" clientClassName="org.apache.cayenne.testdo.deleterules.ClientDeleteRule" dbEntityName="DELETE_RULE"> + <obj-attribute name="name" type="java.lang.String" db-attribute-path="NAME"/> + </obj-entity> + <db-relationship name="cascade" source="DELETE_CASCADE" target="DELETE_RULE"> + <db-attribute-pair source="DELETE_RULE_ID" target="DELETE_RULE_ID"/> + </db-relationship> + <db-relationship name="deny" source="DELETE_DENY" target="DELETE_RULE"> + <db-attribute-pair source="DELETE_RULE_ID" target="DELETE_RULE_ID"/> + </db-relationship> + <db-relationship name="nullify" source="DELETE_NULLIFY" target="DELETE_RULE"> + <db-attribute-pair source="DELETE_RULE_ID" target="DELETE_RULE_ID"/> + </db-relationship> + <db-relationship name="fromCascade" source="DELETE_RULE" target="DELETE_CASCADE" toMany="true"> + <db-attribute-pair source="DELETE_RULE_ID" target="DELETE_RULE_ID"/> + </db-relationship> + <db-relationship name="fromDeny" source="DELETE_RULE" target="DELETE_DENY" toMany="true"> + <db-attribute-pair source="DELETE_RULE_ID" target="DELETE_RULE_ID"/> + </db-relationship> + <db-relationship name="fromNullify" source="DELETE_RULE" target="DELETE_NULLIFY" toMany="true"> + <db-attribute-pair source="DELETE_RULE_ID" target="DELETE_RULE_ID"/> + </db-relationship> + <obj-relationship name="cascade" source="DeleteCascade" target="DeleteRule" deleteRule="Cascade" db-relationship-path="cascade"/> + <obj-relationship name="deny" source="DeleteDeny" target="DeleteRule" deleteRule="Deny" db-relationship-path="deny"/> + <obj-relationship name="nullify" source="DeleteNullify" target="DeleteRule" deleteRule="Nullify" db-relationship-path="nullify"/> + <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> http://git-wip-us.apache.org/repos/asf/cayenne/blob/c58b6f40/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 84bb4b0..10c4db6 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/9/modelMap"; +<data-map xmlns="http://cayenne.apache.org/schema/10/modelMap"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://cayenne.apache.org/schema/9/modelMap http://cayenne.apache.org/schema/9/modelMap.xsd"; - project-version="9"> + xsi:schemaLocation="http://cayenne.apache.org/schema/10/modelMap http://cayenne.apache.org/schema/10/modelMap.xsd"; + project-version="10"> <property name="defaultPackage" value="org.apache.cayenne.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/c58b6f40/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 89734f3..2ddcdd7 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/9/modelMap"; - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://cayenne.apache.org/schema/9/modelMap http://cayenne.apache.org/schema/9/modelMap.xsd"; - project-version="9"> - <db-entity name="EMPTY"> - <db-attribute name="ID" type="INTEGER" isPrimaryKey="true" isMandatory="true"/> - </db-entity> +<data-map xmlns="http://cayenne.apache.org/schema/10/modelMap"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://cayenne.apache.org/schema/10/modelMap http://cayenne.apache.org/schema/10/modelMap.xsd"; + project-version="10"> + <db-entity name="EMPTY"> + <db-attribute name="ID" type="INTEGER" isPrimaryKey="true" isMandatory="true"/> + </db-entity> </data-map> http://git-wip-us.apache.org/repos/asf/cayenne/blob/c58b6f40/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 e4a2807..30019c9 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/9/modelMap"; +<data-map xmlns="http://cayenne.apache.org/schema/10/modelMap"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://cayenne.apache.org/schema/9/modelMap http://cayenne.apache.org/schema/9/modelMap.xsd"; - project-version="9"> + xsi:schemaLocation="http://cayenne.apache.org/schema/10/modelMap http://cayenne.apache.org/schema/10/modelMap.xsd"; + project-version="10"> <property name="defaultPackage" value="org.apache.cayenne.testdo.enum_test"/> <property name="defaultSuperclass" value="org.apache.cayenne.CayenneDataObject"/> <property name="clientSupported" value="true"/> http://git-wip-us.apache.org/repos/asf/cayenne/blob/c58b6f40/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 3cfea21..3241fe7 100644 --- a/cayenne-server/src/test/resources/extended-type.map.xml +++ b/cayenne-server/src/test/resources/extended-type.map.xml @@ -1,18 +1,18 @@ <?xml version="1.0" encoding="utf-8"?> -<data-map xmlns="http://cayenne.apache.org/schema/9/modelMap"; - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://cayenne.apache.org/schema/9/modelMap http://cayenne.apache.org/schema/9/modelMap.xsd"; - project-version="9"> - <property name="defaultPackage" value="org.apache.cayenne.testdo.extended_type"/> - <property name="defaultSuperclass" value="org.apache.cayenne.CayenneDataObject"/> - <property name="clientSupported" value="true"/> - <property name="defaultClientPackage" value="test.client"/> - <property name="defaultClientSuperclass" value="org.apache.cayenne.PersistentObject"/> - <db-entity name="EXTENDED_TYPE_TEST"> - <db-attribute name="ID" type="INTEGER" isPrimaryKey="true" isMandatory="true"/> - <db-attribute name="NAME" type="VARCHAR" length="200"/> - </db-entity> - <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 xmlns="http://cayenne.apache.org/schema/10/modelMap"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://cayenne.apache.org/schema/10/modelMap http://cayenne.apache.org/schema/10/modelMap.xsd"; + project-version="10"> + <property name="defaultPackage" value="org.apache.cayenne.testdo.extended_type"/> + <property name="defaultSuperclass" value="org.apache.cayenne.CayenneDataObject"/> + <property name="clientSupported" value="true"/> + <property name="defaultClientPackage" value="test.client"/> + <property name="defaultClientSuperclass" value="org.apache.cayenne.PersistentObject"/> + <db-entity name="EXTENDED_TYPE_TEST"> + <db-attribute name="ID" type="INTEGER" isPrimaryKey="true" isMandatory="true"/> + <db-attribute name="NAME" type="VARCHAR" length="200"/> + </db-entity> + <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> http://git-wip-us.apache.org/repos/asf/cayenne/blob/c58b6f40/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 c3ddf35..a46b4a9 100644 --- a/cayenne-server/src/test/resources/generated.map.xml +++ b/cayenne-server/src/test/resources/generated.map.xml @@ -1,93 +1,91 @@ <?xml version="1.0" encoding="utf-8"?> -<data-map xmlns="http://cayenne.apache.org/schema/9/modelMap"; - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://cayenne.apache.org/schema/9/modelMap http://cayenne.apache.org/schema/9/modelMap.xsd"; - project-version="9"> - <property name="defaultPackage" value="org.apache.cayenne.testdo.generated"/> - <property name="defaultSuperclass" value="org.apache.cayenne.CayenneDataObject"/> - <property name="clientSupported" value="true"/> - <property name="defaultClientPackage" value="test.client"/> - <property name="defaultClientSuperclass" value="org.apache.cayenne.PersistentObject"/> - <db-entity name="GENERATED_COLUMN_COMP_KEY"> - <db-attribute name="AUTO_PK" type="INTEGER" isPrimaryKey="true" isMandatory="true"/> - <db-attribute name="GENERATED_COLUMN" type="INTEGER" isPrimaryKey="true" isGenerated="true" isMandatory="true"/> - <db-attribute name="NAME" type="VARCHAR" length="100"/> - <db-attribute name="PROPAGATED_PK" type="INTEGER" isPrimaryKey="true" isMandatory="true"/> - </db-entity> - <db-entity name="GENERATED_COLUMN_COMP_M"> - <db-attribute name="ID" type="INTEGER" isPrimaryKey="true" isMandatory="true"/> - <db-attribute name="NAME" type="VARCHAR" length="100"/> - </db-entity> - <db-entity name="GENERATED_COLUMN_DEP"> - <db-attribute name="GENERATED_COLUMN_FK" type="INTEGER" isPrimaryKey="true" isMandatory="true"/> - <db-attribute name="NAME" type="VARCHAR" length="100"/> - </db-entity> - <db-entity name="GENERATED_COLUMN_TEST"> - <db-attribute name="GENERATED_COLUMN" type="INTEGER" isPrimaryKey="true" isGenerated="true" isMandatory="true"/> - <db-attribute name="NAME" type="VARCHAR" length="250"/> - </db-entity> - <db-entity name="GENERATED_COLUMN_TEST2"> - <db-attribute name="GENERATED_COLUMN" type="INTEGER" isPrimaryKey="true" isGenerated="true" isMandatory="true"/> - <db-attribute name="NAME" type="VARCHAR" length="100"/> - </db-entity> - <db-entity name="GENERATED_F1"> - <db-attribute name="ID" type="INTEGER" isPrimaryKey="true" isMandatory="true"/> - </db-entity> - <db-entity name="GENERATED_F2"> - <db-attribute name="ID" type="INTEGER" isPrimaryKey="true" isMandatory="true"/> - </db-entity> - <db-entity name="GENERATED_JOIN"> - <db-attribute name="ID" type="INTEGER" isPrimaryKey="true" isGenerated="true" isMandatory="true"/> - <db-attribute name="ID1" type="INTEGER"/> - <db-attribute name="ID2" type="INTEGER"/> - </db-entity> - <obj-entity name="GeneratedColumnCompKey" className="org.apache.cayenne.testdo.generated.GeneratedColumnCompKey" dbEntityName="GENERATED_COLUMN_COMP_KEY"> - <obj-attribute name="name" type="java.lang.String" db-attribute-path="NAME"/> - </obj-entity> - <obj-entity name="GeneratedColumnCompMaster" className="org.apache.cayenne.testdo.generated.GeneratedColumnCompMaster" dbEntityName="GENERATED_COLUMN_COMP_M"> - <obj-attribute name="name" type="java.lang.String" db-attribute-path="NAME"/> - </obj-entity> - <obj-entity name="GeneratedColumnDep" className="org.apache.cayenne.testdo.generated.GeneratedColumnDep" dbEntityName="GENERATED_COLUMN_DEP"> - <obj-attribute name="name" type="java.lang.String" db-attribute-path="NAME"/> - </obj-entity> - <obj-entity name="GeneratedColumnTest2" className="org.apache.cayenne.testdo.generated.GeneratedColumnTest2" dbEntityName="GENERATED_COLUMN_TEST2"> - <obj-attribute name="name" type="java.lang.String" db-attribute-path="NAME"/> - </obj-entity> - <obj-entity name="GeneratedColumnTestEntity" className="org.apache.cayenne.testdo.generated.GeneratedColumnTestEntity" dbEntityName="GENERATED_COLUMN_TEST"> - <obj-attribute name="name" type="java.lang.String" db-attribute-path="NAME"/> - </obj-entity> - <obj-entity name="GeneratedF1" className="org.apache.cayenne.testdo.generated.GeneratedF1" clientClassName="test.client.GeneratedF1" dbEntityName="GENERATED_F1" superClassName="org.apache.cayenne.CayenneDataObject" clientSuperClassName="org.apache.cayenne.PersistentObject"> - </obj-entity> - <obj-entity name="GeneratedF2" className="org.apache.cayenne.testdo.generated.GeneratedF2" clientClassName="test.client.GeneratedF2" dbEntityName="GENERATED_F2" superClassName="org.apache.cayenne.CayenneDataObject" clientSuperClassName="org.apache.cayenne.PersistentObject"> - </obj-entity> - <db-relationship name="toMaster" source="GENERATED_COLUMN_COMP_KEY" target="GENERATED_COLUMN_COMP_M" toMany="false"> - <db-attribute-pair source="PROPAGATED_PK" target="ID"/> - </db-relationship> - <db-relationship name="toDetail" source="GENERATED_COLUMN_COMP_M" target="GENERATED_COLUMN_COMP_KEY" toDependentPK="true" toMany="true"> - <db-attribute-pair source="ID" target="PROPAGATED_PK"/> - </db-relationship> - <db-relationship name="toMaster" source="GENERATED_COLUMN_DEP" target="GENERATED_COLUMN_TEST" toMany="false"> - <db-attribute-pair source="GENERATED_COLUMN_FK" target="GENERATED_COLUMN"/> - </db-relationship> - <db-relationship name="toDep" source="GENERATED_COLUMN_TEST" target="GENERATED_COLUMN_DEP" toDependentPK="true" toMany="false"> - <db-attribute-pair source="GENERATED_COLUMN" target="GENERATED_COLUMN_FK"/> - </db-relationship> - <db-relationship name="join" source="GENERATED_F1" target="GENERATED_JOIN" toMany="true"> - <db-attribute-pair source="ID" target="ID1"/> - </db-relationship> - <db-relationship name="join" source="GENERATED_F2" target="GENERATED_JOIN" toMany="true"> - <db-attribute-pair source="ID" target="ID2"/> - </db-relationship> - <db-relationship name="f1" source="GENERATED_JOIN" target="GENERATED_F1" toMany="false"> - <db-attribute-pair source="ID1" target="ID"/> - </db-relationship> - <db-relationship name="f2" source="GENERATED_JOIN" target="GENERATED_F2" toMany="false"> - <db-attribute-pair source="ID2" target="ID"/> - </db-relationship> - <obj-relationship name="toMaster" source="GeneratedColumnCompKey" target="GeneratedColumnCompMaster" db-relationship-path="toMaster"/> - <obj-relationship name="toDetail" source="GeneratedColumnCompMaster" target="GeneratedColumnCompKey" db-relationship-path="toDetail"/> - <obj-relationship name="toMaster" source="GeneratedColumnDep" target="GeneratedColumnTestEntity" db-relationship-path="toMaster"/> - <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 xmlns="http://cayenne.apache.org/schema/10/modelMap"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://cayenne.apache.org/schema/10/modelMap http://cayenne.apache.org/schema/10/modelMap.xsd"; + project-version="10"> + <property name="defaultPackage" value="org.apache.cayenne.testdo.generated"/> + <property name="defaultSuperclass" value="org.apache.cayenne.CayenneDataObject"/> + <property name="clientSupported" value="true"/> + <property name="defaultClientPackage" value="test.client"/> + <property name="defaultClientSuperclass" value="org.apache.cayenne.PersistentObject"/> + <db-entity name="GENERATED_COLUMN_COMP_KEY"> + <db-attribute name="AUTO_PK" type="INTEGER" isPrimaryKey="true" isMandatory="true"/> + <db-attribute name="GENERATED_COLUMN" type="INTEGER" isPrimaryKey="true" isGenerated="true" isMandatory="true"/> + <db-attribute name="NAME" type="VARCHAR" length="100"/> + <db-attribute name="PROPAGATED_PK" type="INTEGER" isPrimaryKey="true" isMandatory="true"/> + </db-entity> + <db-entity name="GENERATED_COLUMN_COMP_M"> + <db-attribute name="ID" type="INTEGER" isPrimaryKey="true" isMandatory="true"/> + <db-attribute name="NAME" type="VARCHAR" length="100"/> + </db-entity> + <db-entity name="GENERATED_COLUMN_DEP"> + <db-attribute name="GENERATED_COLUMN_FK" type="INTEGER" isPrimaryKey="true" isMandatory="true"/> + <db-attribute name="NAME" type="VARCHAR" length="100"/> + </db-entity> + <db-entity name="GENERATED_COLUMN_TEST"> + <db-attribute name="GENERATED_COLUMN" type="INTEGER" isPrimaryKey="true" isGenerated="true" isMandatory="true"/> + <db-attribute name="NAME" type="VARCHAR" length="250"/> + </db-entity> + <db-entity name="GENERATED_COLUMN_TEST2"> + <db-attribute name="GENERATED_COLUMN" type="INTEGER" isPrimaryKey="true" isGenerated="true" isMandatory="true"/> + <db-attribute name="NAME" type="VARCHAR" length="100"/> + </db-entity> + <db-entity name="GENERATED_F1"> + <db-attribute name="ID" type="INTEGER" isPrimaryKey="true" isMandatory="true"/> + </db-entity> + <db-entity name="GENERATED_F2"> + <db-attribute name="ID" type="INTEGER" isPrimaryKey="true" isMandatory="true"/> + </db-entity> + <db-entity name="GENERATED_JOIN"> + <db-attribute name="ID" type="INTEGER" isPrimaryKey="true" isGenerated="true" isMandatory="true"/> + <db-attribute name="ID1" type="INTEGER"/> + <db-attribute name="ID2" type="INTEGER"/> + </db-entity> + <obj-entity name="GeneratedColumnCompKey" className="org.apache.cayenne.testdo.generated.GeneratedColumnCompKey" dbEntityName="GENERATED_COLUMN_COMP_KEY"> + <obj-attribute name="name" type="java.lang.String" db-attribute-path="NAME"/> + </obj-entity> + <obj-entity name="GeneratedColumnCompMaster" className="org.apache.cayenne.testdo.generated.GeneratedColumnCompMaster" dbEntityName="GENERATED_COLUMN_COMP_M"> + <obj-attribute name="name" type="java.lang.String" db-attribute-path="NAME"/> + </obj-entity> + <obj-entity name="GeneratedColumnDep" className="org.apache.cayenne.testdo.generated.GeneratedColumnDep" dbEntityName="GENERATED_COLUMN_DEP"> + <obj-attribute name="name" type="java.lang.String" db-attribute-path="NAME"/> + </obj-entity> + <obj-entity name="GeneratedColumnTest2" className="org.apache.cayenne.testdo.generated.GeneratedColumnTest2" dbEntityName="GENERATED_COLUMN_TEST2"> + <obj-attribute name="name" type="java.lang.String" db-attribute-path="NAME"/> + </obj-entity> + <obj-entity name="GeneratedColumnTestEntity" className="org.apache.cayenne.testdo.generated.GeneratedColumnTestEntity" dbEntityName="GENERATED_COLUMN_TEST"> + <obj-attribute name="name" type="java.lang.String" db-attribute-path="NAME"/> + </obj-entity> + <obj-entity name="GeneratedF1" className="org.apache.cayenne.testdo.generated.GeneratedF1" clientClassName="test.client.GeneratedF1" dbEntityName="GENERATED_F1" superClassName="org.apache.cayenne.CayenneDataObject" clientSuperClassName="org.apache.cayenne.PersistentObject"/> + <obj-entity name="GeneratedF2" className="org.apache.cayenne.testdo.generated.GeneratedF2" clientClassName="test.client.GeneratedF2" dbEntityName="GENERATED_F2" superClassName="org.apache.cayenne.CayenneDataObject" clientSuperClassName="org.apache.cayenne.PersistentObject"/> + <db-relationship name="toMaster" source="GENERATED_COLUMN_COMP_KEY" target="GENERATED_COLUMN_COMP_M"> + <db-attribute-pair source="PROPAGATED_PK" target="ID"/> + </db-relationship> + <db-relationship name="toDetail" source="GENERATED_COLUMN_COMP_M" target="GENERATED_COLUMN_COMP_KEY" toDependentPK="true" toMany="true"> + <db-attribute-pair source="ID" target="PROPAGATED_PK"/> + </db-relationship> + <db-relationship name="toMaster" source="GENERATED_COLUMN_DEP" target="GENERATED_COLUMN_TEST"> + <db-attribute-pair source="GENERATED_COLUMN_FK" target="GENERATED_COLUMN"/> + </db-relationship> + <db-relationship name="toDep" source="GENERATED_COLUMN_TEST" target="GENERATED_COLUMN_DEP" toDependentPK="true"> + <db-attribute-pair source="GENERATED_COLUMN" target="GENERATED_COLUMN_FK"/> + </db-relationship> + <db-relationship name="join" source="GENERATED_F1" target="GENERATED_JOIN" toMany="true"> + <db-attribute-pair source="ID" target="ID1"/> + </db-relationship> + <db-relationship name="join" source="GENERATED_F2" target="GENERATED_JOIN" toMany="true"> + <db-attribute-pair source="ID" target="ID2"/> + </db-relationship> + <db-relationship name="f1" source="GENERATED_JOIN" target="GENERATED_F1"> + <db-attribute-pair source="ID1" target="ID"/> + </db-relationship> + <db-relationship name="f2" source="GENERATED_JOIN" target="GENERATED_F2"> + <db-attribute-pair source="ID2" target="ID"/> + </db-relationship> + <obj-relationship name="toMaster" source="GeneratedColumnCompKey" target="GeneratedColumnCompMaster" db-relationship-path="toMaster"/> + <obj-relationship name="toDetail" source="GeneratedColumnCompMaster" target="GeneratedColumnCompKey" db-relationship-path="toDetail"/> + <obj-relationship name="toMaster" source="GeneratedColumnDep" target="GeneratedColumnTestEntity" db-relationship-path="toMaster"/> + <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> http://git-wip-us.apache.org/repos/asf/cayenne/blob/c58b6f40/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 a95bbcc..eace9e0 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/9/modelMap"; +<data-map xmlns="http://cayenne.apache.org/schema/10/modelMap"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://cayenne.apache.org/schema/9/modelMap http://cayenne.apache.org/schema/9/modelMap.xsd"; - project-version="9"> + xsi:schemaLocation="http://cayenne.apache.org/schema/10/modelMap http://cayenne.apache.org/schema/10/modelMap.xsd"; + project-version="10"> <property name="defaultPackage" value="org.apache.cayenne.testdo.generic"/> <db-entity name="GENERIC1"> <db-attribute name="ID" type="INTEGER" isPrimaryKey="true" isMandatory="true"/> @@ -22,7 +22,7 @@ <db-relationship name="generic2s" source="GENERIC1" target="GENERIC2" toMany="true"> <db-attribute-pair source="ID" target="GENERIC1_ID"/> </db-relationship> - <db-relationship name="toGeneric1" source="GENERIC2" target="GENERIC1" toMany="false"> + <db-relationship name="toGeneric1" source="GENERIC2" target="GENERIC1"> <db-attribute-pair source="GENERIC1_ID" target="ID"/> </db-relationship> <obj-relationship name="generic2s" source="Generic1" target="Generic2" deleteRule="Cascade" db-relationship-path="generic2s"/> http://git-wip-us.apache.org/repos/asf/cayenne/blob/c58b6f40/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 144e407..8b453a4 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/9/modelMap"; +<data-map xmlns="http://cayenne.apache.org/schema/10/modelMap"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://cayenne.apache.org/schema/9/modelMap http://cayenne.apache.org/schema/9/modelMap.xsd"; - project-version="9"> + xsi:schemaLocation="http://cayenne.apache.org/schema/10/modelMap http://cayenne.apache.org/schema/10/modelMap.xsd"; + project-version="10"> <property name="defaultPackage" value="org.apache.cayenne.testdo.inheritance_flat"/> <db-entity name="GROUP_MEMBERS"> <db-attribute name="group_id" type="BIGINT" isMandatory="true"/> @@ -47,28 +47,28 @@ <obj-attribute name="id" type="java.lang.Long" db-attribute-path="id"/> <obj-attribute name="nickname" type="java.lang.String" db-attribute-path="nickname"/> </obj-entity> - <db-relationship name="group" source="GROUP_MEMBERS" target="ROLES" toMany="false"> + <db-relationship name="group" source="GROUP_MEMBERS" target="ROLES"> <db-attribute-pair source="group_id" target="id"/> </db-relationship> - <db-relationship name="role" source="GROUP_MEMBERS" target="ROLES" toMany="false"> + <db-relationship name="role" source="GROUP_MEMBERS" target="ROLES"> <db-attribute-pair source="role_id" target="id"/> </db-relationship> - <db-relationship name="group" source="GROUP_PROPERTIES" target="ROLES" toMany="false"> + <db-relationship name="group" source="GROUP_PROPERTIES" target="ROLES"> <db-attribute-pair source="id" target="id"/> </db-relationship> <db-relationship name="group_members" source="ROLES" target="GROUP_MEMBERS" toMany="true"> <db-attribute-pair source="id" target="group_id"/> </db-relationship> - <db-relationship name="group_properties" source="ROLES" target="GROUP_PROPERTIES" toDependentPK="true" toMany="false"> + <db-relationship name="group_properties" source="ROLES" target="GROUP_PROPERTIES" toDependentPK="true"> <db-attribute-pair source="id" target="id"/> </db-relationship> <db-relationship name="role_groups" source="ROLES" target="GROUP_MEMBERS" toMany="true"> <db-attribute-pair source="id" target="role_id"/> </db-relationship> - <db-relationship name="user_properties" source="ROLES" target="USER_PROPERTIES" toDependentPK="true" toMany="false"> + <db-relationship name="user_properties" source="ROLES" target="USER_PROPERTIES" toDependentPK="true"> <db-attribute-pair source="id" target="id"/> </db-relationship> - <db-relationship name="user" source="USER_PROPERTIES" target="ROLES" toMany="false"> + <db-relationship name="user" source="USER_PROPERTIES" target="ROLES"> <db-attribute-pair source="id" target="id"/> </db-relationship> <obj-relationship name="groupMembers" source="Group" target="Role" deleteRule="Nullify" db-relationship-path="group_members.role"/>
