Repository: cayenne Updated Branches: refs/heads/master b1b48514c -> c95cbc7e0
renaming CayenneDbSyncModule to just DbSyncModule for consistency with other modules Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/705d5b6e Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/705d5b6e Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/705d5b6e Branch: refs/heads/master Commit: 705d5b6e9bb91201f8302b9a80bd73b0b37ccf3f Parents: b1b4851 Author: Andrus Adamchik <and...@objectstyle.com> Authored: Sat Nov 5 11:08:15 2016 +0300 Committer: Andrus Adamchik <and...@objectstyle.com> Committed: Sat Nov 5 11:08:15 2016 +0300 ---------------------------------------------------------------------- .../cayenne/dbsync/CayenneDbSyncModule.java | 68 -------------------- .../org/apache/cayenne/dbsync/DbSyncModule.java | 68 ++++++++++++++++++++ .../factory/MergerTokenFactoryProvider.java | 4 +- .../unit/DbSyncServerRuntimeProvider.java | 4 +- .../apache/cayenne/tools/DbGeneratorTask.java | 4 +- .../apache/cayenne/tools/DbImporterTask.java | 4 +- .../cayenne/tools/dbimport/DbImportModule.java | 5 +- .../tools/dbimport/DbImportModuleTest.java | 4 +- .../dbimport/DefaultDbImportActionTest.java | 4 +- .../java/org/apache/cayenne/modeler/Main.java | 4 +- .../modeler/dialog/db/DbLoaderHelper.java | 6 +- .../apache/cayenne/tools/DbGeneratorMojo.java | 4 +- .../apache/cayenne/tools/DbImporterMojo.java | 4 +- 13 files changed, 93 insertions(+), 90 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cayenne/blob/705d5b6e/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/CayenneDbSyncModule.java ---------------------------------------------------------------------- diff --git a/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/CayenneDbSyncModule.java b/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/CayenneDbSyncModule.java deleted file mode 100644 index cbdcd0e..0000000 --- a/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/CayenneDbSyncModule.java +++ /dev/null @@ -1,68 +0,0 @@ -package org.apache.cayenne.dbsync; - -import org.apache.cayenne.dba.db2.DB2Adapter; -import org.apache.cayenne.dba.derby.DerbyAdapter; -import org.apache.cayenne.dba.firebird.FirebirdAdapter; -import org.apache.cayenne.dba.h2.H2Adapter; -import org.apache.cayenne.dba.hsqldb.HSQLDBAdapter; -import org.apache.cayenne.dba.ingres.IngresAdapter; -import org.apache.cayenne.dba.mysql.MySQLAdapter; -import org.apache.cayenne.dba.openbase.OpenBaseAdapter; -import org.apache.cayenne.dba.oracle.Oracle8Adapter; -import org.apache.cayenne.dba.oracle.OracleAdapter; -import org.apache.cayenne.dba.postgres.PostgresAdapter; -import org.apache.cayenne.dba.sqlserver.SQLServerAdapter; -import org.apache.cayenne.dba.sybase.SybaseAdapter; -import org.apache.cayenne.dbsync.merge.factory.MergerTokenFactoryProvider; -import org.apache.cayenne.dbsync.merge.factory.DB2MergerTokenFactory; -import org.apache.cayenne.dbsync.merge.factory.DefaultMergerTokenFactory; -import org.apache.cayenne.dbsync.merge.factory.DerbyMergerTokenFactory; -import org.apache.cayenne.dbsync.merge.factory.FirebirdMergerTokenFactory; -import org.apache.cayenne.dbsync.merge.factory.H2MergerTokenFactory; -import org.apache.cayenne.dbsync.merge.factory.HSQLMergerTokenFactory; -import org.apache.cayenne.dbsync.merge.factory.IngresMergerTokenFactory; -import org.apache.cayenne.dbsync.merge.factory.MergerTokenFactory; -import org.apache.cayenne.dbsync.merge.factory.MySQLMergerTokenFactory; -import org.apache.cayenne.dbsync.merge.factory.OpenBaseMergerTokenFactory; -import org.apache.cayenne.dbsync.merge.factory.OracleMergerTokenFactory; -import org.apache.cayenne.dbsync.merge.factory.PostgresMergerTokenFactory; -import org.apache.cayenne.dbsync.merge.factory.SQLServerMergerTokenFactory; -import org.apache.cayenne.dbsync.merge.factory.SybaseMergerTokenFactory; -import org.apache.cayenne.di.Binder; -import org.apache.cayenne.di.Module; - -/** - * @since 4.0 - */ -public class CayenneDbSyncModule implements Module { - - /** - * A DI container key for the Map<String, String> storing properties - * used by built-in Cayenne service. - */ - public static final String MERGER_FACTORIES_MAP = "cayenne.dbsync.mergerfactories"; - - @Override - public void configure(Binder binder) { - - // default and per adapter merger factories... - binder.bind(MergerTokenFactory.class).to(DefaultMergerTokenFactory.class); - binder.bindMap(MERGER_FACTORIES_MAP) - .put(DB2Adapter.class.getName(), DB2MergerTokenFactory.class) - .put(DerbyAdapter.class.getName(), DerbyMergerTokenFactory.class) - .put(FirebirdAdapter.class.getName(), FirebirdMergerTokenFactory.class) - .put(H2Adapter.class.getName(), H2MergerTokenFactory.class) - .put(HSQLDBAdapter.class.getName(), HSQLMergerTokenFactory.class) - .put(IngresAdapter.class.getName(), IngresMergerTokenFactory.class) - .put(MySQLAdapter.class.getName(), MySQLMergerTokenFactory.class) - .put(OpenBaseAdapter.class.getName(), OpenBaseMergerTokenFactory.class) - .put(OracleAdapter.class.getName(), OracleMergerTokenFactory.class) - .put(Oracle8Adapter.class.getName(), OracleMergerTokenFactory.class) - .put(PostgresAdapter.class.getName(), PostgresMergerTokenFactory.class) - .put(SQLServerAdapter.class.getName(), SQLServerMergerTokenFactory.class) - .put(SybaseAdapter.class.getName(), SybaseMergerTokenFactory.class); - - binder.bind(MergerTokenFactoryProvider.class).to(MergerTokenFactoryProvider.class); - - } -} http://git-wip-us.apache.org/repos/asf/cayenne/blob/705d5b6e/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/DbSyncModule.java ---------------------------------------------------------------------- diff --git a/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/DbSyncModule.java b/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/DbSyncModule.java new file mode 100644 index 0000000..8878e75 --- /dev/null +++ b/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/DbSyncModule.java @@ -0,0 +1,68 @@ +package org.apache.cayenne.dbsync; + +import org.apache.cayenne.dba.db2.DB2Adapter; +import org.apache.cayenne.dba.derby.DerbyAdapter; +import org.apache.cayenne.dba.firebird.FirebirdAdapter; +import org.apache.cayenne.dba.h2.H2Adapter; +import org.apache.cayenne.dba.hsqldb.HSQLDBAdapter; +import org.apache.cayenne.dba.ingres.IngresAdapter; +import org.apache.cayenne.dba.mysql.MySQLAdapter; +import org.apache.cayenne.dba.openbase.OpenBaseAdapter; +import org.apache.cayenne.dba.oracle.Oracle8Adapter; +import org.apache.cayenne.dba.oracle.OracleAdapter; +import org.apache.cayenne.dba.postgres.PostgresAdapter; +import org.apache.cayenne.dba.sqlserver.SQLServerAdapter; +import org.apache.cayenne.dba.sybase.SybaseAdapter; +import org.apache.cayenne.dbsync.merge.factory.MergerTokenFactoryProvider; +import org.apache.cayenne.dbsync.merge.factory.DB2MergerTokenFactory; +import org.apache.cayenne.dbsync.merge.factory.DefaultMergerTokenFactory; +import org.apache.cayenne.dbsync.merge.factory.DerbyMergerTokenFactory; +import org.apache.cayenne.dbsync.merge.factory.FirebirdMergerTokenFactory; +import org.apache.cayenne.dbsync.merge.factory.H2MergerTokenFactory; +import org.apache.cayenne.dbsync.merge.factory.HSQLMergerTokenFactory; +import org.apache.cayenne.dbsync.merge.factory.IngresMergerTokenFactory; +import org.apache.cayenne.dbsync.merge.factory.MergerTokenFactory; +import org.apache.cayenne.dbsync.merge.factory.MySQLMergerTokenFactory; +import org.apache.cayenne.dbsync.merge.factory.OpenBaseMergerTokenFactory; +import org.apache.cayenne.dbsync.merge.factory.OracleMergerTokenFactory; +import org.apache.cayenne.dbsync.merge.factory.PostgresMergerTokenFactory; +import org.apache.cayenne.dbsync.merge.factory.SQLServerMergerTokenFactory; +import org.apache.cayenne.dbsync.merge.factory.SybaseMergerTokenFactory; +import org.apache.cayenne.di.Binder; +import org.apache.cayenne.di.Module; + +/** + * @since 4.0 + */ +public class DbSyncModule implements Module { + + /** + * A DI container key for the Map<String, String> storing properties + * used by built-in Cayenne service. + */ + public static final String MERGER_FACTORIES_MAP = "cayenne.dbsync.mergerfactories"; + + @Override + public void configure(Binder binder) { + + // default and per adapter merger factories... + binder.bind(MergerTokenFactory.class).to(DefaultMergerTokenFactory.class); + binder.bindMap(MERGER_FACTORIES_MAP) + .put(DB2Adapter.class.getName(), DB2MergerTokenFactory.class) + .put(DerbyAdapter.class.getName(), DerbyMergerTokenFactory.class) + .put(FirebirdAdapter.class.getName(), FirebirdMergerTokenFactory.class) + .put(H2Adapter.class.getName(), H2MergerTokenFactory.class) + .put(HSQLDBAdapter.class.getName(), HSQLMergerTokenFactory.class) + .put(IngresAdapter.class.getName(), IngresMergerTokenFactory.class) + .put(MySQLAdapter.class.getName(), MySQLMergerTokenFactory.class) + .put(OpenBaseAdapter.class.getName(), OpenBaseMergerTokenFactory.class) + .put(OracleAdapter.class.getName(), OracleMergerTokenFactory.class) + .put(Oracle8Adapter.class.getName(), OracleMergerTokenFactory.class) + .put(PostgresAdapter.class.getName(), PostgresMergerTokenFactory.class) + .put(SQLServerAdapter.class.getName(), SQLServerMergerTokenFactory.class) + .put(SybaseAdapter.class.getName(), SybaseMergerTokenFactory.class); + + binder.bind(MergerTokenFactoryProvider.class).to(MergerTokenFactoryProvider.class); + + } +} http://git-wip-us.apache.org/repos/asf/cayenne/blob/705d5b6e/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/merge/factory/MergerTokenFactoryProvider.java ---------------------------------------------------------------------- diff --git a/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/merge/factory/MergerTokenFactoryProvider.java b/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/merge/factory/MergerTokenFactoryProvider.java index 8d5b573..3dcb397 100644 --- a/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/merge/factory/MergerTokenFactoryProvider.java +++ b/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/merge/factory/MergerTokenFactoryProvider.java @@ -19,7 +19,7 @@ package org.apache.cayenne.dbsync.merge.factory; import org.apache.cayenne.dba.PerAdapterProvider; -import org.apache.cayenne.dbsync.CayenneDbSyncModule; +import org.apache.cayenne.dbsync.DbSyncModule; import org.apache.cayenne.di.Inject; import java.util.Map; @@ -29,7 +29,7 @@ import java.util.Map; */ public class MergerTokenFactoryProvider extends PerAdapterProvider<MergerTokenFactory> { - public MergerTokenFactoryProvider(@Inject(CayenneDbSyncModule.MERGER_FACTORIES_MAP) Map<String, + public MergerTokenFactoryProvider(@Inject(DbSyncModule.MERGER_FACTORIES_MAP) Map<String, MergerTokenFactory> perAdapterValues, @Inject MergerTokenFactory defaultValue) { super(perAdapterValues, defaultValue); } http://git-wip-us.apache.org/repos/asf/cayenne/blob/705d5b6e/cayenne-dbsync/src/test/java/org/apache/cayenne/dbsync/unit/DbSyncServerRuntimeProvider.java ---------------------------------------------------------------------- diff --git a/cayenne-dbsync/src/test/java/org/apache/cayenne/dbsync/unit/DbSyncServerRuntimeProvider.java b/cayenne-dbsync/src/test/java/org/apache/cayenne/dbsync/unit/DbSyncServerRuntimeProvider.java index 34454d7..32b3b57 100644 --- a/cayenne-dbsync/src/test/java/org/apache/cayenne/dbsync/unit/DbSyncServerRuntimeProvider.java +++ b/cayenne-dbsync/src/test/java/org/apache/cayenne/dbsync/unit/DbSyncServerRuntimeProvider.java @@ -19,7 +19,7 @@ package org.apache.cayenne.dbsync.unit; import org.apache.cayenne.dba.DbAdapter; -import org.apache.cayenne.dbsync.CayenneDbSyncModule; +import org.apache.cayenne.dbsync.DbSyncModule; import org.apache.cayenne.di.Inject; import org.apache.cayenne.di.Module; import org.apache.cayenne.di.Provider; @@ -44,7 +44,7 @@ public class DbSyncServerRuntimeProvider extends ServerRuntimeProvider { protected Collection<? extends Module> getExtraModules() { Collection<Module> modules = new ArrayList<>(); modules.addAll(super.getExtraModules()); - modules.add(new CayenneDbSyncModule()); + modules.add(new DbSyncModule()); return modules; } } http://git-wip-us.apache.org/repos/asf/cayenne/blob/705d5b6e/cayenne-tools/src/main/java/org/apache/cayenne/tools/DbGeneratorTask.java ---------------------------------------------------------------------- diff --git a/cayenne-tools/src/main/java/org/apache/cayenne/tools/DbGeneratorTask.java b/cayenne-tools/src/main/java/org/apache/cayenne/tools/DbGeneratorTask.java index faa3653..2319212 100644 --- a/cayenne-tools/src/main/java/org/apache/cayenne/tools/DbGeneratorTask.java +++ b/cayenne-tools/src/main/java/org/apache/cayenne/tools/DbGeneratorTask.java @@ -22,7 +22,7 @@ package org.apache.cayenne.tools; import org.apache.cayenne.access.DbGenerator; import org.apache.cayenne.datasource.DriverDataSource; import org.apache.cayenne.dba.DbAdapter; -import org.apache.cayenne.dbsync.CayenneDbSyncModule; +import org.apache.cayenne.dbsync.DbSyncModule; import org.apache.cayenne.di.DIBootstrap; import org.apache.cayenne.di.Injector; import org.apache.cayenne.log.NoopJdbcEventLogger; @@ -69,7 +69,7 @@ public class DbGeneratorTask extends CayenneTask { validateAttributes(); ClassLoader loader = null; - Injector injector = DIBootstrap.createInjector(new CayenneDbSyncModule(), new ToolsModule(logger)); + Injector injector = DIBootstrap.createInjector(new DbSyncModule(), new ToolsModule(logger)); try { loader = Thread.currentThread().getContextClassLoader(); Thread.currentThread().setContextClassLoader(DbGeneratorTask.class.getClassLoader()); http://git-wip-us.apache.org/repos/asf/cayenne/blob/705d5b6e/cayenne-tools/src/main/java/org/apache/cayenne/tools/DbImporterTask.java ---------------------------------------------------------------------- diff --git a/cayenne-tools/src/main/java/org/apache/cayenne/tools/DbImporterTask.java b/cayenne-tools/src/main/java/org/apache/cayenne/tools/DbImporterTask.java index 48eb93c..d7e04ec 100644 --- a/cayenne-tools/src/main/java/org/apache/cayenne/tools/DbImporterTask.java +++ b/cayenne-tools/src/main/java/org/apache/cayenne/tools/DbImporterTask.java @@ -24,7 +24,7 @@ import org.apache.cayenne.configuration.server.DbAdapterFactory; import org.apache.cayenne.conn.DataSourceInfo; import org.apache.cayenne.dba.DbAdapter; import org.apache.cayenne.dbimport.*; -import org.apache.cayenne.dbsync.CayenneDbSyncModule; +import org.apache.cayenne.dbsync.DbSyncModule; import org.apache.cayenne.dbsync.naming.DefaultObjectNameGenerator; import org.apache.cayenne.dbsync.reverse.filters.FiltersConfigBuilder; import org.apache.cayenne.di.DIBootstrap; @@ -111,7 +111,7 @@ public class DbImporterTask extends Task { config.setSkipPrimaryKeyLoading(reverseEngineering.getSkipPrimaryKeyLoading()); config.setTableTypes(reverseEngineering.getTableTypes()); - Injector injector = DIBootstrap.createInjector(new CayenneDbSyncModule(), new ToolsModule(logger), new DbImportModule()); + Injector injector = DIBootstrap.createInjector(new DbSyncModule(), new ToolsModule(logger), new DbImportModule()); validateDbImportConfiguration(config, injector); http://git-wip-us.apache.org/repos/asf/cayenne/blob/705d5b6e/cayenne-tools/src/main/java/org/apache/cayenne/tools/dbimport/DbImportModule.java ---------------------------------------------------------------------- diff --git a/cayenne-tools/src/main/java/org/apache/cayenne/tools/dbimport/DbImportModule.java b/cayenne-tools/src/main/java/org/apache/cayenne/tools/dbimport/DbImportModule.java index 754071e..93b5f6b 100644 --- a/cayenne-tools/src/main/java/org/apache/cayenne/tools/dbimport/DbImportModule.java +++ b/cayenne-tools/src/main/java/org/apache/cayenne/tools/dbimport/DbImportModule.java @@ -20,6 +20,7 @@ package org.apache.cayenne.tools.dbimport; import org.apache.cayenne.configuration.ConfigurationNameMapper; import org.apache.cayenne.configuration.DefaultConfigurationNameMapper; +import org.apache.cayenne.dbsync.DbSyncModule; import org.apache.cayenne.di.Binder; import org.apache.cayenne.di.Module; import org.apache.cayenne.map.MapLoader; @@ -29,7 +30,7 @@ import org.apache.cayenne.tools.configuration.ToolsModule; /** * A DI module that bootstraps {@link DbImportAction}. Should be used in - * conjunction with {@link ToolsModule} and {@link org.apache.cayenne.dbsync.CayenneDbSyncModule}. + * conjunction with {@link ToolsModule} and {@link DbSyncModule}. * * @since 4.0 */ @@ -41,4 +42,6 @@ public class DbImportModule implements Module { binder.bind(ConfigurationNameMapper.class).to(DefaultConfigurationNameMapper.class); binder.bind(MapLoader.class).to(MapLoader.class); } + + } http://git-wip-us.apache.org/repos/asf/cayenne/blob/705d5b6e/cayenne-tools/src/test/java/org/apache/cayenne/tools/dbimport/DbImportModuleTest.java ---------------------------------------------------------------------- diff --git a/cayenne-tools/src/test/java/org/apache/cayenne/tools/dbimport/DbImportModuleTest.java b/cayenne-tools/src/test/java/org/apache/cayenne/tools/dbimport/DbImportModuleTest.java index 1e34d4e..5e3e36a 100644 --- a/cayenne-tools/src/test/java/org/apache/cayenne/tools/dbimport/DbImportModuleTest.java +++ b/cayenne-tools/src/test/java/org/apache/cayenne/tools/dbimport/DbImportModuleTest.java @@ -18,7 +18,7 @@ ****************************************************************/ package org.apache.cayenne.tools.dbimport; -import org.apache.cayenne.dbsync.CayenneDbSyncModule; +import org.apache.cayenne.dbsync.DbSyncModule; import org.apache.cayenne.di.DIBootstrap; import org.apache.cayenne.di.Injector; import org.apache.cayenne.tools.configuration.ToolsModule; @@ -34,7 +34,7 @@ public class DbImportModuleTest { public void testModuleContents() { Log log = mock(Log.class); - Injector i = DIBootstrap.createInjector(new CayenneDbSyncModule(), new ToolsModule(log), new DbImportModule()); + Injector i = DIBootstrap.createInjector(new DbSyncModule(), new ToolsModule(log), new DbImportModule()); assertTrue(i.getInstance(DbImportAction.class) instanceof DbImportAction); } } http://git-wip-us.apache.org/repos/asf/cayenne/blob/705d5b6e/cayenne-tools/src/test/java/org/apache/cayenne/tools/dbimport/DefaultDbImportActionTest.java ---------------------------------------------------------------------- diff --git a/cayenne-tools/src/test/java/org/apache/cayenne/tools/dbimport/DefaultDbImportActionTest.java b/cayenne-tools/src/test/java/org/apache/cayenne/tools/dbimport/DefaultDbImportActionTest.java index 4d16193..e55fd89 100644 --- a/cayenne-tools/src/test/java/org/apache/cayenne/tools/dbimport/DefaultDbImportActionTest.java +++ b/cayenne-tools/src/test/java/org/apache/cayenne/tools/dbimport/DefaultDbImportActionTest.java @@ -23,7 +23,7 @@ import org.apache.cayenne.configuration.DataNodeDescriptor; import org.apache.cayenne.configuration.server.DataSourceFactory; import org.apache.cayenne.configuration.server.DbAdapterFactory; import org.apache.cayenne.dba.DbAdapter; -import org.apache.cayenne.dbsync.CayenneDbSyncModule; +import org.apache.cayenne.dbsync.DbSyncModule; import org.apache.cayenne.dbsync.filter.NamePatternMatcher; import org.apache.cayenne.dbsync.merge.AddColumnToDb; import org.apache.cayenne.dbsync.merge.AddRelationshipToDb; @@ -307,7 +307,7 @@ public class DefaultDbImportActionTest { @Test public void testSaveLoaded() throws Exception { Log log = mock(Log.class); - Injector i = DIBootstrap.createInjector(new CayenneDbSyncModule(), new ToolsModule(log), new DbImportModule()); + Injector i = DIBootstrap.createInjector(new DbSyncModule(), new ToolsModule(log), new DbImportModule()); DefaultDbImportAction action = (DefaultDbImportAction) i.getInstance(DbImportAction.class); http://git-wip-us.apache.org/repos/asf/cayenne/blob/705d5b6e/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/Main.java ---------------------------------------------------------------------- diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/Main.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/Main.java index 838f736..1143d74 100644 --- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/Main.java +++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/Main.java @@ -20,7 +20,7 @@ package org.apache.cayenne.modeler; import org.apache.cayenne.configuration.server.ServerModule; -import org.apache.cayenne.dbsync.CayenneDbSyncModule; +import org.apache.cayenne.dbsync.DbSyncModule; import org.apache.cayenne.di.DIBootstrap; import org.apache.cayenne.di.Injector; import org.apache.cayenne.di.Module; @@ -105,7 +105,7 @@ public class Main { protected Collection<Module> appendModules(Collection<Module> modules) { modules.add(new ServerModule("CayenneModeler")); modules.add(new CayenneProjectModule()); - modules.add(new CayenneDbSyncModule()); + modules.add(new DbSyncModule()); modules.add(new CayenneModelerModule()); return modules; http://git-wip-us.apache.org/repos/asf/cayenne/blob/705d5b6e/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/DbLoaderHelper.java ---------------------------------------------------------------------- diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/DbLoaderHelper.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/DbLoaderHelper.java index b14f71c..787f232 100644 --- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/DbLoaderHelper.java +++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/DbLoaderHelper.java @@ -27,7 +27,7 @@ import org.apache.cayenne.dbimport.IncludeProcedure; import org.apache.cayenne.dbimport.IncludeTable; import org.apache.cayenne.dbimport.ReverseEngineering; import org.apache.cayenne.dbimport.Schema; -import org.apache.cayenne.dbsync.CayenneDbSyncModule; +import org.apache.cayenne.dbsync.DbSyncModule; import org.apache.cayenne.dbsync.naming.NameBuilder; import org.apache.cayenne.dbsync.reverse.db.DbLoader; import org.apache.cayenne.dbsync.reverse.db.DefaultDbLoaderDelegate; @@ -369,8 +369,8 @@ public class DbLoaderHelper { ModelerDbImportAction importAction = new ModelerDbImportAction(LOGGER, DbLoaderHelper.this); // TODO: we can keep all these things in the Modeler Injector instead of creating a new one? - // we already have CayenneDbSyncModule in there - Injector injector = DIBootstrap.createInjector(new CayenneDbSyncModule(), new ToolsModule(LOGGER), new DbImportModule()); + // we already have DbSyncModule in there + Injector injector = DIBootstrap.createInjector(new DbSyncModule(), new ToolsModule(LOGGER), new DbImportModule()); injector.injectMembers(importAction); try { importAction.execute(config); http://git-wip-us.apache.org/repos/asf/cayenne/blob/705d5b6e/plugins/maven-cayenne-plugin/src/main/java/org/apache/cayenne/tools/DbGeneratorMojo.java ---------------------------------------------------------------------- diff --git a/plugins/maven-cayenne-plugin/src/main/java/org/apache/cayenne/tools/DbGeneratorMojo.java b/plugins/maven-cayenne-plugin/src/main/java/org/apache/cayenne/tools/DbGeneratorMojo.java index 99a649f..72c524f 100644 --- a/plugins/maven-cayenne-plugin/src/main/java/org/apache/cayenne/tools/DbGeneratorMojo.java +++ b/plugins/maven-cayenne-plugin/src/main/java/org/apache/cayenne/tools/DbGeneratorMojo.java @@ -23,7 +23,7 @@ import org.apache.cayenne.access.DbGenerator; import org.apache.cayenne.datasource.DriverDataSource; import org.apache.cayenne.dba.DbAdapter; import org.apache.cayenne.dba.JdbcAdapter; -import org.apache.cayenne.dbsync.CayenneDbSyncModule; +import org.apache.cayenne.dbsync.DbSyncModule; import org.apache.cayenne.di.AdhocObjectFactory; import org.apache.cayenne.di.DIBootstrap; import org.apache.cayenne.di.Injector; @@ -142,7 +142,7 @@ public class DbGeneratorMojo extends AbstractMojo { public void execute() throws MojoExecutionException, MojoFailureException { Log logger = new MavenLogger(this); - Injector injector = DIBootstrap.createInjector(new CayenneDbSyncModule(), new ToolsModule(logger)); + Injector injector = DIBootstrap.createInjector(new DbSyncModule(), new ToolsModule(logger)); AdhocObjectFactory objectFactory = injector.getInstance(AdhocObjectFactory.class); logger.info(String.format("connection settings - [driver: %s, url: %s, username: %s]", driver, url, username)); http://git-wip-us.apache.org/repos/asf/cayenne/blob/705d5b6e/plugins/maven-cayenne-plugin/src/main/java/org/apache/cayenne/tools/DbImporterMojo.java ---------------------------------------------------------------------- diff --git a/plugins/maven-cayenne-plugin/src/main/java/org/apache/cayenne/tools/DbImporterMojo.java b/plugins/maven-cayenne-plugin/src/main/java/org/apache/cayenne/tools/DbImporterMojo.java index dc4321f..94bd170 100644 --- a/plugins/maven-cayenne-plugin/src/main/java/org/apache/cayenne/tools/DbImporterMojo.java +++ b/plugins/maven-cayenne-plugin/src/main/java/org/apache/cayenne/tools/DbImporterMojo.java @@ -23,7 +23,7 @@ import org.apache.cayenne.configuration.server.DataSourceFactory; import org.apache.cayenne.configuration.server.DbAdapterFactory; import org.apache.cayenne.dba.DbAdapter; import org.apache.cayenne.dbimport.ReverseEngineering; -import org.apache.cayenne.dbsync.CayenneDbSyncModule; +import org.apache.cayenne.dbsync.DbSyncModule; import org.apache.cayenne.dbsync.reverse.filters.FiltersConfigBuilder; import org.apache.cayenne.di.DIBootstrap; import org.apache.cayenne.di.Injector; @@ -146,7 +146,7 @@ public class DbImporterMojo extends AbstractMojo { Log logger = new MavenLogger(this); DbImportConfiguration config = createConfig(logger); - Injector injector = DIBootstrap.createInjector(new CayenneDbSyncModule(), new ToolsModule(logger), new DbImportModule()); + Injector injector = DIBootstrap.createInjector(new DbSyncModule(), new ToolsModule(logger), new DbImportModule()); validateDbImportConfiguration(config, injector);
