This is an automated email from the ASF dual-hosted git repository.
ntimofeev pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/cayenne.git
from 59de5dac0 CAY-2744 Remove ROP support - cleanup client related docs,
test projects
new 512492887 CAY-2747 Update project XML version to 11 - new upgrade
handler for v11 - schemas update - partially update test projects
new d363c21c9 CAY-2747 Update project XML version to 11 - update tests
and test projects
new 7272ad411 CAY-2747 Update project XML version to 11 - update tests
and test projects
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
cayenne-ant/src/test/resources/cgenTest.map.xml | 8 +-
cayenne-ant/src/test/resources/embeddable.map.xml | 6 +-
.../tools/build-include-table.map.xml-result | 6 +-
.../apache/cayenne/tools/cgen-dependent.map.xml | 6 +-
.../org/apache/cayenne/tools/cgen.map.xml | 6 +-
.../testExcludeRelationshipFirst.map.xml-result | 6 +-
cayenne-ant/src/test/resources/testmap.map.xml | 6 +-
.../src/test/resources/cayenne-lifecycle.xml | 4 +-
.../src/test/resources/lifecycle-map.map.xml | 6 +-
.../src/test/resources/cayenne-lifecycle.xml | 6 +-
.../src/test/resources/lifecycle-map.map.xml | 8 +-
.../src/test/resources/cayenne-crypto.xml | 6 +-
cayenne-crypto/src/test/resources/datamap.map.xml | 6 +-
.../dbimport/DefaultDbImportActionTest.java | 89 +++++++---------
.../dbimport/cayenne-relationship-optimisation.xml | 4 +-
.../dbimport/relationship-optimisation.map.xml | 6 +-
.../org/apache/cayenne/tools/cgenMap.map.xml | 8 +-
.../apache/cayenne/tools/cgen_with_config.map.xml | 8 +-
.../org/apache/cayenne/tools/exclude_Table.map.xml | 6 +-
.../org/apache/cayenne/tools/test_datamap.map.xml | 6 +-
.../src/test/resources/cayenne-lifecycle.xml | 4 +-
.../src/test/resources/lifecycle-map.map.xml | 6 +-
.../compatibility/ProjectCompatibilityModule.java | 4 +-
.../compatibility/CompatibilityTestModule.java | 4 +-
.../CompatibilityUpgradeServiceIT.java | 6 +-
.../java/org/apache/cayenne/project/Project.java | 2 +-
.../org/apache/cayenne/project/ProjectModule.java | 4 +-
.../upgrade/handlers/UpgradeHandler_V11.java | 116 +++++++++++++++++++++
.../project/upgrade/DefaultUpgradeServiceTest.java | 14 ++-
...er_V10Test.java => UpgradeHandler_V11Test.java} | 34 ++++--
.../apache/cayenne/project/cayenne-PROJECT1.xml | 4 +-
.../apache/cayenne/project/cayenne-PROJECT2.xml | 4 +-
.../cayenne/project/testProjectMap1_1.map.xml | 6 +-
.../cayenne/project/testProjectMap1_2.map.xml | 6 +-
.../cayenne/project/testProjectMap2_1.map.xml | 6 +-
.../cayenne/project/testProjectMap2_2.map.xml | 6 +-
.../upgrade/handlers/cayenne-project-v10.xml | 18 +++-
...enne-project-v5.xml => cayenne-project-v12.xml} | 2 +-
.../project/upgrade/handlers/test-map-v10.map.xml | 16 +++
.../configuration/DataChannelDescriptor.java | 4 +-
.../xml/XMLDataChannelDescriptorLoader.java | 2 +-
.../main/java/org/apache/cayenne/map/DataMap.java | 4 +-
.../org/apache/cayenne/schema/{10 => 11}/cgen.xsd | 7 +-
.../apache/cayenne/schema/{10 => 11}/dbimport.xsd | 6 +-
.../apache/cayenne/schema/{10 => 11}/domain.xsd | 6 +-
.../org/apache/cayenne/schema/{10 => 11}/graph.xsd | 6 +-
.../org/apache/cayenne/schema/{10 => 11}/info.xsd | 4 +-
.../apache/cayenne/schema/{10 => 11}/modelMap.xsd | 10 +-
.../test/resources/annotation/cayenne-project.xml | 6 +-
.../resources/annotation/datamapAnnotation.map.xml | 6 +-
.../src/test/resources/array-type.map.xml | 6 +-
.../src/test/resources/binary-pk.map.xml | 6 +-
cayenne-server/src/test/resources/cay-2032.map.xml | 6 +-
.../test/resources/cay2641/cayenne-cay-2641.xml | 6 +-
.../src/test/resources/cay2641/datamapLazy.map.xml | 8 +-
.../test/resources/cay2666/cayenne-cay-2666.xml | 6 +-
.../src/test/resources/cay2666/datamap.map.xml | 10 +-
.../src/test/resources/cay743/cayenne-domain.xml | 2 +-
.../src/test/resources/cay743/map1.map.xml | 6 +-
.../src/test/resources/cay743/map2.map.xml | 6 +-
.../src/test/resources/cayenne-array-type.xml | 6 +-
.../src/test/resources/cayenne-binary-pk.xml | 6 +-
.../src/test/resources/cayenne-cay-2032.xml | 6 +-
.../src/test/resources/cayenne-compound.xml | 6 +-
.../src/test/resources/cayenne-date-time.xml | 6 +-
.../src/test/resources/cayenne-delete-rules.xml | 6 +-
.../src/test/resources/cayenne-embeddable.xml | 6 +-
.../src/test/resources/cayenne-empty.xml | 6 +-
cayenne-server/src/test/resources/cayenne-enum.xml | 6 +-
.../src/test/resources/cayenne-extended-type.xml | 6 +-
.../src/test/resources/cayenne-generated.xml | 6 +-
.../src/test/resources/cayenne-generic.xml | 6 +-
.../test/resources/cayenne-hybrid-data-object.xml | 6 +-
.../cayenne-inheritance-single-table1.xml | 6 +-
.../resources/cayenne-inheritance-vertical.xml | 6 +-
.../resources/cayenne-inheritance-with-enum.xml | 6 +-
.../src/test/resources/cayenne-inheritance.xml | 6 +-
.../src/test/resources/cayenne-java8.xml | 6 +-
.../src/test/resources/cayenne-lazy-attributes.xml | 6 +-
.../cayenne-lifecycle-callbacks-order.xml | 6 +-
.../src/test/resources/cayenne-lifecycles.xml | 6 +-
cayenne-server/src/test/resources/cayenne-lob.xml | 6 +-
.../src/test/resources/cayenne-locking.xml | 6 +-
.../src/test/resources/cayenne-map-to-many.xml | 6 +-
.../src/test/resources/cayenne-meaningful-pk.xml | 6 +-
.../src/test/resources/cayenne-misc-types.xml | 6 +-
.../cayenne-mixed-persistence-strategy.xml | 6 +-
.../src/test/resources/cayenne-multi-tier.xml | 6 +-
.../src/test/resources/cayenne-multinode.xml | 6 +-
.../src/test/resources/cayenne-no-pk.xml | 6 +-
.../src/test/resources/cayenne-numeric-types.xml | 6 +-
.../src/test/resources/cayenne-oneway-rels.xml | 6 +-
...ayenne.configuration.rop.server.test-config.xml | 6 +-
.../src/test/resources/cayenne-people.xml | 6 +-
.../src/test/resources/cayenne-primitive.xml | 6 +-
.../src/test/resources/cayenne-qualified.xml | 6 +-
.../test/resources/cayenne-quoted-identifiers.xml | 6 +-
.../src/test/resources/cayenne-reflexive.xml | 6 +-
.../resources/cayenne-relationships-activity.xml | 6 +-
.../cayenne-relationships-child-master.xml | 6 +-
.../test/resources/cayenne-relationships-clob.xml | 6 +-
.../cayenne-relationships-collection-to-many.xml | 6 +-
.../cayenne-relationships-delete-rules.xml | 6 +-
.../resources/cayenne-relationships-flattened.xml | 6 +-
.../cayenne-relationships-many-to-many-join.xml | 6 +-
.../cayenne-relationships-set-to-many.xml | 6 +-
.../resources/cayenne-relationships-to-many-fk.xml | 6 +-
.../resources/cayenne-relationships-to-one-fk.xml | 6 +-
.../src/test/resources/cayenne-relationships.xml | 6 +-
.../src/test/resources/cayenne-return-types.xml | 6 +-
.../src/test/resources/cayenne-soft-delete.xml | 6 +-
cayenne-server/src/test/resources/cayenne-sus.xml | 6 +-
.../test/resources/cayenne-table-primitives.xml | 6 +-
.../src/test/resources/cayenne-testmap.xml | 6 +-
.../src/test/resources/cayenne-things.xml | 6 +-
.../src/test/resources/cayenne-toone.xml | 6 +-
.../cayenne-unsupported-distinct-types.xml | 6 +-
cayenne-server/src/test/resources/cayenne-uuid.xml | 6 +-
.../src/test/resources/cayenne-weighted-sort.xml | 6 +-
cayenne-server/src/test/resources/compound.map.xml | 35 ++-----
.../src/test/resources/custom-name-file.xml | 2 +-
.../src/test/resources/date-time.map.xml | 6 +-
.../src/test/resources/delete-rules.map.xml | 6 +-
.../src/test/resources/embeddable.map.xml | 6 +-
cayenne-server/src/test/resources/empty.map.xml | 6 +-
cayenne-server/src/test/resources/enum.map.xml | 6 +-
.../src/test/resources/extended-type.map.xml | 6 +-
.../src/test/resources/generated.map.xml | 6 +-
cayenne-server/src/test/resources/generic.map.xml | 6 +-
.../src/test/resources/hybrid-data-object.map.xml | 6 +-
.../resources/inheritance-single-table1.map.xml | 6 +-
.../test/resources/inheritance-vertical.map.xml | 6 +-
.../test/resources/inheritance-with-enum.map.xml | 6 +-
.../src/test/resources/inheritance.map.xml | 6 +-
cayenne-server/src/test/resources/java8.map.xml | 12 +--
.../src/test/resources/lazy-attributes.map.xml | 6 +-
.../resources/lifecycle-callbacks-order.map.xml | 6 +-
.../src/test/resources/lifecycles.map.xml | 6 +-
cayenne-server/src/test/resources/lob.map.xml | 6 +-
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 +-
.../src/test/resources/map-to-many.map.xml | 6 +-
.../src/test/resources/meaningful-pk.map.xml | 6 +-
.../src/test/resources/misc-types.map.xml | 6 +-
.../resources/mixed-persistence-strategy.map.xml | 6 +-
.../src/test/resources/multi-tier.map.xml | 6 +-
cayenne-server/src/test/resources/no-pk.map.xml | 6 +-
.../src/test/resources/numeric-types.map.xml | 6 +-
.../src/test/resources/oneway-rels.map.xml | 6 +-
.../configuration/xml/cayenne-testConfig1.xml | 2 +-
.../configuration/xml/cayenne-testConfig2.xml | 4 +-
.../configuration/xml/cayenne-testConfig3.xml | 6 +-
.../configuration/xml/cayenne-testConfig5.xml | 2 +-
.../configuration/xml/testConfigMap2.map.xml | 6 +-
.../configuration/xml/testConfigMap3_1.map.xml | 6 +-
.../configuration/xml/testConfigMap3_2.map.xml | 6 +-
.../configuration/xml/testConfigMap4.map.xml | 8 +-
cayenne-server/src/test/resources/people.map.xml | 6 +-
.../src/test/resources/primitive.map.xml | 6 +-
.../src/test/resources/qualified.map.xml | 6 +-
.../src/test/resources/quoted-identifiers.map.xml | 6 +-
.../src/test/resources/reflexive.map.xml | 6 +-
.../test/resources/relationships-activity.map.xml | 6 +-
.../resources/relationships-child-master.map.xml | 6 +-
.../src/test/resources/relationships-clob.map.xml | 6 +-
.../relationships-collection-to-many.map.xml | 6 +-
.../resources/relationships-delete-rules.map.xml | 6 +-
.../test/resources/relationships-flattened.map.xml | 12 +--
.../relationships-many-to-many-join.map.xml | 12 +--
.../resources/relationships-set-to-many.map.xml | 6 +-
.../resources/relationships-to-many-fk.map.xml | 6 +-
.../test/resources/relationships-to-one-fk.map.xml | 6 +-
.../src/test/resources/relationships.map.xml | 62 +++++------
.../src/test/resources/return-types.map.xml | 6 +-
.../src/test/resources/soft-delete.map.xml | 6 +-
cayenne-server/src/test/resources/sus-map.map.xml | 6 +-
.../src/test/resources/table-primitives.map.xml | 6 +-
cayenne-server/src/test/resources/testmap.map.xml | 19 +---
cayenne-server/src/test/resources/things.map.xml | 6 +-
cayenne-server/src/test/resources/toone.map.xml | 6 +-
.../resources/unsupported-distinct-types.map.xml | 6 +-
cayenne-server/src/test/resources/uuid.map.xml | 6 +-
.../src/test/resources/weighted-sort.map.xml | 6 +-
.../src/test/resources/cgen/cayenne-testDomain.xml | 4 +-
.../test/resources/cgen/testAdditionalMap.map.xml | 6 +-
.../src/test/resources/cgen/testCgen.map.xml | 8 +-
.../src/test/resources/cgen/testCgenMap.map.xml | 8 +-
.../src/test/resources/cgen/testDomainMap.map.xml | 8 +-
.../testAddedFlattenedRelationship.map.xml | 6 +-
.../testAddedFlattenedRelationship.map.xml-result | 6 +-
.../tools/dbimport/testComplexChangeOrder.map.xml | 6 +-
.../dbimport/testComplexChangeOrder.map.xml-result | 6 +-
.../tools/dbimport/testConfigFromDataMap.map.xml | 8 +-
.../dbimport/testConfigFromDataMap.map.xml-result | 8 +-
.../dbimport/testCustomObjectLayerSettings.map.xml | 6 +-
.../testCustomObjectLayerSettings.map.xml-result | 6 +-
.../tools/dbimport/testDbAttributeChange.map.xml | 6 +-
.../dbimport/testDbAttributeChange.map.xml-result | 6 +-
.../dbimport/testDefaultPackage.map.xml-result | 6 +-
.../tools/dbimport/testDropProcedure.map.xml | 6 +-
.../dbimport/testDropProcedure.map.xml-result | 6 +-
.../tools/dbimport/testExcludeRelationship.map.xml | 6 +-
.../testExcludeRelationship.map.xml-result | 6 +-
.../testExcludeRelationshipFirst.map.xml-result | 6 +-
.../testFilteringWithSchema.map.xml-result | 6 +-
.../tools/dbimport/testFkAttributeRename.map.xml | 6 +-
.../dbimport/testFkAttributeRename.map.xml-result | 6 +-
...ttensManyToManyWithRecursiveLink.map.xml-result | 6 +-
.../tools/dbimport/testForceDataMapSchema.map.xml | 6 +-
.../dbimport/testForceDataMapSchema.map.xml-result | 6 +-
.../dbimport/testImportAddTableAndColumn.map.xml | 6 +-
.../testImportAddTableAndColumn.map.xml-result | 6 +-
.../dbimport/testImportNewDataMap.map.xml-result | 6 +-
.../dbimport/testImportNewRelationship.map.xml | 6 +-
.../testImportNewRelationship.map.xml-result | 6 +-
.../tools/dbimport/testImportProcedure.map.xml | 6 +-
.../dbimport/testImportProcedure.map.xml-result | 6 +-
.../dbimport/testImportWithoutChanges.map.xml | 6 +-
.../testImportWithoutChanges.map.xml-result | 6 +-
.../cayenne/tools/dbimport/testInheritance.map.xml | 6 +-
.../tools/dbimport/testInheritance.map.xml-result | 6 +-
.../cayenne/tools/dbimport/testJava7Types.map.xml | 6 +-
.../tools/dbimport/testJava7Types.map.xml-result | 6 +-
.../cayenne/tools/dbimport/testJava8Types.map.xml | 6 +-
.../tools/dbimport/testJava8Types.map.xml-result | 6 +-
.../dbimport/testNamingStrategy.map.xml-result | 6 +-
.../tools/dbimport/testOneToOne.map.xml-result | 6 +-
.../dbimport/testPreserveCustomObjMappings.map.xml | 6 +-
.../testPreserveCustomObjMappings.map.xml-result | 6 +-
.../dbimport/testPreserveRelationships.map.xml | 6 +-
.../testPreserveRelationships.map.xml-result | 6 +-
.../tools/dbimport/testSameProcedure.map.xml | 6 +-
.../dbimport/testSameProcedure.map.xml-result | 6 +-
.../testSchemasAndTableExclude.map.xml-result | 6 +-
.../dbimport/testSkipPrimaryKeyLoading.map.xml | 6 +-
.../testSkipPrimaryKeyLoading.map.xml-result | 6 +-
.../dbimport/testSkipRelationshipsLoading.map.xml | 6 +-
.../testSkipRelationshipsLoading.map.xml-result | 6 +-
.../tools/dbimport/testTableTypes.map.xml-result | 6 +-
.../tools/dbimport/testTableTypesMap.map.xml | 8 +-
.../dbimport/testTableTypesMap.map.xml-result | 8 +-
.../dbimport/testUnFlattensManyToMany.map.xml | 6 +-
.../testUnFlattensManyToMany.map.xml-result | 6 +-
.../tools/dbimport/testViewsExclude.map.xml-result | 6 +-
.../src/test/resources/cayenne-client.xml | 4 +-
.../src/test/resources/embeddable.map.xml | 6 +-
.../src/test/resources/testmap.map.xml | 6 +-
.../src/main/resources/cayenne-project.xml | 6 +-
.../tutorial/src/main/resources/datamap.map.xml | 6 +-
250 files changed, 1017 insertions(+), 829 deletions(-)
create mode 100644
cayenne-project/src/main/java/org/apache/cayenne/project/upgrade/handlers/UpgradeHandler_V11.java
copy
cayenne-project/src/test/java/org/apache/cayenne/project/upgrade/handlers/{UpgradeHandler_V10Test.java
=> UpgradeHandler_V11Test.java} (63%)
copy
cayenne-project/src/test/resources/org/apache/cayenne/project/upgrade/handlers/{cayenne-project-v5.xml
=> cayenne-project-v12.xml} (75%)
create mode 100644
cayenne-project/src/test/resources/org/apache/cayenne/project/upgrade/handlers/test-map-v10.map.xml
copy cayenne-server/src/main/resources/org/apache/cayenne/schema/{10 =>
11}/cgen.xsd (91%)
copy cayenne-server/src/main/resources/org/apache/cayenne/schema/{10 =>
11}/dbimport.xsd (96%)
copy cayenne-server/src/main/resources/org/apache/cayenne/schema/{10 =>
11}/domain.xsd (96%)
copy cayenne-server/src/main/resources/org/apache/cayenne/schema/{10 =>
11}/graph.xsd (91%)
copy cayenne-server/src/main/resources/org/apache/cayenne/schema/{10 =>
11}/info.xsd (92%)
copy cayenne-server/src/main/resources/org/apache/cayenne/schema/{10 =>
11}/modelMap.xsd (97%)
