Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 6EA90200CEC for ; Mon, 21 Aug 2017 11:29:18 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 6B33D163D3D; Mon, 21 Aug 2017 09:29:18 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id B3306163D3E for ; Mon, 21 Aug 2017 11:29:17 +0200 (CEST) Received: (qmail 41718 invoked by uid 500); 21 Aug 2017 09:29:16 -0000 Mailing-List: contact commits-help@cayenne.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cayenne.apache.org Delivered-To: mailing list commits@cayenne.apache.org Received: (qmail 41588 invoked by uid 99); 21 Aug 2017 09:29:16 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 21 Aug 2017 09:29:16 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 192BBF555E; Mon, 21 Aug 2017 09:29:14 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: ntimofeev@apache.org To: commits@cayenne.apache.org Date: Mon, 21 Aug 2017 09:29:22 -0000 Message-Id: In-Reply-To: <60e97d7db44342c6bc5a4c7b36d96bbd@git.apache.org> References: <60e97d7db44342c6bc5a4c7b36d96bbd@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [9/9] cayenne git commit: Merge remote-tracking branch 'remotes/parent/pr/239' into asf-master archived-at: Mon, 21 Aug 2017 09:29:18 -0000 Merge remote-tracking branch 'remotes/parent/pr/239' into asf-master Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/afb42ed4 Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/afb42ed4 Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/afb42ed4 Branch: refs/heads/master Commit: afb42ed4c9772d81cc5f5c768ae02d0bb4ab67a6 Parents: de0969a 3c215ef Author: Nikita Timofeev Authored: Mon Aug 21 12:20:53 2017 +0300 Committer: Nikita Timofeev Committed: Mon Aug 21 12:20:53 2017 +0300 ---------------------------------------------------------------------- .travis.yml | 2 - .../org/apache/cayenne/gen/DataMapUtils.java | 5 +- cayenne-client/pom.xml | 5 - cayenne-lifecycle/pom.xml | 7 + .../ObjectIdPropagatedValueFactory.java | 8 +- cayenne-server/pom.xml | 13 +- .../cayenne/access/DataDomainSyncBucket.java | 6 +- .../access/DataNodeSyncQualifierDescriptor.java | 49 +-- .../access/DefaultObjectMapRetainStrategy.java | 15 +- .../access/jdbc/RowDescriptorBuilder.java | 27 +- .../cayenne/access/jdbc/SQLTemplateAction.java | 18 +- .../access/translator/select/JoinStack.java | 7 +- .../translator/select/QualifierTranslator.java | 10 +- .../cayenne/ashwood/AshwoodEntitySorter.java | 5 +- .../ashwood/WeightedAshwoodEntitySorter.java | 5 +- .../cayenne/ashwood/graph/DepthFirstSearch.java | 7 +- .../ashwood/graph/FilterArcIterator.java | 20 +- .../cayenne/ashwood/graph/FilterIteration.java | 31 +- .../cayenne/ashwood/graph/StrongConnection.java | 28 +- .../org/apache/cayenne/cache/MapQueryCache.java | 5 +- .../dba/oracle/OracleQualifierTranslator.java | 6 +- .../org/apache/cayenne/event/EventSubject.java | 6 +- .../java/org/apache/cayenne/exp/Expression.java | 16 +- .../org/apache/cayenne/exp/parser/ASTIn.java | 5 +- .../org/apache/cayenne/exp/parser/ASTNotIn.java | 5 +- .../exp/parser/AggregateConditionNode.java | 5 +- .../java/org/apache/cayenne/map/DbEntity.java | 6 +- .../org/apache/cayenne/map/DbRelationship.java | 24 +- .../org/apache/cayenne/map/MappingCache.java | 14 +- .../org/apache/cayenne/map/ObjAttribute.java | 12 +- .../java/org/apache/cayenne/map/ObjEntity.java | 6 +- .../org/apache/cayenne/query/BatchQueryRow.java | 6 +- .../apache/cayenne/query/InsertBatchQuery.java | 2 +- .../java/org/apache/cayenne/query/Ordering.java | 10 +- .../org/apache/cayenne/query/SQLTemplate.java | 17 +- .../org/apache/cayenne/util/ReferenceMap.java | 345 +++++++++++++++++++ .../org/apache/cayenne/util/SoftValueMap.java | 64 ++++ .../org/apache/cayenne/util/WeakValueMap.java | 63 ++++ .../util/commons/CompositeCollection.java | 328 ++++++++++++++++++ .../cayenne/util/commons/IteratorChain.java | 195 +++++++++++ .../java/org/apache/cayenne/ObjectIdTest.java | 10 +- .../unit/di/server/ConnectionProperties.java | 36 +- .../ServerCaseDataSourceInfoProvider.java | 14 +- .../apache/cayenne/util/WeakValueMapTest.java | 203 +++++++++++ .../velocity/SQLTemplateResourceManager.java | 4 +- docs/doc/pom.xml | 5 - docs/doc/src/main/resources/RELEASE-NOTES.txt | 1 + modeler/cayenne-modeler/pom.xml | 12 + .../org/apache/cayenne/modeler/Application.java | 17 +- .../modeler/action/ImportEOModelAction.java | 66 ++-- .../InferRelationshipsControllerBase.java | 11 +- .../InferRelationshipsTabController.java | 11 +- .../dialog/codegen/ClassesTabController.java | 8 +- .../dialog/codegen/ClientModeController.java | 21 +- .../dialog/codegen/CodeGeneratorController.java | 7 +- .../codegen/CodeGeneratorControllerBase.java | 28 +- .../dialog/codegen/GeneratorController.java | 48 +-- .../dialog/pref/DataSourcePreferences.java | 17 +- .../cayenne/modeler/editor/ObjEntityTab.java | 27 +- .../cayenne/pref/UpgradeCayennePreference.java | 46 ++- .../org/apache/cayenne/swing/TableBinding.java | 4 +- modeler/cayenne-wocompat/pom.xml | 16 +- .../apache/cayenne/wocompat/EOModelHelper.java | 7 +- .../cayenne/wocompat/EOModelProcessor.java | 63 ++-- .../apache/cayenne/wocompat/EOObjEntity.java | 6 +- pom.xml | 10 - 66 files changed, 1592 insertions(+), 514 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cayenne/blob/afb42ed4/docs/doc/src/main/resources/RELEASE-NOTES.txt ----------------------------------------------------------------------