You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by nt...@apache.org on 2017/06/08 08:24:50 UTC
[2/2] cayenne git commit: Merge remote-tracking branch
'remotes/parent/pr/227' into asf-STABLE-4.0
Merge remote-tracking branch 'remotes/parent/pr/227' into asf-STABLE-4.0
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/14f80ada
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/14f80ada
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/14f80ada
Branch: refs/heads/STABLE-4.0
Commit: 14f80ada6671dd4685e076b9fcaa49ba06e47cf3
Parents: 330f868 347e504
Author: Nikita Timofeev <st...@gmail.com>
Authored: Thu Jun 8 11:24:15 2017 +0300
Committer: Nikita Timofeev <st...@gmail.com>
Committed: Thu Jun 8 11:24:15 2017 +0300
----------------------------------------------------------------------
.../getting-started/src/docbkx/delete.xml | 3 +-
.../getting-started/src/docbkx/select-query.xml | 7 ++---
tutorials/tutorial-rop-client/pom.xml | 7 +++++
.../persistent/client/auto/_Artist.java | 14 ++++-----
tutorials/tutorial-rop-server/pom.xml | 7 +++++
.../cayenne/tutorial/persistent/Artist.java | 20 ++++++-------
.../tutorial/persistent/auto/_Artist.java | 10 +++----
.../persistent/client/auto/_Artist.java | 10 +++----
.../src/main/resources/datamap.map.xml | 2 +-
tutorials/tutorial/pom.xml | 29 +++++++++++++-----
.../java/org/apache/cayenne/tutorial/Main.java | 31 +++++++-------------
.../cayenne/tutorial/persistent/Artist.java | 20 ++++++-------
.../tutorial/persistent/auto/_Artist.java | 10 +++----
.../tutorial/src/main/resources/datamap.map.xml | 2 +-
tutorials/tutorial/src/main/webapp/detail.jsp | 4 ++-
tutorials/tutorial/src/main/webapp/index.jsp | 10 +++----
16 files changed, 99 insertions(+), 87 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cayenne/blob/14f80ada/tutorials/tutorial-rop-client/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cayenne/blob/14f80ada/tutorials/tutorial-rop-server/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cayenne/blob/14f80ada/tutorials/tutorial/pom.xml
----------------------------------------------------------------------