cayenne-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aadamc...@apache.org
Subject [4/4] cayenne git commit: Merge branch '62'
Date Sat, 17 Jan 2015 08:05:46 GMT
Merge branch '62'


Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/c8ff4355
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/c8ff4355
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/c8ff4355

Branch: refs/heads/master
Commit: c8ff4355fa0d33480f80f341d3c593eb6794a2ee
Parents: e2069ef aaafe11
Author: aadamchik <aadamchik@apache.org>
Authored: Fri Jan 16 09:43:11 2015 +0300
Committer: aadamchik <aadamchik@apache.org>
Committed: Fri Jan 16 09:43:11 2015 +0300

----------------------------------------------------------------------
 .../org/apache/cayenne/access/DbLoader.java     |  69 ++++-----
 .../access/loader/LoggingDbLoaderDelegate.java  |  20 +--
 .../org/apache/cayenne/map/DbRelationship.java  |  40 ++++--
 .../org/apache/cayenne/map/Relationship.java    |   6 +-
 .../apache/cayenne/map/naming/ExportedKey.java  |  18 ++-
 .../merge/DropRelationshipToModelIT.java        |   7 +-
 .../apache/cayenne/merge/MergerFactoryIT.java   |  13 +-
 cayenne-tools/pom.xml                           |   5 +
 .../cayenne/tools/CayenneGeneratorTask.java     |  11 +-
 .../cayenne/tools/dbimport/DbImportAction.java  |  30 ++--
 .../dbimport/DbImportDbLoaderDelegate.java      |   1 -
 .../src/main/resources/reverseEngineering.xsd   | 139 +++++++++++++++++++
 .../cayenne/tools/DbImporterMojoTest.java       |   4 +
 .../cayenne/tools/dbimport/testOneToOne-pom.xml |  39 ++++++
 .../tools/dbimport/testOneToOne.map.xml-result  |  58 ++++++++
 .../cayenne/tools/dbimport/testOneToOne.sql     |  24 ++++
 16 files changed, 400 insertions(+), 84 deletions(-)
----------------------------------------------------------------------



Mime
View raw message