Merge remote-tracking branch 'upstream/master'
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/e71732b4 Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/e71732b4 Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/e71732b4 Branch: refs/heads/master Commit: e71732b4feee8a532c7d3cf99bd1a36319c3992a Parents: fee9eb4 865ee2b Author: Ruslan Ibragimov <rus...@ibragimov.by> Authored: Fri Dec 2 20:06:33 2016 +0300 Committer: Ruslan Ibragimov <rus...@ibragimov.by> Committed: Fri Dec 2 20:06:33 2016 +0300 ---------------------------------------------------------------------- .../org/apache/cayenne/CayenneContextIT.java | 13 +++++++- .../cayenne/remote/ClientChannelTest.java | 32 +++++++++++++++----- .../http/HessianROPSerializationServiceIT.java | 19 ++++++++++++ .../org/apache/cayenne/crypto/db/Table4.java | 19 ++++++++++++ .../org/apache/cayenne/dbsync/DbSyncModule.java | 19 ++++++++++++ ...stCommitFilter_ListenerInducedChangesIT.java | 19 ++++++++++++ .../project/upgrade/v9/reverseEngineering.xml | 18 +++++++++++ .../protostuff/persistent/ClientMtTable1.java | 19 ++++++++++++ .../protostuff/persistent/ClientMtTable2.java | 19 ++++++++++++ .../rop/protostuff/persistent/MtTable1.java | 19 ++++++++++++ .../rop/protostuff/persistent/MtTable2.java | 19 ++++++++++++ .../apache/cayenne/dbimport/package-info.java | 19 ++++++++++++ .../DataContextObjectIdQuery_PolymorphicIT.java | 19 ++++++++++++ ...aContextRelationshipQuery_PolymorphicIT.java | 19 ++++++++++++ .../access/DataContextSharedCacheEmpiricIT.java | 13 +++++++- .../org/apache/cayenne/access/DataDomainIT.java | 25 +++++++++------ .../apache/cayenne/access/DataRowStoreIT.java | 24 ++++++++++++--- .../rop/server/ROPServletTest.java | 20 +++++++++--- .../datasource/ManagedPoolingDataSourceIT.java | 19 ++++++++++++ .../cayenne/event/DefaultEventManagerTest.java | 6 ++++ .../apache/cayenne/event/EventBridgeTest.java | 25 ++++++++++++--- .../testdo/inheritance_vertical/IvAbstract.java | 19 ++++++++++++ .../testdo/inheritance_vertical/IvBase.java | 19 ++++++++++++ .../testdo/inheritance_vertical/IvConcrete.java | 19 ++++++++++++ .../testdo/inheritance_vertical/IvImpl.java | 19 ++++++++++++ .../testdo/inheritance_vertical/IvOther.java | 19 ++++++++++++ .../testdo/inheritance_vertical/IvSub3.java | 19 ++++++++++++ .../dbimport/reverseEngineering-expected.xml | 18 +++++++++++ .../cayenne/modeler/dialog/db/templateXML.xml | 18 +++++++++++ .../tutorial/persistent/client/Artist.java | 19 ++++++++++++ .../tutorial/persistent/client/Gallery.java | 19 ++++++++++++ .../tutorial/persistent/client/Painting.java | 19 ++++++++++++ .../cayenne/tutorial/persistent/Artist.java | 19 ++++++++++++ .../cayenne/tutorial/persistent/Gallery.java | 19 ++++++++++++ .../cayenne/tutorial/persistent/Painting.java | 19 ++++++++++++ .../tutorial/persistent/client/Artist.java | 19 ++++++++++++ .../tutorial/persistent/client/Gallery.java | 19 ++++++++++++ .../tutorial/persistent/client/Painting.java | 19 ++++++++++++ 38 files changed, 692 insertions(+), 33 deletions(-) ----------------------------------------------------------------------
