Merge remote-tracking branch 'remotes/parent/pr/235' into asf-master # Conflicts: # cayenne-cgen/src/test/java/org/apache/cayenne/gen/ClassGenerationActionTest.java # docs/doc/src/main/resources/RELEASE-NOTES.txt # docs/doc/src/main/resources/UPGRADE.txt
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/7b762e9a Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/7b762e9a Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/7b762e9a Branch: refs/heads/master Commit: 7b762e9a3182403329ca3f428553dd13ca6429f8 Parents: caaeb99 1ba6f5e Author: Nikita Timofeev <stari...@gmail.com> Authored: Fri Aug 11 10:44:16 2017 +0300 Committer: Nikita Timofeev <stari...@gmail.com> Committed: Fri Aug 11 10:44:16 2017 +0300 ---------------------------------------------------------------------- ...eGeneratorTaskCrossMapRelationshipsTest.java | 2 +- .../cayenne/tools/CayenneGeneratorTaskTest.java | 12 +- .../cayenne/gen/ClassGenerationAction.java | 2 +- .../org/apache/cayenne/gen/EntityArtifact.java | 4 +- .../org/apache/cayenne/gen/ImportUtils.java | 9 + .../v4_1/client-datamap-singleclass.vm | 98 +++ .../templates/v4_1/client-datamap-subclass.vm | 47 ++ .../templates/v4_1/client-datamap-superclass.vm | 87 +++ .../resources/templates/v4_1/client-subclass.vm | 57 ++ .../templates/v4_1/client-superclass.vm | 248 +++++++ .../templates/v4_1/datamap-singleclass.vm | 100 +++ .../templates/v4_1/datamap-subclass.vm | 47 ++ .../templates/v4_1/datamap-superclass.vm | 91 +++ .../templates/v4_1/embeddable-singleclass.vm | 106 +++ .../templates/v4_1/embeddable-subclass.vm | 45 ++ .../templates/v4_1/embeddable-superclass.vm | 112 +++ .../resources/templates/v4_1/singleclass.vm | 278 +++++++ .../main/resources/templates/v4_1/subclass.vm | 47 ++ .../main/resources/templates/v4_1/superclass.vm | 292 ++++++++ .../cayenne/gen/ClassGenerationActionTest.java | 13 +- .../cayenne/CayenneContextPrimitiveIT.java | 29 + .../apache/cayenne/crypto/db/auto/_Table1.java | 114 ++- .../apache/cayenne/crypto/db/auto/_Table2.java | 82 ++- .../apache/cayenne/crypto/db/auto/_Table3.java | 67 +- .../apache/cayenne/crypto/db/auto/_Table4.java | 83 ++- .../apache/cayenne/crypto/db/auto/_Table5.java | 100 ++- .../apache/cayenne/crypto/db/auto/_Table6.java | 84 ++- .../java8/db/auto/_LocalDateTestEntity.java | 66 +- .../java8/db/auto/_LocalDateTimeTestEntity.java | 66 +- .../java8/db/auto/_LocalTimeTestEntity.java | 66 +- .../java/org/apache/cayenne/BaseDataObject.java | 722 +++++++++++++++++++ .../org/apache/cayenne/CayenneDataObject.java | 664 +---------------- .../cayenne/access/DataContextExtrasIT.java | 25 +- .../access/DataContextPrefetchExtrasIT.java | 10 +- .../array_type/auto/_ArrayTestEntity.java | 67 +- .../testdo/binary_pk/auto/_BinaryPKTest1.java | 75 +- .../testdo/binary_pk/auto/_BinaryPKTest2.java | 74 +- .../cayenne/testdo/cay_2032/auto/_Team.java | 60 +- .../cayenne/testdo/cay_2032/auto/_User.java | 75 +- .../testdo/compound/auto/_CharFkTestEntity.java | 74 +- .../testdo/compound/auto/_CharPkTestEntity.java | 90 ++- .../compound/auto/_CompoundFkTestEntity.java | 74 +- .../compound/auto/_CompoundPkTestEntity.java | 105 ++- .../testdo/date_time/auto/_CalendarEntity.java | 66 +- .../testdo/date_time/auto/_DateTestEntity.java | 96 ++- .../cayenne/testdo/db1/auto/_CrossdbM1E1.java | 86 ++- .../cayenne/testdo/db2/auto/_CrossdbM2E1.java | 75 +- .../cayenne/testdo/db2/auto/_CrossdbM2E2.java | 83 ++- .../testdo/deleterules/auto/_DeleteCascade.java | 74 +- .../testdo/deleterules/auto/_DeleteDeny.java | 74 +- .../testdo/deleterules/auto/_DeleteNullify.java | 74 +- .../testdo/deleterules/auto/_DeleteRule.java | 97 ++- .../testdo/embeddable/auto/_EmbedEntity1.java | 97 ++- .../testdo/enum_test/auto/_EnumEntity.java | 67 +- .../extended_type/auto/_ExtendedTypeEntity.java | 67 +- .../generated/auto/_GeneratedColumnCompKey.java | 74 +- .../auto/_GeneratedColumnCompMaster.java | 75 +- .../generated/auto/_GeneratedColumnDep.java | 74 +- .../generated/auto/_GeneratedColumnTest2.java | 67 +- .../auto/_GeneratedColumnTestEntity.java | 74 +- .../testdo/generated/auto/_GeneratedF1.java | 56 ++ .../testdo/generated/auto/_GeneratedF2.java | 56 ++ .../testdo/inheritance/auto/_BaseEntity.java | 83 ++- .../inheritance/auto/_DirectToSubEntity.java | 60 +- .../testdo/inheritance/auto/_RelatedEntity.java | 71 +- .../testdo/inheritance/auto/_SubEntity.java | 48 ++ .../testdo/inheritance_flat/auto/_Group.java | 65 +- .../inheritance_flat/auto/_GroupProperties.java | 89 ++- .../testdo/inheritance_flat/auto/_Role.java | 109 ++- .../testdo/inheritance_flat/auto/_User.java | 55 ++ .../inheritance_flat/auto/_UserProperties.java | 89 ++- .../auto/_AbstractPerson.java | 90 ++- .../inheritance_people/auto/_Address.java | 74 +- .../inheritance_people/auto/_ClientCompany.java | 75 +- .../auto/_CustomerRepresentative.java | 70 +- .../inheritance_people/auto/_Department.java | 84 ++- .../inheritance_people/auto/_Employee.java | 80 +- .../inheritance_people/auto/_Manager.java | 56 ++ .../inheritance_people/auto/_PersonNotes.java | 74 +- .../inheritance_vertical/auto/_Iv1Root.java | 82 ++- .../inheritance_vertical/auto/_Iv1Sub1.java | 63 +- .../inheritance_vertical/auto/_Iv2Root.java | 67 +- .../inheritance_vertical/auto/_Iv2Sub1.java | 55 ++ .../testdo/inheritance_vertical/auto/_Iv2X.java | 52 +- .../inheritance_vertical/auto/_IvAbstract.java | 67 +- .../inheritance_vertical/auto/_IvBase.java | 82 ++- .../auto/_IvBaseWithLock.java | 103 ++- .../inheritance_vertical/auto/_IvConcrete.java | 80 +- .../inheritance_vertical/auto/_IvImpl.java | 94 ++- .../auto/_IvImplWithLock.java | 95 ++- .../inheritance_vertical/auto/_IvOther.java | 97 ++- .../inheritance_vertical/auto/_IvRoot.java | 82 ++- .../inheritance_vertical/auto/_IvSub1.java | 63 +- .../inheritance_vertical/auto/_IvSub1Sub1.java | 63 +- .../inheritance_vertical/auto/_IvSub2.java | 78 +- .../inheritance_vertical/auto/_IvSub3.java | 56 +- .../auto/_Lifecycle.java | 67 +- .../testdo/lifecycles/auto/_Lifecycles.java | 67 +- .../testdo/lob/auto/_BlobTestEntity.java | 67 +- .../testdo/lob/auto/_ClobTestEntity.java | 75 +- .../testdo/lob/auto/_ClobTestRelation.java | 89 ++- .../testdo/lob/auto/_NClobTestEntity.java | 67 +- .../testdo/locking/auto/_LockingHelper.java | 74 +- .../locking/auto/_RelLockingTestEntity.java | 84 ++- .../locking/auto/_SimpleLockingTestEntity.java | 82 ++- .../testdo/map_to_many/auto/_IdMapToMany.java | 60 +- .../map_to_many/auto/_IdMapToManyTarget.java | 59 +- .../testdo/map_to_many/auto/_MapToMany.java | 60 +- .../map_to_many/auto/_MapToManyTarget.java | 74 +- .../meaningful_pk/auto/_MeaningfulPKDep.java | 74 +- .../meaningful_pk/auto/_MeaningfulPKTest1.java | 90 ++- .../meaningful_pk/auto/_MeaningfulPk.java | 67 +- .../testdo/misc_types/auto/_ArraysEntity.java | 112 ++- .../misc_types/auto/_CharacterEntity.java | 67 +- .../misc_types/auto/_SerializableEntity.java | 67 +- .../auto/_MixedPersistenceStrategy.java | 90 ++- .../auto/_MixedPersistenceStrategy2.java | 74 +- .../cayenne/testdo/mt/auto/_MtTable1.java | 90 ++- .../testdo/mt/auto/_MtTable1Subclass1.java | 63 +- .../testdo/mt/auto/_MtTable1Subclass2.java | 63 +- .../cayenne/testdo/mt/auto/_MtTable2.java | 83 ++- .../cayenne/testdo/mt/auto/_MtTable3.java | 105 ++- .../cayenne/testdo/mt/auto/_MtTable4.java | 60 +- .../cayenne/testdo/mt/auto/_MtTable5.java | 60 +- .../testdo/no_pk/auto/_NoPkTestEntity.java | 67 +- .../numeric_types/auto/_BigDecimalEntity.java | 66 +- .../numeric_types/auto/_BigIntegerEntity.java | 66 +- .../auto/_BitNumberTestEntity.java | 67 +- .../numeric_types/auto/_BitTestEntity.java | 67 +- .../numeric_types/auto/_BooleanTestEntity.java | 67 +- .../numeric_types/auto/_DecimalPKTest1.java | 82 ++- .../auto/_DecimalPKTestEntity.java | 81 ++- .../testdo/numeric_types/auto/_LongEntity.java | 67 +- .../numeric_types/auto/_SmallintTestEntity.java | 67 +- .../numeric_types/auto/_TinyintTestEntity.java | 67 +- .../testdo/oneway/auto/_OnewayTable1.java | 52 +- .../testdo/oneway/auto/_OnewayTable2.java | 74 +- .../testdo/oneway/auto/_OnewayTable3.java | 60 +- .../testdo/oneway/auto/_OnewayTable4.java | 52 +- .../primitive/auto/_PrimitivesTestEntity.java | 84 ++- .../testdo/qualified/auto/_Qualified1.java | 90 ++- .../testdo/qualified/auto/_Qualified2.java | 89 ++- .../testdo/quotemap/auto/_QuoteAdress.java | 89 ++- .../testdo/quotemap/auto/_Quote_Person.java | 133 +++- .../testdo/reflexive/auto/_Reflexive.java | 84 ++- .../relationships/auto/_FkOfDifferentType.java | 59 +- .../relationships/auto/_MeaningfulFK.java | 74 +- .../relationships/auto/_ReflexiveAndToOne.java | 93 ++- .../relationships/auto/_RelationshipHelper.java | 97 ++- .../relationships_activity/auto/_Activity.java | 91 ++- .../auto/_ActivityResult.java | 97 ++- .../relationships_child_master/auto/_Child.java | 59 +- .../auto/_Master.java | 75 +- .../relationships_clob/auto/_ClobDetail.java | 74 +- .../relationships_clob/auto/_ClobMaster.java | 90 ++- .../auto/_CollectionToMany.java | 60 +- .../auto/_CollectionToManyTarget.java | 59 +- .../auto/_DeleteRuleFlatA.java | 60 +- .../auto/_DeleteRuleFlatB.java | 60 +- .../auto/_DeleteRuleTest1.java | 59 +- .../auto/_DeleteRuleTest2.java | 71 +- .../auto/_DeleteRuleTest3.java | 59 +- .../auto/_FlattenedCircular.java | 71 +- .../auto/_FlattenedTest1.java | 115 ++- .../auto/_FlattenedTest2.java | 84 ++- .../auto/_FlattenedTest3.java | 94 ++- .../auto/_FlattenedTest4.java | 74 +- .../auto/_FlattenedTest5.java | 74 +- .../auto/_SetToMany.java | 60 +- .../auto/_SetToManyTarget.java | 59 +- .../auto/_ToManyFkDep.java | 98 ++- .../auto/_ToManyFkRoot.java | 90 ++- .../auto/_ToManyRoot2.java | 75 +- .../relationships_to_one_fk/auto/_ToOneFK1.java | 59 +- .../relationships_to_one_fk/auto/_ToOneFK2.java | 59 +- .../return_types/auto/_ReturnTypesMap1.java | 347 ++++++++- .../return_types/auto/_ReturnTypesMap2.java | 108 ++- .../return_types/auto/_ReturnTypesMapLobs1.java | 78 +- .../testdo/soft_delete/auto/_SoftDelete.java | 82 ++- .../table_primitives/auto/_TablePrimitives.java | 84 ++- .../cayenne/testdo/testmap/auto/_ArtGroup.java | 95 ++- .../cayenne/testdo/testmap/auto/_Artist.java | 112 ++- .../testdo/testmap/auto/_ArtistCallback.java | 81 ++- .../testdo/testmap/auto/_ArtistExhibit.java | 68 +- .../testdo/testmap/auto/_CompoundPainting.java | 151 +++- .../auto/_CompoundPaintingLongNames.java | 175 ++++- .../cayenne/testdo/testmap/auto/_Exhibit.java | 99 ++- .../cayenne/testdo/testmap/auto/_Gallery.java | 86 ++- .../_MeaningfulGeneratedColumnTestEntity.java | 82 ++- .../testdo/testmap/auto/_NullTestEntity.java | 67 +- .../cayenne/testdo/testmap/auto/_Painting.java | 117 ++- .../cayenne/testdo/testmap/auto/_Painting1.java | 88 ++- .../testdo/testmap/auto/_PaintingInfo.java | 89 ++- .../cayenne/testdo/testmap/auto/_ROArtist.java | 82 ++- .../testdo/testmap/auto/_ROPainting.java | 81 ++- .../testmap/auto/_RWCompoundPainting.java | 96 ++- .../testdo/testmap/auto/_SubPainting.java | 67 +- .../apache/cayenne/testdo/things/auto/_Bag.java | 89 ++- .../cayenne/testdo/things/auto/_Ball.java | 94 ++- .../apache/cayenne/testdo/things/auto/_Box.java | 98 ++- .../cayenne/testdo/things/auto/_BoxInfo.java | 70 +- .../cayenne/testdo/things/auto/_Thing.java | 93 ++- .../cayenne/testdo/toone/auto/_TooneDep.java | 59 +- .../cayenne/testdo/toone/auto/_TooneMaster.java | 59 +- .../auto/_Customer.java | 75 +- .../auto/_Product.java | 97 ++- .../cayenne/testdo/uuid/auto/_UuidPkEntity.java | 66 +- .../testdo/uuid/auto/_UuidTestEntity.java | 66 +- .../testdo/weighted_sort/auto/_SortDep.java | 59 +- .../testdo/weighted_sort/auto/_SortRoot.java | 60 +- .../src/test/resources/testmap.map.xml | 2 +- docs/doc/src/main/resources/RELEASE-NOTES.txt | 1 + docs/doc/src/main/resources/UPGRADE.txt | 5 + .../tools/CayenneGeneratorIntegrationTest.java | 12 +- 214 files changed, 16190 insertions(+), 1612 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cayenne/blob/7b762e9a/cayenne-cgen/src/main/java/org/apache/cayenne/gen/ClassGenerationAction.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cayenne/blob/7b762e9a/cayenne-cgen/src/test/java/org/apache/cayenne/gen/ClassGenerationActionTest.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cayenne/blob/7b762e9a/cayenne-server/src/test/resources/testmap.map.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cayenne/blob/7b762e9a/docs/doc/src/main/resources/RELEASE-NOTES.txt ---------------------------------------------------------------------- diff --cc docs/doc/src/main/resources/RELEASE-NOTES.txt index b2ee928,7a373a0..c42dad6 --- a/docs/doc/src/main/resources/RELEASE-NOTES.txt +++ b/docs/doc/src/main/resources/RELEASE-NOTES.txt @@@ -13,11 -13,8 +13,12 @@@ Date ---------------------------------- Changes/New Features: +CAY-2152 Redesign project file upgrade system CAY-2329 Update project dependencies + CAY-2330 Field based data objects +CAY-2335 New XML loading/saving mechanics with support of plugable handlers +CAY-2336 Support for comments in Modeler +CAY-2339 Compatibility module to support old versions of projects at runtime Bug Fixes: http://git-wip-us.apache.org/repos/asf/cayenne/blob/7b762e9a/docs/doc/src/main/resources/UPGRADE.txt ---------------------------------------------------------------------- diff --cc docs/doc/src/main/resources/UPGRADE.txt index 2eee938,3594439..ddc72e4 --- a/docs/doc/src/main/resources/UPGRADE.txt +++ b/docs/doc/src/main/resources/UPGRADE.txt @@@ -7,13 -7,11 +7,18 @@@ IMPORTANT: be sure to read all notes fo UPGRADING TO 4.1.M1 +* Per CAY-2335 ServerRuntime by default will fail to load projects in case of version mismatch. + You have two options: + - update project via opening it in Cayenne Modeler + - if you are unable to do so you can use new cayenne-project-compatibility module, + to enable it simply add it as a dependency in Maven (or any other build system you use), however + this module can support only versions created by Cayenne 3.1 or later. + + * Per CAY-2330 Field-based data objects are introduced and enabled by default. + Your existing code will continue to work, but in order to get benefits from this feature you should + regenerate code via Modeler ("Tools" -> "Generate Classes") or cgen tools in Maven/Ant/Gradle plugins. + Also note that serialization format of old data objects have changed, make sure you don't use serialization + form to store your objects. UPGRADING TO 4.0.B1
