Merge branch 'master' into CAY-2172 # Conflicts: # modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/MigrateAction.java # modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/DbLoaderHelper.java # modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/ModelerDbImportAction.java
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/163a8715 Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/163a8715 Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/163a8715 Branch: refs/heads/master Commit: 163a871542e1cd54c929961cdc52f6fdf6a477ac Parents: 391c564 Author: stariy <stari...@gmail.com> Authored: Wed Dec 14 22:50:00 2016 +0300 Committer: stariy <stari...@gmail.com> Committed: Wed Dec 14 22:50:00 2016 +0300 ---------------------------------------------------------------------- .../java/org/apache/cayenne/modeler/action/DBWizardAction.java | 2 +- .../org/apache/cayenne/modeler/dialog/db/load/DbLoaderContext.java | 2 +- .../org/apache/cayenne/modeler/dialog/db/load/LoaderDelegate.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cayenne/blob/163a8715/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/DBWizardAction.java ---------------------------------------------------------------------- diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/DBWizardAction.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/DBWizardAction.java index 4002d58..25a912f 100644 --- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/DBWizardAction.java +++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/DBWizardAction.java @@ -26,7 +26,7 @@ import java.util.List; import javax.swing.JOptionPane; -import org.apache.cayenne.dbsync.reverse.db.DbLoader; +import org.apache.cayenne.dbsync.reverse.dbload.DbLoader; import org.apache.cayenne.modeler.Application; import org.apache.cayenne.modeler.dialog.db.DataSourceWizard; import org.apache.cayenne.modeler.dialog.db.DbActionOptionsDialog; http://git-wip-us.apache.org/repos/asf/cayenne/blob/163a8715/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/load/DbLoaderContext.java ---------------------------------------------------------------------- diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/load/DbLoaderContext.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/load/DbLoaderContext.java index 6a550a6..65b9b6e 100644 --- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/load/DbLoaderContext.java +++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/load/DbLoaderContext.java @@ -32,7 +32,7 @@ import org.apache.cayenne.dbimport.IncludeTable; import org.apache.cayenne.dbimport.ReverseEngineering; import org.apache.cayenne.dbimport.Schema; import org.apache.cayenne.dbsync.naming.NameBuilder; -import org.apache.cayenne.dbsync.reverse.db.DbLoaderDelegate; +import org.apache.cayenne.dbsync.reverse.dbload.DbLoaderDelegate; import org.apache.cayenne.dbsync.reverse.filters.FiltersConfigBuilder; import org.apache.cayenne.map.DataMap; import org.apache.cayenne.modeler.Application; http://git-wip-us.apache.org/repos/asf/cayenne/blob/163a8715/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/load/LoaderDelegate.java ---------------------------------------------------------------------- diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/load/LoaderDelegate.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/load/LoaderDelegate.java index 92043fc..a49f3b6 100644 --- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/load/LoaderDelegate.java +++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/load/LoaderDelegate.java @@ -20,7 +20,7 @@ package org.apache.cayenne.modeler.dialog.db.load; import org.apache.cayenne.CayenneRuntimeException; -import org.apache.cayenne.dbsync.reverse.db.DefaultDbLoaderDelegate; +import org.apache.cayenne.dbsync.reverse.dbload.DefaultDbLoaderDelegate; import org.apache.cayenne.map.DbEntity; import org.apache.cayenne.map.DbRelationship; import org.apache.cayenne.map.event.EntityEvent;
