You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by ko...@apache.org on 2015/04/24 00:12:52 UTC
[07/17] cayenne git commit: Merge remote-tracking branch
'upstream/master'
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/5eff639c
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/5eff639c
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/5eff639c
Branch: refs/heads/master
Commit: 5eff639ca7736dd8e861d33d43b7195637a8d560
Parents: f657579 3b1d6ef
Author: alexkolonitsky <Al...@gmail.com>
Authored: Wed Oct 8 11:16:57 2014 +0300
Committer: alexkolonitsky <Al...@gmail.com>
Committed: Wed Oct 8 11:16:57 2014 +0300
----------------------------------------------------------------------
.../rop/client/ClientLocalRuntime.java | 42 +-
.../configuration/rop/client/ClientRuntime.java | 55 +-
.../rop/client/ClientLocalRuntimeTest.java | 76 +-
.../rop/client/ClientRuntimeTest.java | 178 +-
.../apache/cayenne/query/SQLTemplateTest.java | 39 +-
.../apache/cayenne/query/SelectByIdTest.java | 26 +
.../translator/select/QualifierTranslator.java | 4 +-
.../cayenne/configuration/CayenneRuntime.java | 291 +-
.../cayenne/configuration/ModuleCollection.java | 82 +
.../configuration/server/ServerRuntime.java | 173 +-
.../java/org/apache/cayenne/exp/Expression.java | 1436 +++++-----
.../apache/cayenne/exp/ExpressionFactory.java | 1593 ++++++-----
.../java/org/apache/cayenne/map/DataMap.java | 2602 +++++++++---------
.../java/org/apache/cayenne/map/Embeddable.java | 276 +-
.../org/apache/cayenne/query/IndirectQuery.java | 174 +-
.../apache/cayenne/query/QualifiedQuery.java | 59 -
.../org/apache/cayenne/query/SQLSelect.java | 655 ++---
.../org/apache/cayenne/query/SelectById.java | 212 ++
.../org/apache/cayenne/query/SelectQuery.java | 1528 +++++-----
.../rop/server/ROPHessianServletTest.java | 196 +-
.../server/ServerRuntimeBuilderTest.java | 89 +-
.../configuration/server/ServerRuntimeTest.java | 227 +-
.../configuration/web/CayenneFilterTest.java | 191 +-
.../cayenne/configuration/web/WebUtilTest.java | 28 +-
.../cayenne/query/MockQualifiedQuery.java | 35 -
.../cayenne/query/QualifiedQueryTest.java | 64 -
.../org/apache/cayenne/query/SQLSelectTest.java | 10 +-
.../apache/cayenne/query/SelectByIdTest.java | 175 ++
.../apache/cayenne/query/SelectQueryTest.java | 36 +
.../org/apache/cayenne/gen/DataMapUtils.java | 35 +-
docs/doc/src/main/resources/RELEASE-NOTES.txt | 1 +
31 files changed, 5506 insertions(+), 5082 deletions(-)
----------------------------------------------------------------------