Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cayenne into ish/master
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/4621beff Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/4621beff Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/4621beff Branch: refs/heads/ish/master Commit: 4621beffc1b3168ebba68e5a4e8f6b8a2ba22987 Parents: f7c02d1 9aba7ec Author: Aristedes Maniatis <a...@ish.com.au> Authored: Fri Feb 12 09:24:05 2016 +1100 Committer: Aristedes Maniatis <a...@ish.com.au> Committed: Fri Feb 12 09:24:05 2016 +1100 ---------------------------------------------------------------------- assembly/pom.xml | 14 - .../org/apache/cayenne/CayenneDataObject.java | 91 ++++++ .../java/org/apache/cayenne/QueryResult.java | 56 ++++ .../access/translator/ParameterBinding.java | 9 +- .../translator/batch/DeleteBatchTranslator.java | 13 +- .../translator/batch/InsertBatchTranslator.java | 11 +- .../batch/SoftDeleteBatchTranslator.java | 7 +- .../translator/batch/UpdateBatchTranslator.java | 18 +- .../translator/select/QueryAssembler.java | 59 ++-- .../translator/select/QueryAssemblerHelper.java | 22 +- .../apache/cayenne/cache/EhCacheQueryCache.java | 30 +- .../server/SyntheticNodeDataDomainProvider.java | 11 +- .../dba/oracle/Oracle8LOBBatchTranslator.java | 14 +- .../org/apache/cayenne/map/EntityResolver.java | 20 +- .../java/org/apache/cayenne/query/SQLExec.java | 241 +++++++++++++++ .../apache/cayenne/util/QueryResultBuilder.java | 150 +++++++++ .../CayenneDataObjectSetToManyCollectionIT.java | 79 +++++ .../CayenneDataObjectSetToManyListIT.java | 301 +++++++++++++++++++ .../CayenneDataObjectSetToManyMapIT.java | 96 ++++++ .../CayenneDataObjectSetToManySetIT.java | 71 +++++ .../org/apache/cayenne/TranslationCase.java | 78 ----- .../translator/select/OrderingTranslatorIT.java | 129 ++------ .../select/QualifierTranslatorIT.java | 90 +++--- .../translator/select/TstQueryAssembler.java | 3 +- .../AshwoodEntitySorter_InheritanceIT.java | 16 +- .../SyntheticNodeDataDomainProviderTest.java | 42 +++ .../cayenne/exp/ExpressionTraversalTest.java | 117 ++++--- .../apache/cayenne/exp/TstBinaryExpSuite.java | 164 ---------- .../apache/cayenne/exp/TstExpressionCase.java | 55 ---- .../apache/cayenne/exp/TstExpressionSuite.java | 37 --- .../apache/cayenne/exp/TstTernaryExpSuite.java | 45 --- .../apache/cayenne/exp/TstTraversalHandler.java | 2 +- .../apache/cayenne/exp/TstUnaryExpSuite.java | 71 ----- .../org/apache/cayenne/query/SQLExecIT.java | 74 +++++ .../org/apache/cayenne/query/TstQueryCase.java | 34 --- docs/doc/src/main/resources/KEYS | 119 ++++++++ docs/doc/src/main/resources/RELEASE-NOTES.txt | 14 + .../src/docbkx/performance-tuning.xml | 70 +++++ .../dialog/objentity/ObjRelationshipInfo.java | 32 +- .../modeler/cayennemodeler-strings.properties | 2 +- 40 files changed, 1731 insertions(+), 776 deletions(-) ----------------------------------------------------------------------
