You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by sk...@apache.org on 2016/11/16 18:46:02 UTC
[7/9] cayenne git commit: Merge branch 'master' into
modeler-reverseengineering-added-relation-fix
Merge branch 'master' into modeler-reverseengineering-added-relation-fix
# Conflicts:
# modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/MergerOptions.java
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/8c5985ee
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/8c5985ee
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/8c5985ee
Branch: refs/heads/master
Commit: 8c5985ee2f938d03b9ce55c5a24eec9485a7d54b
Parents: 2eb2172 56906f0
Author: Nikita Timofeev <st...@gmail.com>
Authored: Tue Nov 15 10:38:57 2016 +0300
Committer: Nikita Timofeev <st...@gmail.com>
Committed: Tue Nov 15 10:38:57 2016 +0300
----------------------------------------------------------------------
.../cayenne/dbsync/CayenneDbSyncModule.java | 68 --------
.../org/apache/cayenne/dbsync/DbSyncModule.java | 68 ++++++++
.../dbsync/merge/EntityMergeSupport.java | 61 ++++++-
.../cayenne/dbsync/merge/MergerContext.java | 3 +-
.../factory/MergerTokenFactoryProvider.java | 8 +-
.../dbsync/naming/DbEntityNameStemmer.java | 29 ++++
.../naming/DefaultObjectNameGenerator.java | 26 ++-
.../cayenne/dbsync/naming/NoStemStemmer.java | 39 +++++
.../dbsync/naming/ObjectNameGenerator.java | 11 +-
.../cayenne/dbsync/naming/PatternStemmer.java | 46 +++++
.../cayenne/dbsync/reverse/db/DbLoader.java | 59 +++----
.../dbsync/merge/EntityMergeSupportIT.java | 4 +-
.../apache/cayenne/dbsync/merge/MergeCase.java | 3 +-
.../naming/DefaultObjectNameGeneratorTest.java | 3 +-
.../dbsync/naming/PatternStemmerTest.java | 61 +++++++
.../cayenne/dbsync/reverse/db/DbLoaderIT.java | 3 +-
.../unit/DbSyncServerRuntimeProvider.java | 4 +-
.../project/validation/EJBQLQueryValidator.java | 9 +-
.../validation/EJBQLStatementValidator.java | 34 ++--
.../java/org/apache/cayenne/query/Ordering.java | 5 +-
.../org/apache/cayenne/dba/firebird/types.xml | 10 +-
.../org/apache/cayenne/query/OrderingTest.java | 62 +++++++
.../apache/cayenne/tools/DbGeneratorTask.java | 4 +-
.../apache/cayenne/tools/DbImporterTask.java | 23 ++-
.../tools/dbimport/DbImportConfiguration.java | 52 ++++--
.../cayenne/tools/dbimport/DbImportModule.java | 5 +-
.../tools/dbimport/DefaultDbImportAction.java | 54 +++++-
.../tools/dbimport/DbImportModuleTest.java | 4 +-
.../dbimport/DefaultDbImportActionTest.java | 48 +++---
.../dbimport/ManyToManyCandidateEntityTest.java | 4 +-
docs/doc/pom.xml | 6 +-
docs/doc/src/main/resources/RELEASE-NOTES.txt | 4 +
modeler/cayenne-modeler-generic-ext/pom.xml | 4 +-
.../generic/GenericPlatformInitializer.java | 2 +-
modeler/cayenne-modeler-win-ext/pom.xml | 93 ++++++++++
.../modeler/win/WinCayenneModelerModule.java | 30 ++++
.../org/apache/cayenne/modeler/win/WinMain.java | 50 ++++++
.../modeler/win/WinPlatformInitializer.java | 43 +++++
modeler/cayenne-modeler-win/pom.xml | 7 +-
modeler/cayenne-modeler/pom.xml | 2 +-
.../java/org/apache/cayenne/modeler/Main.java | 4 +-
.../modeler/action/CreateEmbeddableAction.java | 4 +-
.../modeler/action/CreateObjEntityAction.java | 6 +-
.../modeler/action/DefaultActionManager.java | 5 +-
.../modeler/action/ImportDataMapAction.java | 8 +-
.../cayenne/modeler/action/MigrateAction.java | 3 +-
.../action/ReverseEngineeringAction.java | 14 +-
.../modeler/dialog/DbImportProjectSaver.java | 77 +++++++++
.../modeler/dialog/codegen/CustomModePanel.java | 1 +
.../dialog/datamap/PackageUpdateController.java | 9 +-
.../modeler/dialog/db/DbLoaderHelper.java | 168 ++++++++++---------
.../dialog/db/DbLoaderOptionsDialog.java | 55 +++---
.../modeler/dialog/db/MergerOptions.java | 12 +-
.../dialog/db/ModelerDbImportAction.java | 95 +++--------
.../objentity/ObjAttributeInfoDialogView.java | 4 +-
.../cayenne/modeler/editor/EditorView.java | 2 +-
.../modeler/editor/EjbqlQueryScriptsTab.java | 5 +-
.../modeler/editor/dbentity/DbEntityTab.java | 2 +-
.../cayenne/modeler/util/LongRunningTask.java | 30 ++--
.../modeler/util/NameGeneratorPreferences.java | 3 +-
.../util/PathChooserComboBoxCellEditor.java | 3 +
modeler/pom.xml | 3 +-
.../apache/cayenne/tools/DbGeneratorMojo.java | 4 +-
.../apache/cayenne/tools/DbImporterMojo.java | 40 +++--
.../tools/DbImporterMojoConfigurationTest.java | 6 +-
.../cayenne/tools/DbImporterMojoTest.java | 29 ++--
.../testCustomObjectLayerSettings-pom.xml | 1 +
...testCustomObjectLayerSettings.map.xml-result | 6 +
.../dbimport/testCustomObjectLayerSettings.sql | 5 +
.../dbimport/testForceDataMapSchema-pom.xml | 46 +++++
.../dbimport/testForceDataMapSchema.map.xml | 26 +++
.../testForceDataMapSchema.map.xml-result | 52 ++++++
.../tools/dbimport/testForceDataMapSchema.sql | 40 +++++
pom.xml | 12 +-
74 files changed, 1343 insertions(+), 488 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cayenne/blob/8c5985ee/cayenne-dbsync/src/test/java/org/apache/cayenne/dbsync/merge/MergeCase.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cayenne/blob/8c5985ee/cayenne-tools/src/main/java/org/apache/cayenne/tools/dbimport/DefaultDbImportAction.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cayenne/blob/8c5985ee/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/MergerOptions.java
----------------------------------------------------------------------
diff --cc modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/MergerOptions.java
index b19fe35,9c417fe..344215d
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/MergerOptions.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/MergerOptions.java
@@@ -20,11 -20,11 +20,12 @@@
package org.apache.cayenne.modeler.dialog.db;
import org.apache.cayenne.CayenneRuntimeException;
- import org.apache.cayenne.configuration.event.DataMapEvent;
- import org.apache.cayenne.dba.JdbcAdapter;
+ import org.apache.cayenne.configuration.DataChannelDescriptor;
+ import org.apache.cayenne.configuration.DataNodeDescriptor;
+ import org.apache.cayenne.dba.DbAdapter;
import org.apache.cayenne.dbsync.merge.AbstractToDbToken;
import org.apache.cayenne.dbsync.merge.DbMerger;
+import org.apache.cayenne.dbsync.merge.DefaultModelMergeDelegate;
import org.apache.cayenne.dbsync.merge.MergeDirection;
import org.apache.cayenne.dbsync.merge.MergerContext;
import org.apache.cayenne.dbsync.merge.MergerToken;