You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by aa...@apache.org on 2016/11/03 17:53:36 UTC
[6/6] cayenne git commit: Merge branch '116'
Merge branch '116'
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/4d7433bf
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/4d7433bf
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/4d7433bf
Branch: refs/heads/master
Commit: 4d7433bff239e99089fe3c72d35f1361450a4255
Parents: 0e1912c b292c42
Author: Andrus Adamchik <an...@objectstyle.com>
Authored: Thu Nov 3 20:47:14 2016 +0300
Committer: Andrus Adamchik <an...@objectstyle.com>
Committed: Thu Nov 3 20:49:53 2016 +0300
----------------------------------------------------------------------
.../cayenne/dbsync/reverse/db/DbLoader.java | 6 ++--
.../java/org/apache/cayenne/map/Procedure.java | 7 +++++
.../tools/dbimport/DefaultDbImportAction.java | 31 ++++++++++++++++++++
docs/doc/src/main/resources/RELEASE-NOTES.txt | 1 +
4 files changed, 42 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cayenne/blob/4d7433bf/cayenne-tools/src/main/java/org/apache/cayenne/tools/dbimport/DefaultDbImportAction.java
----------------------------------------------------------------------
diff --cc cayenne-tools/src/main/java/org/apache/cayenne/tools/dbimport/DefaultDbImportAction.java
index 4d6fffb,e417f2a..1e681a9
--- a/cayenne-tools/src/main/java/org/apache/cayenne/tools/dbimport/DefaultDbImportAction.java
+++ b/cayenne-tools/src/main/java/org/apache/cayenne/tools/dbimport/DefaultDbImportAction.java
@@@ -36,7 -36,8 +36,9 @@@ import org.apache.cayenne.dbsync.merge.
import org.apache.cayenne.dbsync.naming.ObjectNameGenerator;
import org.apache.cayenne.dbsync.reverse.db.DbLoader;
import org.apache.cayenne.dbsync.reverse.db.DbLoaderConfiguration;
+import org.apache.cayenne.dbsync.reverse.filters.CatalogFilter;
+ import org.apache.cayenne.dbsync.reverse.filters.FiltersConfig;
+ import org.apache.cayenne.dbsync.reverse.filters.PatternFilter;
import org.apache.cayenne.di.Inject;
import org.apache.cayenne.map.DataMap;
import org.apache.cayenne.map.EntityResolver;
http://git-wip-us.apache.org/repos/asf/cayenne/blob/4d7433bf/docs/doc/src/main/resources/RELEASE-NOTES.txt
----------------------------------------------------------------------