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:51 UTC
[06/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/f657579b
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/f657579b
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/f657579b
Branch: refs/heads/master
Commit: f657579b4c7fb2065f9e6cc61ee681d6aa595b74
Parents: 5438bce 9bcf298
Author: alexkolonitsky <Al...@gmail.com>
Authored: Wed Sep 24 16:43:38 2014 +0300
Committer: alexkolonitsky <Al...@gmail.com>
Committed: Wed Sep 24 16:43:38 2014 +0300
----------------------------------------------------------------------
assembly/pom.xml | 40 ++--
.../cayenne/project/FileProjectSaver.java | 88 ++++---
.../org/apache/cayenne/project/Project.java | 79 ++++---
.../java/org/apache/cayenne/BaseContext.java | 4 +-
.../main/java/org/apache/cayenne/Cayenne.java | 12 +-
.../apache/cayenne/ResultIteratorCallback.java | 6 +-
.../apache/cayenne/access/DataContextTest.java | 59 +++--
.../cayenne/merge/DropColumnToModelTest.java | 12 +-
.../merge/DropRelationshipToModelTest.java | 9 +-
docs/doc/src/main/resources/RELEASE-NOTES.txt | 4 +
modeler/cayenne-modeler-generic/pom.xml | 49 ++--
modeler/cayenne-modeler-mac-ext/pom.xml | 8 +
modeler/cayenne-modeler-mac-legacy/pom.xml | 59 ++---
modeler/cayenne-modeler-mac/pom.xml | 58 ++---
modeler/cayenne-modeler-win/pom.xml | 57 +++--
.../modeler/action/CreateDataMapAction.java | 14 +-
.../modeler/action/CreateDbEntityAction.java | 114 +++++-----
.../modeler/action/CreateNodeAction.java | 149 ++++++------
.../modeler/action/CreateObjEntityAction.java | 228 +++++++++----------
.../action/CreateObjEntityListenerAction.java | 147 ++++++------
.../modeler/action/CreateProcedureAction.java | 87 ++++---
.../action/CreateProcedureParameterAction.java | 105 ++++-----
.../action/CreateRelationshipAction.java | 210 ++++++++---------
.../modeler/action/DbEntitySyncAction.java | 104 ++++-----
.../cayenne/modeler/action/FindAction.java | 43 +++-
.../cayenne/modeler/action/RemoveAction.java | 24 +-
.../modeler/cayennemodeler-strings.properties | 2 +-
modeler/pom.xml | 31 +--
pom.xml | 22 +-
29 files changed, 919 insertions(+), 905 deletions(-)
----------------------------------------------------------------------