(cayenne) branch master updated (220eda835 -> afb43f08e)

[aa...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

asf-gitbox-commits pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/cayenne.git


    from 220eda835 simplifying MacUIInitializer
     new 397cc81f9 Collapsing platform builds into cayenne-modeler
     new afb43f08e Flattenning modeler submodules into the project root

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../modeler-architecture.md                        |   2 +-
 CLAUDE.md                                          |   2 +-
 UPGRADE.md                                         |  15 ++
 build-tools/rat-excludes                           |   2 +-
 {assembly => cayenne-assembly}/pom.xml             |  29 +--
 .../assemblies/generic/assembly-generic.xml        |  17 +-
 .../src/main/resources/assemblies/mac}/README.txt  |   0
 .../main/resources/assemblies/mac/assembly-mac.xml |  24 +--
 .../main/resources/assemblies/mac/background.tiff  | Bin
 .../main/resources/assemblies/mac/create-dmg.sh    |   0
 .../main/resources/assemblies/src/assembly-src.xml |   0
 .../assemblies/windows/assembly-windows.xml        |  17 +-
 cayenne-mcp-server/pom.xml                         |   2 +-
 .../pom.xml                                        |  20 +-
 .../cayenne/modeler/pref/PreferenceNodeIds.java    |   0
 .../apache/cayenne/modeler/pref/PrefsAdapter.java  |   0
 .../apache/cayenne/modeler/pref/PrefsLocator.java  |   0
 .../modeler/pref/adapters/ClasspathPrefs.java      |   0
 .../modeler/pref/adapters/DBConnectorsPrefs.java   |   0
 .../modeler/pref/adapters/DataMapPrefs.java        |   0
 .../modeler/pref/dbconnector/DBConnector.java      |   0
 .../modeler/pref/dbconnector/DBConnectors.java     |   0
 .../modeler/pref/PreferenceNodeIdsTest.java        |   0
 .../cayenne/modeler/pref/PrefsLocatorTest.java     |   0
 .../modeler/pref/adapters/ClasspathPrefsTest.java  |   0
 .../pref/adapters/DBConnectorsPrefsTest.java       |   0
 .../modeler/pref/adapters/DataMapPrefsTest.java    |   0
 .../modeler/pref/dbconnector/DBConnectorTest.java  |   0
 .../modeler/pref/dbconnector/DBConnectorsTest.java |   0
 {modeler => cayenne-modeler}/AGENTS.md             |   0
 cayenne-modeler/pom.xml                            | 210 +++++++++++++++++++++
 .../src/japplication/resources/CayenneModeler.icns | Bin
 .../src/japplication/resources/CayenneModeler.ico  | Bin
 .../org/apache/cayenne/modeler/Application.java    |   0
 .../java/org/apache/cayenne/modeler/CliArgs.java   |   0
 .../main/java/org/apache/cayenne/modeler/Main.java |   0
 .../org/apache/cayenne/modeler/ModelerModule.java  |   0
 .../cayenne/modeler/NameGeneratorPreferences.java  |   0
 .../cayenne/modeler/dbadapter/DbAdapters.java      |   0
 .../modeler/dbconnector/DBConnectorFactory.java    |   0
 .../event/display/CallbackMethodDisplayEvent.java  |   0
 .../display/CallbackMethodDisplayListener.java     |   0
 .../event/display/CallbackTypeDisplayEvent.java    |   0
 .../display/CallbackTypeSelectionListener.java     |   0
 .../modeler/event/display/DataMapDisplayEvent.java |   0
 .../event/display/DataMapDisplayListener.java      |   0
 .../event/display/DbAttributeDisplayEvent.java     |   0
 .../event/display/DbAttributeDisplayListener.java  |   0
 .../event/display/DbEntityDisplayEvent.java        |   0
 .../event/display/DbEntityDisplayListener.java     |   0
 .../event/display/DbRelationshipDisplayEvent.java  |   0
 .../display/DbRelationshipDisplayListener.java     |   0
 .../modeler/event/display/DisplayEvent.java        |   0
 .../modeler/event/display/DomainDisplayEvent.java  |   0
 .../event/display/DomainDisplayListener.java       |   0
 .../display/EmbeddableAttributeDisplayEvent.java   |   0
 .../EmbeddableAttributeDisplayListener.java        |   0
 .../event/display/EmbeddableDisplayEvent.java      |   0
 .../event/display/EmbeddableDisplayListener.java   |   0
 .../event/display/MultipleObjectsDisplayEvent.java |   0
 .../display/MultipleObjectsDisplayListener.java    |   0
 .../event/display/ObjAttributeDisplayEvent.java    |   0
 .../event/display/ObjAttributeDisplayListener.java |   0
 .../event/display/ObjEntityDisplayEvent.java       |   0
 .../event/display/ObjEntityDisplayListener.java    |   0
 .../event/display/ObjRelationshipDisplayEvent.java |   0
 .../display/ObjRelationshipDisplayListener.java    |   0
 .../event/display/ProcedureDisplayEvent.java       |   0
 .../event/display/ProcedureDisplayListener.java    |   0
 .../display/ProcedureParameterDisplayEvent.java    |   0
 .../display/ProcedureParameterDisplayListener.java |   0
 .../modeler/event/display/QueryDisplayEvent.java   |   0
 .../event/display/QueryDisplayListener.java        |   0
 .../modeler/event/display/TablePopupHandler.java   |   0
 .../display/ValidationConfigDisplayEvent.java      |   0
 .../display/ValidationConfigDisplayListener.java   |   0
 .../modeler/event/model/CallbackMethodEvent.java   |   0
 .../event/model/CallbackMethodListener.java        |   0
 .../cayenne/modeler/event/model/DataMapEvent.java  |   0
 .../modeler/event/model/DataMapListener.java       |   0
 .../modeler/event/model/DbAttributeEvent.java      |   0
 .../modeler/event/model/DbAttributeListener.java   |   0
 .../cayenne/modeler/event/model/DbEntityEvent.java |   0
 .../modeler/event/model/DbEntityListener.java      |   0
 .../modeler/event/model/DbRelationshipEvent.java   |   0
 .../event/model/DbRelationshipListener.java        |   0
 .../cayenne/modeler/event/model/DomainEvent.java   |   0
 .../modeler/event/model/DomainListener.java        |   0
 .../event/model/EmbeddableAttributeEvent.java      |   0
 .../event/model/EmbeddableAttributeListener.java   |   0
 .../modeler/event/model/EmbeddableEvent.java       |   0
 .../modeler/event/model/EmbeddableListener.java    |   0
 .../cayenne/modeler/event/model/ModelEvent.java    |   0
 .../modeler/event/model/ObjAttributeEvent.java     |   0
 .../modeler/event/model/ObjAttributeListener.java  |   0
 .../modeler/event/model/ObjEntityEvent.java        |   0
 .../modeler/event/model/ObjEntityListener.java     |   0
 .../modeler/event/model/ObjRelationshipEvent.java  |   0
 .../event/model/ObjRelationshipListener.java       |   0
 .../modeler/event/model/ProcedureEvent.java        |   0
 .../modeler/event/model/ProcedureListener.java     |   0
 .../event/model/ProcedureParameterEvent.java       |   0
 .../event/model/ProcedureParameterListener.java    |   0
 .../modeler/event/model/ProjectAfterSaveEvent.java |   0
 .../event/model/ProjectAfterSaveListener.java      |   0
 .../event/model/ProjectBeforeSaveEvent.java        |   0
 .../event/model/ProjectBeforeSaveListener.java     |   0
 .../cayenne/modeler/event/model/QueryEvent.java    |   0
 .../cayenne/modeler/event/model/QueryListener.java |   0
 .../modeler/event/model/RecentFileListener.java    |   0
 .../apache/cayenne/modeler/log/LogAppender.java    |   0
 .../cayenne/modeler/log/ModelerLogFactory.java     |   0
 .../modeler/log/ModelerLogServiceProvider.java     |   0
 .../apache/cayenne/modeler/log/ModelerLogger.java  |   0
 .../cayenne/modeler/mcp/McpHandshakeWriter.java    |   0
 .../modeler/platform/FlatLafLayoutStyle.java       |   0
 .../modeler/platform/GenericUIInitializer.java     |   0
 .../cayenne/modeler/platform/UIInitializer.java    |   0
 .../modeler/platform/mac/MacFileChooser.java       |   0
 .../modeler/platform/mac/MacUIInitializer.java     |   0
 .../cayenne/modeler/pref/PreferenceMigration.java  |   0
 .../apache/cayenne/modeler/pref/PrefsCopier.java   |   0
 .../apache/cayenne/modeler/pref/PrefsExporter.java |   0
 .../apache/cayenne/modeler/pref/PrefsManager.java  |   0
 .../modeler/pref/adapters/CMTablePrefs.java        |   0
 .../pref/adapters/ComponentGeometryPrefs.java      |   0
 .../modeler/pref/adapters/DBGeneratorPrefs.java    |   0
 .../modeler/pref/adapters/FileChooserPrefs.java    |   0
 .../modeler/pref/adapters/GeneralPrefs.java        |   0
 .../modeler/pref/adapters/LogConsolePrefs.java     |   0
 .../modeler/pref/adapters/ProjectPrefs.java        |   0
 .../modeler/pref/adapters/RecentProjectsPrefs.java |   0
 .../modeler/pref/adapters/SplitPanePrefs.java      |   0
 .../migration/toV5/_1_DbConnectorsMigration.java   |   0
 .../pref/migration/toV5/_2_ClasspathMigration.java |   0
 .../migration/toV5/_3_GeneralPrefsMigration.java   |   0
 .../migration/toV5/_4_RecentProjectsMigration.java |   0
 .../migration/toV5/_5_FrameGeometryMigration.java  |   0
 .../toV5/_6_ProjectSplitPaneMigration.java         |   0
 .../toV5/_7_EntityTablePrefsMigration.java         |   0
 .../toV5/_8_RemoveRedundantPathIndexMigration.java |   0
 .../apache/cayenne/modeler/project/CgenOps.java    |   0
 .../apache/cayenne/modeler/project/DataMapOps.java |   0
 .../cayenne/modeler/project/DbAttributeOps.java    |   0
 .../cayenne/modeler/project/DbEntityOps.java       |   0
 .../cayenne/modeler/project/DbRelationshipOps.java |   0
 .../cayenne/modeler/project/ObjEntityOps.java      |   0
 .../modeler/project/ProjectComparators.java        |   0
 .../modeler/project/ProjectDirtyListener.java      |   0
 .../modeler/project/ProjectFileChangeTracker.java  |   0
 .../modeler/project/ProjectNavigationHistory.java  |   0
 .../cayenne/modeler/project/ProjectSession.java    |   0
 .../modeler/service/action/GlobalActions.java      |   0
 .../service/classloader/ModelerClassLoader.java    |   0
 .../modeler/service/os/OperatingSystem.java        |   0
 .../validator/ConfigurableProjectValidator.java    |   0
 .../apache/cayenne/modeler/toolkit/AppAction.java  |   0
 .../apache/cayenne/modeler/toolkit/AppDialog.java  |   0
 .../apache/cayenne/modeler/toolkit/AppFrame.java   |   0
 .../apache/cayenne/modeler/toolkit/AppPanel.java   |   0
 .../cayenne/modeler/toolkit/AppTabbedPane.java     |   0
 .../apache/cayenne/modeler/toolkit/AppToolBar.java |   0
 .../cayenne/modeler/toolkit/ProjectDialog.java     |   0
 .../cayenne/modeler/toolkit/ProjectPanel.java      |   0
 .../cayenne/modeler/toolkit/ProjectTabbedPane.java |   0
 .../apache/cayenne/modeler/toolkit/Renderers.java  |   0
 .../cayenne/modeler/toolkit/border/TopBorder.java  |   0
 .../modeler/toolkit/buttons/CMButtonPanel.java     |   0
 .../modeler/toolkit/checkbox/CMCheckBox.java       |   0
 .../toolkit/checkbox/CMCheckBoxUndoableEdit.java   |   0
 .../toolkit/columnview/ColumnViewPanel.java        |   0
 .../modeler/toolkit/combobox/AutoCompletion.java   |   0
 .../combobox/CMAutoCompleteComboBoxCellEditor.java |   0
 .../modeler/toolkit/combobox/CMComboBox.java       |   0
 .../toolkit/combobox/CMComboBoxCellEditor.java     |   0
 .../toolkit/combobox/CMComboBoxPopupResizer.java   |   0
 .../toolkit/combobox/CMComboBoxUndoableEdit.java   |   0
 .../toolkit/combobox/CMUndoableComboBox.java       |   0
 .../modeler/toolkit/combobox/ComboBoxPopup.java    |   0
 .../toolkit/combobox/CustomTypeComboBoxEditor.java |   0
 .../modeler/toolkit/combobox/EditorTextField.java  |   0
 .../modeler/toolkit/combobox/SuggestionList.java   |   0
 .../modeler/toolkit/copypaste/CMTransferable.java  |   0
 .../modeler/toolkit/filechooser/CMFileChooser.java |   0
 .../toolkit/filechooser/CMFileChooserFactory.java  |   0
 .../modeler/toolkit/filechooser/FileFilters.java   |   0
 .../toolkit/filechooser/SwingDirChooserDialog.java |   0
 .../toolkit/filechooser/SwingFileChooser.java      |   0
 .../toolkit/filechooser/SwingFileOpenerDialog.java |   0
 .../toolkit/filechooser/SwingFileSaverDialog.java  |   0
 .../cayenne/modeler/toolkit/icon/IconFactory.java  |   0
 .../toolkit/table/BoardTableCellRenderer.java      |   0
 .../cayenne/modeler/toolkit/table/CMTable.java     |   0
 .../modeler/toolkit/table/CMTableModel.java        |   0
 .../toolkit/table/CMTableModelUndoableEdit.java    |   0
 .../modeler/toolkit/table/CMTablePanel.java        |   0
 .../toolkit/table/CMTextFieldCellEditor.java       |   0
 .../modeler/toolkit/table/IconCellRenderer.java    |   0
 .../modeler/toolkit/table/SortButtonRenderer.java  |   0
 .../cayenne/modeler/toolkit/table/TableSizer.java  |   0
 .../modeler/toolkit/text/CMPasswordField.java      |   0
 .../cayenne/modeler/toolkit/text/CMTextArea.java   |   0
 .../modeler/toolkit/text/CMTextCommitListener.java |   0
 .../cayenne/modeler/toolkit/text/CMTextField.java  |   0
 .../cayenne/modeler/toolkit/text/CMTextPane.java   |   0
 .../modeler/toolkit/text/CMTextPaneEditorKit.java  |   0
 .../modeler/toolkit/text/CMUndoableTextField.java  |   0
 .../modeler/toolkit/text/CMUndoableTextPane.java   |   0
 .../modeler/toolkit/text/LineNumberedBorder.java   |   0
 .../toolkit/text/TextComponentUndoListener.java    |   0
 .../toolkit/text/UnderlineHighlighterForText.java  |   0
 .../modeler/toolkit/text/style/SyntaxStyle.java    |   0
 .../toolkit/text/style/TextPaneStyleTypes.java     |   0
 .../modeler/toolkit/text/style/TextSyntax.java     |   0
 .../toolkit/tree/ChangeOptimizingTreeModel.java    |   0
 .../modeler/toolkit/tree/CheckBoxNodeData.java     |   0
 .../cayenne/modeler/toolkit/tree/CheckBoxTree.java |   0
 .../toolkit/tree/CheckBoxTreeCellEditor.java       |   0
 .../toolkit/tree/CheckBoxTreeCellRenderer.java     |   0
 .../EntityTreeAttributeRelationshipFilter.java     |   0
 .../modeler/toolkit/tree/EntityTreeFilter.java     |   0
 .../modeler/toolkit/tree/EntityTreeModel.java      |   0
 .../toolkit/tree/EntityTreeRelationshipFilter.java |   0
 .../toolkit/tree/LabelTreeCellRenderer.java        |   0
 .../cayenne/modeler/toolkit/url/UrlOpener.java     |   0
 .../modeler/toolkit/valuetype/ValueTypes.java      |   0
 .../org/apache/cayenne/modeler/ui/MainFrame.java   |   0
 .../org/apache/cayenne/modeler/ui/MainMenuBar.java |   0
 .../org/apache/cayenne/modeler/ui/MainToolBar.java |   0
 .../org/apache/cayenne/modeler/ui/SearchPanel.java |   0
 .../cayenne/modeler/ui/about/AboutFrame.java       |   0
 .../cayenne/modeler/ui/action/AboutAction.java     |   0
 .../modeler/ui/action/BaseViewEntityAction.java    |   0
 .../modeler/ui/action/CloseProjectAction.java      |   0
 .../modeler/ui/action/CollapseTreeAction.java      |   0
 .../ui/action/ConfigurePreferencesAction.java      |   0
 .../cayenne/modeler/ui/action/CopyAction.java      |   0
 .../modeler/ui/action/CopyAttributeAction.java     |   0
 .../ui/action/CopyAttributeRelationshipAction.java |   0
 .../ui/action/CopyCallbackMethodAction.java        |   0
 .../ui/action/CopyProcedureParameterAction.java    |   0
 .../modeler/ui/action/CopyRelationshipAction.java  |   0
 .../modeler/ui/action/CreateAttributeAction.java   |   0
 .../ui/action/CreateCallbackMethodAction.java      |   0
 .../modeler/ui/action/CreateDataMapAction.java     |   0
 .../modeler/ui/action/CreateDbEntityAction.java    |   0
 .../modeler/ui/action/CreateEmbeddableAction.java  |   0
 .../modeler/ui/action/CreateObjEntityAction.java   |   0
 .../ui/action/CreateObjEntityFromDbAction.java     |   0
 .../modeler/ui/action/CreateProcedureAction.java   |   0
 .../ui/action/CreateProcedureParameterAction.java  |   0
 .../modeler/ui/action/CreateQueryAction.java       |   0
 .../ui/action/CreateRelationshipAction.java        |   0
 .../cayenne/modeler/ui/action/CutAction.java       |   0
 .../modeler/ui/action/CutAttributeAction.java      |   0
 .../ui/action/CutAttributeRelationshipAction.java  |   0
 .../modeler/ui/action/CutCallbackMethodAction.java |   0
 .../ui/action/CutProcedureParameterAction.java     |   0
 .../modeler/ui/action/CutRelationshipAction.java   |   0
 .../modeler/ui/action/DBConnectionAwareAction.java |   0
 .../ui/action/DbEntityCounterpartAction.java       |   0
 .../modeler/ui/action/DbEntitySyncAction.java      |   0
 .../action/DisableValidationInspectionAction.java  |   0
 .../modeler/ui/action/DocumentationAction.java     |   0
 .../cayenne/modeler/ui/action/ExitAction.java      |   0
 .../cayenne/modeler/ui/action/FilterAction.java    |   0
 .../cayenne/modeler/ui/action/FindAction.java      |   0
 .../modeler/ui/action/GenerateDBAction.java        |   0
 .../modeler/ui/action/ImportDataMapAction.java     |   0
 .../modeler/ui/action/ImportEOModelAction.java     |   0
 .../ui/action/InferRelationshipsAction.java        |   0
 .../cayenne/modeler/ui/action/MigrateAction.java   |   0
 .../modeler/ui/action/MultipleObjectsAction.java   |   0
 .../cayenne/modeler/ui/action/NavigateAction.java  |   0
 .../modeler/ui/action/NavigateBackwardAction.java  |   0
 .../modeler/ui/action/NavigateForwardAction.java   |   0
 .../modeler/ui/action/NewProjectAction.java        |   0
 .../ui/action/ObjEntityCounterpartAction.java      |   0
 .../modeler/ui/action/ObjEntitySyncAction.java     |   0
 .../ui/action/ObjEntityToSuperEntityAction.java    |   0
 .../modeler/ui/action/OpenProjectAction.java       |   0
 .../cayenne/modeler/ui/action/PasteAction.java     |   0
 .../cayenne/modeler/ui/action/RedoAction.java      |   0
 .../cayenne/modeler/ui/action/RemoveAction.java    |   0
 .../modeler/ui/action/RemoveAttributeAction.java   |   0
 .../action/RemoveAttributeRelationshipAction.java  |   0
 .../ui/action/RemoveCallbackMethodAction.java      |   0
 .../ui/action/RemoveProcedureParameterAction.java  |   0
 .../ui/action/RemoveRelationshipAction.java        |   0
 .../cayenne/modeler/ui/action/RevertAction.java    |   0
 .../cayenne/modeler/ui/action/SaveAction.java      |   0
 .../cayenne/modeler/ui/action/SaveAsAction.java    |   0
 .../modeler/ui/action/ShowLogConsoleAction.java    |   0
 .../ui/action/ShowValidationConfigAction.java      |   0
 .../ui/action/ShowValidationOptionAction.java      |   0
 .../cayenne/modeler/ui/action/UndoAction.java      |   0
 .../ui/action/UpdateValidationConfigAction.java    |   0
 .../cayenne/modeler/ui/action/ValidateAction.java  |   0
 .../autorelationship/InferRelationshipsDialog.java |   0
 .../autorelationship/InferRelationshipsPanel.java  |   0
 .../InferRelationshipsTabController.java           |   0
 .../ui/autorelationship/InferredRelationship.java  |   0
 .../ui/confirmremove/ConfirmRemoveDialog.java      |   0
 .../modeler/ui/datasource/DataSourceDialog.java    |   0
 .../ui/dbactionoptions/DbActionOptionsDialog.java  |   0
 .../modeler/ui/dbgen/DBGeneratorOptionsDialog.java |   0
 .../modeler/ui/dbgen/TableSelectorPanel.java       |   0
 .../modeler/ui/dbmerge/MergerOptionsDialog.java    |   0
 .../modeler/ui/dbmerge/MergerTokenSelector.java    |   0
 .../modeler/ui/dbmerge/MergerTokenTableModel.java  |   0
 .../ui/dbrelationship/DbJoinTableModel.java        |   0
 .../ui/dbrelationship/DbRelationshipDialog.java    |   0
 .../modeler/ui/entitysync/EntitySyncDialog.java    |   0
 .../cayenne/modeler/ui/errors/ErrorDialog.java     |   0
 .../modeler/ui/filedeleted/FileDeletedDialog.java  |   0
 .../apache/cayenne/modeler/ui/find/FindDialog.java |   0
 .../cayenne/modeler/ui/logconsole/LogConsole.java  |   0
 .../modeler/ui/preferences/PreferenceDialog.java   |   0
 .../preferences/classpath/ClasspathPrefsPanel.java |   0
 .../classpath/maven/MavenDependencyDialog.java     |   0
 .../preferences/dbconnector/DBConnectorEditor.java |   0
 .../dbconnector/DBConnectorPrefsPanel.java         |   0
 .../preferences/dbconnector/creator/Adapters.java  |   0
 .../creator/DBConnectorCreatorDialog.java          |   0
 .../duplicator/DBConnectorDuplicatorDialog.java    |   0
 .../ui/preferences/general/GeneralPrefsPanel.java  |   0
 .../ui/preferences/more/MorePrefsPanel.java        |   0
 .../cayenne/modeler/ui/project/ProjectView.java    |   0
 .../modeler/ui/project/editor/EditorPanelView.java |   0
 .../ui/project/editor/ExpressionConvertor.java     |   0
 .../datadomain/DataDomainGeneratorsPanel.java      |   0
 .../editor/datadomain/DataDomainGeneratorsTab.java |   0
 .../project/editor/datadomain/DataDomainView.java  |   0
 .../editor/datadomain/cgen/DataDomainCgenTab.java  |   0
 .../datadomain/dbimport/DataDomainDbImportTab.java |   0
 .../editor/datadomain/main/DataDomainMainView.java |   0
 .../validation/InspectionCheckBoxTree.java         |   0
 .../datadomain/validation/ValidationTab.java       |   0
 .../ui/project/editor/datamap/DataMapView.java     |   0
 .../datamap/cgen/CgenArtefactSelectorPanel.java    |   0
 .../editor/datamap/cgen/CgenConfigPanel.java       |   0
 .../ui/project/editor/datamap/cgen/CgenPanel.java  |   0
 .../project/editor/datamap/cgen/CgenValidator.java |   0
 .../editor/datamap/cgen/CheckBoxHeader.java        |   0
 .../project/editor/datamap/cgen/CodeValidator.java |   0
 .../editor/datamap/cgen/SelectionModel.java        |   0
 .../datamap/cgen/action/AddCgenConfigAction.java   |   0
 .../datamap/cgen/action/EditCgenConfigAction.java  |   0
 .../cgen/action/RemoveCgenConfigAction.java        |   0
 .../cgen/templateeditor/ArtefactsConfigurator.java |   0
 .../DataMapArtefactsConfigurator.java              |   0
 .../cgen/templateeditor/EditorTemplateLoader.java  |   0
 .../cgen/templateeditor/EditorTemplateSaver.java   |   0
 .../EmbeddableArtefactsConfigurator.java           |   0
 .../EntityArtefactsConfigurator.java               |   0
 .../templateeditor/PreviewActionConfigurator.java  |   0
 .../PreviewClassGenerationFactory.java             |   0
 .../templateeditor/PreviewGenerationAction.java    |   0
 .../cgen/templateeditor/TemplateEditor.java        |   0
 .../TemplateEditorFindAndReplaceDialog.java        |   0
 .../templateeditor/TemplateEditorFindDialog.java   |   0
 .../cgen/templateeditor/VelocityTokenMaker.java    |   0
 .../editor/datamap/dbimport/CatalogPopUpMenu.java  |   0
 .../editor/datamap/dbimport/ConfigToolbar.java     |   0
 .../editor/datamap/dbimport/DBSchemaPanel.java     |   0
 .../datamap/dbimport/DatabaseSchemaLoader.java     |   0
 .../datamap/dbimport/DbImportResultDialog.java     |   0
 .../editor/datamap/dbimport/DbImportSorter.java    |   0
 .../editor/datamap/dbimport/DbImportTree.java      |   0
 .../datamap/dbimport/DbImportTreeCellEditor.java   |   0
 .../datamap/dbimport/DbImportTreeCellRenderer.java |   0
 .../editor/datamap/dbimport/DbImportTreeModel.java |   0
 .../editor/datamap/dbimport/DbImportView.java      |   0
 .../editor/datamap/dbimport/DbSchemaToolbar.java   |   0
 .../editor/datamap/dbimport/DefaultPopUpMenu.java  |   0
 .../datamap/dbimport/IncludeTablePopUpMenu.java    |   0
 .../datamap/dbimport/PrintColumnsBiFunction.java   |   0
 .../datamap/dbimport/PrintTablesBiFunction.java    |   0
 .../dbimport/ReverseEngineeringConfigPanel.java    |   0
 .../dbimport/ReverseEngineeringTreePanel.java      |   0
 .../editor/datamap/dbimport/RootPopUpMenu.java     |   0
 .../editor/datamap/dbimport/SchemaPopUpMenu.java   |   0
 .../datamap/dbimport/action/AddCatalogAction.java  |   0
 .../dbimport/action/AddExcludeColumnAction.java    |   0
 .../dbimport/action/AddExcludeProcedureAction.java |   0
 .../dbimport/action/AddExcludeTableAction.java     |   0
 .../dbimport/action/AddIncludeColumnAction.java    |   0
 .../dbimport/action/AddIncludeProcedureAction.java |   0
 .../dbimport/action/AddIncludeTableAction.java     |   0
 .../dbimport/action/AddPatternParamAction.java     |   0
 .../datamap/dbimport/action/AddSchemaAction.java   |   0
 .../datamap/dbimport/action/DbImportActions.java   |   0
 .../datamap/dbimport/action/DeleteNodeAction.java  |   0
 .../dbimport/action/DragAndDropNodeAction.java     |   0
 .../datamap/dbimport/action/EditNodeAction.java    |   0
 .../dbimport/action/GetDbConnectionAction.java     |   0
 .../dbimport/action/LoadDbSchemaAction.java        |   0
 .../dbimport/action/ModelerDbImportAction.java     |   0
 .../dbimport/action/MoveImportNodeAction.java      |   0
 .../dbimport/action/MoveInvertNodeAction.java      |   0
 .../datamap/dbimport/action/SortNodesAction.java   |   0
 .../dbimport/action/TreeManipulationAction.java    |   0
 .../dbimport/progress/DbImportProgressDialog.java  |   0
 .../dbimport/runner/DbImportProjectSaver.java      |   0
 .../dbimport/runner/ModelerDbImportAction.java     |   0
 .../dbimport/runner/ModelerDbImportModule.java     |   0
 .../dbimport/runner/ModelerDbLoaderContext.java    |   0
 .../dbimport/runner/ModelerDbLoaderDelegate.java   |   0
 .../editor/datamap/dbimport/tree/CatalogNode.java  |   0
 .../dbimport/tree/CatalogProcedureNode.java        |   0
 .../datamap/dbimport/tree/CatalogTableNode.java    |   0
 .../datamap/dbimport/tree/ColorTreeRenderer.java   |   0
 .../editor/datamap/dbimport/tree/ColumnNode.java   |   0
 .../datamap/dbimport/tree/DbImportTreeNode.java    |   0
 .../project/editor/datamap/dbimport/tree/Node.java |   0
 .../editor/datamap/dbimport/tree/NodeType.java     |   0
 .../editor/datamap/dbimport/tree/ObjectType.java   |   0
 .../datamap/dbimport/tree/ProcedureNode.java       |   0
 .../editor/datamap/dbimport/tree/SchemaNode.java   |   0
 .../datamap/dbimport/tree/SchemaProcedureNode.java |   0
 .../datamap/dbimport/tree/SchemaTableNode.java     |   0
 .../editor/datamap/dbimport/tree/Status.java       |   0
 .../editor/datamap/dbimport/tree/TableNode.java    |   0
 .../datamap/dbimport/tree/TransferableNode.java    |   0
 .../datamap/defaults/DefaultsUpdateDialog.java     |   0
 .../editor/datamap/main/DataMapMainView.java       |   0
 .../datamap/main/catalog/CatalogUpdateDialog.java  |   0
 .../datamap/main/locking/LockingUpdateDialog.java  |   0
 .../datamap/main/pkg/PackageUpdateDialog.java      |   0
 .../datamap/main/schema/SchemaUpdateDialog.java    |   0
 .../main/superclass/SuperclassUpdateDialog.java    |   0
 .../ui/project/editor/dbentity/DbEntityView.java   |   0
 .../editor/dbentity/main/DbEntityMainView.java     |   0
 .../main/PKCustomSequenceGeneratorPanel.java       |   0
 .../editor/dbentity/main/PKDBGeneratorPanel.java   |   0
 .../dbentity/main/PKDefaultGeneratorPanel.java     |   0
 .../editor/dbentity/main/PKGeneratorPanel.java     |   0
 .../dbentity/properties/DbAttributePanel.java      |   0
 .../dbentity/properties/DbAttributeTableModel.java |   0
 .../properties/DbEntityPropertiesView.java         |   0
 .../dbentity/properties/DbRelationshipPanel.java   |   0
 .../properties/DbRelationshipTableModel.java       |   0
 .../project/editor/embeddable/EmbeddableView.java  |   0
 .../attributes/EmbeddableAttributeTableModel.java  |   0
 .../attributes/EmbeddableAttributesView.java       |   0
 .../editor/embeddable/main/EmbeddableMainView.java |   0
 .../ui/project/editor/objentity/ObjEntityView.java |   0
 .../objentity/attrinfo/ObjAttributeInfoDialog.java |   0
 .../attrinfo/ObjAttributePathNavigatorPanel.java   |   0
 .../attrinfo/ObjAttributeTableCellEditor.java      |   0
 .../OverrideEmbeddableAttributeTableModel.java     |   0
 .../callbacks/CallbackDescriptorTableModel.java    |   0
 .../editor/objentity/callbacks/CallbackType.java   |   0
 .../objentity/callbacks/ObjCallbackMethod.java     |   0
 .../callbacks/ObjEntityCallbacksView.java          |   0
 .../classname/ClassNameUpdaterController.java      |   0
 .../duplicates/DuplicatedAttributesDialog.java     |   0
 .../editor/objentity/main/ObjEntityMainView.java   |   0
 .../properties/DbAttributePathComboBoxEditor.java  |   0
 .../DbAttributePathComboBoxRenderer.java           |   0
 .../DbRelationshipPathComboBoxEditor.java          |   0
 .../objentity/properties/ObjAttributePanel.java    |   0
 .../properties/ObjAttributeTableModel.java         |   0
 .../properties/ObjEntityPropertiesView.java        |   0
 .../objentity/properties/ObjRelationshipPanel.java |   0
 .../properties/ObjRelationshipTableModel.java      |   0
 .../properties/PathChooserComboBoxCellEditor.java  |   0
 .../relinfo/ObjRelationshipInfoDialog.java         |   0
 .../relinfo/ObjRelationshipPathNavigatorPanel.java |   0
 .../editor/procedure/ProcedureParameterTab.java    |   0
 .../procedure/ProcedureParameterTableModel.java    |   0
 .../editor/procedure/ProcedureQueryView.java       |   0
 .../ui/project/editor/procedure/ProcedureTab.java  |   0
 .../editor/procedure/ProcedureTabbedView.java      |   0
 .../ui/project/editor/query/BaseQueryMainTab.java  |   0
 .../editor/query/ExistingSelectionProcessor.java   |   0
 .../editor/query/ObjectQueryPropertiesPanel.java   |   0
 .../ui/project/editor/query/PrefetchModel.java     |   0
 .../editor/query/RawQueryPropertiesPanel.java      |   0
 .../project/editor/query/RootSelectionHandler.java |   0
 .../editor/query/SelectPropertiesPanel.java        |   0
 .../editor/query/ejbql/EjbqlQueryMainTab.java      |   0
 .../query/ejbql/EjbqlQueryPropertiesPanel.java     |   0
 .../editor/query/ejbql/EjbqlQueryScriptsTab.java   |   0
 .../ui/project/editor/query/ejbql/EjbqlSyntax.java |   0
 .../editor/query/ejbql/EjbqlTabbedView.java        |   0
 .../query/selectquery/AddPrefetchUndoableEdit.java |   0
 .../query/selectquery/SelectQueryMainTab.java      |   0
 .../query/selectquery/SelectQueryOrderingTab.java  |   0
 .../query/selectquery/SelectQueryPrefetchTab.java  |   0
 .../query/selectquery/SelectQueryTabbedView.java   |   0
 .../AddPrefetchUndoableEditForSqlTemplate.java     |   0
 .../editor/query/sqltemplate/SQLSyntax.java        |   0
 .../query/sqltemplate/SQLTemplateMainTab.java      |   0
 .../query/sqltemplate/SQLTemplatePrefetchTab.java  |   0
 .../query/sqltemplate/SQLTemplateScriptsTab.java   |   0
 .../query/sqltemplate/SQLTemplateTabbedView.java   |   0
 .../ui/project/overwrite/OverwriteDialog.java      |   0
 .../ui/project/querytype/QueryTypeDialog.java      |   0
 .../modeler/ui/project/tree/ProjectTree.java       |   0
 .../ui/project/tree/ProjectTreeFactory.java        |   0
 .../modeler/ui/project/tree/ProjectTreeModel.java  |   0
 .../project/tree/treefilter/TreeFilterPopup.java   |   0
 .../ui/project/validator/AttributeErrorMsg.java    |   0
 .../ui/project/validator/DataMapErrorMsg.java      |   0
 .../ui/project/validator/DomainErrorMsg.java       |   0
 .../validator/EmbeddableAttributeErrorMsg.java     |   0
 .../ui/project/validator/EmbeddableErrorMsg.java   |   0
 .../ui/project/validator/EntityErrorMsg.java       |   0
 .../ui/project/validator/ProcedureErrorMsg.java    |   0
 .../validator/ProcedureParameterErrorMsg.java      |   0
 .../project/validator/ProjectValidatorDialog.java  |   0
 .../ui/project/validator/QueryErrorMsg.java        |   0
 .../ui/project/validator/RelationshipErrorMsg.java |   0
 .../validator/ValidationDisplayHandler.java        |   0
 .../ui/unsavedchanges/UnsavedChangesDialog.java    |   0
 .../modeler/ui/validation/ValidationDialog.java    |   0
 .../modeler/ui/welcome/BackgroundPanel.java        |   0
 .../modeler/ui/welcome/RecentFileListModel.java    |   0
 .../modeler/ui/welcome/RecentFileListRenderer.java |   0
 .../cayenne/modeler/ui/welcome/WelcomeScreen.java  |   0
 .../modeler/ui/welcome/WelcomeScreenMainPanel.java |   0
 .../undo/BaseRemovePropertyUndoableEdit.java       |   0
 .../cayenne/modeler/undo/CayenneUndoManager.java   |   0
 .../cayenne/modeler/undo/CayenneUndoableEdit.java  |   0
 .../undo/ChangePKGeneratorUndoableEdit.java        |   0
 .../undo/CreateCallbackMethodUndoableEdit.java     |   0
 .../modeler/undo/CreateDataMapUndoableEdit.java    |   0
 .../undo/CreateDbAttributeUndoableEdit.java        |   0
 .../modeler/undo/CreateDbEntityUndoableEdit.java   |   0
 .../undo/CreateDbRelationshipUndoableEdit.java     |   0
 .../undo/CreateEmbAttributeUndoableEdit.java       |   0
 .../modeler/undo/CreateEmbeddableUndoableEdit.java |   0
 .../undo/CreateObjAttributeUndoableEdit.java       |   0
 .../modeler/undo/CreateObjEntityUndoableEdit.java  |   0
 .../undo/CreateObjRelationshipUndoableEdit.java    |   0
 .../undo/CreateProcedureParameterUndoableEdit.java |   0
 .../modeler/undo/CreateProcedureUndoableEdit.java  |   0
 .../modeler/undo/CreateQueryUndoableEdit.java      |   0
 .../modeler/undo/DbEntitySyncUndoableEdit.java     |   0
 .../modeler/undo/DbImportTreeUndoableEdit.java     |   0
 .../modeler/undo/DbRelationshipUndoableEdit.java   |   0
 .../undo/InferRelationshipsUndoableEdit.java       |   0
 .../modeler/undo/ObjRelationshipUndoableEdit.java  |   0
 .../modeler/undo/PasteCompoundUndoableEdit.java    |   0
 .../cayenne/modeler/undo/PasteUndoableEdit.java    |   0
 .../undo/RemoveCallbackMethodUndoableEdit.java     |   0
 .../modeler/undo/RemoveCompoundUndoableEdit.java   |   0
 .../undo/RemoveDbAttributeUndoableEdit.java        |   0
 .../undo/RemoveDbRelationshipUndoableEdit.java     |   0
 .../RemoveEmbeddableAttributeUndoableEdit.java     |   0
 .../undo/RemoveObjAttributeUndoableEdit.java       |   0
 .../undo/RemoveObjRelationshipUndoableEdit.java    |   0
 .../cayenne/modeler/undo/RemoveUndoableEdit.java   |   0
 .../cayenne/modeler/undo/TextCompoundEdit.java     |   0
 .../undo/UpdateValidationConfigUndoableEdit.java   |   0
 .../services/org.slf4j.spi.SLF4JServiceProvider    |   0
 .../cayenne/modeler/images/CayenneModeler.png      | Bin
 .../cayenne/modeler/images/icon-arrow-closed.png   | Bin
 .../cayenne/modeler/images/icon-arrow-open.png     | Bin
 .../cayenne/modeler/images/icon-attribute.png      | Bin
 .../cayenne/modeler/images/icon-backward.png       | Bin
 .../apache/cayenne/modeler/images/icon-copy.png    | Bin
 .../cayenne/modeler/images/icon-create-method.png  | Bin
 .../org/apache/cayenne/modeler/images/icon-cut.png | Bin
 .../apache/cayenne/modeler/images/icon-datamap.png | Bin
 .../cayenne/modeler/images/icon-dbentity.png       | Bin
 .../cayenne/modeler/images/icon-dbi-catalog.png    | Bin
 .../cayenne/modeler/images/icon-dbi-column.png     | Bin
 .../cayenne/modeler/images/icon-dbi-config.png     | Bin
 .../modeler/images/icon-dbi-excludeColumn.png      | Bin
 .../modeler/images/icon-dbi-excludeProcedure.png   | Bin
 .../modeler/images/icon-dbi-excludeTable.png       | Bin
 .../modeler/images/icon-dbi-includeColumn.png      | Bin
 .../modeler/images/icon-dbi-includeProcedure.png   | Bin
 .../modeler/images/icon-dbi-includeTable.png       | Bin
 .../cayenne/modeler/images/icon-dbi-refresh.png    | Bin
 .../cayenne/modeler/images/icon-dbi-runImport.png  | Bin
 .../cayenne/modeler/images/icon-dbi-schema.png     | Bin
 .../cayenne/modeler/images/icon-dbi-sort.png       | Bin
 .../apache/cayenne/modeler/images/icon-disable.png | Bin
 .../org/apache/cayenne/modeler/images/icon-dom.png | Bin
 .../apache/cayenne/modeler/images/icon-down.png    | Bin
 .../apache/cayenne/modeler/images/icon-edit.png    | Bin
 .../cayenne/modeler/images/icon-embeddable.png     | Bin
 .../apache/cayenne/modeler/images/icon-eomodel.png | Bin
 .../apache/cayenne/modeler/images/icon-error.png   | Bin
 .../apache/cayenne/modeler/images/icon-filter.png  | Bin
 .../modeler/images/icon-find_and_replace.png       | Bin
 .../apache/cayenne/modeler/images/icon-forward.png | Bin
 .../cayenne/modeler/images/icon-gen_java.png       | Bin
 .../apache/cayenne/modeler/images/icon-info.png    | Bin
 .../cayenne/modeler/images/icon-inheritance.png    | Bin
 .../cayenne/modeler/images/icon-move_down.png      | Bin
 .../apache/cayenne/modeler/images/icon-move_up.png | Bin
 .../org/apache/cayenne/modeler/images/icon-new.png | Bin
 .../cayenne/modeler/images/icon-new_embeddable.png | Bin
 .../cayenne/modeler/images/icon-new_objentity.png  | Bin
 .../cayenne/modeler/images/icon-new_query.png      | Bin
 .../cayenne/modeler/images/icon-objentity.png      | Bin
 .../apache/cayenne/modeler/images/icon-open.png    | Bin
 .../apache/cayenne/modeler/images/icon-paste.png   | Bin
 .../apache/cayenne/modeler/images/icon-plus.png    | Bin
 .../apache/cayenne/modeler/images/icon-query.png   | Bin
 .../apache/cayenne/modeler/images/icon-redo.png    | Bin
 .../apache/cayenne/modeler/images/icon-refresh.png | Bin
 .../cayenne/modeler/images/icon-relationship.png   | Bin
 .../apache/cayenne/modeler/images/icon-remove.png  | Bin
 .../cayenne/modeler/images/icon-save-as-image.png  | Bin
 .../apache/cayenne/modeler/images/icon-save.png    | Bin
 .../cayenne/modeler/images/icon-sort-asc.png       | Bin
 .../cayenne/modeler/images/icon-sort-desc.png      | Bin
 .../modeler/images/icon-stored-procedure.png       | Bin
 .../apache/cayenne/modeler/images/icon-sync.png    | Bin
 .../apache/cayenne/modeler/images/icon-trash.png   | Bin
 .../cayenne/modeler/images/icon-tree-collapse.png  | Bin
 .../apache/cayenne/modeler/images/icon-undo.png    | Bin
 .../org/apache/cayenne/modeler/images/icon-up.png  | Bin
 .../apache/cayenne/modeler/images/icon-zoom-in.png | Bin
 .../cayenne/modeler/images/icon-zoom-out.png       | Bin
 .../org/apache/cayenne/modeler/images/logo.jpg     | Bin
 .../images/welcome/welcome-screen-left-bg.jpg      | Bin
 .../welcome/welcome-screen-new-btn-hover.png       | Bin
 .../images/welcome/welcome-screen-new-btn.png      | Bin
 .../welcome/welcome-screen-open-btn-hover.png      | Bin
 .../images/welcome/welcome-screen-open-btn.png     | Bin
 .../images/welcome/welcome-screen-right-bg.jpg     | Bin
 .../modeler/CayenneModelerValidationIT.java        |   0
 .../org/apache/cayenne/modeler/CliArgsTest.java    |   0
 .../java/org/apache/cayenne/modeler/MainTest.java  |   0
 .../editor/dbimport/DbImportSorterTest.java        |   0
 .../modeler/editor/dbimport/tree/BaseNodeTest.java |   0
 .../editor/dbimport/tree/CatalogNodeTest.java      |   0
 .../editor/dbimport/tree/ColumnNodeTest.java       |   0
 .../editor/dbimport/tree/SchemaNodeTest.java       |   0
 .../dbimport/tree/SchemaProcedureNodeTest.java     |   0
 .../editor/dbimport/tree/SchemaTableNodeTest.java  |   0
 .../templateeditor/ArtifactsConfiguratorTest.java  |   0
 .../templateeditor/EditorTemplateLoaderTest.java   |   0
 .../templateeditor/EditorTemplateSaverTest.java    |   0
 .../PreviewActionConfiguratorTest.java             |   0
 .../event/display/DomainDisplayEventTest.java      |   0
 .../modeler/event/model/DataMapEventTest.java      |   0
 .../modeler/event/model/DbAttributeEventTest.java  |   0
 .../modeler/event/model/DbEntityEventTest.java     |   0
 .../event/model/DbRelationshipEventTest.java       |   0
 .../modeler/event/model/DomainEventTest.java       |   0
 .../modeler/event/model/ModelEventTest.java        |   0
 .../modeler/mcp/McpHandshakeWriterTest.java        |   0
 .../toV5/_3_GeneralPrefsMigrationTest.java         |   0
 .../_8_RemoveRedundantPathIndexMigrationTest.java  |   0
 .../modeler/ui/action/EOModelFileFilterTest.java   |   0
 .../preferences/general/GeneralPrefsPanelTest.java |   0
 .../modeler/util/ApplicationFileFilterTest.java    |   0
 .../modeler/util/DataMapFileFilterTest.java        |   0
 .../modeler/cayenne-configured-validation.xml      |   0
 .../cayenne-wocompat => cayenne-wocompat}/pom.xml  |  20 +-
 .../org/apache/cayenne/wocompat/EODbAttribute.java |   0
 .../org/apache/cayenne/wocompat/EOModelHelper.java |   0
 .../apache/cayenne/wocompat/EOModelProcessor.java  |   0
 .../apache/cayenne/wocompat/EOObjAttribute.java    |   0
 .../org/apache/cayenne/wocompat/EOObjEntity.java   |   0
 .../java/org/apache/cayenne/wocompat/EOQuery.java  |   0
 .../org/apache/cayenne/wocompat/EOSQLQuery.java    |   0
 .../wocompat/PlistDataStructureFactory.java        |   0
 .../wocompat/PropertyListSerialization.java        |   0
 .../parser/DefaultPlistDataStructureFactory.java   |   0
 .../cayenne/wocompat/parser/ParseException.java    |   0
 .../org/apache/cayenne/wocompat/parser/Parser.java |   0
 .../org/apache/cayenne/wocompat/parser/Parser.jj   |   0
 .../cayenne/wocompat/parser/ParserConstants.java   |   0
 .../wocompat/parser/ParserTokenManager.java        |   0
 .../cayenne/wocompat/parser/SimpleCharStream.java  |   0
 .../org/apache/cayenne/wocompat/parser/Token.java  |   0
 .../cayenne/wocompat/parser/TokenMgrError.java     |   0
 .../apache/cayenne/wocompat/EOModelHelperTest.java |   0
 .../wocompat/EOModelProcessorInheritanceTest.java  |   0
 .../cayenne/wocompat/EOModelProcessorTest.java     |   0
 .../cayenne/wocompat/EOModelPrototypesTest.java    |   0
 .../org/apache/cayenne/wocompat/EOQueryTest.java   |   0
 .../wocompat/PropertyListSerializationTest.java    |   0
 .../wocompat/parser/PropertyListParserTest.java    |   0
 .../art-with-errors.eomodeld/Artist.plist          |   0
 .../art-with-errors.eomodeld/ArtistExhibit.plist   |   0
 .../art-with-errors.eomodeld/DiagramLayout         |   0
 .../art-with-errors.eomodeld/Exhibit.plist         |   0
 .../art-with-errors.eomodeld/Gallery.plist         |   0
 .../art-with-errors.eomodeld/Painting.plist        |   0
 .../art-with-errors.eomodeld/PaintingInfo.plist    |   0
 .../art-with-errors.eomodeld/index.eomodeld        |   0
 .../inheritance.eomodeld/AbstractEntity.plist      |   0
 .../inheritance.eomodeld/ConcreteEntityOne.plist   |   0
 .../inheritance.eomodeld/DetailEntity.plist        |   0
 .../resources/inheritance.eomodeld/DiagramLayout   |   0
 .../inheritance.eomodeld/HelperEntity.plist        |   0
 .../inheritance.eomodeld/HelperFlatEntity.plist    |   0
 .../SingleTableConcreteEntityOne.plist             |   0
 .../SingleTableConcreteEntityTwo.plist             |   0
 .../inheritance.eomodeld/SingleTableJoin.plist     |   0
 .../XSingleTableAbstractEntity.plist               |   0
 .../resources/inheritance.eomodeld/index.eomodeld  |   0
 .../resources/prototypes.eomodeld/DiagramLayout    |   0
 .../resources/prototypes.eomodeld/Document.plist   |   0
 .../prototypes.eomodeld/EOPrototypes.plist         |   0
 .../prototypes.eomodeld/EOXYZPrototypes.plist      |   0
 .../resources/prototypes.eomodeld/Estimate.plist   |   0
 .../resources/prototypes.eomodeld/Invoice.plist    |   0
 .../resources/prototypes.eomodeld/VendorPO.plist   |   0
 .../resources/prototypes.eomodeld/index.eomodeld   |   0
 .../resources/wotests/art.eomodeld/Artist.plist    |   0
 .../wotests/art.eomodeld/ArtistExhibit.plist       |   0
 .../wotests/art.eomodeld/CustomTypes.plist         |   0
 .../resources/wotests/art.eomodeld/DiagramLayout   |   0
 .../resources/wotests/art.eomodeld/Exhibit.plist   |   0
 .../wotests/art.eomodeld/ExhibitType.fspec         |   0
 .../wotests/art.eomodeld/ExhibitType.plist         |   0
 .../resources/wotests/art.eomodeld/Gallery.plist   |   0
 .../resources/wotests/art.eomodeld/Painting.plist  |   0
 .../wotests/art.eomodeld/PaintingInfo.plist        |   0
 .../resources/wotests/art.eomodeld/index.eomodeld  |   0
 .../CrossModelRelTest.plist                        |   0
 .../DiagramLayout                                  |   0
 .../index.eomodeld                                 |   0
 .../wotests/fetchspec.eomodeld/DiagramLayout       |   0
 .../wotests/fetchspec.eomodeld/Entity1.fspec       |   0
 .../wotests/fetchspec.eomodeld/Entity1.plist       |   0
 .../wotests/fetchspec.eomodeld/Entity2.plist       |   0
 .../wotests/fetchspec.eomodeld/index.eomodeld      |   0
 .../wotests/flattened.eomodeld/Artist.plist        |   0
 .../wotests/flattened.eomodeld/ArtistExhibit.plist |   0
 .../wotests/flattened.eomodeld/Exhibit.plist       |   0
 .../wotests/flattened.eomodeld/index.eomodeld      |   0
 modeler/cayenne-modeler-generic/pom.xml            |  62 ------
 modeler/cayenne-modeler-mac/pom.xml                |  73 -------
 modeler/cayenne-modeler-win/pom.xml                |  75 --------
 modeler/cayenne-modeler/pom.xml                    |  94 ---------
 modeler/pom.xml                                    |  59 ------
 pom.xml                                            |   6 +-
 738 files changed, 295 insertions(+), 434 deletions(-)
 rename .claude/rules/{modeler => cayenne-modeler}/modeler-architecture.md (98%)
 rename {assembly => cayenne-assembly}/pom.xml (93%)
 rename {assembly => cayenne-assembly}/src/main/resources/assemblies/generic/assembly-generic.xml (93%)
 rename {modeler/cayenne-modeler-mac/src/main/resources => cayenne-assembly/src/main/resources/assemblies/mac}/README.txt (100%)
 rename {assembly => cayenne-assembly}/src/main/resources/assemblies/mac/assembly-mac.xml (91%)
 rename {assembly => cayenne-assembly}/src/main/resources/assemblies/mac/background.tiff (100%)
 rename {assembly => cayenne-assembly}/src/main/resources/assemblies/mac/create-dmg.sh (100%)
 rename {assembly => cayenne-assembly}/src/main/resources/assemblies/src/assembly-src.xml (100%)
 rename {assembly => cayenne-assembly}/src/main/resources/assemblies/windows/assembly-windows.xml (93%)
 rename {modeler/cayenne-modeler-prefs => cayenne-modeler-prefs}/pom.xml (74%)
 rename {modeler/cayenne-modeler-prefs => cayenne-modeler-prefs}/src/main/java/org/apache/cayenne/modeler/pref/PreferenceNodeIds.java (100%)
 rename {modeler/cayenne-modeler-prefs => cayenne-modeler-prefs}/src/main/java/org/apache/cayenne/modeler/pref/PrefsAdapter.java (100%)
 rename {modeler/cayenne-modeler-prefs => cayenne-modeler-prefs}/src/main/java/org/apache/cayenne/modeler/pref/PrefsLocator.java (100%)
 rename {modeler/cayenne-modeler-prefs => cayenne-modeler-prefs}/src/main/java/org/apache/cayenne/modeler/pref/adapters/ClasspathPrefs.java (100%)
 rename {modeler/cayenne-modeler-prefs => cayenne-modeler-prefs}/src/main/java/org/apache/cayenne/modeler/pref/adapters/DBConnectorsPrefs.java (100%)
 rename {modeler/cayenne-modeler-prefs => cayenne-modeler-prefs}/src/main/java/org/apache/cayenne/modeler/pref/adapters/DataMapPrefs.java (100%)
 rename {modeler/cayenne-modeler-prefs => cayenne-modeler-prefs}/src/main/java/org/apache/cayenne/modeler/pref/dbconnector/DBConnector.java (100%)
 rename {modeler/cayenne-modeler-prefs => cayenne-modeler-prefs}/src/main/java/org/apache/cayenne/modeler/pref/dbconnector/DBConnectors.java (100%)
 rename {modeler/cayenne-modeler-prefs => cayenne-modeler-prefs}/src/test/java/org/apache/cayenne/modeler/pref/PreferenceNodeIdsTest.java (100%)
 rename {modeler/cayenne-modeler-prefs => cayenne-modeler-prefs}/src/test/java/org/apache/cayenne/modeler/pref/PrefsLocatorTest.java (100%)
 rename {modeler/cayenne-modeler-prefs => cayenne-modeler-prefs}/src/test/java/org/apache/cayenne/modeler/pref/adapters/ClasspathPrefsTest.java (100%)
 rename {modeler/cayenne-modeler-prefs => cayenne-modeler-prefs}/src/test/java/org/apache/cayenne/modeler/pref/adapters/DBConnectorsPrefsTest.java (100%)
 rename {modeler/cayenne-modeler-prefs => cayenne-modeler-prefs}/src/test/java/org/apache/cayenne/modeler/pref/adapters/DataMapPrefsTest.java (100%)
 rename {modeler/cayenne-modeler-prefs => cayenne-modeler-prefs}/src/test/java/org/apache/cayenne/modeler/pref/dbconnector/DBConnectorTest.java (100%)
 rename {modeler/cayenne-modeler-prefs => cayenne-modeler-prefs}/src/test/java/org/apache/cayenne/modeler/pref/dbconnector/DBConnectorsTest.java (100%)
 rename {modeler => cayenne-modeler}/AGENTS.md (100%)
 create mode 100644 cayenne-modeler/pom.xml
 rename {modeler/cayenne-modeler-mac => cayenne-modeler}/src/japplication/resources/CayenneModeler.icns (100%)
 rename {modeler/cayenne-modeler-win => cayenne-modeler}/src/japplication/resources/CayenneModeler.ico (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/Application.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/CliArgs.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/Main.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/ModelerModule.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/NameGeneratorPreferences.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/dbadapter/DbAdapters.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/dbconnector/DBConnectorFactory.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/event/display/CallbackMethodDisplayEvent.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/event/display/CallbackMethodDisplayListener.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/event/display/CallbackTypeDisplayEvent.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/event/display/CallbackTypeSelectionListener.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/event/display/DataMapDisplayEvent.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/event/display/DataMapDisplayListener.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/event/display/DbAttributeDisplayEvent.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/event/display/DbAttributeDisplayListener.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/event/display/DbEntityDisplayEvent.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/event/display/DbEntityDisplayListener.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/event/display/DbRelationshipDisplayEvent.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/event/display/DbRelationshipDisplayListener.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/event/display/DisplayEvent.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/event/display/DomainDisplayEvent.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/event/display/DomainDisplayListener.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/event/display/EmbeddableAttributeDisplayEvent.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/event/display/EmbeddableAttributeDisplayListener.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/event/display/EmbeddableDisplayEvent.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/event/display/EmbeddableDisplayListener.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/event/display/MultipleObjectsDisplayEvent.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/event/display/MultipleObjectsDisplayListener.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/event/display/ObjAttributeDisplayEvent.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/event/display/ObjAttributeDisplayListener.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/event/display/ObjEntityDisplayEvent.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/event/display/ObjEntityDisplayListener.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/event/display/ObjRelationshipDisplayEvent.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/event/display/ObjRelationshipDisplayListener.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/event/display/ProcedureDisplayEvent.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/event/display/ProcedureDisplayListener.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/event/display/ProcedureParameterDisplayEvent.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/event/display/ProcedureParameterDisplayListener.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/event/display/QueryDisplayEvent.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/event/display/QueryDisplayListener.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/event/display/TablePopupHandler.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/event/display/ValidationConfigDisplayEvent.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/event/display/ValidationConfigDisplayListener.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/event/model/CallbackMethodEvent.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/event/model/CallbackMethodListener.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/event/model/DataMapEvent.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/event/model/DataMapListener.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/event/model/DbAttributeEvent.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/event/model/DbAttributeListener.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/event/model/DbEntityEvent.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/event/model/DbEntityListener.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/event/model/DbRelationshipEvent.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/event/model/DbRelationshipListener.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/event/model/DomainEvent.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/event/model/DomainListener.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/event/model/EmbeddableAttributeEvent.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/event/model/EmbeddableAttributeListener.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/event/model/EmbeddableEvent.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/event/model/EmbeddableListener.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/event/model/ModelEvent.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/event/model/ObjAttributeEvent.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/event/model/ObjAttributeListener.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/event/model/ObjEntityEvent.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/event/model/ObjEntityListener.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/event/model/ObjRelationshipEvent.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/event/model/ObjRelationshipListener.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/event/model/ProcedureEvent.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/event/model/ProcedureListener.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/event/model/ProcedureParameterEvent.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/event/model/ProcedureParameterListener.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/event/model/ProjectAfterSaveEvent.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/event/model/ProjectAfterSaveListener.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/event/model/ProjectBeforeSaveEvent.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/event/model/ProjectBeforeSaveListener.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/event/model/QueryEvent.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/event/model/QueryListener.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/event/model/RecentFileListener.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/log/LogAppender.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/log/ModelerLogFactory.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/log/ModelerLogServiceProvider.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/log/ModelerLogger.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/mcp/McpHandshakeWriter.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/platform/FlatLafLayoutStyle.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/platform/GenericUIInitializer.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/platform/UIInitializer.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/platform/mac/MacFileChooser.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/platform/mac/MacUIInitializer.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/pref/PreferenceMigration.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/pref/PrefsCopier.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/pref/PrefsExporter.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/pref/PrefsManager.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/pref/adapters/CMTablePrefs.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/pref/adapters/ComponentGeometryPrefs.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/pref/adapters/DBGeneratorPrefs.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/pref/adapters/FileChooserPrefs.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/pref/adapters/GeneralPrefs.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/pref/adapters/LogConsolePrefs.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/pref/adapters/ProjectPrefs.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/pref/adapters/RecentProjectsPrefs.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/pref/adapters/SplitPanePrefs.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/pref/migration/toV5/_1_DbConnectorsMigration.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/pref/migration/toV5/_2_ClasspathMigration.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/pref/migration/toV5/_3_GeneralPrefsMigration.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/pref/migration/toV5/_4_RecentProjectsMigration.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/pref/migration/toV5/_5_FrameGeometryMigration.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/pref/migration/toV5/_6_ProjectSplitPaneMigration.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/pref/migration/toV5/_7_EntityTablePrefsMigration.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/pref/migration/toV5/_8_RemoveRedundantPathIndexMigration.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/project/CgenOps.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/project/DataMapOps.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/project/DbAttributeOps.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/project/DbEntityOps.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/project/DbRelationshipOps.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/project/ObjEntityOps.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/project/ProjectComparators.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/project/ProjectDirtyListener.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/project/ProjectFileChangeTracker.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/project/ProjectNavigationHistory.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/project/ProjectSession.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/service/action/GlobalActions.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/service/classloader/ModelerClassLoader.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/service/os/OperatingSystem.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/service/validator/ConfigurableProjectValidator.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/toolkit/AppAction.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/toolkit/AppDialog.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/toolkit/AppFrame.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/toolkit/AppPanel.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/toolkit/AppTabbedPane.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/toolkit/AppToolBar.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/toolkit/ProjectDialog.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/toolkit/ProjectPanel.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/toolkit/ProjectTabbedPane.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/toolkit/Renderers.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/toolkit/border/TopBorder.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/toolkit/buttons/CMButtonPanel.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/toolkit/checkbox/CMCheckBox.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/toolkit/checkbox/CMCheckBoxUndoableEdit.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/toolkit/columnview/ColumnViewPanel.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/toolkit/combobox/AutoCompletion.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/toolkit/combobox/CMAutoCompleteComboBoxCellEditor.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/toolkit/combobox/CMComboBox.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/toolkit/combobox/CMComboBoxCellEditor.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/toolkit/combobox/CMComboBoxPopupResizer.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/toolkit/combobox/CMComboBoxUndoableEdit.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/toolkit/combobox/CMUndoableComboBox.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/toolkit/combobox/ComboBoxPopup.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/toolkit/combobox/CustomTypeComboBoxEditor.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/toolkit/combobox/EditorTextField.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/toolkit/combobox/SuggestionList.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/toolkit/copypaste/CMTransferable.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/toolkit/filechooser/CMFileChooser.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/toolkit/filechooser/CMFileChooserFactory.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/toolkit/filechooser/FileFilters.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/toolkit/filechooser/SwingDirChooserDialog.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/toolkit/filechooser/SwingFileChooser.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/toolkit/filechooser/SwingFileOpenerDialog.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/toolkit/filechooser/SwingFileSaverDialog.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/toolkit/icon/IconFactory.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/toolkit/table/BoardTableCellRenderer.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/toolkit/table/CMTable.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/toolkit/table/CMTableModel.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/toolkit/table/CMTableModelUndoableEdit.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/toolkit/table/CMTablePanel.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/toolkit/table/CMTextFieldCellEditor.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/toolkit/table/IconCellRenderer.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/toolkit/table/SortButtonRenderer.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/toolkit/table/TableSizer.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/toolkit/text/CMPasswordField.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/toolkit/text/CMTextArea.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/toolkit/text/CMTextCommitListener.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/toolkit/text/CMTextField.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/toolkit/text/CMTextPane.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/toolkit/text/CMTextPaneEditorKit.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/toolkit/text/CMUndoableTextField.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/toolkit/text/CMUndoableTextPane.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/toolkit/text/LineNumberedBorder.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/toolkit/text/TextComponentUndoListener.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/toolkit/text/UnderlineHighlighterForText.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/toolkit/text/style/SyntaxStyle.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/toolkit/text/style/TextPaneStyleTypes.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/toolkit/text/style/TextSyntax.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/toolkit/tree/ChangeOptimizingTreeModel.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/toolkit/tree/CheckBoxNodeData.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/toolkit/tree/CheckBoxTree.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/toolkit/tree/CheckBoxTreeCellEditor.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/toolkit/tree/CheckBoxTreeCellRenderer.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/toolkit/tree/EntityTreeAttributeRelationshipFilter.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/toolkit/tree/EntityTreeFilter.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/toolkit/tree/EntityTreeModel.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/toolkit/tree/EntityTreeRelationshipFilter.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/toolkit/tree/LabelTreeCellRenderer.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/toolkit/url/UrlOpener.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/toolkit/valuetype/ValueTypes.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/ui/MainFrame.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/ui/MainMenuBar.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/ui/MainToolBar.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/ui/SearchPanel.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/ui/about/AboutFrame.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/ui/action/AboutAction.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/ui/action/BaseViewEntityAction.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/ui/action/CloseProjectAction.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/ui/action/CollapseTreeAction.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/ui/action/ConfigurePreferencesAction.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/ui/action/CopyAction.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/ui/action/CopyAttributeAction.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/ui/action/CopyAttributeRelationshipAction.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/ui/action/CopyCallbackMethodAction.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/ui/action/CopyProcedureParameterAction.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/ui/action/CopyRelationshipAction.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/ui/action/CreateAttributeAction.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/ui/action/CreateCallbackMethodAction.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/ui/action/CreateDataMapAction.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/ui/action/CreateDbEntityAction.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/ui/action/CreateEmbeddableAction.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/ui/action/CreateObjEntityAction.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/ui/action/CreateObjEntityFromDbAction.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/ui/action/CreateProcedureAction.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/ui/action/CreateProcedureParameterAction.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/ui/action/CreateQueryAction.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/ui/action/CreateRelationshipAction.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/ui/action/CutAction.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/ui/action/CutAttributeAction.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/ui/action/CutAttributeRelationshipAction.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/ui/action/CutCallbackMethodAction.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/ui/action/CutProcedureParameterAction.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/ui/action/CutRelationshipAction.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/ui/action/DBConnectionAwareAction.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/ui/action/DbEntityCounterpartAction.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/ui/action/DbEntitySyncAction.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/ui/action/DisableValidationInspectionAction.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/ui/action/DocumentationAction.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/ui/action/ExitAction.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/ui/action/FilterAction.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/ui/action/FindAction.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/ui/action/GenerateDBAction.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/ui/action/ImportDataMapAction.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/ui/action/ImportEOModelAction.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/ui/action/InferRelationshipsAction.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/ui/action/MigrateAction.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/ui/action/MultipleObjectsAction.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/ui/action/NavigateAction.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/ui/action/NavigateBackwardAction.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/ui/action/NavigateForwardAction.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/ui/action/NewProjectAction.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/ui/action/ObjEntityCounterpartAction.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/ui/action/ObjEntitySyncAction.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/ui/action/ObjEntityToSuperEntityAction.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/ui/action/OpenProjectAction.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/ui/action/PasteAction.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/ui/action/RedoAction.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/ui/action/RemoveAction.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/ui/action/RemoveAttributeAction.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/ui/action/RemoveAttributeRelationshipAction.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/ui/action/RemoveCallbackMethodAction.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/ui/action/RemoveProcedureParameterAction.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/ui/action/RemoveRelationshipAction.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/ui/action/RevertAction.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/ui/action/SaveAction.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/ui/action/SaveAsAction.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/ui/action/ShowLogConsoleAction.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/ui/action/ShowValidationConfigAction.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/ui/action/ShowValidationOptionAction.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/ui/action/UndoAction.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/ui/action/UpdateValidationConfigAction.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/ui/action/ValidateAction.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/ui/autorelationship/InferRelationshipsDialog.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/ui/autorelationship/InferRelationshipsPanel.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/ui/autorelationship/InferRelationshipsTabController.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/ui/autorelationship/InferredRelationship.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/ui/confirmremove/ConfirmRemoveDialog.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/ui/datasource/DataSourceDialog.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/ui/dbactionoptions/DbActionOptionsDialog.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/ui/dbgen/DBGeneratorOptionsDialog.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/ui/dbgen/TableSelectorPanel.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/ui/dbmerge/MergerOptionsDialog.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/ui/dbmerge/MergerTokenSelector.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/ui/dbmerge/MergerTokenTableModel.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/ui/dbrelationship/DbJoinTableModel.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/ui/dbrelationship/DbRelationshipDialog.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/ui/entitysync/EntitySyncDialog.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/ui/errors/ErrorDialog.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/ui/filedeleted/FileDeletedDialog.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/ui/find/FindDialog.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/ui/logconsole/LogConsole.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/ui/preferences/PreferenceDialog.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/ui/preferences/classpath/ClasspathPrefsPanel.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/ui/preferences/classpath/maven/MavenDependencyDialog.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/ui/preferences/dbconnector/DBConnectorEditor.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/ui/preferences/dbconnector/DBConnectorPrefsPanel.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/ui/preferences/dbconnector/creator/Adapters.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/ui/preferences/dbconnector/creator/DBConnectorCreatorDialog.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/ui/preferences/dbconnector/duplicator/DBConnectorDuplicatorDialog.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/ui/preferences/general/GeneralPrefsPanel.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/ui/preferences/more/MorePrefsPanel.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/ui/project/ProjectView.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/ui/project/editor/EditorPanelView.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/ui/project/editor/ExpressionConvertor.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datadomain/DataDomainGeneratorsPanel.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datadomain/DataDomainGeneratorsTab.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datadomain/DataDomainView.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datadomain/cgen/DataDomainCgenTab.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datadomain/dbimport/DataDomainDbImportTab.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datadomain/main/DataDomainMainView.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datadomain/validation/InspectionCheckBoxTree.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datadomain/validation/ValidationTab.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/DataMapView.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/cgen/CgenArtefactSelectorPanel.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/cgen/CgenConfigPanel.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/cgen/CgenPanel.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/cgen/CgenValidator.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/cgen/CheckBoxHeader.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/cgen/CodeValidator.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/cgen/SelectionModel.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/cgen/action/AddCgenConfigAction.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/cgen/action/EditCgenConfigAction.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/cgen/action/RemoveCgenConfigAction.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/cgen/templateeditor/ArtefactsConfigurator.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/cgen/templateeditor/DataMapArtefactsConfigurator.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/cgen/templateeditor/EditorTemplateLoader.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/cgen/templateeditor/EditorTemplateSaver.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/cgen/templateeditor/EmbeddableArtefactsConfigurator.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/cgen/templateeditor/EntityArtefactsConfigurator.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/cgen/templateeditor/PreviewActionConfigurator.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/cgen/templateeditor/PreviewClassGenerationFactory.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/cgen/templateeditor/PreviewGenerationAction.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/cgen/templateeditor/TemplateEditor.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/cgen/templateeditor/TemplateEditorFindAndReplaceDialog.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/cgen/templateeditor/TemplateEditorFindDialog.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/cgen/templateeditor/VelocityTokenMaker.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/CatalogPopUpMenu.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/ConfigToolbar.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/DBSchemaPanel.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/DatabaseSchemaLoader.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/DbImportResultDialog.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/DbImportSorter.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/DbImportTree.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/DbImportTreeCellEditor.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/DbImportTreeCellRenderer.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/DbImportTreeModel.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/DbImportView.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/DbSchemaToolbar.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/DefaultPopUpMenu.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/IncludeTablePopUpMenu.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/PrintColumnsBiFunction.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/PrintTablesBiFunction.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/ReverseEngineeringConfigPanel.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/ReverseEngineeringTreePanel.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/RootPopUpMenu.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/SchemaPopUpMenu.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/action/AddCatalogAction.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/action/AddExcludeColumnAction.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/action/AddExcludeProcedureAction.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/action/AddExcludeTableAction.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/action/AddIncludeColumnAction.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/action/AddIncludeProcedureAction.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/action/AddIncludeTableAction.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/action/AddPatternParamAction.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/action/AddSchemaAction.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/action/DbImportActions.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/action/DeleteNodeAction.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/action/DragAndDropNodeAction.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/action/EditNodeAction.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/action/GetDbConnectionAction.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/action/LoadDbSchemaAction.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/action/ModelerDbImportAction.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/action/MoveImportNodeAction.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/action/MoveInvertNodeAction.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/action/SortNodesAction.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/action/TreeManipulationAction.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/progress/DbImportProgressDialog.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/runner/DbImportProjectSaver.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/runner/ModelerDbImportAction.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/runner/ModelerDbImportModule.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/runner/ModelerDbLoaderContext.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/runner/ModelerDbLoaderDelegate.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/tree/CatalogNode.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/tree/CatalogProcedureNode.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/tree/CatalogTableNode.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/tree/ColorTreeRenderer.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/tree/ColumnNode.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/tree/DbImportTreeNode.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/tree/Node.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/tree/NodeType.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/tree/ObjectType.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/tree/ProcedureNode.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/tree/SchemaNode.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/tree/SchemaProcedureNode.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/tree/SchemaTableNode.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/tree/Status.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/tree/TableNode.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/tree/TransferableNode.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/defaults/DefaultsUpdateDialog.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/main/DataMapMainView.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/main/catalog/CatalogUpdateDialog.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/main/locking/LockingUpdateDialog.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/main/pkg/PackageUpdateDialog.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/main/schema/SchemaUpdateDialog.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/main/superclass/SuperclassUpdateDialog.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/ui/project/editor/dbentity/DbEntityView.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/ui/project/editor/dbentity/main/DbEntityMainView.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/ui/project/editor/dbentity/main/PKCustomSequenceGeneratorPanel.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/ui/project/editor/dbentity/main/PKDBGeneratorPanel.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/ui/project/editor/dbentity/main/PKDefaultGeneratorPanel.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/ui/project/editor/dbentity/main/PKGeneratorPanel.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/ui/project/editor/dbentity/properties/DbAttributePanel.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/ui/project/editor/dbentity/properties/DbAttributeTableModel.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/ui/project/editor/dbentity/properties/DbEntityPropertiesView.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/ui/project/editor/dbentity/properties/DbRelationshipPanel.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/ui/project/editor/dbentity/properties/DbRelationshipTableModel.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/ui/project/editor/embeddable/EmbeddableView.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/ui/project/editor/embeddable/attributes/EmbeddableAttributeTableModel.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/ui/project/editor/embeddable/attributes/EmbeddableAttributesView.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/ui/project/editor/embeddable/main/EmbeddableMainView.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/ui/project/editor/objentity/ObjEntityView.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/ui/project/editor/objentity/attrinfo/ObjAttributeInfoDialog.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/ui/project/editor/objentity/attrinfo/ObjAttributePathNavigatorPanel.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/ui/project/editor/objentity/attrinfo/ObjAttributeTableCellEditor.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/ui/project/editor/objentity/attrinfo/OverrideEmbeddableAttributeTableModel.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/ui/project/editor/objentity/callbacks/CallbackDescriptorTableModel.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/ui/project/editor/objentity/callbacks/CallbackType.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/ui/project/editor/objentity/callbacks/ObjCallbackMethod.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/ui/project/editor/objentity/callbacks/ObjEntityCallbacksView.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/ui/project/editor/objentity/classname/ClassNameUpdaterController.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/ui/project/editor/objentity/duplicates/DuplicatedAttributesDialog.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/ui/project/editor/objentity/main/ObjEntityMainView.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/ui/project/editor/objentity/properties/DbAttributePathComboBoxEditor.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/ui/project/editor/objentity/properties/DbAttributePathComboBoxRenderer.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/ui/project/editor/objentity/properties/DbRelationshipPathComboBoxEditor.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/ui/project/editor/objentity/properties/ObjAttributePanel.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/ui/project/editor/objentity/properties/ObjAttributeTableModel.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/ui/project/editor/objentity/properties/ObjEntityPropertiesView.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/ui/project/editor/objentity/properties/ObjRelationshipPanel.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/ui/project/editor/objentity/properties/ObjRelationshipTableModel.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/ui/project/editor/objentity/properties/PathChooserComboBoxCellEditor.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/ui/project/editor/objentity/relinfo/ObjRelationshipInfoDialog.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/ui/project/editor/objentity/relinfo/ObjRelationshipPathNavigatorPanel.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/ui/project/editor/procedure/ProcedureParameterTab.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/ui/project/editor/procedure/ProcedureParameterTableModel.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/ui/project/editor/procedure/ProcedureQueryView.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/ui/project/editor/procedure/ProcedureTab.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/ui/project/editor/procedure/ProcedureTabbedView.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/ui/project/editor/query/BaseQueryMainTab.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/ui/project/editor/query/ExistingSelectionProcessor.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/ui/project/editor/query/ObjectQueryPropertiesPanel.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/ui/project/editor/query/PrefetchModel.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/ui/project/editor/query/RawQueryPropertiesPanel.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/ui/project/editor/query/RootSelectionHandler.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/ui/project/editor/query/SelectPropertiesPanel.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/ui/project/editor/query/ejbql/EjbqlQueryMainTab.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/ui/project/editor/query/ejbql/EjbqlQueryPropertiesPanel.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/ui/project/editor/query/ejbql/EjbqlQueryScriptsTab.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/ui/project/editor/query/ejbql/EjbqlSyntax.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/ui/project/editor/query/ejbql/EjbqlTabbedView.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/ui/project/editor/query/selectquery/AddPrefetchUndoableEdit.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/ui/project/editor/query/selectquery/SelectQueryMainTab.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/ui/project/editor/query/selectquery/SelectQueryOrderingTab.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/ui/project/editor/query/selectquery/SelectQueryPrefetchTab.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/ui/project/editor/query/selectquery/SelectQueryTabbedView.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/ui/project/editor/query/sqltemplate/AddPrefetchUndoableEditForSqlTemplate.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/ui/project/editor/query/sqltemplate/SQLSyntax.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/ui/project/editor/query/sqltemplate/SQLTemplateMainTab.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/ui/project/editor/query/sqltemplate/SQLTemplatePrefetchTab.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/ui/project/editor/query/sqltemplate/SQLTemplateScriptsTab.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/ui/project/editor/query/sqltemplate/SQLTemplateTabbedView.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/ui/project/overwrite/OverwriteDialog.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/ui/project/querytype/QueryTypeDialog.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/ui/project/tree/ProjectTree.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/ui/project/tree/ProjectTreeFactory.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/ui/project/tree/ProjectTreeModel.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/ui/project/tree/treefilter/TreeFilterPopup.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/ui/project/validator/AttributeErrorMsg.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/ui/project/validator/DataMapErrorMsg.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/ui/project/validator/DomainErrorMsg.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/ui/project/validator/EmbeddableAttributeErrorMsg.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/ui/project/validator/EmbeddableErrorMsg.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/ui/project/validator/EntityErrorMsg.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/ui/project/validator/ProcedureErrorMsg.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/ui/project/validator/ProcedureParameterErrorMsg.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/ui/project/validator/ProjectValidatorDialog.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/ui/project/validator/QueryErrorMsg.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/ui/project/validator/RelationshipErrorMsg.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/ui/project/validator/ValidationDisplayHandler.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/ui/unsavedchanges/UnsavedChangesDialog.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/ui/validation/ValidationDialog.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/ui/welcome/BackgroundPanel.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/ui/welcome/RecentFileListModel.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/ui/welcome/RecentFileListRenderer.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/ui/welcome/WelcomeScreen.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/ui/welcome/WelcomeScreenMainPanel.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/undo/BaseRemovePropertyUndoableEdit.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/undo/CayenneUndoManager.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/undo/CayenneUndoableEdit.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/undo/ChangePKGeneratorUndoableEdit.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/undo/CreateCallbackMethodUndoableEdit.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/undo/CreateDataMapUndoableEdit.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/undo/CreateDbAttributeUndoableEdit.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/undo/CreateDbEntityUndoableEdit.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/undo/CreateDbRelationshipUndoableEdit.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/undo/CreateEmbAttributeUndoableEdit.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/undo/CreateEmbeddableUndoableEdit.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/undo/CreateObjAttributeUndoableEdit.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/undo/CreateObjEntityUndoableEdit.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/undo/CreateObjRelationshipUndoableEdit.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/undo/CreateProcedureParameterUndoableEdit.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/undo/CreateProcedureUndoableEdit.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/undo/CreateQueryUndoableEdit.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/undo/DbEntitySyncUndoableEdit.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/undo/DbImportTreeUndoableEdit.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/undo/DbRelationshipUndoableEdit.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/undo/InferRelationshipsUndoableEdit.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/undo/ObjRelationshipUndoableEdit.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/undo/PasteCompoundUndoableEdit.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/undo/PasteUndoableEdit.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/undo/RemoveCallbackMethodUndoableEdit.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/undo/RemoveCompoundUndoableEdit.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/undo/RemoveDbAttributeUndoableEdit.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/undo/RemoveDbRelationshipUndoableEdit.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/undo/RemoveEmbeddableAttributeUndoableEdit.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/undo/RemoveObjAttributeUndoableEdit.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/undo/RemoveObjRelationshipUndoableEdit.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/undo/RemoveUndoableEdit.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/undo/TextCompoundEdit.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/java/org/apache/cayenne/modeler/undo/UpdateValidationConfigUndoableEdit.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/resources/META-INF/services/org.slf4j.spi.SLF4JServiceProvider (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/resources/org/apache/cayenne/modeler/images/CayenneModeler.png (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/resources/org/apache/cayenne/modeler/images/icon-arrow-closed.png (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/resources/org/apache/cayenne/modeler/images/icon-arrow-open.png (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/resources/org/apache/cayenne/modeler/images/icon-attribute.png (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/resources/org/apache/cayenne/modeler/images/icon-backward.png (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/resources/org/apache/cayenne/modeler/images/icon-copy.png (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/resources/org/apache/cayenne/modeler/images/icon-create-method.png (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/resources/org/apache/cayenne/modeler/images/icon-cut.png (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/resources/org/apache/cayenne/modeler/images/icon-datamap.png (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/resources/org/apache/cayenne/modeler/images/icon-dbentity.png (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/resources/org/apache/cayenne/modeler/images/icon-dbi-catalog.png (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/resources/org/apache/cayenne/modeler/images/icon-dbi-column.png (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/resources/org/apache/cayenne/modeler/images/icon-dbi-config.png (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/resources/org/apache/cayenne/modeler/images/icon-dbi-excludeColumn.png (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/resources/org/apache/cayenne/modeler/images/icon-dbi-excludeProcedure.png (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/resources/org/apache/cayenne/modeler/images/icon-dbi-excludeTable.png (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/resources/org/apache/cayenne/modeler/images/icon-dbi-includeColumn.png (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/resources/org/apache/cayenne/modeler/images/icon-dbi-includeProcedure.png (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/resources/org/apache/cayenne/modeler/images/icon-dbi-includeTable.png (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/resources/org/apache/cayenne/modeler/images/icon-dbi-refresh.png (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/resources/org/apache/cayenne/modeler/images/icon-dbi-runImport.png (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/resources/org/apache/cayenne/modeler/images/icon-dbi-schema.png (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/resources/org/apache/cayenne/modeler/images/icon-dbi-sort.png (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/resources/org/apache/cayenne/modeler/images/icon-disable.png (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/resources/org/apache/cayenne/modeler/images/icon-dom.png (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/resources/org/apache/cayenne/modeler/images/icon-down.png (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/resources/org/apache/cayenne/modeler/images/icon-edit.png (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/resources/org/apache/cayenne/modeler/images/icon-embeddable.png (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/resources/org/apache/cayenne/modeler/images/icon-eomodel.png (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/resources/org/apache/cayenne/modeler/images/icon-error.png (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/resources/org/apache/cayenne/modeler/images/icon-filter.png (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/resources/org/apache/cayenne/modeler/images/icon-find_and_replace.png (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/resources/org/apache/cayenne/modeler/images/icon-forward.png (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/resources/org/apache/cayenne/modeler/images/icon-gen_java.png (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/resources/org/apache/cayenne/modeler/images/icon-info.png (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/resources/org/apache/cayenne/modeler/images/icon-inheritance.png (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/resources/org/apache/cayenne/modeler/images/icon-move_down.png (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/resources/org/apache/cayenne/modeler/images/icon-move_up.png (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/resources/org/apache/cayenne/modeler/images/icon-new.png (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/resources/org/apache/cayenne/modeler/images/icon-new_embeddable.png (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/resources/org/apache/cayenne/modeler/images/icon-new_objentity.png (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/resources/org/apache/cayenne/modeler/images/icon-new_query.png (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/resources/org/apache/cayenne/modeler/images/icon-objentity.png (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/resources/org/apache/cayenne/modeler/images/icon-open.png (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/resources/org/apache/cayenne/modeler/images/icon-paste.png (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/resources/org/apache/cayenne/modeler/images/icon-plus.png (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/resources/org/apache/cayenne/modeler/images/icon-query.png (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/resources/org/apache/cayenne/modeler/images/icon-redo.png (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/resources/org/apache/cayenne/modeler/images/icon-refresh.png (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/resources/org/apache/cayenne/modeler/images/icon-relationship.png (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/resources/org/apache/cayenne/modeler/images/icon-remove.png (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/resources/org/apache/cayenne/modeler/images/icon-save-as-image.png (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/resources/org/apache/cayenne/modeler/images/icon-save.png (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/resources/org/apache/cayenne/modeler/images/icon-sort-asc.png (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/resources/org/apache/cayenne/modeler/images/icon-sort-desc.png (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/resources/org/apache/cayenne/modeler/images/icon-stored-procedure.png (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/resources/org/apache/cayenne/modeler/images/icon-sync.png (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/resources/org/apache/cayenne/modeler/images/icon-trash.png (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/resources/org/apache/cayenne/modeler/images/icon-tree-collapse.png (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/resources/org/apache/cayenne/modeler/images/icon-undo.png (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/resources/org/apache/cayenne/modeler/images/icon-up.png (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/resources/org/apache/cayenne/modeler/images/icon-zoom-in.png (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/resources/org/apache/cayenne/modeler/images/icon-zoom-out.png (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/resources/org/apache/cayenne/modeler/images/logo.jpg (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/resources/org/apache/cayenne/modeler/images/welcome/welcome-screen-left-bg.jpg (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/resources/org/apache/cayenne/modeler/images/welcome/welcome-screen-new-btn-hover.png (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/resources/org/apache/cayenne/modeler/images/welcome/welcome-screen-new-btn.png (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/resources/org/apache/cayenne/modeler/images/welcome/welcome-screen-open-btn-hover.png (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/resources/org/apache/cayenne/modeler/images/welcome/welcome-screen-open-btn.png (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/main/resources/org/apache/cayenne/modeler/images/welcome/welcome-screen-right-bg.jpg (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/test/java/org/apache/cayenne/modeler/CayenneModelerValidationIT.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/test/java/org/apache/cayenne/modeler/CliArgsTest.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/test/java/org/apache/cayenne/modeler/MainTest.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/test/java/org/apache/cayenne/modeler/editor/dbimport/DbImportSorterTest.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/test/java/org/apache/cayenne/modeler/editor/dbimport/tree/BaseNodeTest.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/test/java/org/apache/cayenne/modeler/editor/dbimport/tree/CatalogNodeTest.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/test/java/org/apache/cayenne/modeler/editor/dbimport/tree/ColumnNodeTest.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/test/java/org/apache/cayenne/modeler/editor/dbimport/tree/SchemaNodeTest.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/test/java/org/apache/cayenne/modeler/editor/dbimport/tree/SchemaProcedureNodeTest.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/test/java/org/apache/cayenne/modeler/editor/dbimport/tree/SchemaTableNodeTest.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/test/java/org/apache/cayenne/modeler/editor/templateeditor/ArtifactsConfiguratorTest.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/test/java/org/apache/cayenne/modeler/editor/templateeditor/EditorTemplateLoaderTest.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/test/java/org/apache/cayenne/modeler/editor/templateeditor/EditorTemplateSaverTest.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/test/java/org/apache/cayenne/modeler/editor/templateeditor/PreviewActionConfiguratorTest.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/test/java/org/apache/cayenne/modeler/event/display/DomainDisplayEventTest.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/test/java/org/apache/cayenne/modeler/event/model/DataMapEventTest.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/test/java/org/apache/cayenne/modeler/event/model/DbAttributeEventTest.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/test/java/org/apache/cayenne/modeler/event/model/DbEntityEventTest.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/test/java/org/apache/cayenne/modeler/event/model/DbRelationshipEventTest.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/test/java/org/apache/cayenne/modeler/event/model/DomainEventTest.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/test/java/org/apache/cayenne/modeler/event/model/ModelEventTest.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/test/java/org/apache/cayenne/modeler/mcp/McpHandshakeWriterTest.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/test/java/org/apache/cayenne/modeler/pref/migration/toV5/_3_GeneralPrefsMigrationTest.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/test/java/org/apache/cayenne/modeler/pref/migration/toV5/_8_RemoveRedundantPathIndexMigrationTest.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/test/java/org/apache/cayenne/modeler/ui/action/EOModelFileFilterTest.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/test/java/org/apache/cayenne/modeler/ui/preferences/general/GeneralPrefsPanelTest.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/test/java/org/apache/cayenne/modeler/util/ApplicationFileFilterTest.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/test/java/org/apache/cayenne/modeler/util/DataMapFileFilterTest.java (100%)
 rename {modeler/cayenne-modeler => cayenne-modeler}/src/test/resources/org/apache/cayenne/modeler/cayenne-configured-validation.xml (100%)
 rename {modeler/cayenne-wocompat => cayenne-wocompat}/pom.xml (82%)
 rename {modeler/cayenne-wocompat => cayenne-wocompat}/src/main/java/org/apache/cayenne/wocompat/EODbAttribute.java (100%)
 rename {modeler/cayenne-wocompat => cayenne-wocompat}/src/main/java/org/apache/cayenne/wocompat/EOModelHelper.java (100%)
 rename {modeler/cayenne-wocompat => cayenne-wocompat}/src/main/java/org/apache/cayenne/wocompat/EOModelProcessor.java (100%)
 rename {modeler/cayenne-wocompat => cayenne-wocompat}/src/main/java/org/apache/cayenne/wocompat/EOObjAttribute.java (100%)
 rename {modeler/cayenne-wocompat => cayenne-wocompat}/src/main/java/org/apache/cayenne/wocompat/EOObjEntity.java (100%)
 rename {modeler/cayenne-wocompat => cayenne-wocompat}/src/main/java/org/apache/cayenne/wocompat/EOQuery.java (100%)
 rename {modeler/cayenne-wocompat => cayenne-wocompat}/src/main/java/org/apache/cayenne/wocompat/EOSQLQuery.java (100%)
 rename {modeler/cayenne-wocompat => cayenne-wocompat}/src/main/java/org/apache/cayenne/wocompat/PlistDataStructureFactory.java (100%)
 rename {modeler/cayenne-wocompat => cayenne-wocompat}/src/main/java/org/apache/cayenne/wocompat/PropertyListSerialization.java (100%)
 rename {modeler/cayenne-wocompat => cayenne-wocompat}/src/main/java/org/apache/cayenne/wocompat/parser/DefaultPlistDataStructureFactory.java (100%)
 rename {modeler/cayenne-wocompat => cayenne-wocompat}/src/main/java/org/apache/cayenne/wocompat/parser/ParseException.java (100%)
 rename {modeler/cayenne-wocompat => cayenne-wocompat}/src/main/java/org/apache/cayenne/wocompat/parser/Parser.java (100%)
 rename {modeler/cayenne-wocompat => cayenne-wocompat}/src/main/java/org/apache/cayenne/wocompat/parser/Parser.jj (100%)
 rename {modeler/cayenne-wocompat => cayenne-wocompat}/src/main/java/org/apache/cayenne/wocompat/parser/ParserConstants.java (100%)
 rename {modeler/cayenne-wocompat => cayenne-wocompat}/src/main/java/org/apache/cayenne/wocompat/parser/ParserTokenManager.java (100%)
 rename {modeler/cayenne-wocompat => cayenne-wocompat}/src/main/java/org/apache/cayenne/wocompat/parser/SimpleCharStream.java (100%)
 rename {modeler/cayenne-wocompat => cayenne-wocompat}/src/main/java/org/apache/cayenne/wocompat/parser/Token.java (100%)
 rename {modeler/cayenne-wocompat => cayenne-wocompat}/src/main/java/org/apache/cayenne/wocompat/parser/TokenMgrError.java (100%)
 rename {modeler/cayenne-wocompat => cayenne-wocompat}/src/test/java/org/apache/cayenne/wocompat/EOModelHelperTest.java (100%)
 rename {modeler/cayenne-wocompat => cayenne-wocompat}/src/test/java/org/apache/cayenne/wocompat/EOModelProcessorInheritanceTest.java (100%)
 rename {modeler/cayenne-wocompat => cayenne-wocompat}/src/test/java/org/apache/cayenne/wocompat/EOModelProcessorTest.java (100%)
 rename {modeler/cayenne-wocompat => cayenne-wocompat}/src/test/java/org/apache/cayenne/wocompat/EOModelPrototypesTest.java (100%)
 rename {modeler/cayenne-wocompat => cayenne-wocompat}/src/test/java/org/apache/cayenne/wocompat/EOQueryTest.java (100%)
 rename {modeler/cayenne-wocompat => cayenne-wocompat}/src/test/java/org/apache/cayenne/wocompat/PropertyListSerializationTest.java (100%)
 rename {modeler/cayenne-wocompat => cayenne-wocompat}/src/test/java/org/apache/cayenne/wocompat/parser/PropertyListParserTest.java (100%)
 rename {modeler/cayenne-wocompat => cayenne-wocompat}/src/test/resources/art-with-errors.eomodeld/Artist.plist (100%)
 rename {modeler/cayenne-wocompat => cayenne-wocompat}/src/test/resources/art-with-errors.eomodeld/ArtistExhibit.plist (100%)
 rename {modeler/cayenne-wocompat => cayenne-wocompat}/src/test/resources/art-with-errors.eomodeld/DiagramLayout (100%)
 rename {modeler/cayenne-wocompat => cayenne-wocompat}/src/test/resources/art-with-errors.eomodeld/Exhibit.plist (100%)
 rename {modeler/cayenne-wocompat => cayenne-wocompat}/src/test/resources/art-with-errors.eomodeld/Gallery.plist (100%)
 rename {modeler/cayenne-wocompat => cayenne-wocompat}/src/test/resources/art-with-errors.eomodeld/Painting.plist (100%)
 rename {modeler/cayenne-wocompat => cayenne-wocompat}/src/test/resources/art-with-errors.eomodeld/PaintingInfo.plist (100%)
 rename {modeler/cayenne-wocompat => cayenne-wocompat}/src/test/resources/art-with-errors.eomodeld/index.eomodeld (100%)
 rename {modeler/cayenne-wocompat => cayenne-wocompat}/src/test/resources/inheritance.eomodeld/AbstractEntity.plist (100%)
 rename {modeler/cayenne-wocompat => cayenne-wocompat}/src/test/resources/inheritance.eomodeld/ConcreteEntityOne.plist (100%)
 rename {modeler/cayenne-wocompat => cayenne-wocompat}/src/test/resources/inheritance.eomodeld/DetailEntity.plist (100%)
 rename {modeler/cayenne-wocompat => cayenne-wocompat}/src/test/resources/inheritance.eomodeld/DiagramLayout (100%)
 rename {modeler/cayenne-wocompat => cayenne-wocompat}/src/test/resources/inheritance.eomodeld/HelperEntity.plist (100%)
 rename {modeler/cayenne-wocompat => cayenne-wocompat}/src/test/resources/inheritance.eomodeld/HelperFlatEntity.plist (100%)
 rename {modeler/cayenne-wocompat => cayenne-wocompat}/src/test/resources/inheritance.eomodeld/SingleTableConcreteEntityOne.plist (100%)
 rename {modeler/cayenne-wocompat => cayenne-wocompat}/src/test/resources/inheritance.eomodeld/SingleTableConcreteEntityTwo.plist (100%)
 rename {modeler/cayenne-wocompat => cayenne-wocompat}/src/test/resources/inheritance.eomodeld/SingleTableJoin.plist (100%)
 rename {modeler/cayenne-wocompat => cayenne-wocompat}/src/test/resources/inheritance.eomodeld/XSingleTableAbstractEntity.plist (100%)
 rename {modeler/cayenne-wocompat => cayenne-wocompat}/src/test/resources/inheritance.eomodeld/index.eomodeld (100%)
 rename {modeler/cayenne-wocompat => cayenne-wocompat}/src/test/resources/prototypes.eomodeld/DiagramLayout (100%)
 rename {modeler/cayenne-wocompat => cayenne-wocompat}/src/test/resources/prototypes.eomodeld/Document.plist (100%)
 rename {modeler/cayenne-wocompat => cayenne-wocompat}/src/test/resources/prototypes.eomodeld/EOPrototypes.plist (100%)
 rename {modeler/cayenne-wocompat => cayenne-wocompat}/src/test/resources/prototypes.eomodeld/EOXYZPrototypes.plist (100%)
 rename {modeler/cayenne-wocompat => cayenne-wocompat}/src/test/resources/prototypes.eomodeld/Estimate.plist (100%)
 rename {modeler/cayenne-wocompat => cayenne-wocompat}/src/test/resources/prototypes.eomodeld/Invoice.plist (100%)
 rename {modeler/cayenne-wocompat => cayenne-wocompat}/src/test/resources/prototypes.eomodeld/VendorPO.plist (100%)
 rename {modeler/cayenne-wocompat => cayenne-wocompat}/src/test/resources/prototypes.eomodeld/index.eomodeld (100%)
 rename {modeler/cayenne-wocompat => cayenne-wocompat}/src/test/resources/wotests/art.eomodeld/Artist.plist (100%)
 rename {modeler/cayenne-wocompat => cayenne-wocompat}/src/test/resources/wotests/art.eomodeld/ArtistExhibit.plist (100%)
 rename {modeler/cayenne-wocompat => cayenne-wocompat}/src/test/resources/wotests/art.eomodeld/CustomTypes.plist (100%)
 rename {modeler/cayenne-wocompat => cayenne-wocompat}/src/test/resources/wotests/art.eomodeld/DiagramLayout (100%)
 rename {modeler/cayenne-wocompat => cayenne-wocompat}/src/test/resources/wotests/art.eomodeld/Exhibit.plist (100%)
 rename {modeler/cayenne-wocompat => cayenne-wocompat}/src/test/resources/wotests/art.eomodeld/ExhibitType.fspec (100%)
 rename {modeler/cayenne-wocompat => cayenne-wocompat}/src/test/resources/wotests/art.eomodeld/ExhibitType.plist (100%)
 rename {modeler/cayenne-wocompat => cayenne-wocompat}/src/test/resources/wotests/art.eomodeld/Gallery.plist (100%)
 rename {modeler/cayenne-wocompat => cayenne-wocompat}/src/test/resources/wotests/art.eomodeld/Painting.plist (100%)
 rename {modeler/cayenne-wocompat => cayenne-wocompat}/src/test/resources/wotests/art.eomodeld/PaintingInfo.plist (100%)
 rename {modeler/cayenne-wocompat => cayenne-wocompat}/src/test/resources/wotests/art.eomodeld/index.eomodeld (100%)
 rename {modeler/cayenne-wocompat => cayenne-wocompat}/src/test/resources/wotests/cross-model-relationships.eomodeld/CrossModelRelTest.plist (100%)
 rename {modeler/cayenne-wocompat => cayenne-wocompat}/src/test/resources/wotests/cross-model-relationships.eomodeld/DiagramLayout (100%)
 rename {modeler/cayenne-wocompat => cayenne-wocompat}/src/test/resources/wotests/cross-model-relationships.eomodeld/index.eomodeld (100%)
 rename {modeler/cayenne-wocompat => cayenne-wocompat}/src/test/resources/wotests/fetchspec.eomodeld/DiagramLayout (100%)
 rename {modeler/cayenne-wocompat => cayenne-wocompat}/src/test/resources/wotests/fetchspec.eomodeld/Entity1.fspec (100%)
 rename {modeler/cayenne-wocompat => cayenne-wocompat}/src/test/resources/wotests/fetchspec.eomodeld/Entity1.plist (100%)
 rename {modeler/cayenne-wocompat => cayenne-wocompat}/src/test/resources/wotests/fetchspec.eomodeld/Entity2.plist (100%)
 rename {modeler/cayenne-wocompat => cayenne-wocompat}/src/test/resources/wotests/fetchspec.eomodeld/index.eomodeld (100%)
 rename {modeler/cayenne-wocompat => cayenne-wocompat}/src/test/resources/wotests/flattened.eomodeld/Artist.plist (100%)
 rename {modeler/cayenne-wocompat => cayenne-wocompat}/src/test/resources/wotests/flattened.eomodeld/ArtistExhibit.plist (100%)
 rename {modeler/cayenne-wocompat => cayenne-wocompat}/src/test/resources/wotests/flattened.eomodeld/Exhibit.plist (100%)
 rename {modeler/cayenne-wocompat => cayenne-wocompat}/src/test/resources/wotests/flattened.eomodeld/index.eomodeld (100%)
 delete mode 100644 modeler/cayenne-modeler-generic/pom.xml
 delete mode 100644 modeler/cayenne-modeler-mac/pom.xml
 delete mode 100644 modeler/cayenne-modeler-win/pom.xml
 delete mode 100644 modeler/cayenne-modeler/pom.xml
 delete mode 100644 modeler/pom.xml

(cayenne) 02/02: Flattenning modeler submodules into the project root

[aa...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

asf-gitbox-commits pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cayenne.git

commit afb43f08e3e42c1b0fadd63d945867002d39355b
Author: Andrus Adamchik <an...@objectstyle.com>
AuthorDate: Thu Aug 27 15:11:38 2026 -0400

    Flattenning modeler submodules into the project root
---
 .../modeler-architecture.md                        |   2 +-
 CLAUDE.md                                          |   2 +-
 UPGRADE.md                                         |  15 ++++++
 cayenne-assembly/pom.xml                           |   2 +-
 .../assemblies/generic/assembly-generic.xml        |   2 +-
 .../main/resources/assemblies/mac/assembly-mac.xml |   2 +-
 .../assemblies/windows/assembly-windows.xml        |   2 +-
 cayenne-mcp-server/pom.xml                         |   2 +-
 .../pom.xml                                        |  20 +++++++-
 .../cayenne/modeler/pref/PreferenceNodeIds.java    |   0
 .../apache/cayenne/modeler/pref/PrefsAdapter.java  |   0
 .../apache/cayenne/modeler/pref/PrefsLocator.java  |   0
 .../modeler/pref/adapters/ClasspathPrefs.java      |   0
 .../modeler/pref/adapters/DBConnectorsPrefs.java   |   0
 .../modeler/pref/adapters/DataMapPrefs.java        |   0
 .../modeler/pref/dbconnector/DBConnector.java      |   0
 .../modeler/pref/dbconnector/DBConnectors.java     |   0
 .../modeler/pref/PreferenceNodeIdsTest.java        |   0
 .../cayenne/modeler/pref/PrefsLocatorTest.java     |   0
 .../modeler/pref/adapters/ClasspathPrefsTest.java  |   0
 .../pref/adapters/DBConnectorsPrefsTest.java       |   0
 .../modeler/pref/adapters/DataMapPrefsTest.java    |   0
 .../modeler/pref/dbconnector/DBConnectorTest.java  |   0
 .../modeler/pref/dbconnector/DBConnectorsTest.java |   0
 {modeler => cayenne-modeler}/AGENTS.md             |   0
 .../cayenne-modeler => cayenne-modeler}/pom.xml    |  27 ++++++++--
 .../src/japplication/resources/CayenneModeler.icns | Bin
 .../src/japplication/resources/CayenneModeler.ico  | Bin
 .../org/apache/cayenne/modeler/Application.java    |   0
 .../java/org/apache/cayenne/modeler/CliArgs.java   |   0
 .../main/java/org/apache/cayenne/modeler/Main.java |   0
 .../org/apache/cayenne/modeler/ModelerModule.java  |   0
 .../cayenne/modeler/NameGeneratorPreferences.java  |   0
 .../cayenne/modeler/dbadapter/DbAdapters.java      |   0
 .../modeler/dbconnector/DBConnectorFactory.java    |   0
 .../event/display/CallbackMethodDisplayEvent.java  |   0
 .../display/CallbackMethodDisplayListener.java     |   0
 .../event/display/CallbackTypeDisplayEvent.java    |   0
 .../display/CallbackTypeSelectionListener.java     |   0
 .../modeler/event/display/DataMapDisplayEvent.java |   0
 .../event/display/DataMapDisplayListener.java      |   0
 .../event/display/DbAttributeDisplayEvent.java     |   0
 .../event/display/DbAttributeDisplayListener.java  |   0
 .../event/display/DbEntityDisplayEvent.java        |   0
 .../event/display/DbEntityDisplayListener.java     |   0
 .../event/display/DbRelationshipDisplayEvent.java  |   0
 .../display/DbRelationshipDisplayListener.java     |   0
 .../modeler/event/display/DisplayEvent.java        |   0
 .../modeler/event/display/DomainDisplayEvent.java  |   0
 .../event/display/DomainDisplayListener.java       |   0
 .../display/EmbeddableAttributeDisplayEvent.java   |   0
 .../EmbeddableAttributeDisplayListener.java        |   0
 .../event/display/EmbeddableDisplayEvent.java      |   0
 .../event/display/EmbeddableDisplayListener.java   |   0
 .../event/display/MultipleObjectsDisplayEvent.java |   0
 .../display/MultipleObjectsDisplayListener.java    |   0
 .../event/display/ObjAttributeDisplayEvent.java    |   0
 .../event/display/ObjAttributeDisplayListener.java |   0
 .../event/display/ObjEntityDisplayEvent.java       |   0
 .../event/display/ObjEntityDisplayListener.java    |   0
 .../event/display/ObjRelationshipDisplayEvent.java |   0
 .../display/ObjRelationshipDisplayListener.java    |   0
 .../event/display/ProcedureDisplayEvent.java       |   0
 .../event/display/ProcedureDisplayListener.java    |   0
 .../display/ProcedureParameterDisplayEvent.java    |   0
 .../display/ProcedureParameterDisplayListener.java |   0
 .../modeler/event/display/QueryDisplayEvent.java   |   0
 .../event/display/QueryDisplayListener.java        |   0
 .../modeler/event/display/TablePopupHandler.java   |   0
 .../display/ValidationConfigDisplayEvent.java      |   0
 .../display/ValidationConfigDisplayListener.java   |   0
 .../modeler/event/model/CallbackMethodEvent.java   |   0
 .../event/model/CallbackMethodListener.java        |   0
 .../cayenne/modeler/event/model/DataMapEvent.java  |   0
 .../modeler/event/model/DataMapListener.java       |   0
 .../modeler/event/model/DbAttributeEvent.java      |   0
 .../modeler/event/model/DbAttributeListener.java   |   0
 .../cayenne/modeler/event/model/DbEntityEvent.java |   0
 .../modeler/event/model/DbEntityListener.java      |   0
 .../modeler/event/model/DbRelationshipEvent.java   |   0
 .../event/model/DbRelationshipListener.java        |   0
 .../cayenne/modeler/event/model/DomainEvent.java   |   0
 .../modeler/event/model/DomainListener.java        |   0
 .../event/model/EmbeddableAttributeEvent.java      |   0
 .../event/model/EmbeddableAttributeListener.java   |   0
 .../modeler/event/model/EmbeddableEvent.java       |   0
 .../modeler/event/model/EmbeddableListener.java    |   0
 .../cayenne/modeler/event/model/ModelEvent.java    |   0
 .../modeler/event/model/ObjAttributeEvent.java     |   0
 .../modeler/event/model/ObjAttributeListener.java  |   0
 .../modeler/event/model/ObjEntityEvent.java        |   0
 .../modeler/event/model/ObjEntityListener.java     |   0
 .../modeler/event/model/ObjRelationshipEvent.java  |   0
 .../event/model/ObjRelationshipListener.java       |   0
 .../modeler/event/model/ProcedureEvent.java        |   0
 .../modeler/event/model/ProcedureListener.java     |   0
 .../event/model/ProcedureParameterEvent.java       |   0
 .../event/model/ProcedureParameterListener.java    |   0
 .../modeler/event/model/ProjectAfterSaveEvent.java |   0
 .../event/model/ProjectAfterSaveListener.java      |   0
 .../event/model/ProjectBeforeSaveEvent.java        |   0
 .../event/model/ProjectBeforeSaveListener.java     |   0
 .../cayenne/modeler/event/model/QueryEvent.java    |   0
 .../cayenne/modeler/event/model/QueryListener.java |   0
 .../modeler/event/model/RecentFileListener.java    |   0
 .../apache/cayenne/modeler/log/LogAppender.java    |   0
 .../cayenne/modeler/log/ModelerLogFactory.java     |   0
 .../modeler/log/ModelerLogServiceProvider.java     |   0
 .../apache/cayenne/modeler/log/ModelerLogger.java  |   0
 .../cayenne/modeler/mcp/McpHandshakeWriter.java    |   0
 .../modeler/platform/FlatLafLayoutStyle.java       |   0
 .../modeler/platform/GenericUIInitializer.java     |   0
 .../cayenne/modeler/platform/UIInitializer.java    |   0
 .../modeler/platform/mac/MacFileChooser.java       |   0
 .../modeler/platform/mac/MacUIInitializer.java     |   0
 .../cayenne/modeler/pref/PreferenceMigration.java  |   0
 .../apache/cayenne/modeler/pref/PrefsCopier.java   |   0
 .../apache/cayenne/modeler/pref/PrefsExporter.java |   0
 .../apache/cayenne/modeler/pref/PrefsManager.java  |   0
 .../modeler/pref/adapters/CMTablePrefs.java        |   0
 .../pref/adapters/ComponentGeometryPrefs.java      |   0
 .../modeler/pref/adapters/DBGeneratorPrefs.java    |   0
 .../modeler/pref/adapters/FileChooserPrefs.java    |   0
 .../modeler/pref/adapters/GeneralPrefs.java        |   0
 .../modeler/pref/adapters/LogConsolePrefs.java     |   0
 .../modeler/pref/adapters/ProjectPrefs.java        |   0
 .../modeler/pref/adapters/RecentProjectsPrefs.java |   0
 .../modeler/pref/adapters/SplitPanePrefs.java      |   0
 .../migration/toV5/_1_DbConnectorsMigration.java   |   0
 .../pref/migration/toV5/_2_ClasspathMigration.java |   0
 .../migration/toV5/_3_GeneralPrefsMigration.java   |   0
 .../migration/toV5/_4_RecentProjectsMigration.java |   0
 .../migration/toV5/_5_FrameGeometryMigration.java  |   0
 .../toV5/_6_ProjectSplitPaneMigration.java         |   0
 .../toV5/_7_EntityTablePrefsMigration.java         |   0
 .../toV5/_8_RemoveRedundantPathIndexMigration.java |   0
 .../apache/cayenne/modeler/project/CgenOps.java    |   0
 .../apache/cayenne/modeler/project/DataMapOps.java |   0
 .../cayenne/modeler/project/DbAttributeOps.java    |   0
 .../cayenne/modeler/project/DbEntityOps.java       |   0
 .../cayenne/modeler/project/DbRelationshipOps.java |   0
 .../cayenne/modeler/project/ObjEntityOps.java      |   0
 .../modeler/project/ProjectComparators.java        |   0
 .../modeler/project/ProjectDirtyListener.java      |   0
 .../modeler/project/ProjectFileChangeTracker.java  |   0
 .../modeler/project/ProjectNavigationHistory.java  |   0
 .../cayenne/modeler/project/ProjectSession.java    |   0
 .../modeler/service/action/GlobalActions.java      |   0
 .../service/classloader/ModelerClassLoader.java    |   0
 .../modeler/service/os/OperatingSystem.java        |   0
 .../validator/ConfigurableProjectValidator.java    |   0
 .../apache/cayenne/modeler/toolkit/AppAction.java  |   0
 .../apache/cayenne/modeler/toolkit/AppDialog.java  |   0
 .../apache/cayenne/modeler/toolkit/AppFrame.java   |   0
 .../apache/cayenne/modeler/toolkit/AppPanel.java   |   0
 .../cayenne/modeler/toolkit/AppTabbedPane.java     |   0
 .../apache/cayenne/modeler/toolkit/AppToolBar.java |   0
 .../cayenne/modeler/toolkit/ProjectDialog.java     |   0
 .../cayenne/modeler/toolkit/ProjectPanel.java      |   0
 .../cayenne/modeler/toolkit/ProjectTabbedPane.java |   0
 .../apache/cayenne/modeler/toolkit/Renderers.java  |   0
 .../cayenne/modeler/toolkit/border/TopBorder.java  |   0
 .../modeler/toolkit/buttons/CMButtonPanel.java     |   0
 .../modeler/toolkit/checkbox/CMCheckBox.java       |   0
 .../toolkit/checkbox/CMCheckBoxUndoableEdit.java   |   0
 .../toolkit/columnview/ColumnViewPanel.java        |   0
 .../modeler/toolkit/combobox/AutoCompletion.java   |   0
 .../combobox/CMAutoCompleteComboBoxCellEditor.java |   0
 .../modeler/toolkit/combobox/CMComboBox.java       |   0
 .../toolkit/combobox/CMComboBoxCellEditor.java     |   0
 .../toolkit/combobox/CMComboBoxPopupResizer.java   |   0
 .../toolkit/combobox/CMComboBoxUndoableEdit.java   |   0
 .../toolkit/combobox/CMUndoableComboBox.java       |   0
 .../modeler/toolkit/combobox/ComboBoxPopup.java    |   0
 .../toolkit/combobox/CustomTypeComboBoxEditor.java |   0
 .../modeler/toolkit/combobox/EditorTextField.java  |   0
 .../modeler/toolkit/combobox/SuggestionList.java   |   0
 .../modeler/toolkit/copypaste/CMTransferable.java  |   0
 .../modeler/toolkit/filechooser/CMFileChooser.java |   0
 .../toolkit/filechooser/CMFileChooserFactory.java  |   0
 .../modeler/toolkit/filechooser/FileFilters.java   |   0
 .../toolkit/filechooser/SwingDirChooserDialog.java |   0
 .../toolkit/filechooser/SwingFileChooser.java      |   0
 .../toolkit/filechooser/SwingFileOpenerDialog.java |   0
 .../toolkit/filechooser/SwingFileSaverDialog.java  |   0
 .../cayenne/modeler/toolkit/icon/IconFactory.java  |   0
 .../toolkit/table/BoardTableCellRenderer.java      |   0
 .../cayenne/modeler/toolkit/table/CMTable.java     |   0
 .../modeler/toolkit/table/CMTableModel.java        |   0
 .../toolkit/table/CMTableModelUndoableEdit.java    |   0
 .../modeler/toolkit/table/CMTablePanel.java        |   0
 .../toolkit/table/CMTextFieldCellEditor.java       |   0
 .../modeler/toolkit/table/IconCellRenderer.java    |   0
 .../modeler/toolkit/table/SortButtonRenderer.java  |   0
 .../cayenne/modeler/toolkit/table/TableSizer.java  |   0
 .../modeler/toolkit/text/CMPasswordField.java      |   0
 .../cayenne/modeler/toolkit/text/CMTextArea.java   |   0
 .../modeler/toolkit/text/CMTextCommitListener.java |   0
 .../cayenne/modeler/toolkit/text/CMTextField.java  |   0
 .../cayenne/modeler/toolkit/text/CMTextPane.java   |   0
 .../modeler/toolkit/text/CMTextPaneEditorKit.java  |   0
 .../modeler/toolkit/text/CMUndoableTextField.java  |   0
 .../modeler/toolkit/text/CMUndoableTextPane.java   |   0
 .../modeler/toolkit/text/LineNumberedBorder.java   |   0
 .../toolkit/text/TextComponentUndoListener.java    |   0
 .../toolkit/text/UnderlineHighlighterForText.java  |   0
 .../modeler/toolkit/text/style/SyntaxStyle.java    |   0
 .../toolkit/text/style/TextPaneStyleTypes.java     |   0
 .../modeler/toolkit/text/style/TextSyntax.java     |   0
 .../toolkit/tree/ChangeOptimizingTreeModel.java    |   0
 .../modeler/toolkit/tree/CheckBoxNodeData.java     |   0
 .../cayenne/modeler/toolkit/tree/CheckBoxTree.java |   0
 .../toolkit/tree/CheckBoxTreeCellEditor.java       |   0
 .../toolkit/tree/CheckBoxTreeCellRenderer.java     |   0
 .../EntityTreeAttributeRelationshipFilter.java     |   0
 .../modeler/toolkit/tree/EntityTreeFilter.java     |   0
 .../modeler/toolkit/tree/EntityTreeModel.java      |   0
 .../toolkit/tree/EntityTreeRelationshipFilter.java |   0
 .../toolkit/tree/LabelTreeCellRenderer.java        |   0
 .../cayenne/modeler/toolkit/url/UrlOpener.java     |   0
 .../modeler/toolkit/valuetype/ValueTypes.java      |   0
 .../org/apache/cayenne/modeler/ui/MainFrame.java   |   0
 .../org/apache/cayenne/modeler/ui/MainMenuBar.java |   0
 .../org/apache/cayenne/modeler/ui/MainToolBar.java |   0
 .../org/apache/cayenne/modeler/ui/SearchPanel.java |   0
 .../cayenne/modeler/ui/about/AboutFrame.java       |   0
 .../cayenne/modeler/ui/action/AboutAction.java     |   0
 .../modeler/ui/action/BaseViewEntityAction.java    |   0
 .../modeler/ui/action/CloseProjectAction.java      |   0
 .../modeler/ui/action/CollapseTreeAction.java      |   0
 .../ui/action/ConfigurePreferencesAction.java      |   0
 .../cayenne/modeler/ui/action/CopyAction.java      |   0
 .../modeler/ui/action/CopyAttributeAction.java     |   0
 .../ui/action/CopyAttributeRelationshipAction.java |   0
 .../ui/action/CopyCallbackMethodAction.java        |   0
 .../ui/action/CopyProcedureParameterAction.java    |   0
 .../modeler/ui/action/CopyRelationshipAction.java  |   0
 .../modeler/ui/action/CreateAttributeAction.java   |   0
 .../ui/action/CreateCallbackMethodAction.java      |   0
 .../modeler/ui/action/CreateDataMapAction.java     |   0
 .../modeler/ui/action/CreateDbEntityAction.java    |   0
 .../modeler/ui/action/CreateEmbeddableAction.java  |   0
 .../modeler/ui/action/CreateObjEntityAction.java   |   0
 .../ui/action/CreateObjEntityFromDbAction.java     |   0
 .../modeler/ui/action/CreateProcedureAction.java   |   0
 .../ui/action/CreateProcedureParameterAction.java  |   0
 .../modeler/ui/action/CreateQueryAction.java       |   0
 .../ui/action/CreateRelationshipAction.java        |   0
 .../cayenne/modeler/ui/action/CutAction.java       |   0
 .../modeler/ui/action/CutAttributeAction.java      |   0
 .../ui/action/CutAttributeRelationshipAction.java  |   0
 .../modeler/ui/action/CutCallbackMethodAction.java |   0
 .../ui/action/CutProcedureParameterAction.java     |   0
 .../modeler/ui/action/CutRelationshipAction.java   |   0
 .../modeler/ui/action/DBConnectionAwareAction.java |   0
 .../ui/action/DbEntityCounterpartAction.java       |   0
 .../modeler/ui/action/DbEntitySyncAction.java      |   0
 .../action/DisableValidationInspectionAction.java  |   0
 .../modeler/ui/action/DocumentationAction.java     |   0
 .../cayenne/modeler/ui/action/ExitAction.java      |   0
 .../cayenne/modeler/ui/action/FilterAction.java    |   0
 .../cayenne/modeler/ui/action/FindAction.java      |   0
 .../modeler/ui/action/GenerateDBAction.java        |   0
 .../modeler/ui/action/ImportDataMapAction.java     |   0
 .../modeler/ui/action/ImportEOModelAction.java     |   0
 .../ui/action/InferRelationshipsAction.java        |   0
 .../cayenne/modeler/ui/action/MigrateAction.java   |   0
 .../modeler/ui/action/MultipleObjectsAction.java   |   0
 .../cayenne/modeler/ui/action/NavigateAction.java  |   0
 .../modeler/ui/action/NavigateBackwardAction.java  |   0
 .../modeler/ui/action/NavigateForwardAction.java   |   0
 .../modeler/ui/action/NewProjectAction.java        |   0
 .../ui/action/ObjEntityCounterpartAction.java      |   0
 .../modeler/ui/action/ObjEntitySyncAction.java     |   0
 .../ui/action/ObjEntityToSuperEntityAction.java    |   0
 .../modeler/ui/action/OpenProjectAction.java       |   0
 .../cayenne/modeler/ui/action/PasteAction.java     |   0
 .../cayenne/modeler/ui/action/RedoAction.java      |   0
 .../cayenne/modeler/ui/action/RemoveAction.java    |   0
 .../modeler/ui/action/RemoveAttributeAction.java   |   0
 .../action/RemoveAttributeRelationshipAction.java  |   0
 .../ui/action/RemoveCallbackMethodAction.java      |   0
 .../ui/action/RemoveProcedureParameterAction.java  |   0
 .../ui/action/RemoveRelationshipAction.java        |   0
 .../cayenne/modeler/ui/action/RevertAction.java    |   0
 .../cayenne/modeler/ui/action/SaveAction.java      |   0
 .../cayenne/modeler/ui/action/SaveAsAction.java    |   0
 .../modeler/ui/action/ShowLogConsoleAction.java    |   0
 .../ui/action/ShowValidationConfigAction.java      |   0
 .../ui/action/ShowValidationOptionAction.java      |   0
 .../cayenne/modeler/ui/action/UndoAction.java      |   0
 .../ui/action/UpdateValidationConfigAction.java    |   0
 .../cayenne/modeler/ui/action/ValidateAction.java  |   0
 .../autorelationship/InferRelationshipsDialog.java |   0
 .../autorelationship/InferRelationshipsPanel.java  |   0
 .../InferRelationshipsTabController.java           |   0
 .../ui/autorelationship/InferredRelationship.java  |   0
 .../ui/confirmremove/ConfirmRemoveDialog.java      |   0
 .../modeler/ui/datasource/DataSourceDialog.java    |   0
 .../ui/dbactionoptions/DbActionOptionsDialog.java  |   0
 .../modeler/ui/dbgen/DBGeneratorOptionsDialog.java |   0
 .../modeler/ui/dbgen/TableSelectorPanel.java       |   0
 .../modeler/ui/dbmerge/MergerOptionsDialog.java    |   0
 .../modeler/ui/dbmerge/MergerTokenSelector.java    |   0
 .../modeler/ui/dbmerge/MergerTokenTableModel.java  |   0
 .../ui/dbrelationship/DbJoinTableModel.java        |   0
 .../ui/dbrelationship/DbRelationshipDialog.java    |   0
 .../modeler/ui/entitysync/EntitySyncDialog.java    |   0
 .../cayenne/modeler/ui/errors/ErrorDialog.java     |   0
 .../modeler/ui/filedeleted/FileDeletedDialog.java  |   0
 .../apache/cayenne/modeler/ui/find/FindDialog.java |   0
 .../cayenne/modeler/ui/logconsole/LogConsole.java  |   0
 .../modeler/ui/preferences/PreferenceDialog.java   |   0
 .../preferences/classpath/ClasspathPrefsPanel.java |   0
 .../classpath/maven/MavenDependencyDialog.java     |   0
 .../preferences/dbconnector/DBConnectorEditor.java |   0
 .../dbconnector/DBConnectorPrefsPanel.java         |   0
 .../preferences/dbconnector/creator/Adapters.java  |   0
 .../creator/DBConnectorCreatorDialog.java          |   0
 .../duplicator/DBConnectorDuplicatorDialog.java    |   0
 .../ui/preferences/general/GeneralPrefsPanel.java  |   0
 .../ui/preferences/more/MorePrefsPanel.java        |   0
 .../cayenne/modeler/ui/project/ProjectView.java    |   0
 .../modeler/ui/project/editor/EditorPanelView.java |   0
 .../ui/project/editor/ExpressionConvertor.java     |   0
 .../datadomain/DataDomainGeneratorsPanel.java      |   0
 .../editor/datadomain/DataDomainGeneratorsTab.java |   0
 .../project/editor/datadomain/DataDomainView.java  |   0
 .../editor/datadomain/cgen/DataDomainCgenTab.java  |   0
 .../datadomain/dbimport/DataDomainDbImportTab.java |   0
 .../editor/datadomain/main/DataDomainMainView.java |   0
 .../validation/InspectionCheckBoxTree.java         |   0
 .../datadomain/validation/ValidationTab.java       |   0
 .../ui/project/editor/datamap/DataMapView.java     |   0
 .../datamap/cgen/CgenArtefactSelectorPanel.java    |   0
 .../editor/datamap/cgen/CgenConfigPanel.java       |   0
 .../ui/project/editor/datamap/cgen/CgenPanel.java  |   0
 .../project/editor/datamap/cgen/CgenValidator.java |   0
 .../editor/datamap/cgen/CheckBoxHeader.java        |   0
 .../project/editor/datamap/cgen/CodeValidator.java |   0
 .../editor/datamap/cgen/SelectionModel.java        |   0
 .../datamap/cgen/action/AddCgenConfigAction.java   |   0
 .../datamap/cgen/action/EditCgenConfigAction.java  |   0
 .../cgen/action/RemoveCgenConfigAction.java        |   0
 .../cgen/templateeditor/ArtefactsConfigurator.java |   0
 .../DataMapArtefactsConfigurator.java              |   0
 .../cgen/templateeditor/EditorTemplateLoader.java  |   0
 .../cgen/templateeditor/EditorTemplateSaver.java   |   0
 .../EmbeddableArtefactsConfigurator.java           |   0
 .../EntityArtefactsConfigurator.java               |   0
 .../templateeditor/PreviewActionConfigurator.java  |   0
 .../PreviewClassGenerationFactory.java             |   0
 .../templateeditor/PreviewGenerationAction.java    |   0
 .../cgen/templateeditor/TemplateEditor.java        |   0
 .../TemplateEditorFindAndReplaceDialog.java        |   0
 .../templateeditor/TemplateEditorFindDialog.java   |   0
 .../cgen/templateeditor/VelocityTokenMaker.java    |   0
 .../editor/datamap/dbimport/CatalogPopUpMenu.java  |   0
 .../editor/datamap/dbimport/ConfigToolbar.java     |   0
 .../editor/datamap/dbimport/DBSchemaPanel.java     |   0
 .../datamap/dbimport/DatabaseSchemaLoader.java     |   0
 .../datamap/dbimport/DbImportResultDialog.java     |   0
 .../editor/datamap/dbimport/DbImportSorter.java    |   0
 .../editor/datamap/dbimport/DbImportTree.java      |   0
 .../datamap/dbimport/DbImportTreeCellEditor.java   |   0
 .../datamap/dbimport/DbImportTreeCellRenderer.java |   0
 .../editor/datamap/dbimport/DbImportTreeModel.java |   0
 .../editor/datamap/dbimport/DbImportView.java      |   0
 .../editor/datamap/dbimport/DbSchemaToolbar.java   |   0
 .../editor/datamap/dbimport/DefaultPopUpMenu.java  |   0
 .../datamap/dbimport/IncludeTablePopUpMenu.java    |   0
 .../datamap/dbimport/PrintColumnsBiFunction.java   |   0
 .../datamap/dbimport/PrintTablesBiFunction.java    |   0
 .../dbimport/ReverseEngineeringConfigPanel.java    |   0
 .../dbimport/ReverseEngineeringTreePanel.java      |   0
 .../editor/datamap/dbimport/RootPopUpMenu.java     |   0
 .../editor/datamap/dbimport/SchemaPopUpMenu.java   |   0
 .../datamap/dbimport/action/AddCatalogAction.java  |   0
 .../dbimport/action/AddExcludeColumnAction.java    |   0
 .../dbimport/action/AddExcludeProcedureAction.java |   0
 .../dbimport/action/AddExcludeTableAction.java     |   0
 .../dbimport/action/AddIncludeColumnAction.java    |   0
 .../dbimport/action/AddIncludeProcedureAction.java |   0
 .../dbimport/action/AddIncludeTableAction.java     |   0
 .../dbimport/action/AddPatternParamAction.java     |   0
 .../datamap/dbimport/action/AddSchemaAction.java   |   0
 .../datamap/dbimport/action/DbImportActions.java   |   0
 .../datamap/dbimport/action/DeleteNodeAction.java  |   0
 .../dbimport/action/DragAndDropNodeAction.java     |   0
 .../datamap/dbimport/action/EditNodeAction.java    |   0
 .../dbimport/action/GetDbConnectionAction.java     |   0
 .../dbimport/action/LoadDbSchemaAction.java        |   0
 .../dbimport/action/ModelerDbImportAction.java     |   0
 .../dbimport/action/MoveImportNodeAction.java      |   0
 .../dbimport/action/MoveInvertNodeAction.java      |   0
 .../datamap/dbimport/action/SortNodesAction.java   |   0
 .../dbimport/action/TreeManipulationAction.java    |   0
 .../dbimport/progress/DbImportProgressDialog.java  |   0
 .../dbimport/runner/DbImportProjectSaver.java      |   0
 .../dbimport/runner/ModelerDbImportAction.java     |   0
 .../dbimport/runner/ModelerDbImportModule.java     |   0
 .../dbimport/runner/ModelerDbLoaderContext.java    |   0
 .../dbimport/runner/ModelerDbLoaderDelegate.java   |   0
 .../editor/datamap/dbimport/tree/CatalogNode.java  |   0
 .../dbimport/tree/CatalogProcedureNode.java        |   0
 .../datamap/dbimport/tree/CatalogTableNode.java    |   0
 .../datamap/dbimport/tree/ColorTreeRenderer.java   |   0
 .../editor/datamap/dbimport/tree/ColumnNode.java   |   0
 .../datamap/dbimport/tree/DbImportTreeNode.java    |   0
 .../project/editor/datamap/dbimport/tree/Node.java |   0
 .../editor/datamap/dbimport/tree/NodeType.java     |   0
 .../editor/datamap/dbimport/tree/ObjectType.java   |   0
 .../datamap/dbimport/tree/ProcedureNode.java       |   0
 .../editor/datamap/dbimport/tree/SchemaNode.java   |   0
 .../datamap/dbimport/tree/SchemaProcedureNode.java |   0
 .../datamap/dbimport/tree/SchemaTableNode.java     |   0
 .../editor/datamap/dbimport/tree/Status.java       |   0
 .../editor/datamap/dbimport/tree/TableNode.java    |   0
 .../datamap/dbimport/tree/TransferableNode.java    |   0
 .../datamap/defaults/DefaultsUpdateDialog.java     |   0
 .../editor/datamap/main/DataMapMainView.java       |   0
 .../datamap/main/catalog/CatalogUpdateDialog.java  |   0
 .../datamap/main/locking/LockingUpdateDialog.java  |   0
 .../datamap/main/pkg/PackageUpdateDialog.java      |   0
 .../datamap/main/schema/SchemaUpdateDialog.java    |   0
 .../main/superclass/SuperclassUpdateDialog.java    |   0
 .../ui/project/editor/dbentity/DbEntityView.java   |   0
 .../editor/dbentity/main/DbEntityMainView.java     |   0
 .../main/PKCustomSequenceGeneratorPanel.java       |   0
 .../editor/dbentity/main/PKDBGeneratorPanel.java   |   0
 .../dbentity/main/PKDefaultGeneratorPanel.java     |   0
 .../editor/dbentity/main/PKGeneratorPanel.java     |   0
 .../dbentity/properties/DbAttributePanel.java      |   0
 .../dbentity/properties/DbAttributeTableModel.java |   0
 .../properties/DbEntityPropertiesView.java         |   0
 .../dbentity/properties/DbRelationshipPanel.java   |   0
 .../properties/DbRelationshipTableModel.java       |   0
 .../project/editor/embeddable/EmbeddableView.java  |   0
 .../attributes/EmbeddableAttributeTableModel.java  |   0
 .../attributes/EmbeddableAttributesView.java       |   0
 .../editor/embeddable/main/EmbeddableMainView.java |   0
 .../ui/project/editor/objentity/ObjEntityView.java |   0
 .../objentity/attrinfo/ObjAttributeInfoDialog.java |   0
 .../attrinfo/ObjAttributePathNavigatorPanel.java   |   0
 .../attrinfo/ObjAttributeTableCellEditor.java      |   0
 .../OverrideEmbeddableAttributeTableModel.java     |   0
 .../callbacks/CallbackDescriptorTableModel.java    |   0
 .../editor/objentity/callbacks/CallbackType.java   |   0
 .../objentity/callbacks/ObjCallbackMethod.java     |   0
 .../callbacks/ObjEntityCallbacksView.java          |   0
 .../classname/ClassNameUpdaterController.java      |   0
 .../duplicates/DuplicatedAttributesDialog.java     |   0
 .../editor/objentity/main/ObjEntityMainView.java   |   0
 .../properties/DbAttributePathComboBoxEditor.java  |   0
 .../DbAttributePathComboBoxRenderer.java           |   0
 .../DbRelationshipPathComboBoxEditor.java          |   0
 .../objentity/properties/ObjAttributePanel.java    |   0
 .../properties/ObjAttributeTableModel.java         |   0
 .../properties/ObjEntityPropertiesView.java        |   0
 .../objentity/properties/ObjRelationshipPanel.java |   0
 .../properties/ObjRelationshipTableModel.java      |   0
 .../properties/PathChooserComboBoxCellEditor.java  |   0
 .../relinfo/ObjRelationshipInfoDialog.java         |   0
 .../relinfo/ObjRelationshipPathNavigatorPanel.java |   0
 .../editor/procedure/ProcedureParameterTab.java    |   0
 .../procedure/ProcedureParameterTableModel.java    |   0
 .../editor/procedure/ProcedureQueryView.java       |   0
 .../ui/project/editor/procedure/ProcedureTab.java  |   0
 .../editor/procedure/ProcedureTabbedView.java      |   0
 .../ui/project/editor/query/BaseQueryMainTab.java  |   0
 .../editor/query/ExistingSelectionProcessor.java   |   0
 .../editor/query/ObjectQueryPropertiesPanel.java   |   0
 .../ui/project/editor/query/PrefetchModel.java     |   0
 .../editor/query/RawQueryPropertiesPanel.java      |   0
 .../project/editor/query/RootSelectionHandler.java |   0
 .../editor/query/SelectPropertiesPanel.java        |   0
 .../editor/query/ejbql/EjbqlQueryMainTab.java      |   0
 .../query/ejbql/EjbqlQueryPropertiesPanel.java     |   0
 .../editor/query/ejbql/EjbqlQueryScriptsTab.java   |   0
 .../ui/project/editor/query/ejbql/EjbqlSyntax.java |   0
 .../editor/query/ejbql/EjbqlTabbedView.java        |   0
 .../query/selectquery/AddPrefetchUndoableEdit.java |   0
 .../query/selectquery/SelectQueryMainTab.java      |   0
 .../query/selectquery/SelectQueryOrderingTab.java  |   0
 .../query/selectquery/SelectQueryPrefetchTab.java  |   0
 .../query/selectquery/SelectQueryTabbedView.java   |   0
 .../AddPrefetchUndoableEditForSqlTemplate.java     |   0
 .../editor/query/sqltemplate/SQLSyntax.java        |   0
 .../query/sqltemplate/SQLTemplateMainTab.java      |   0
 .../query/sqltemplate/SQLTemplatePrefetchTab.java  |   0
 .../query/sqltemplate/SQLTemplateScriptsTab.java   |   0
 .../query/sqltemplate/SQLTemplateTabbedView.java   |   0
 .../ui/project/overwrite/OverwriteDialog.java      |   0
 .../ui/project/querytype/QueryTypeDialog.java      |   0
 .../modeler/ui/project/tree/ProjectTree.java       |   0
 .../ui/project/tree/ProjectTreeFactory.java        |   0
 .../modeler/ui/project/tree/ProjectTreeModel.java  |   0
 .../project/tree/treefilter/TreeFilterPopup.java   |   0
 .../ui/project/validator/AttributeErrorMsg.java    |   0
 .../ui/project/validator/DataMapErrorMsg.java      |   0
 .../ui/project/validator/DomainErrorMsg.java       |   0
 .../validator/EmbeddableAttributeErrorMsg.java     |   0
 .../ui/project/validator/EmbeddableErrorMsg.java   |   0
 .../ui/project/validator/EntityErrorMsg.java       |   0
 .../ui/project/validator/ProcedureErrorMsg.java    |   0
 .../validator/ProcedureParameterErrorMsg.java      |   0
 .../project/validator/ProjectValidatorDialog.java  |   0
 .../ui/project/validator/QueryErrorMsg.java        |   0
 .../ui/project/validator/RelationshipErrorMsg.java |   0
 .../validator/ValidationDisplayHandler.java        |   0
 .../ui/unsavedchanges/UnsavedChangesDialog.java    |   0
 .../modeler/ui/validation/ValidationDialog.java    |   0
 .../modeler/ui/welcome/BackgroundPanel.java        |   0
 .../modeler/ui/welcome/RecentFileListModel.java    |   0
 .../modeler/ui/welcome/RecentFileListRenderer.java |   0
 .../cayenne/modeler/ui/welcome/WelcomeScreen.java  |   0
 .../modeler/ui/welcome/WelcomeScreenMainPanel.java |   0
 .../undo/BaseRemovePropertyUndoableEdit.java       |   0
 .../cayenne/modeler/undo/CayenneUndoManager.java   |   0
 .../cayenne/modeler/undo/CayenneUndoableEdit.java  |   0
 .../undo/ChangePKGeneratorUndoableEdit.java        |   0
 .../undo/CreateCallbackMethodUndoableEdit.java     |   0
 .../modeler/undo/CreateDataMapUndoableEdit.java    |   0
 .../undo/CreateDbAttributeUndoableEdit.java        |   0
 .../modeler/undo/CreateDbEntityUndoableEdit.java   |   0
 .../undo/CreateDbRelationshipUndoableEdit.java     |   0
 .../undo/CreateEmbAttributeUndoableEdit.java       |   0
 .../modeler/undo/CreateEmbeddableUndoableEdit.java |   0
 .../undo/CreateObjAttributeUndoableEdit.java       |   0
 .../modeler/undo/CreateObjEntityUndoableEdit.java  |   0
 .../undo/CreateObjRelationshipUndoableEdit.java    |   0
 .../undo/CreateProcedureParameterUndoableEdit.java |   0
 .../modeler/undo/CreateProcedureUndoableEdit.java  |   0
 .../modeler/undo/CreateQueryUndoableEdit.java      |   0
 .../modeler/undo/DbEntitySyncUndoableEdit.java     |   0
 .../modeler/undo/DbImportTreeUndoableEdit.java     |   0
 .../modeler/undo/DbRelationshipUndoableEdit.java   |   0
 .../undo/InferRelationshipsUndoableEdit.java       |   0
 .../modeler/undo/ObjRelationshipUndoableEdit.java  |   0
 .../modeler/undo/PasteCompoundUndoableEdit.java    |   0
 .../cayenne/modeler/undo/PasteUndoableEdit.java    |   0
 .../undo/RemoveCallbackMethodUndoableEdit.java     |   0
 .../modeler/undo/RemoveCompoundUndoableEdit.java   |   0
 .../undo/RemoveDbAttributeUndoableEdit.java        |   0
 .../undo/RemoveDbRelationshipUndoableEdit.java     |   0
 .../RemoveEmbeddableAttributeUndoableEdit.java     |   0
 .../undo/RemoveObjAttributeUndoableEdit.java       |   0
 .../undo/RemoveObjRelationshipUndoableEdit.java    |   0
 .../cayenne/modeler/undo/RemoveUndoableEdit.java   |   0
 .../cayenne/modeler/undo/TextCompoundEdit.java     |   0
 .../undo/UpdateValidationConfigUndoableEdit.java   |   0
 .../services/org.slf4j.spi.SLF4JServiceProvider    |   0
 .../cayenne/modeler/images/CayenneModeler.png      | Bin
 .../cayenne/modeler/images/icon-arrow-closed.png   | Bin
 .../cayenne/modeler/images/icon-arrow-open.png     | Bin
 .../cayenne/modeler/images/icon-attribute.png      | Bin
 .../cayenne/modeler/images/icon-backward.png       | Bin
 .../apache/cayenne/modeler/images/icon-copy.png    | Bin
 .../cayenne/modeler/images/icon-create-method.png  | Bin
 .../org/apache/cayenne/modeler/images/icon-cut.png | Bin
 .../apache/cayenne/modeler/images/icon-datamap.png | Bin
 .../cayenne/modeler/images/icon-dbentity.png       | Bin
 .../cayenne/modeler/images/icon-dbi-catalog.png    | Bin
 .../cayenne/modeler/images/icon-dbi-column.png     | Bin
 .../cayenne/modeler/images/icon-dbi-config.png     | Bin
 .../modeler/images/icon-dbi-excludeColumn.png      | Bin
 .../modeler/images/icon-dbi-excludeProcedure.png   | Bin
 .../modeler/images/icon-dbi-excludeTable.png       | Bin
 .../modeler/images/icon-dbi-includeColumn.png      | Bin
 .../modeler/images/icon-dbi-includeProcedure.png   | Bin
 .../modeler/images/icon-dbi-includeTable.png       | Bin
 .../cayenne/modeler/images/icon-dbi-refresh.png    | Bin
 .../cayenne/modeler/images/icon-dbi-runImport.png  | Bin
 .../cayenne/modeler/images/icon-dbi-schema.png     | Bin
 .../cayenne/modeler/images/icon-dbi-sort.png       | Bin
 .../apache/cayenne/modeler/images/icon-disable.png | Bin
 .../org/apache/cayenne/modeler/images/icon-dom.png | Bin
 .../apache/cayenne/modeler/images/icon-down.png    | Bin
 .../apache/cayenne/modeler/images/icon-edit.png    | Bin
 .../cayenne/modeler/images/icon-embeddable.png     | Bin
 .../apache/cayenne/modeler/images/icon-eomodel.png | Bin
 .../apache/cayenne/modeler/images/icon-error.png   | Bin
 .../apache/cayenne/modeler/images/icon-filter.png  | Bin
 .../modeler/images/icon-find_and_replace.png       | Bin
 .../apache/cayenne/modeler/images/icon-forward.png | Bin
 .../cayenne/modeler/images/icon-gen_java.png       | Bin
 .../apache/cayenne/modeler/images/icon-info.png    | Bin
 .../cayenne/modeler/images/icon-inheritance.png    | Bin
 .../cayenne/modeler/images/icon-move_down.png      | Bin
 .../apache/cayenne/modeler/images/icon-move_up.png | Bin
 .../org/apache/cayenne/modeler/images/icon-new.png | Bin
 .../cayenne/modeler/images/icon-new_embeddable.png | Bin
 .../cayenne/modeler/images/icon-new_objentity.png  | Bin
 .../cayenne/modeler/images/icon-new_query.png      | Bin
 .../cayenne/modeler/images/icon-objentity.png      | Bin
 .../apache/cayenne/modeler/images/icon-open.png    | Bin
 .../apache/cayenne/modeler/images/icon-paste.png   | Bin
 .../apache/cayenne/modeler/images/icon-plus.png    | Bin
 .../apache/cayenne/modeler/images/icon-query.png   | Bin
 .../apache/cayenne/modeler/images/icon-redo.png    | Bin
 .../apache/cayenne/modeler/images/icon-refresh.png | Bin
 .../cayenne/modeler/images/icon-relationship.png   | Bin
 .../apache/cayenne/modeler/images/icon-remove.png  | Bin
 .../cayenne/modeler/images/icon-save-as-image.png  | Bin
 .../apache/cayenne/modeler/images/icon-save.png    | Bin
 .../cayenne/modeler/images/icon-sort-asc.png       | Bin
 .../cayenne/modeler/images/icon-sort-desc.png      | Bin
 .../modeler/images/icon-stored-procedure.png       | Bin
 .../apache/cayenne/modeler/images/icon-sync.png    | Bin
 .../apache/cayenne/modeler/images/icon-trash.png   | Bin
 .../cayenne/modeler/images/icon-tree-collapse.png  | Bin
 .../apache/cayenne/modeler/images/icon-undo.png    | Bin
 .../org/apache/cayenne/modeler/images/icon-up.png  | Bin
 .../apache/cayenne/modeler/images/icon-zoom-in.png | Bin
 .../cayenne/modeler/images/icon-zoom-out.png       | Bin
 .../org/apache/cayenne/modeler/images/logo.jpg     | Bin
 .../images/welcome/welcome-screen-left-bg.jpg      | Bin
 .../welcome/welcome-screen-new-btn-hover.png       | Bin
 .../images/welcome/welcome-screen-new-btn.png      | Bin
 .../welcome/welcome-screen-open-btn-hover.png      | Bin
 .../images/welcome/welcome-screen-open-btn.png     | Bin
 .../images/welcome/welcome-screen-right-bg.jpg     | Bin
 .../modeler/CayenneModelerValidationIT.java        |   0
 .../org/apache/cayenne/modeler/CliArgsTest.java    |   0
 .../java/org/apache/cayenne/modeler/MainTest.java  |   0
 .../editor/dbimport/DbImportSorterTest.java        |   0
 .../modeler/editor/dbimport/tree/BaseNodeTest.java |   0
 .../editor/dbimport/tree/CatalogNodeTest.java      |   0
 .../editor/dbimport/tree/ColumnNodeTest.java       |   0
 .../editor/dbimport/tree/SchemaNodeTest.java       |   0
 .../dbimport/tree/SchemaProcedureNodeTest.java     |   0
 .../editor/dbimport/tree/SchemaTableNodeTest.java  |   0
 .../templateeditor/ArtifactsConfiguratorTest.java  |   0
 .../templateeditor/EditorTemplateLoaderTest.java   |   0
 .../templateeditor/EditorTemplateSaverTest.java    |   0
 .../PreviewActionConfiguratorTest.java             |   0
 .../event/display/DomainDisplayEventTest.java      |   0
 .../modeler/event/model/DataMapEventTest.java      |   0
 .../modeler/event/model/DbAttributeEventTest.java  |   0
 .../modeler/event/model/DbEntityEventTest.java     |   0
 .../event/model/DbRelationshipEventTest.java       |   0
 .../modeler/event/model/DomainEventTest.java       |   0
 .../modeler/event/model/ModelEventTest.java        |   0
 .../modeler/mcp/McpHandshakeWriterTest.java        |   0
 .../toV5/_3_GeneralPrefsMigrationTest.java         |   0
 .../_8_RemoveRedundantPathIndexMigrationTest.java  |   0
 .../modeler/ui/action/EOModelFileFilterTest.java   |   0
 .../preferences/general/GeneralPrefsPanelTest.java |   0
 .../modeler/util/ApplicationFileFilterTest.java    |   0
 .../modeler/util/DataMapFileFilterTest.java        |   0
 .../modeler/cayenne-configured-validation.xml      |   0
 .../cayenne-wocompat => cayenne-wocompat}/pom.xml  |  20 +++++++-
 .../org/apache/cayenne/wocompat/EODbAttribute.java |   0
 .../org/apache/cayenne/wocompat/EOModelHelper.java |   0
 .../apache/cayenne/wocompat/EOModelProcessor.java  |   0
 .../apache/cayenne/wocompat/EOObjAttribute.java    |   0
 .../org/apache/cayenne/wocompat/EOObjEntity.java   |   0
 .../java/org/apache/cayenne/wocompat/EOQuery.java  |   0
 .../org/apache/cayenne/wocompat/EOSQLQuery.java    |   0
 .../wocompat/PlistDataStructureFactory.java        |   0
 .../wocompat/PropertyListSerialization.java        |   0
 .../parser/DefaultPlistDataStructureFactory.java   |   0
 .../cayenne/wocompat/parser/ParseException.java    |   0
 .../org/apache/cayenne/wocompat/parser/Parser.java |   0
 .../org/apache/cayenne/wocompat/parser/Parser.jj   |   0
 .../cayenne/wocompat/parser/ParserConstants.java   |   0
 .../wocompat/parser/ParserTokenManager.java        |   0
 .../cayenne/wocompat/parser/SimpleCharStream.java  |   0
 .../org/apache/cayenne/wocompat/parser/Token.java  |   0
 .../cayenne/wocompat/parser/TokenMgrError.java     |   0
 .../apache/cayenne/wocompat/EOModelHelperTest.java |   0
 .../wocompat/EOModelProcessorInheritanceTest.java  |   0
 .../cayenne/wocompat/EOModelProcessorTest.java     |   0
 .../cayenne/wocompat/EOModelPrototypesTest.java    |   0
 .../org/apache/cayenne/wocompat/EOQueryTest.java   |   0
 .../wocompat/PropertyListSerializationTest.java    |   0
 .../wocompat/parser/PropertyListParserTest.java    |   0
 .../art-with-errors.eomodeld/Artist.plist          |   0
 .../art-with-errors.eomodeld/ArtistExhibit.plist   |   0
 .../art-with-errors.eomodeld/DiagramLayout         |   0
 .../art-with-errors.eomodeld/Exhibit.plist         |   0
 .../art-with-errors.eomodeld/Gallery.plist         |   0
 .../art-with-errors.eomodeld/Painting.plist        |   0
 .../art-with-errors.eomodeld/PaintingInfo.plist    |   0
 .../art-with-errors.eomodeld/index.eomodeld        |   0
 .../inheritance.eomodeld/AbstractEntity.plist      |   0
 .../inheritance.eomodeld/ConcreteEntityOne.plist   |   0
 .../inheritance.eomodeld/DetailEntity.plist        |   0
 .../resources/inheritance.eomodeld/DiagramLayout   |   0
 .../inheritance.eomodeld/HelperEntity.plist        |   0
 .../inheritance.eomodeld/HelperFlatEntity.plist    |   0
 .../SingleTableConcreteEntityOne.plist             |   0
 .../SingleTableConcreteEntityTwo.plist             |   0
 .../inheritance.eomodeld/SingleTableJoin.plist     |   0
 .../XSingleTableAbstractEntity.plist               |   0
 .../resources/inheritance.eomodeld/index.eomodeld  |   0
 .../resources/prototypes.eomodeld/DiagramLayout    |   0
 .../resources/prototypes.eomodeld/Document.plist   |   0
 .../prototypes.eomodeld/EOPrototypes.plist         |   0
 .../prototypes.eomodeld/EOXYZPrototypes.plist      |   0
 .../resources/prototypes.eomodeld/Estimate.plist   |   0
 .../resources/prototypes.eomodeld/Invoice.plist    |   0
 .../resources/prototypes.eomodeld/VendorPO.plist   |   0
 .../resources/prototypes.eomodeld/index.eomodeld   |   0
 .../resources/wotests/art.eomodeld/Artist.plist    |   0
 .../wotests/art.eomodeld/ArtistExhibit.plist       |   0
 .../wotests/art.eomodeld/CustomTypes.plist         |   0
 .../resources/wotests/art.eomodeld/DiagramLayout   |   0
 .../resources/wotests/art.eomodeld/Exhibit.plist   |   0
 .../wotests/art.eomodeld/ExhibitType.fspec         |   0
 .../wotests/art.eomodeld/ExhibitType.plist         |   0
 .../resources/wotests/art.eomodeld/Gallery.plist   |   0
 .../resources/wotests/art.eomodeld/Painting.plist  |   0
 .../wotests/art.eomodeld/PaintingInfo.plist        |   0
 .../resources/wotests/art.eomodeld/index.eomodeld  |   0
 .../CrossModelRelTest.plist                        |   0
 .../DiagramLayout                                  |   0
 .../index.eomodeld                                 |   0
 .../wotests/fetchspec.eomodeld/DiagramLayout       |   0
 .../wotests/fetchspec.eomodeld/Entity1.fspec       |   0
 .../wotests/fetchspec.eomodeld/Entity1.plist       |   0
 .../wotests/fetchspec.eomodeld/Entity2.plist       |   0
 .../wotests/fetchspec.eomodeld/index.eomodeld      |   0
 .../wotests/flattened.eomodeld/Artist.plist        |   0
 .../wotests/flattened.eomodeld/ArtistExhibit.plist |   0
 .../wotests/flattened.eomodeld/Exhibit.plist       |   0
 .../wotests/flattened.eomodeld/index.eomodeld      |   0
 modeler/pom.xml                                    |  56 ---------------------
 pom.xml                                            |   4 +-
 729 files changed, 83 insertions(+), 73 deletions(-)

diff --git a/.claude/rules/modeler/modeler-architecture.md b/.claude/rules/cayenne-modeler/modeler-architecture.md
similarity index 98%
rename from .claude/rules/modeler/modeler-architecture.md
rename to .claude/rules/cayenne-modeler/modeler-architecture.md
index 8685e4e97..9db9ea0db 100644
--- a/.claude/rules/modeler/modeler-architecture.md
+++ b/.claude/rules/cayenne-modeler/modeler-architecture.md
@@ -1,6 +1,6 @@
 ---
 paths:
-  - "modeler/**"
+  - "cayenne-modeler/**"
 description: CayenneModeler UI components architecture
 ---
 
diff --git a/CLAUDE.md b/CLAUDE.md
index 1cdb4a669..6ed2ae128 100644
--- a/CLAUDE.md
+++ b/CLAUDE.md
@@ -92,7 +92,7 @@ Why the `failIfNoSpecifiedTests=false` flags are needed when using `-am`: Surefi
 - **cayenne-dbsync** — Database schema synchronization
 - **cayenne-gradle-plugin**, **cayenne-maven-plugin**, **cayenne-ant** — Build tool integrations
 - **cayenne-crypto**, **cayenne-commitlog**, **cayenne-lifecycle**, **cayenne-jcache**, **cayenne-cache-invalidation** — Optional extension modules
-- **modeler** — CayenneModeler GUI application (Swing)
+- **cayenne-modeler** — CayenneModeler GUI application (Swing)
 
 
 ## Test Style
diff --git a/UPGRADE.md b/UPGRADE.md
index cd6459958..de9f9c480 100644
--- a/UPGRADE.md
+++ b/UPGRADE.md
@@ -53,6 +53,21 @@ Expression caseWhenExp = caseWhen(
 ```
 
 
+## Upgrading to 5.0-M4
+
+*  The `groupId` of `cayenne-modeler` and `cayenne-wocompat` changed from `org.apache.cayenne.modeler` to
+  `org.apache.cayenne`. Artifact ids and versions are unchanged. If you depend on any of them directly, update the
+  coordinates:
+
+  ```xml
+  <dependency>
+      <groupId>org.apache.cayenne</groupId>
+      <artifactId>cayenne-modeler</artifactId>
+      <version>5.0-XX</version>
+  </dependency>
+  ```
+
+
 ## Upgrading to 5.0-M3
 
 
diff --git a/cayenne-assembly/pom.xml b/cayenne-assembly/pom.xml
index 45344e928..106767066 100644
--- a/cayenne-assembly/pom.xml
+++ b/cayenne-assembly/pom.xml
@@ -89,7 +89,7 @@
 		</dependency>
 
 		<dependency>
-			<groupId>org.apache.cayenne.modeler</groupId>
+			<groupId>org.apache.cayenne</groupId>
 			<artifactId>cayenne-modeler</artifactId>
 			<version>${project.version}</version>
 		</dependency>
diff --git a/cayenne-assembly/src/main/resources/assemblies/generic/assembly-generic.xml b/cayenne-assembly/src/main/resources/assemblies/generic/assembly-generic.xml
index 0403f4713..86aff1b4d 100644
--- a/cayenne-assembly/src/main/resources/assemblies/generic/assembly-generic.xml
+++ b/cayenne-assembly/src/main/resources/assemblies/generic/assembly-generic.xml
@@ -63,7 +63,7 @@
 		</fileSet>
 		<!-- Native Modeler launchers, built by the matching "generic" profile of "cayenne-modeler" -->
 		<fileSet>
-			<directory>../modeler/cayenne-modeler/target/apps/generic</directory>
+			<directory>../cayenne-modeler/target/apps/generic</directory>
 			<outputDirectory>bin</outputDirectory>
 		</fileSet>
 	</fileSets>
diff --git a/cayenne-assembly/src/main/resources/assemblies/mac/assembly-mac.xml b/cayenne-assembly/src/main/resources/assemblies/mac/assembly-mac.xml
index 136a7e521..ce7bae3e3 100644
--- a/cayenne-assembly/src/main/resources/assemblies/mac/assembly-mac.xml
+++ b/cayenne-assembly/src/main/resources/assemblies/mac/assembly-mac.xml
@@ -68,7 +68,7 @@
 		</fileSet>
 		<!-- Native Modeler launchers, built by the matching "mac" profile of "cayenne-modeler" -->
 		<fileSet>
-			<directory>../modeler/cayenne-modeler/target/apps/mac</directory>
+			<directory>../cayenne-modeler/target/apps/mac</directory>
 			<outputDirectory>/</outputDirectory>
 		</fileSet>
 	</fileSets>
diff --git a/cayenne-assembly/src/main/resources/assemblies/windows/assembly-windows.xml b/cayenne-assembly/src/main/resources/assemblies/windows/assembly-windows.xml
index d5ccc6b3a..5f87b5f46 100644
--- a/cayenne-assembly/src/main/resources/assemblies/windows/assembly-windows.xml
+++ b/cayenne-assembly/src/main/resources/assemblies/windows/assembly-windows.xml
@@ -61,7 +61,7 @@
 		</fileSet>
 		<!-- Native Modeler launchers, built by the matching "windows" profile of "cayenne-modeler" -->
 		<fileSet>
-			<directory>../modeler/cayenne-modeler/target/apps/windows</directory>
+			<directory>../cayenne-modeler/target/apps/windows</directory>
 			<outputDirectory>bin</outputDirectory>
 		</fileSet>
 	</fileSets>
diff --git a/cayenne-mcp-server/pom.xml b/cayenne-mcp-server/pom.xml
index 41ef519d2..5cdf2485c 100644
--- a/cayenne-mcp-server/pom.xml
+++ b/cayenne-mcp-server/pom.xml
@@ -44,7 +44,7 @@
         </dependency>
 
         <dependency>
-            <groupId>org.apache.cayenne.modeler</groupId>
+            <groupId>org.apache.cayenne</groupId>
             <artifactId>cayenne-modeler-prefs</artifactId>
             <version>${project.version}</version>
         </dependency>
diff --git a/modeler/cayenne-modeler-prefs/pom.xml b/cayenne-modeler-prefs/pom.xml
similarity index 74%
rename from modeler/cayenne-modeler-prefs/pom.xml
rename to cayenne-modeler-prefs/pom.xml
index 14b06ea84..679079918 100644
--- a/modeler/cayenne-modeler-prefs/pom.xml
+++ b/cayenne-modeler-prefs/pom.xml
@@ -22,8 +22,8 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.apache.cayenne.modeler</groupId>
-        <artifactId>cayenne-modeler-parent</artifactId>
+        <groupId>org.apache.cayenne</groupId>
+        <artifactId>cayenne-parent</artifactId>
         <version>5.0-SNAPSHOT</version>
     </parent>
 
@@ -45,4 +45,20 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
+
+    <build>
+        <plugins>
+            <!-- This ensures LICENSE and NOTICE inclusion in all jars -->
+            <plugin>
+                <artifactId>maven-remote-resources-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>process</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
 </project>
diff --git a/modeler/cayenne-modeler-prefs/src/main/java/org/apache/cayenne/modeler/pref/PreferenceNodeIds.java b/cayenne-modeler-prefs/src/main/java/org/apache/cayenne/modeler/pref/PreferenceNodeIds.java
similarity index 100%
rename from modeler/cayenne-modeler-prefs/src/main/java/org/apache/cayenne/modeler/pref/PreferenceNodeIds.java
rename to cayenne-modeler-prefs/src/main/java/org/apache/cayenne/modeler/pref/PreferenceNodeIds.java
diff --git a/modeler/cayenne-modeler-prefs/src/main/java/org/apache/cayenne/modeler/pref/PrefsAdapter.java b/cayenne-modeler-prefs/src/main/java/org/apache/cayenne/modeler/pref/PrefsAdapter.java
similarity index 100%
rename from modeler/cayenne-modeler-prefs/src/main/java/org/apache/cayenne/modeler/pref/PrefsAdapter.java
rename to cayenne-modeler-prefs/src/main/java/org/apache/cayenne/modeler/pref/PrefsAdapter.java
diff --git a/modeler/cayenne-modeler-prefs/src/main/java/org/apache/cayenne/modeler/pref/PrefsLocator.java b/cayenne-modeler-prefs/src/main/java/org/apache/cayenne/modeler/pref/PrefsLocator.java
similarity index 100%
rename from modeler/cayenne-modeler-prefs/src/main/java/org/apache/cayenne/modeler/pref/PrefsLocator.java
rename to cayenne-modeler-prefs/src/main/java/org/apache/cayenne/modeler/pref/PrefsLocator.java
diff --git a/modeler/cayenne-modeler-prefs/src/main/java/org/apache/cayenne/modeler/pref/adapters/ClasspathPrefs.java b/cayenne-modeler-prefs/src/main/java/org/apache/cayenne/modeler/pref/adapters/ClasspathPrefs.java
similarity index 100%
rename from modeler/cayenne-modeler-prefs/src/main/java/org/apache/cayenne/modeler/pref/adapters/ClasspathPrefs.java
rename to cayenne-modeler-prefs/src/main/java/org/apache/cayenne/modeler/pref/adapters/ClasspathPrefs.java
diff --git a/modeler/cayenne-modeler-prefs/src/main/java/org/apache/cayenne/modeler/pref/adapters/DBConnectorsPrefs.java b/cayenne-modeler-prefs/src/main/java/org/apache/cayenne/modeler/pref/adapters/DBConnectorsPrefs.java
similarity index 100%
rename from modeler/cayenne-modeler-prefs/src/main/java/org/apache/cayenne/modeler/pref/adapters/DBConnectorsPrefs.java
rename to cayenne-modeler-prefs/src/main/java/org/apache/cayenne/modeler/pref/adapters/DBConnectorsPrefs.java
diff --git a/modeler/cayenne-modeler-prefs/src/main/java/org/apache/cayenne/modeler/pref/adapters/DataMapPrefs.java b/cayenne-modeler-prefs/src/main/java/org/apache/cayenne/modeler/pref/adapters/DataMapPrefs.java
similarity index 100%
rename from modeler/cayenne-modeler-prefs/src/main/java/org/apache/cayenne/modeler/pref/adapters/DataMapPrefs.java
rename to cayenne-modeler-prefs/src/main/java/org/apache/cayenne/modeler/pref/adapters/DataMapPrefs.java
diff --git a/modeler/cayenne-modeler-prefs/src/main/java/org/apache/cayenne/modeler/pref/dbconnector/DBConnector.java b/cayenne-modeler-prefs/src/main/java/org/apache/cayenne/modeler/pref/dbconnector/DBConnector.java
similarity index 100%
rename from modeler/cayenne-modeler-prefs/src/main/java/org/apache/cayenne/modeler/pref/dbconnector/DBConnector.java
rename to cayenne-modeler-prefs/src/main/java/org/apache/cayenne/modeler/pref/dbconnector/DBConnector.java
diff --git a/modeler/cayenne-modeler-prefs/src/main/java/org/apache/cayenne/modeler/pref/dbconnector/DBConnectors.java b/cayenne-modeler-prefs/src/main/java/org/apache/cayenne/modeler/pref/dbconnector/DBConnectors.java
similarity index 100%
rename from modeler/cayenne-modeler-prefs/src/main/java/org/apache/cayenne/modeler/pref/dbconnector/DBConnectors.java
rename to cayenne-modeler-prefs/src/main/java/org/apache/cayenne/modeler/pref/dbconnector/DBConnectors.java
diff --git a/modeler/cayenne-modeler-prefs/src/test/java/org/apache/cayenne/modeler/pref/PreferenceNodeIdsTest.java b/cayenne-modeler-prefs/src/test/java/org/apache/cayenne/modeler/pref/PreferenceNodeIdsTest.java
similarity index 100%
rename from modeler/cayenne-modeler-prefs/src/test/java/org/apache/cayenne/modeler/pref/PreferenceNodeIdsTest.java
rename to cayenne-modeler-prefs/src/test/java/org/apache/cayenne/modeler/pref/PreferenceNodeIdsTest.java
diff --git a/modeler/cayenne-modeler-prefs/src/test/java/org/apache/cayenne/modeler/pref/PrefsLocatorTest.java b/cayenne-modeler-prefs/src/test/java/org/apache/cayenne/modeler/pref/PrefsLocatorTest.java
similarity index 100%
rename from modeler/cayenne-modeler-prefs/src/test/java/org/apache/cayenne/modeler/pref/PrefsLocatorTest.java
rename to cayenne-modeler-prefs/src/test/java/org/apache/cayenne/modeler/pref/PrefsLocatorTest.java
diff --git a/modeler/cayenne-modeler-prefs/src/test/java/org/apache/cayenne/modeler/pref/adapters/ClasspathPrefsTest.java b/cayenne-modeler-prefs/src/test/java/org/apache/cayenne/modeler/pref/adapters/ClasspathPrefsTest.java
similarity index 100%
rename from modeler/cayenne-modeler-prefs/src/test/java/org/apache/cayenne/modeler/pref/adapters/ClasspathPrefsTest.java
rename to cayenne-modeler-prefs/src/test/java/org/apache/cayenne/modeler/pref/adapters/ClasspathPrefsTest.java
diff --git a/modeler/cayenne-modeler-prefs/src/test/java/org/apache/cayenne/modeler/pref/adapters/DBConnectorsPrefsTest.java b/cayenne-modeler-prefs/src/test/java/org/apache/cayenne/modeler/pref/adapters/DBConnectorsPrefsTest.java
similarity index 100%
rename from modeler/cayenne-modeler-prefs/src/test/java/org/apache/cayenne/modeler/pref/adapters/DBConnectorsPrefsTest.java
rename to cayenne-modeler-prefs/src/test/java/org/apache/cayenne/modeler/pref/adapters/DBConnectorsPrefsTest.java
diff --git a/modeler/cayenne-modeler-prefs/src/test/java/org/apache/cayenne/modeler/pref/adapters/DataMapPrefsTest.java b/cayenne-modeler-prefs/src/test/java/org/apache/cayenne/modeler/pref/adapters/DataMapPrefsTest.java
similarity index 100%
rename from modeler/cayenne-modeler-prefs/src/test/java/org/apache/cayenne/modeler/pref/adapters/DataMapPrefsTest.java
rename to cayenne-modeler-prefs/src/test/java/org/apache/cayenne/modeler/pref/adapters/DataMapPrefsTest.java
diff --git a/modeler/cayenne-modeler-prefs/src/test/java/org/apache/cayenne/modeler/pref/dbconnector/DBConnectorTest.java b/cayenne-modeler-prefs/src/test/java/org/apache/cayenne/modeler/pref/dbconnector/DBConnectorTest.java
similarity index 100%
rename from modeler/cayenne-modeler-prefs/src/test/java/org/apache/cayenne/modeler/pref/dbconnector/DBConnectorTest.java
rename to cayenne-modeler-prefs/src/test/java/org/apache/cayenne/modeler/pref/dbconnector/DBConnectorTest.java
diff --git a/modeler/cayenne-modeler-prefs/src/test/java/org/apache/cayenne/modeler/pref/dbconnector/DBConnectorsTest.java b/cayenne-modeler-prefs/src/test/java/org/apache/cayenne/modeler/pref/dbconnector/DBConnectorsTest.java
similarity index 100%
rename from modeler/cayenne-modeler-prefs/src/test/java/org/apache/cayenne/modeler/pref/dbconnector/DBConnectorsTest.java
rename to cayenne-modeler-prefs/src/test/java/org/apache/cayenne/modeler/pref/dbconnector/DBConnectorsTest.java
diff --git a/modeler/AGENTS.md b/cayenne-modeler/AGENTS.md
similarity index 100%
rename from modeler/AGENTS.md
rename to cayenne-modeler/AGENTS.md
diff --git a/modeler/cayenne-modeler/pom.xml b/cayenne-modeler/pom.xml
similarity index 92%
rename from modeler/cayenne-modeler/pom.xml
rename to cayenne-modeler/pom.xml
index 79b99a3b0..887ecb3e6 100644
--- a/modeler/cayenne-modeler/pom.xml
+++ b/cayenne-modeler/pom.xml
@@ -21,9 +21,9 @@
 
 	<modelVersion>4.0.0</modelVersion>
 
-    <parent>
-		<groupId>org.apache.cayenne.modeler</groupId>
-		<artifactId>cayenne-modeler-parent</artifactId>
+	<parent>
+		<groupId>org.apache.cayenne</groupId>
+		<artifactId>cayenne-parent</artifactId>
 		<version>5.0-SNAPSHOT</version>
 	</parent>
 
@@ -53,12 +53,12 @@
 			<version>${project.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>org.apache.cayenne.modeler</groupId>
+			<groupId>org.apache.cayenne</groupId>
 			<artifactId>cayenne-wocompat</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>org.apache.cayenne.modeler</groupId>
+			<groupId>org.apache.cayenne</groupId>
 			<artifactId>cayenne-modeler-prefs</artifactId>
 			<version>${project.version}</version>
 		</dependency>
@@ -91,6 +91,23 @@
 			<scope>test</scope>
 		</dependency>
 	</dependencies>
+
+	<build>
+		<plugins>
+			<!-- This ensures LICENSE and NOTICE inclusion in all jars -->
+			<plugin>
+				<artifactId>maven-remote-resources-plugin</artifactId>
+				<executions>
+					<execution>
+						<goals>
+							<goal>process</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+		</plugins>
+	</build>
+
 	<!--
 		Native Modeler launchers, built into "target/apps/<platform>" and picked up from there by
 		"cayenne-assembly". Bound to "verify" rather than "package", as "japp" bundles the module's
diff --git a/modeler/cayenne-modeler/src/japplication/resources/CayenneModeler.icns b/cayenne-modeler/src/japplication/resources/CayenneModeler.icns
similarity index 100%
rename from modeler/cayenne-modeler/src/japplication/resources/CayenneModeler.icns
rename to cayenne-modeler/src/japplication/resources/CayenneModeler.icns
diff --git a/modeler/cayenne-modeler/src/japplication/resources/CayenneModeler.ico b/cayenne-modeler/src/japplication/resources/CayenneModeler.ico
similarity index 100%
rename from modeler/cayenne-modeler/src/japplication/resources/CayenneModeler.ico
rename to cayenne-modeler/src/japplication/resources/CayenneModeler.ico
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/Application.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/Application.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/Application.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/Application.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/CliArgs.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/CliArgs.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/CliArgs.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/CliArgs.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/Main.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/Main.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/Main.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/Main.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ModelerModule.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ModelerModule.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ModelerModule.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ModelerModule.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/NameGeneratorPreferences.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/NameGeneratorPreferences.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/NameGeneratorPreferences.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/NameGeneratorPreferences.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dbadapter/DbAdapters.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dbadapter/DbAdapters.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dbadapter/DbAdapters.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dbadapter/DbAdapters.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dbconnector/DBConnectorFactory.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dbconnector/DBConnectorFactory.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dbconnector/DBConnectorFactory.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dbconnector/DBConnectorFactory.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/display/CallbackMethodDisplayEvent.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/display/CallbackMethodDisplayEvent.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/display/CallbackMethodDisplayEvent.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/display/CallbackMethodDisplayEvent.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/display/CallbackMethodDisplayListener.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/display/CallbackMethodDisplayListener.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/display/CallbackMethodDisplayListener.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/display/CallbackMethodDisplayListener.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/display/CallbackTypeDisplayEvent.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/display/CallbackTypeDisplayEvent.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/display/CallbackTypeDisplayEvent.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/display/CallbackTypeDisplayEvent.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/display/CallbackTypeSelectionListener.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/display/CallbackTypeSelectionListener.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/display/CallbackTypeSelectionListener.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/display/CallbackTypeSelectionListener.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/display/DataMapDisplayEvent.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/display/DataMapDisplayEvent.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/display/DataMapDisplayEvent.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/display/DataMapDisplayEvent.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/display/DataMapDisplayListener.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/display/DataMapDisplayListener.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/display/DataMapDisplayListener.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/display/DataMapDisplayListener.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/display/DbAttributeDisplayEvent.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/display/DbAttributeDisplayEvent.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/display/DbAttributeDisplayEvent.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/display/DbAttributeDisplayEvent.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/display/DbAttributeDisplayListener.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/display/DbAttributeDisplayListener.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/display/DbAttributeDisplayListener.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/display/DbAttributeDisplayListener.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/display/DbEntityDisplayEvent.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/display/DbEntityDisplayEvent.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/display/DbEntityDisplayEvent.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/display/DbEntityDisplayEvent.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/display/DbEntityDisplayListener.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/display/DbEntityDisplayListener.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/display/DbEntityDisplayListener.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/display/DbEntityDisplayListener.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/display/DbRelationshipDisplayEvent.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/display/DbRelationshipDisplayEvent.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/display/DbRelationshipDisplayEvent.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/display/DbRelationshipDisplayEvent.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/display/DbRelationshipDisplayListener.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/display/DbRelationshipDisplayListener.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/display/DbRelationshipDisplayListener.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/display/DbRelationshipDisplayListener.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/display/DisplayEvent.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/display/DisplayEvent.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/display/DisplayEvent.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/display/DisplayEvent.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/display/DomainDisplayEvent.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/display/DomainDisplayEvent.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/display/DomainDisplayEvent.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/display/DomainDisplayEvent.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/display/DomainDisplayListener.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/display/DomainDisplayListener.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/display/DomainDisplayListener.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/display/DomainDisplayListener.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/display/EmbeddableAttributeDisplayEvent.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/display/EmbeddableAttributeDisplayEvent.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/display/EmbeddableAttributeDisplayEvent.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/display/EmbeddableAttributeDisplayEvent.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/display/EmbeddableAttributeDisplayListener.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/display/EmbeddableAttributeDisplayListener.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/display/EmbeddableAttributeDisplayListener.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/display/EmbeddableAttributeDisplayListener.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/display/EmbeddableDisplayEvent.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/display/EmbeddableDisplayEvent.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/display/EmbeddableDisplayEvent.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/display/EmbeddableDisplayEvent.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/display/EmbeddableDisplayListener.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/display/EmbeddableDisplayListener.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/display/EmbeddableDisplayListener.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/display/EmbeddableDisplayListener.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/display/MultipleObjectsDisplayEvent.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/display/MultipleObjectsDisplayEvent.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/display/MultipleObjectsDisplayEvent.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/display/MultipleObjectsDisplayEvent.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/display/MultipleObjectsDisplayListener.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/display/MultipleObjectsDisplayListener.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/display/MultipleObjectsDisplayListener.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/display/MultipleObjectsDisplayListener.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/display/ObjAttributeDisplayEvent.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/display/ObjAttributeDisplayEvent.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/display/ObjAttributeDisplayEvent.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/display/ObjAttributeDisplayEvent.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/display/ObjAttributeDisplayListener.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/display/ObjAttributeDisplayListener.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/display/ObjAttributeDisplayListener.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/display/ObjAttributeDisplayListener.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/display/ObjEntityDisplayEvent.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/display/ObjEntityDisplayEvent.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/display/ObjEntityDisplayEvent.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/display/ObjEntityDisplayEvent.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/display/ObjEntityDisplayListener.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/display/ObjEntityDisplayListener.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/display/ObjEntityDisplayListener.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/display/ObjEntityDisplayListener.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/display/ObjRelationshipDisplayEvent.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/display/ObjRelationshipDisplayEvent.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/display/ObjRelationshipDisplayEvent.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/display/ObjRelationshipDisplayEvent.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/display/ObjRelationshipDisplayListener.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/display/ObjRelationshipDisplayListener.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/display/ObjRelationshipDisplayListener.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/display/ObjRelationshipDisplayListener.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/display/ProcedureDisplayEvent.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/display/ProcedureDisplayEvent.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/display/ProcedureDisplayEvent.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/display/ProcedureDisplayEvent.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/display/ProcedureDisplayListener.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/display/ProcedureDisplayListener.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/display/ProcedureDisplayListener.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/display/ProcedureDisplayListener.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/display/ProcedureParameterDisplayEvent.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/display/ProcedureParameterDisplayEvent.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/display/ProcedureParameterDisplayEvent.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/display/ProcedureParameterDisplayEvent.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/display/ProcedureParameterDisplayListener.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/display/ProcedureParameterDisplayListener.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/display/ProcedureParameterDisplayListener.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/display/ProcedureParameterDisplayListener.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/display/QueryDisplayEvent.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/display/QueryDisplayEvent.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/display/QueryDisplayEvent.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/display/QueryDisplayEvent.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/display/QueryDisplayListener.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/display/QueryDisplayListener.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/display/QueryDisplayListener.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/display/QueryDisplayListener.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/display/TablePopupHandler.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/display/TablePopupHandler.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/display/TablePopupHandler.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/display/TablePopupHandler.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/display/ValidationConfigDisplayEvent.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/display/ValidationConfigDisplayEvent.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/display/ValidationConfigDisplayEvent.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/display/ValidationConfigDisplayEvent.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/display/ValidationConfigDisplayListener.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/display/ValidationConfigDisplayListener.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/display/ValidationConfigDisplayListener.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/display/ValidationConfigDisplayListener.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/model/CallbackMethodEvent.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/model/CallbackMethodEvent.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/model/CallbackMethodEvent.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/model/CallbackMethodEvent.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/model/CallbackMethodListener.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/model/CallbackMethodListener.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/model/CallbackMethodListener.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/model/CallbackMethodListener.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/model/DataMapEvent.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/model/DataMapEvent.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/model/DataMapEvent.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/model/DataMapEvent.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/model/DataMapListener.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/model/DataMapListener.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/model/DataMapListener.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/model/DataMapListener.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/model/DbAttributeEvent.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/model/DbAttributeEvent.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/model/DbAttributeEvent.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/model/DbAttributeEvent.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/model/DbAttributeListener.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/model/DbAttributeListener.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/model/DbAttributeListener.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/model/DbAttributeListener.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/model/DbEntityEvent.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/model/DbEntityEvent.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/model/DbEntityEvent.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/model/DbEntityEvent.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/model/DbEntityListener.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/model/DbEntityListener.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/model/DbEntityListener.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/model/DbEntityListener.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/model/DbRelationshipEvent.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/model/DbRelationshipEvent.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/model/DbRelationshipEvent.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/model/DbRelationshipEvent.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/model/DbRelationshipListener.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/model/DbRelationshipListener.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/model/DbRelationshipListener.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/model/DbRelationshipListener.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/model/DomainEvent.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/model/DomainEvent.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/model/DomainEvent.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/model/DomainEvent.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/model/DomainListener.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/model/DomainListener.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/model/DomainListener.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/model/DomainListener.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/model/EmbeddableAttributeEvent.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/model/EmbeddableAttributeEvent.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/model/EmbeddableAttributeEvent.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/model/EmbeddableAttributeEvent.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/model/EmbeddableAttributeListener.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/model/EmbeddableAttributeListener.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/model/EmbeddableAttributeListener.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/model/EmbeddableAttributeListener.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/model/EmbeddableEvent.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/model/EmbeddableEvent.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/model/EmbeddableEvent.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/model/EmbeddableEvent.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/model/EmbeddableListener.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/model/EmbeddableListener.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/model/EmbeddableListener.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/model/EmbeddableListener.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/model/ModelEvent.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/model/ModelEvent.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/model/ModelEvent.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/model/ModelEvent.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/model/ObjAttributeEvent.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/model/ObjAttributeEvent.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/model/ObjAttributeEvent.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/model/ObjAttributeEvent.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/model/ObjAttributeListener.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/model/ObjAttributeListener.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/model/ObjAttributeListener.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/model/ObjAttributeListener.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/model/ObjEntityEvent.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/model/ObjEntityEvent.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/model/ObjEntityEvent.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/model/ObjEntityEvent.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/model/ObjEntityListener.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/model/ObjEntityListener.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/model/ObjEntityListener.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/model/ObjEntityListener.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/model/ObjRelationshipEvent.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/model/ObjRelationshipEvent.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/model/ObjRelationshipEvent.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/model/ObjRelationshipEvent.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/model/ObjRelationshipListener.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/model/ObjRelationshipListener.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/model/ObjRelationshipListener.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/model/ObjRelationshipListener.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/model/ProcedureEvent.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/model/ProcedureEvent.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/model/ProcedureEvent.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/model/ProcedureEvent.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/model/ProcedureListener.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/model/ProcedureListener.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/model/ProcedureListener.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/model/ProcedureListener.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/model/ProcedureParameterEvent.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/model/ProcedureParameterEvent.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/model/ProcedureParameterEvent.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/model/ProcedureParameterEvent.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/model/ProcedureParameterListener.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/model/ProcedureParameterListener.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/model/ProcedureParameterListener.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/model/ProcedureParameterListener.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/model/ProjectAfterSaveEvent.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/model/ProjectAfterSaveEvent.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/model/ProjectAfterSaveEvent.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/model/ProjectAfterSaveEvent.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/model/ProjectAfterSaveListener.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/model/ProjectAfterSaveListener.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/model/ProjectAfterSaveListener.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/model/ProjectAfterSaveListener.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/model/ProjectBeforeSaveEvent.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/model/ProjectBeforeSaveEvent.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/model/ProjectBeforeSaveEvent.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/model/ProjectBeforeSaveEvent.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/model/ProjectBeforeSaveListener.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/model/ProjectBeforeSaveListener.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/model/ProjectBeforeSaveListener.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/model/ProjectBeforeSaveListener.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/model/QueryEvent.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/model/QueryEvent.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/model/QueryEvent.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/model/QueryEvent.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/model/QueryListener.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/model/QueryListener.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/model/QueryListener.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/model/QueryListener.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/model/RecentFileListener.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/model/RecentFileListener.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/model/RecentFileListener.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/model/RecentFileListener.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/log/LogAppender.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/log/LogAppender.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/log/LogAppender.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/log/LogAppender.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/log/ModelerLogFactory.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/log/ModelerLogFactory.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/log/ModelerLogFactory.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/log/ModelerLogFactory.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/log/ModelerLogServiceProvider.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/log/ModelerLogServiceProvider.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/log/ModelerLogServiceProvider.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/log/ModelerLogServiceProvider.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/log/ModelerLogger.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/log/ModelerLogger.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/log/ModelerLogger.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/log/ModelerLogger.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/mcp/McpHandshakeWriter.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/mcp/McpHandshakeWriter.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/mcp/McpHandshakeWriter.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/mcp/McpHandshakeWriter.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/platform/FlatLafLayoutStyle.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/platform/FlatLafLayoutStyle.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/platform/FlatLafLayoutStyle.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/platform/FlatLafLayoutStyle.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/platform/GenericUIInitializer.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/platform/GenericUIInitializer.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/platform/GenericUIInitializer.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/platform/GenericUIInitializer.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/platform/UIInitializer.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/platform/UIInitializer.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/platform/UIInitializer.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/platform/UIInitializer.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/platform/mac/MacFileChooser.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/platform/mac/MacFileChooser.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/platform/mac/MacFileChooser.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/platform/mac/MacFileChooser.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/platform/mac/MacUIInitializer.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/platform/mac/MacUIInitializer.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/platform/mac/MacUIInitializer.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/platform/mac/MacUIInitializer.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/pref/PreferenceMigration.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/pref/PreferenceMigration.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/pref/PreferenceMigration.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/pref/PreferenceMigration.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/pref/PrefsCopier.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/pref/PrefsCopier.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/pref/PrefsCopier.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/pref/PrefsCopier.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/pref/PrefsExporter.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/pref/PrefsExporter.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/pref/PrefsExporter.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/pref/PrefsExporter.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/pref/PrefsManager.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/pref/PrefsManager.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/pref/PrefsManager.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/pref/PrefsManager.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/pref/adapters/CMTablePrefs.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/pref/adapters/CMTablePrefs.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/pref/adapters/CMTablePrefs.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/pref/adapters/CMTablePrefs.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/pref/adapters/ComponentGeometryPrefs.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/pref/adapters/ComponentGeometryPrefs.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/pref/adapters/ComponentGeometryPrefs.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/pref/adapters/ComponentGeometryPrefs.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/pref/adapters/DBGeneratorPrefs.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/pref/adapters/DBGeneratorPrefs.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/pref/adapters/DBGeneratorPrefs.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/pref/adapters/DBGeneratorPrefs.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/pref/adapters/FileChooserPrefs.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/pref/adapters/FileChooserPrefs.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/pref/adapters/FileChooserPrefs.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/pref/adapters/FileChooserPrefs.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/pref/adapters/GeneralPrefs.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/pref/adapters/GeneralPrefs.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/pref/adapters/GeneralPrefs.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/pref/adapters/GeneralPrefs.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/pref/adapters/LogConsolePrefs.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/pref/adapters/LogConsolePrefs.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/pref/adapters/LogConsolePrefs.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/pref/adapters/LogConsolePrefs.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/pref/adapters/ProjectPrefs.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/pref/adapters/ProjectPrefs.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/pref/adapters/ProjectPrefs.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/pref/adapters/ProjectPrefs.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/pref/adapters/RecentProjectsPrefs.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/pref/adapters/RecentProjectsPrefs.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/pref/adapters/RecentProjectsPrefs.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/pref/adapters/RecentProjectsPrefs.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/pref/adapters/SplitPanePrefs.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/pref/adapters/SplitPanePrefs.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/pref/adapters/SplitPanePrefs.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/pref/adapters/SplitPanePrefs.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/pref/migration/toV5/_1_DbConnectorsMigration.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/pref/migration/toV5/_1_DbConnectorsMigration.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/pref/migration/toV5/_1_DbConnectorsMigration.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/pref/migration/toV5/_1_DbConnectorsMigration.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/pref/migration/toV5/_2_ClasspathMigration.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/pref/migration/toV5/_2_ClasspathMigration.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/pref/migration/toV5/_2_ClasspathMigration.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/pref/migration/toV5/_2_ClasspathMigration.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/pref/migration/toV5/_3_GeneralPrefsMigration.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/pref/migration/toV5/_3_GeneralPrefsMigration.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/pref/migration/toV5/_3_GeneralPrefsMigration.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/pref/migration/toV5/_3_GeneralPrefsMigration.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/pref/migration/toV5/_4_RecentProjectsMigration.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/pref/migration/toV5/_4_RecentProjectsMigration.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/pref/migration/toV5/_4_RecentProjectsMigration.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/pref/migration/toV5/_4_RecentProjectsMigration.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/pref/migration/toV5/_5_FrameGeometryMigration.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/pref/migration/toV5/_5_FrameGeometryMigration.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/pref/migration/toV5/_5_FrameGeometryMigration.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/pref/migration/toV5/_5_FrameGeometryMigration.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/pref/migration/toV5/_6_ProjectSplitPaneMigration.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/pref/migration/toV5/_6_ProjectSplitPaneMigration.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/pref/migration/toV5/_6_ProjectSplitPaneMigration.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/pref/migration/toV5/_6_ProjectSplitPaneMigration.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/pref/migration/toV5/_7_EntityTablePrefsMigration.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/pref/migration/toV5/_7_EntityTablePrefsMigration.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/pref/migration/toV5/_7_EntityTablePrefsMigration.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/pref/migration/toV5/_7_EntityTablePrefsMigration.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/pref/migration/toV5/_8_RemoveRedundantPathIndexMigration.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/pref/migration/toV5/_8_RemoveRedundantPathIndexMigration.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/pref/migration/toV5/_8_RemoveRedundantPathIndexMigration.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/pref/migration/toV5/_8_RemoveRedundantPathIndexMigration.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/project/CgenOps.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/project/CgenOps.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/project/CgenOps.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/project/CgenOps.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/project/DataMapOps.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/project/DataMapOps.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/project/DataMapOps.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/project/DataMapOps.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/project/DbAttributeOps.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/project/DbAttributeOps.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/project/DbAttributeOps.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/project/DbAttributeOps.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/project/DbEntityOps.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/project/DbEntityOps.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/project/DbEntityOps.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/project/DbEntityOps.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/project/DbRelationshipOps.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/project/DbRelationshipOps.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/project/DbRelationshipOps.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/project/DbRelationshipOps.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/project/ObjEntityOps.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/project/ObjEntityOps.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/project/ObjEntityOps.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/project/ObjEntityOps.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/project/ProjectComparators.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/project/ProjectComparators.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/project/ProjectComparators.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/project/ProjectComparators.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/project/ProjectDirtyListener.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/project/ProjectDirtyListener.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/project/ProjectDirtyListener.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/project/ProjectDirtyListener.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/project/ProjectFileChangeTracker.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/project/ProjectFileChangeTracker.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/project/ProjectFileChangeTracker.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/project/ProjectFileChangeTracker.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/project/ProjectNavigationHistory.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/project/ProjectNavigationHistory.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/project/ProjectNavigationHistory.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/project/ProjectNavigationHistory.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/project/ProjectSession.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/project/ProjectSession.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/project/ProjectSession.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/project/ProjectSession.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/service/action/GlobalActions.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/service/action/GlobalActions.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/service/action/GlobalActions.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/service/action/GlobalActions.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/service/classloader/ModelerClassLoader.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/service/classloader/ModelerClassLoader.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/service/classloader/ModelerClassLoader.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/service/classloader/ModelerClassLoader.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/service/os/OperatingSystem.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/service/os/OperatingSystem.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/service/os/OperatingSystem.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/service/os/OperatingSystem.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/service/validator/ConfigurableProjectValidator.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/service/validator/ConfigurableProjectValidator.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/service/validator/ConfigurableProjectValidator.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/service/validator/ConfigurableProjectValidator.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/AppAction.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/AppAction.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/AppAction.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/AppAction.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/AppDialog.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/AppDialog.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/AppDialog.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/AppDialog.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/AppFrame.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/AppFrame.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/AppFrame.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/AppFrame.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/AppPanel.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/AppPanel.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/AppPanel.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/AppPanel.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/AppTabbedPane.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/AppTabbedPane.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/AppTabbedPane.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/AppTabbedPane.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/AppToolBar.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/AppToolBar.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/AppToolBar.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/AppToolBar.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/ProjectDialog.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/ProjectDialog.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/ProjectDialog.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/ProjectDialog.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/ProjectPanel.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/ProjectPanel.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/ProjectPanel.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/ProjectPanel.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/ProjectTabbedPane.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/ProjectTabbedPane.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/ProjectTabbedPane.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/ProjectTabbedPane.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/Renderers.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/Renderers.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/Renderers.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/Renderers.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/border/TopBorder.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/border/TopBorder.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/border/TopBorder.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/border/TopBorder.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/buttons/CMButtonPanel.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/buttons/CMButtonPanel.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/buttons/CMButtonPanel.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/buttons/CMButtonPanel.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/checkbox/CMCheckBox.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/checkbox/CMCheckBox.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/checkbox/CMCheckBox.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/checkbox/CMCheckBox.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/checkbox/CMCheckBoxUndoableEdit.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/checkbox/CMCheckBoxUndoableEdit.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/checkbox/CMCheckBoxUndoableEdit.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/checkbox/CMCheckBoxUndoableEdit.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/columnview/ColumnViewPanel.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/columnview/ColumnViewPanel.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/columnview/ColumnViewPanel.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/columnview/ColumnViewPanel.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/combobox/AutoCompletion.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/combobox/AutoCompletion.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/combobox/AutoCompletion.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/combobox/AutoCompletion.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/combobox/CMAutoCompleteComboBoxCellEditor.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/combobox/CMAutoCompleteComboBoxCellEditor.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/combobox/CMAutoCompleteComboBoxCellEditor.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/combobox/CMAutoCompleteComboBoxCellEditor.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/combobox/CMComboBox.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/combobox/CMComboBox.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/combobox/CMComboBox.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/combobox/CMComboBox.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/combobox/CMComboBoxCellEditor.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/combobox/CMComboBoxCellEditor.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/combobox/CMComboBoxCellEditor.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/combobox/CMComboBoxCellEditor.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/combobox/CMComboBoxPopupResizer.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/combobox/CMComboBoxPopupResizer.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/combobox/CMComboBoxPopupResizer.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/combobox/CMComboBoxPopupResizer.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/combobox/CMComboBoxUndoableEdit.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/combobox/CMComboBoxUndoableEdit.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/combobox/CMComboBoxUndoableEdit.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/combobox/CMComboBoxUndoableEdit.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/combobox/CMUndoableComboBox.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/combobox/CMUndoableComboBox.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/combobox/CMUndoableComboBox.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/combobox/CMUndoableComboBox.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/combobox/ComboBoxPopup.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/combobox/ComboBoxPopup.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/combobox/ComboBoxPopup.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/combobox/ComboBoxPopup.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/combobox/CustomTypeComboBoxEditor.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/combobox/CustomTypeComboBoxEditor.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/combobox/CustomTypeComboBoxEditor.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/combobox/CustomTypeComboBoxEditor.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/combobox/EditorTextField.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/combobox/EditorTextField.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/combobox/EditorTextField.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/combobox/EditorTextField.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/combobox/SuggestionList.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/combobox/SuggestionList.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/combobox/SuggestionList.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/combobox/SuggestionList.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/copypaste/CMTransferable.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/copypaste/CMTransferable.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/copypaste/CMTransferable.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/copypaste/CMTransferable.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/filechooser/CMFileChooser.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/filechooser/CMFileChooser.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/filechooser/CMFileChooser.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/filechooser/CMFileChooser.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/filechooser/CMFileChooserFactory.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/filechooser/CMFileChooserFactory.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/filechooser/CMFileChooserFactory.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/filechooser/CMFileChooserFactory.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/filechooser/FileFilters.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/filechooser/FileFilters.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/filechooser/FileFilters.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/filechooser/FileFilters.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/filechooser/SwingDirChooserDialog.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/filechooser/SwingDirChooserDialog.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/filechooser/SwingDirChooserDialog.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/filechooser/SwingDirChooserDialog.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/filechooser/SwingFileChooser.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/filechooser/SwingFileChooser.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/filechooser/SwingFileChooser.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/filechooser/SwingFileChooser.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/filechooser/SwingFileOpenerDialog.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/filechooser/SwingFileOpenerDialog.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/filechooser/SwingFileOpenerDialog.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/filechooser/SwingFileOpenerDialog.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/filechooser/SwingFileSaverDialog.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/filechooser/SwingFileSaverDialog.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/filechooser/SwingFileSaverDialog.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/filechooser/SwingFileSaverDialog.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/icon/IconFactory.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/icon/IconFactory.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/icon/IconFactory.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/icon/IconFactory.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/table/BoardTableCellRenderer.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/table/BoardTableCellRenderer.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/table/BoardTableCellRenderer.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/table/BoardTableCellRenderer.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/table/CMTable.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/table/CMTable.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/table/CMTable.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/table/CMTable.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/table/CMTableModel.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/table/CMTableModel.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/table/CMTableModel.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/table/CMTableModel.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/table/CMTableModelUndoableEdit.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/table/CMTableModelUndoableEdit.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/table/CMTableModelUndoableEdit.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/table/CMTableModelUndoableEdit.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/table/CMTablePanel.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/table/CMTablePanel.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/table/CMTablePanel.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/table/CMTablePanel.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/table/CMTextFieldCellEditor.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/table/CMTextFieldCellEditor.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/table/CMTextFieldCellEditor.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/table/CMTextFieldCellEditor.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/table/IconCellRenderer.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/table/IconCellRenderer.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/table/IconCellRenderer.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/table/IconCellRenderer.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/table/SortButtonRenderer.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/table/SortButtonRenderer.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/table/SortButtonRenderer.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/table/SortButtonRenderer.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/table/TableSizer.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/table/TableSizer.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/table/TableSizer.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/table/TableSizer.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/text/CMPasswordField.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/text/CMPasswordField.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/text/CMPasswordField.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/text/CMPasswordField.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/text/CMTextArea.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/text/CMTextArea.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/text/CMTextArea.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/text/CMTextArea.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/text/CMTextCommitListener.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/text/CMTextCommitListener.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/text/CMTextCommitListener.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/text/CMTextCommitListener.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/text/CMTextField.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/text/CMTextField.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/text/CMTextField.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/text/CMTextField.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/text/CMTextPane.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/text/CMTextPane.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/text/CMTextPane.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/text/CMTextPane.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/text/CMTextPaneEditorKit.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/text/CMTextPaneEditorKit.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/text/CMTextPaneEditorKit.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/text/CMTextPaneEditorKit.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/text/CMUndoableTextField.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/text/CMUndoableTextField.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/text/CMUndoableTextField.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/text/CMUndoableTextField.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/text/CMUndoableTextPane.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/text/CMUndoableTextPane.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/text/CMUndoableTextPane.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/text/CMUndoableTextPane.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/text/LineNumberedBorder.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/text/LineNumberedBorder.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/text/LineNumberedBorder.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/text/LineNumberedBorder.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/text/TextComponentUndoListener.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/text/TextComponentUndoListener.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/text/TextComponentUndoListener.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/text/TextComponentUndoListener.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/text/UnderlineHighlighterForText.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/text/UnderlineHighlighterForText.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/text/UnderlineHighlighterForText.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/text/UnderlineHighlighterForText.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/text/style/SyntaxStyle.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/text/style/SyntaxStyle.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/text/style/SyntaxStyle.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/text/style/SyntaxStyle.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/text/style/TextPaneStyleTypes.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/text/style/TextPaneStyleTypes.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/text/style/TextPaneStyleTypes.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/text/style/TextPaneStyleTypes.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/text/style/TextSyntax.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/text/style/TextSyntax.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/text/style/TextSyntax.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/text/style/TextSyntax.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/tree/ChangeOptimizingTreeModel.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/tree/ChangeOptimizingTreeModel.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/tree/ChangeOptimizingTreeModel.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/tree/ChangeOptimizingTreeModel.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/tree/CheckBoxNodeData.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/tree/CheckBoxNodeData.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/tree/CheckBoxNodeData.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/tree/CheckBoxNodeData.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/tree/CheckBoxTree.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/tree/CheckBoxTree.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/tree/CheckBoxTree.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/tree/CheckBoxTree.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/tree/CheckBoxTreeCellEditor.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/tree/CheckBoxTreeCellEditor.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/tree/CheckBoxTreeCellEditor.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/tree/CheckBoxTreeCellEditor.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/tree/CheckBoxTreeCellRenderer.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/tree/CheckBoxTreeCellRenderer.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/tree/CheckBoxTreeCellRenderer.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/tree/CheckBoxTreeCellRenderer.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/tree/EntityTreeAttributeRelationshipFilter.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/tree/EntityTreeAttributeRelationshipFilter.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/tree/EntityTreeAttributeRelationshipFilter.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/tree/EntityTreeAttributeRelationshipFilter.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/tree/EntityTreeFilter.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/tree/EntityTreeFilter.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/tree/EntityTreeFilter.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/tree/EntityTreeFilter.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/tree/EntityTreeModel.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/tree/EntityTreeModel.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/tree/EntityTreeModel.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/tree/EntityTreeModel.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/tree/EntityTreeRelationshipFilter.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/tree/EntityTreeRelationshipFilter.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/tree/EntityTreeRelationshipFilter.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/tree/EntityTreeRelationshipFilter.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/tree/LabelTreeCellRenderer.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/tree/LabelTreeCellRenderer.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/tree/LabelTreeCellRenderer.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/tree/LabelTreeCellRenderer.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/url/UrlOpener.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/url/UrlOpener.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/url/UrlOpener.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/url/UrlOpener.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/valuetype/ValueTypes.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/valuetype/ValueTypes.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/valuetype/ValueTypes.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/valuetype/ValueTypes.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/MainFrame.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/MainFrame.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/MainFrame.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/MainFrame.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/MainMenuBar.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/MainMenuBar.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/MainMenuBar.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/MainMenuBar.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/MainToolBar.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/MainToolBar.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/MainToolBar.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/MainToolBar.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/SearchPanel.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/SearchPanel.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/SearchPanel.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/SearchPanel.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/about/AboutFrame.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/about/AboutFrame.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/about/AboutFrame.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/about/AboutFrame.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/AboutAction.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/AboutAction.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/AboutAction.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/AboutAction.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/BaseViewEntityAction.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/BaseViewEntityAction.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/BaseViewEntityAction.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/BaseViewEntityAction.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/CloseProjectAction.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/CloseProjectAction.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/CloseProjectAction.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/CloseProjectAction.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/CollapseTreeAction.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/CollapseTreeAction.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/CollapseTreeAction.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/CollapseTreeAction.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/ConfigurePreferencesAction.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/ConfigurePreferencesAction.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/ConfigurePreferencesAction.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/ConfigurePreferencesAction.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/CopyAction.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/CopyAction.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/CopyAction.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/CopyAction.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/CopyAttributeAction.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/CopyAttributeAction.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/CopyAttributeAction.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/CopyAttributeAction.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/CopyAttributeRelationshipAction.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/CopyAttributeRelationshipAction.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/CopyAttributeRelationshipAction.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/CopyAttributeRelationshipAction.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/CopyCallbackMethodAction.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/CopyCallbackMethodAction.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/CopyCallbackMethodAction.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/CopyCallbackMethodAction.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/CopyProcedureParameterAction.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/CopyProcedureParameterAction.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/CopyProcedureParameterAction.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/CopyProcedureParameterAction.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/CopyRelationshipAction.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/CopyRelationshipAction.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/CopyRelationshipAction.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/CopyRelationshipAction.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/CreateAttributeAction.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/CreateAttributeAction.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/CreateAttributeAction.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/CreateAttributeAction.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/CreateCallbackMethodAction.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/CreateCallbackMethodAction.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/CreateCallbackMethodAction.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/CreateCallbackMethodAction.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/CreateDataMapAction.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/CreateDataMapAction.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/CreateDataMapAction.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/CreateDataMapAction.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/CreateDbEntityAction.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/CreateDbEntityAction.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/CreateDbEntityAction.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/CreateDbEntityAction.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/CreateEmbeddableAction.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/CreateEmbeddableAction.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/CreateEmbeddableAction.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/CreateEmbeddableAction.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/CreateObjEntityAction.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/CreateObjEntityAction.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/CreateObjEntityAction.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/CreateObjEntityAction.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/CreateObjEntityFromDbAction.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/CreateObjEntityFromDbAction.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/CreateObjEntityFromDbAction.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/CreateObjEntityFromDbAction.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/CreateProcedureAction.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/CreateProcedureAction.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/CreateProcedureAction.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/CreateProcedureAction.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/CreateProcedureParameterAction.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/CreateProcedureParameterAction.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/CreateProcedureParameterAction.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/CreateProcedureParameterAction.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/CreateQueryAction.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/CreateQueryAction.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/CreateQueryAction.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/CreateQueryAction.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/CreateRelationshipAction.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/CreateRelationshipAction.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/CreateRelationshipAction.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/CreateRelationshipAction.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/CutAction.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/CutAction.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/CutAction.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/CutAction.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/CutAttributeAction.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/CutAttributeAction.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/CutAttributeAction.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/CutAttributeAction.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/CutAttributeRelationshipAction.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/CutAttributeRelationshipAction.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/CutAttributeRelationshipAction.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/CutAttributeRelationshipAction.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/CutCallbackMethodAction.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/CutCallbackMethodAction.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/CutCallbackMethodAction.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/CutCallbackMethodAction.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/CutProcedureParameterAction.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/CutProcedureParameterAction.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/CutProcedureParameterAction.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/CutProcedureParameterAction.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/CutRelationshipAction.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/CutRelationshipAction.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/CutRelationshipAction.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/CutRelationshipAction.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/DBConnectionAwareAction.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/DBConnectionAwareAction.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/DBConnectionAwareAction.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/DBConnectionAwareAction.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/DbEntityCounterpartAction.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/DbEntityCounterpartAction.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/DbEntityCounterpartAction.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/DbEntityCounterpartAction.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/DbEntitySyncAction.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/DbEntitySyncAction.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/DbEntitySyncAction.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/DbEntitySyncAction.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/DisableValidationInspectionAction.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/DisableValidationInspectionAction.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/DisableValidationInspectionAction.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/DisableValidationInspectionAction.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/DocumentationAction.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/DocumentationAction.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/DocumentationAction.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/DocumentationAction.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/ExitAction.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/ExitAction.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/ExitAction.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/ExitAction.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/FilterAction.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/FilterAction.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/FilterAction.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/FilterAction.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/FindAction.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/FindAction.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/FindAction.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/FindAction.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/GenerateDBAction.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/GenerateDBAction.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/GenerateDBAction.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/GenerateDBAction.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/ImportDataMapAction.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/ImportDataMapAction.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/ImportDataMapAction.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/ImportDataMapAction.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/ImportEOModelAction.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/ImportEOModelAction.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/ImportEOModelAction.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/ImportEOModelAction.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/InferRelationshipsAction.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/InferRelationshipsAction.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/InferRelationshipsAction.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/InferRelationshipsAction.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/MigrateAction.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/MigrateAction.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/MigrateAction.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/MigrateAction.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/MultipleObjectsAction.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/MultipleObjectsAction.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/MultipleObjectsAction.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/MultipleObjectsAction.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/NavigateAction.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/NavigateAction.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/NavigateAction.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/NavigateAction.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/NavigateBackwardAction.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/NavigateBackwardAction.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/NavigateBackwardAction.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/NavigateBackwardAction.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/NavigateForwardAction.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/NavigateForwardAction.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/NavigateForwardAction.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/NavigateForwardAction.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/NewProjectAction.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/NewProjectAction.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/NewProjectAction.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/NewProjectAction.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/ObjEntityCounterpartAction.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/ObjEntityCounterpartAction.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/ObjEntityCounterpartAction.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/ObjEntityCounterpartAction.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/ObjEntitySyncAction.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/ObjEntitySyncAction.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/ObjEntitySyncAction.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/ObjEntitySyncAction.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/ObjEntityToSuperEntityAction.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/ObjEntityToSuperEntityAction.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/ObjEntityToSuperEntityAction.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/ObjEntityToSuperEntityAction.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/OpenProjectAction.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/OpenProjectAction.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/OpenProjectAction.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/OpenProjectAction.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/PasteAction.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/PasteAction.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/PasteAction.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/PasteAction.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/RedoAction.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/RedoAction.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/RedoAction.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/RedoAction.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/RemoveAction.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/RemoveAction.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/RemoveAction.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/RemoveAction.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/RemoveAttributeAction.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/RemoveAttributeAction.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/RemoveAttributeAction.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/RemoveAttributeAction.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/RemoveAttributeRelationshipAction.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/RemoveAttributeRelationshipAction.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/RemoveAttributeRelationshipAction.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/RemoveAttributeRelationshipAction.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/RemoveCallbackMethodAction.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/RemoveCallbackMethodAction.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/RemoveCallbackMethodAction.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/RemoveCallbackMethodAction.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/RemoveProcedureParameterAction.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/RemoveProcedureParameterAction.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/RemoveProcedureParameterAction.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/RemoveProcedureParameterAction.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/RemoveRelationshipAction.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/RemoveRelationshipAction.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/RemoveRelationshipAction.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/RemoveRelationshipAction.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/RevertAction.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/RevertAction.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/RevertAction.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/RevertAction.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/SaveAction.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/SaveAction.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/SaveAction.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/SaveAction.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/SaveAsAction.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/SaveAsAction.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/SaveAsAction.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/SaveAsAction.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/ShowLogConsoleAction.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/ShowLogConsoleAction.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/ShowLogConsoleAction.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/ShowLogConsoleAction.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/ShowValidationConfigAction.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/ShowValidationConfigAction.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/ShowValidationConfigAction.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/ShowValidationConfigAction.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/ShowValidationOptionAction.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/ShowValidationOptionAction.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/ShowValidationOptionAction.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/ShowValidationOptionAction.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/UndoAction.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/UndoAction.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/UndoAction.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/UndoAction.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/UpdateValidationConfigAction.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/UpdateValidationConfigAction.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/UpdateValidationConfigAction.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/UpdateValidationConfigAction.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/ValidateAction.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/ValidateAction.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/ValidateAction.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/ValidateAction.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/autorelationship/InferRelationshipsDialog.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/autorelationship/InferRelationshipsDialog.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/autorelationship/InferRelationshipsDialog.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/autorelationship/InferRelationshipsDialog.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/autorelationship/InferRelationshipsPanel.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/autorelationship/InferRelationshipsPanel.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/autorelationship/InferRelationshipsPanel.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/autorelationship/InferRelationshipsPanel.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/autorelationship/InferRelationshipsTabController.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/autorelationship/InferRelationshipsTabController.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/autorelationship/InferRelationshipsTabController.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/autorelationship/InferRelationshipsTabController.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/autorelationship/InferredRelationship.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/autorelationship/InferredRelationship.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/autorelationship/InferredRelationship.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/autorelationship/InferredRelationship.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/confirmremove/ConfirmRemoveDialog.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/confirmremove/ConfirmRemoveDialog.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/confirmremove/ConfirmRemoveDialog.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/confirmremove/ConfirmRemoveDialog.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/datasource/DataSourceDialog.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/datasource/DataSourceDialog.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/datasource/DataSourceDialog.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/datasource/DataSourceDialog.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/dbactionoptions/DbActionOptionsDialog.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/dbactionoptions/DbActionOptionsDialog.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/dbactionoptions/DbActionOptionsDialog.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/dbactionoptions/DbActionOptionsDialog.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/dbgen/DBGeneratorOptionsDialog.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/dbgen/DBGeneratorOptionsDialog.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/dbgen/DBGeneratorOptionsDialog.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/dbgen/DBGeneratorOptionsDialog.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/dbgen/TableSelectorPanel.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/dbgen/TableSelectorPanel.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/dbgen/TableSelectorPanel.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/dbgen/TableSelectorPanel.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/dbmerge/MergerOptionsDialog.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/dbmerge/MergerOptionsDialog.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/dbmerge/MergerOptionsDialog.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/dbmerge/MergerOptionsDialog.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/dbmerge/MergerTokenSelector.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/dbmerge/MergerTokenSelector.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/dbmerge/MergerTokenSelector.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/dbmerge/MergerTokenSelector.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/dbmerge/MergerTokenTableModel.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/dbmerge/MergerTokenTableModel.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/dbmerge/MergerTokenTableModel.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/dbmerge/MergerTokenTableModel.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/dbrelationship/DbJoinTableModel.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/dbrelationship/DbJoinTableModel.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/dbrelationship/DbJoinTableModel.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/dbrelationship/DbJoinTableModel.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/dbrelationship/DbRelationshipDialog.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/dbrelationship/DbRelationshipDialog.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/dbrelationship/DbRelationshipDialog.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/dbrelationship/DbRelationshipDialog.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/entitysync/EntitySyncDialog.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/entitysync/EntitySyncDialog.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/entitysync/EntitySyncDialog.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/entitysync/EntitySyncDialog.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/errors/ErrorDialog.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/errors/ErrorDialog.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/errors/ErrorDialog.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/errors/ErrorDialog.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/filedeleted/FileDeletedDialog.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/filedeleted/FileDeletedDialog.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/filedeleted/FileDeletedDialog.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/filedeleted/FileDeletedDialog.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/find/FindDialog.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/find/FindDialog.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/find/FindDialog.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/find/FindDialog.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/logconsole/LogConsole.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/logconsole/LogConsole.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/logconsole/LogConsole.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/logconsole/LogConsole.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/preferences/PreferenceDialog.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/preferences/PreferenceDialog.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/preferences/PreferenceDialog.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/preferences/PreferenceDialog.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/preferences/classpath/ClasspathPrefsPanel.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/preferences/classpath/ClasspathPrefsPanel.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/preferences/classpath/ClasspathPrefsPanel.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/preferences/classpath/ClasspathPrefsPanel.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/preferences/classpath/maven/MavenDependencyDialog.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/preferences/classpath/maven/MavenDependencyDialog.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/preferences/classpath/maven/MavenDependencyDialog.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/preferences/classpath/maven/MavenDependencyDialog.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/preferences/dbconnector/DBConnectorEditor.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/preferences/dbconnector/DBConnectorEditor.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/preferences/dbconnector/DBConnectorEditor.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/preferences/dbconnector/DBConnectorEditor.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/preferences/dbconnector/DBConnectorPrefsPanel.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/preferences/dbconnector/DBConnectorPrefsPanel.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/preferences/dbconnector/DBConnectorPrefsPanel.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/preferences/dbconnector/DBConnectorPrefsPanel.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/preferences/dbconnector/creator/Adapters.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/preferences/dbconnector/creator/Adapters.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/preferences/dbconnector/creator/Adapters.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/preferences/dbconnector/creator/Adapters.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/preferences/dbconnector/creator/DBConnectorCreatorDialog.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/preferences/dbconnector/creator/DBConnectorCreatorDialog.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/preferences/dbconnector/creator/DBConnectorCreatorDialog.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/preferences/dbconnector/creator/DBConnectorCreatorDialog.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/preferences/dbconnector/duplicator/DBConnectorDuplicatorDialog.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/preferences/dbconnector/duplicator/DBConnectorDuplicatorDialog.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/preferences/dbconnector/duplicator/DBConnectorDuplicatorDialog.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/preferences/dbconnector/duplicator/DBConnectorDuplicatorDialog.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/preferences/general/GeneralPrefsPanel.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/preferences/general/GeneralPrefsPanel.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/preferences/general/GeneralPrefsPanel.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/preferences/general/GeneralPrefsPanel.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/preferences/more/MorePrefsPanel.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/preferences/more/MorePrefsPanel.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/preferences/more/MorePrefsPanel.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/preferences/more/MorePrefsPanel.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/ProjectView.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/ProjectView.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/ProjectView.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/ProjectView.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/EditorPanelView.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/EditorPanelView.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/EditorPanelView.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/EditorPanelView.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/ExpressionConvertor.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/ExpressionConvertor.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/ExpressionConvertor.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/ExpressionConvertor.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datadomain/DataDomainGeneratorsPanel.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datadomain/DataDomainGeneratorsPanel.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datadomain/DataDomainGeneratorsPanel.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datadomain/DataDomainGeneratorsPanel.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datadomain/DataDomainGeneratorsTab.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datadomain/DataDomainGeneratorsTab.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datadomain/DataDomainGeneratorsTab.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datadomain/DataDomainGeneratorsTab.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datadomain/DataDomainView.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datadomain/DataDomainView.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datadomain/DataDomainView.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datadomain/DataDomainView.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datadomain/cgen/DataDomainCgenTab.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datadomain/cgen/DataDomainCgenTab.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datadomain/cgen/DataDomainCgenTab.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datadomain/cgen/DataDomainCgenTab.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datadomain/dbimport/DataDomainDbImportTab.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datadomain/dbimport/DataDomainDbImportTab.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datadomain/dbimport/DataDomainDbImportTab.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datadomain/dbimport/DataDomainDbImportTab.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datadomain/main/DataDomainMainView.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datadomain/main/DataDomainMainView.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datadomain/main/DataDomainMainView.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datadomain/main/DataDomainMainView.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datadomain/validation/InspectionCheckBoxTree.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datadomain/validation/InspectionCheckBoxTree.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datadomain/validation/InspectionCheckBoxTree.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datadomain/validation/InspectionCheckBoxTree.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datadomain/validation/ValidationTab.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datadomain/validation/ValidationTab.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datadomain/validation/ValidationTab.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datadomain/validation/ValidationTab.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/DataMapView.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/DataMapView.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/DataMapView.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/DataMapView.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/cgen/CgenArtefactSelectorPanel.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/cgen/CgenArtefactSelectorPanel.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/cgen/CgenArtefactSelectorPanel.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/cgen/CgenArtefactSelectorPanel.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/cgen/CgenConfigPanel.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/cgen/CgenConfigPanel.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/cgen/CgenConfigPanel.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/cgen/CgenConfigPanel.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/cgen/CgenPanel.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/cgen/CgenPanel.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/cgen/CgenPanel.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/cgen/CgenPanel.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/cgen/CgenValidator.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/cgen/CgenValidator.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/cgen/CgenValidator.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/cgen/CgenValidator.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/cgen/CheckBoxHeader.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/cgen/CheckBoxHeader.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/cgen/CheckBoxHeader.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/cgen/CheckBoxHeader.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/cgen/CodeValidator.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/cgen/CodeValidator.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/cgen/CodeValidator.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/cgen/CodeValidator.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/cgen/SelectionModel.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/cgen/SelectionModel.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/cgen/SelectionModel.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/cgen/SelectionModel.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/cgen/action/AddCgenConfigAction.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/cgen/action/AddCgenConfigAction.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/cgen/action/AddCgenConfigAction.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/cgen/action/AddCgenConfigAction.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/cgen/action/EditCgenConfigAction.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/cgen/action/EditCgenConfigAction.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/cgen/action/EditCgenConfigAction.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/cgen/action/EditCgenConfigAction.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/cgen/action/RemoveCgenConfigAction.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/cgen/action/RemoveCgenConfigAction.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/cgen/action/RemoveCgenConfigAction.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/cgen/action/RemoveCgenConfigAction.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/cgen/templateeditor/ArtefactsConfigurator.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/cgen/templateeditor/ArtefactsConfigurator.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/cgen/templateeditor/ArtefactsConfigurator.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/cgen/templateeditor/ArtefactsConfigurator.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/cgen/templateeditor/DataMapArtefactsConfigurator.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/cgen/templateeditor/DataMapArtefactsConfigurator.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/cgen/templateeditor/DataMapArtefactsConfigurator.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/cgen/templateeditor/DataMapArtefactsConfigurator.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/cgen/templateeditor/EditorTemplateLoader.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/cgen/templateeditor/EditorTemplateLoader.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/cgen/templateeditor/EditorTemplateLoader.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/cgen/templateeditor/EditorTemplateLoader.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/cgen/templateeditor/EditorTemplateSaver.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/cgen/templateeditor/EditorTemplateSaver.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/cgen/templateeditor/EditorTemplateSaver.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/cgen/templateeditor/EditorTemplateSaver.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/cgen/templateeditor/EmbeddableArtefactsConfigurator.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/cgen/templateeditor/EmbeddableArtefactsConfigurator.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/cgen/templateeditor/EmbeddableArtefactsConfigurator.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/cgen/templateeditor/EmbeddableArtefactsConfigurator.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/cgen/templateeditor/EntityArtefactsConfigurator.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/cgen/templateeditor/EntityArtefactsConfigurator.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/cgen/templateeditor/EntityArtefactsConfigurator.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/cgen/templateeditor/EntityArtefactsConfigurator.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/cgen/templateeditor/PreviewActionConfigurator.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/cgen/templateeditor/PreviewActionConfigurator.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/cgen/templateeditor/PreviewActionConfigurator.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/cgen/templateeditor/PreviewActionConfigurator.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/cgen/templateeditor/PreviewClassGenerationFactory.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/cgen/templateeditor/PreviewClassGenerationFactory.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/cgen/templateeditor/PreviewClassGenerationFactory.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/cgen/templateeditor/PreviewClassGenerationFactory.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/cgen/templateeditor/PreviewGenerationAction.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/cgen/templateeditor/PreviewGenerationAction.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/cgen/templateeditor/PreviewGenerationAction.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/cgen/templateeditor/PreviewGenerationAction.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/cgen/templateeditor/TemplateEditor.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/cgen/templateeditor/TemplateEditor.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/cgen/templateeditor/TemplateEditor.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/cgen/templateeditor/TemplateEditor.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/cgen/templateeditor/TemplateEditorFindAndReplaceDialog.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/cgen/templateeditor/TemplateEditorFindAndReplaceDialog.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/cgen/templateeditor/TemplateEditorFindAndReplaceDialog.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/cgen/templateeditor/TemplateEditorFindAndReplaceDialog.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/cgen/templateeditor/TemplateEditorFindDialog.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/cgen/templateeditor/TemplateEditorFindDialog.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/cgen/templateeditor/TemplateEditorFindDialog.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/cgen/templateeditor/TemplateEditorFindDialog.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/cgen/templateeditor/VelocityTokenMaker.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/cgen/templateeditor/VelocityTokenMaker.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/cgen/templateeditor/VelocityTokenMaker.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/cgen/templateeditor/VelocityTokenMaker.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/CatalogPopUpMenu.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/CatalogPopUpMenu.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/CatalogPopUpMenu.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/CatalogPopUpMenu.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/ConfigToolbar.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/ConfigToolbar.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/ConfigToolbar.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/ConfigToolbar.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/DBSchemaPanel.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/DBSchemaPanel.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/DBSchemaPanel.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/DBSchemaPanel.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/DatabaseSchemaLoader.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/DatabaseSchemaLoader.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/DatabaseSchemaLoader.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/DatabaseSchemaLoader.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/DbImportResultDialog.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/DbImportResultDialog.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/DbImportResultDialog.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/DbImportResultDialog.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/DbImportSorter.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/DbImportSorter.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/DbImportSorter.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/DbImportSorter.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/DbImportTree.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/DbImportTree.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/DbImportTree.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/DbImportTree.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/DbImportTreeCellEditor.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/DbImportTreeCellEditor.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/DbImportTreeCellEditor.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/DbImportTreeCellEditor.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/DbImportTreeCellRenderer.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/DbImportTreeCellRenderer.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/DbImportTreeCellRenderer.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/DbImportTreeCellRenderer.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/DbImportTreeModel.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/DbImportTreeModel.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/DbImportTreeModel.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/DbImportTreeModel.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/DbImportView.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/DbImportView.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/DbImportView.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/DbImportView.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/DbSchemaToolbar.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/DbSchemaToolbar.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/DbSchemaToolbar.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/DbSchemaToolbar.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/DefaultPopUpMenu.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/DefaultPopUpMenu.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/DefaultPopUpMenu.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/DefaultPopUpMenu.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/IncludeTablePopUpMenu.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/IncludeTablePopUpMenu.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/IncludeTablePopUpMenu.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/IncludeTablePopUpMenu.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/PrintColumnsBiFunction.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/PrintColumnsBiFunction.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/PrintColumnsBiFunction.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/PrintColumnsBiFunction.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/PrintTablesBiFunction.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/PrintTablesBiFunction.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/PrintTablesBiFunction.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/PrintTablesBiFunction.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/ReverseEngineeringConfigPanel.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/ReverseEngineeringConfigPanel.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/ReverseEngineeringConfigPanel.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/ReverseEngineeringConfigPanel.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/ReverseEngineeringTreePanel.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/ReverseEngineeringTreePanel.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/ReverseEngineeringTreePanel.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/ReverseEngineeringTreePanel.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/RootPopUpMenu.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/RootPopUpMenu.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/RootPopUpMenu.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/RootPopUpMenu.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/SchemaPopUpMenu.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/SchemaPopUpMenu.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/SchemaPopUpMenu.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/SchemaPopUpMenu.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/action/AddCatalogAction.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/action/AddCatalogAction.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/action/AddCatalogAction.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/action/AddCatalogAction.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/action/AddExcludeColumnAction.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/action/AddExcludeColumnAction.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/action/AddExcludeColumnAction.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/action/AddExcludeColumnAction.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/action/AddExcludeProcedureAction.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/action/AddExcludeProcedureAction.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/action/AddExcludeProcedureAction.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/action/AddExcludeProcedureAction.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/action/AddExcludeTableAction.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/action/AddExcludeTableAction.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/action/AddExcludeTableAction.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/action/AddExcludeTableAction.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/action/AddIncludeColumnAction.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/action/AddIncludeColumnAction.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/action/AddIncludeColumnAction.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/action/AddIncludeColumnAction.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/action/AddIncludeProcedureAction.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/action/AddIncludeProcedureAction.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/action/AddIncludeProcedureAction.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/action/AddIncludeProcedureAction.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/action/AddIncludeTableAction.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/action/AddIncludeTableAction.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/action/AddIncludeTableAction.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/action/AddIncludeTableAction.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/action/AddPatternParamAction.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/action/AddPatternParamAction.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/action/AddPatternParamAction.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/action/AddPatternParamAction.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/action/AddSchemaAction.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/action/AddSchemaAction.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/action/AddSchemaAction.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/action/AddSchemaAction.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/action/DbImportActions.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/action/DbImportActions.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/action/DbImportActions.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/action/DbImportActions.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/action/DeleteNodeAction.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/action/DeleteNodeAction.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/action/DeleteNodeAction.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/action/DeleteNodeAction.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/action/DragAndDropNodeAction.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/action/DragAndDropNodeAction.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/action/DragAndDropNodeAction.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/action/DragAndDropNodeAction.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/action/EditNodeAction.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/action/EditNodeAction.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/action/EditNodeAction.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/action/EditNodeAction.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/action/GetDbConnectionAction.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/action/GetDbConnectionAction.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/action/GetDbConnectionAction.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/action/GetDbConnectionAction.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/action/LoadDbSchemaAction.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/action/LoadDbSchemaAction.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/action/LoadDbSchemaAction.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/action/LoadDbSchemaAction.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/action/ModelerDbImportAction.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/action/ModelerDbImportAction.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/action/ModelerDbImportAction.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/action/ModelerDbImportAction.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/action/MoveImportNodeAction.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/action/MoveImportNodeAction.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/action/MoveImportNodeAction.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/action/MoveImportNodeAction.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/action/MoveInvertNodeAction.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/action/MoveInvertNodeAction.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/action/MoveInvertNodeAction.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/action/MoveInvertNodeAction.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/action/SortNodesAction.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/action/SortNodesAction.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/action/SortNodesAction.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/action/SortNodesAction.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/action/TreeManipulationAction.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/action/TreeManipulationAction.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/action/TreeManipulationAction.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/action/TreeManipulationAction.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/progress/DbImportProgressDialog.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/progress/DbImportProgressDialog.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/progress/DbImportProgressDialog.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/progress/DbImportProgressDialog.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/runner/DbImportProjectSaver.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/runner/DbImportProjectSaver.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/runner/DbImportProjectSaver.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/runner/DbImportProjectSaver.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/runner/ModelerDbImportAction.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/runner/ModelerDbImportAction.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/runner/ModelerDbImportAction.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/runner/ModelerDbImportAction.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/runner/ModelerDbImportModule.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/runner/ModelerDbImportModule.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/runner/ModelerDbImportModule.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/runner/ModelerDbImportModule.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/runner/ModelerDbLoaderContext.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/runner/ModelerDbLoaderContext.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/runner/ModelerDbLoaderContext.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/runner/ModelerDbLoaderContext.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/runner/ModelerDbLoaderDelegate.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/runner/ModelerDbLoaderDelegate.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/runner/ModelerDbLoaderDelegate.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/runner/ModelerDbLoaderDelegate.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/tree/CatalogNode.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/tree/CatalogNode.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/tree/CatalogNode.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/tree/CatalogNode.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/tree/CatalogProcedureNode.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/tree/CatalogProcedureNode.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/tree/CatalogProcedureNode.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/tree/CatalogProcedureNode.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/tree/CatalogTableNode.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/tree/CatalogTableNode.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/tree/CatalogTableNode.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/tree/CatalogTableNode.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/tree/ColorTreeRenderer.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/tree/ColorTreeRenderer.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/tree/ColorTreeRenderer.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/tree/ColorTreeRenderer.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/tree/ColumnNode.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/tree/ColumnNode.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/tree/ColumnNode.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/tree/ColumnNode.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/tree/DbImportTreeNode.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/tree/DbImportTreeNode.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/tree/DbImportTreeNode.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/tree/DbImportTreeNode.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/tree/Node.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/tree/Node.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/tree/Node.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/tree/Node.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/tree/NodeType.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/tree/NodeType.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/tree/NodeType.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/tree/NodeType.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/tree/ObjectType.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/tree/ObjectType.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/tree/ObjectType.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/tree/ObjectType.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/tree/ProcedureNode.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/tree/ProcedureNode.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/tree/ProcedureNode.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/tree/ProcedureNode.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/tree/SchemaNode.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/tree/SchemaNode.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/tree/SchemaNode.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/tree/SchemaNode.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/tree/SchemaProcedureNode.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/tree/SchemaProcedureNode.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/tree/SchemaProcedureNode.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/tree/SchemaProcedureNode.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/tree/SchemaTableNode.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/tree/SchemaTableNode.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/tree/SchemaTableNode.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/tree/SchemaTableNode.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/tree/Status.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/tree/Status.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/tree/Status.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/tree/Status.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/tree/TableNode.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/tree/TableNode.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/tree/TableNode.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/tree/TableNode.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/tree/TransferableNode.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/tree/TransferableNode.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/tree/TransferableNode.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/tree/TransferableNode.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/defaults/DefaultsUpdateDialog.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/defaults/DefaultsUpdateDialog.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/defaults/DefaultsUpdateDialog.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/defaults/DefaultsUpdateDialog.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/main/DataMapMainView.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/main/DataMapMainView.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/main/DataMapMainView.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/main/DataMapMainView.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/main/catalog/CatalogUpdateDialog.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/main/catalog/CatalogUpdateDialog.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/main/catalog/CatalogUpdateDialog.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/main/catalog/CatalogUpdateDialog.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/main/locking/LockingUpdateDialog.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/main/locking/LockingUpdateDialog.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/main/locking/LockingUpdateDialog.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/main/locking/LockingUpdateDialog.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/main/pkg/PackageUpdateDialog.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/main/pkg/PackageUpdateDialog.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/main/pkg/PackageUpdateDialog.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/main/pkg/PackageUpdateDialog.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/main/schema/SchemaUpdateDialog.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/main/schema/SchemaUpdateDialog.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/main/schema/SchemaUpdateDialog.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/main/schema/SchemaUpdateDialog.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/main/superclass/SuperclassUpdateDialog.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/main/superclass/SuperclassUpdateDialog.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/main/superclass/SuperclassUpdateDialog.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/main/superclass/SuperclassUpdateDialog.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/dbentity/DbEntityView.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/dbentity/DbEntityView.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/dbentity/DbEntityView.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/dbentity/DbEntityView.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/dbentity/main/DbEntityMainView.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/dbentity/main/DbEntityMainView.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/dbentity/main/DbEntityMainView.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/dbentity/main/DbEntityMainView.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/dbentity/main/PKCustomSequenceGeneratorPanel.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/dbentity/main/PKCustomSequenceGeneratorPanel.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/dbentity/main/PKCustomSequenceGeneratorPanel.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/dbentity/main/PKCustomSequenceGeneratorPanel.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/dbentity/main/PKDBGeneratorPanel.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/dbentity/main/PKDBGeneratorPanel.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/dbentity/main/PKDBGeneratorPanel.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/dbentity/main/PKDBGeneratorPanel.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/dbentity/main/PKDefaultGeneratorPanel.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/dbentity/main/PKDefaultGeneratorPanel.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/dbentity/main/PKDefaultGeneratorPanel.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/dbentity/main/PKDefaultGeneratorPanel.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/dbentity/main/PKGeneratorPanel.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/dbentity/main/PKGeneratorPanel.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/dbentity/main/PKGeneratorPanel.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/dbentity/main/PKGeneratorPanel.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/dbentity/properties/DbAttributePanel.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/dbentity/properties/DbAttributePanel.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/dbentity/properties/DbAttributePanel.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/dbentity/properties/DbAttributePanel.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/dbentity/properties/DbAttributeTableModel.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/dbentity/properties/DbAttributeTableModel.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/dbentity/properties/DbAttributeTableModel.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/dbentity/properties/DbAttributeTableModel.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/dbentity/properties/DbEntityPropertiesView.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/dbentity/properties/DbEntityPropertiesView.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/dbentity/properties/DbEntityPropertiesView.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/dbentity/properties/DbEntityPropertiesView.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/dbentity/properties/DbRelationshipPanel.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/dbentity/properties/DbRelationshipPanel.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/dbentity/properties/DbRelationshipPanel.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/dbentity/properties/DbRelationshipPanel.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/dbentity/properties/DbRelationshipTableModel.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/dbentity/properties/DbRelationshipTableModel.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/dbentity/properties/DbRelationshipTableModel.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/dbentity/properties/DbRelationshipTableModel.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/embeddable/EmbeddableView.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/embeddable/EmbeddableView.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/embeddable/EmbeddableView.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/embeddable/EmbeddableView.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/embeddable/attributes/EmbeddableAttributeTableModel.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/embeddable/attributes/EmbeddableAttributeTableModel.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/embeddable/attributes/EmbeddableAttributeTableModel.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/embeddable/attributes/EmbeddableAttributeTableModel.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/embeddable/attributes/EmbeddableAttributesView.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/embeddable/attributes/EmbeddableAttributesView.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/embeddable/attributes/EmbeddableAttributesView.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/embeddable/attributes/EmbeddableAttributesView.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/embeddable/main/EmbeddableMainView.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/embeddable/main/EmbeddableMainView.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/embeddable/main/EmbeddableMainView.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/embeddable/main/EmbeddableMainView.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/objentity/ObjEntityView.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/objentity/ObjEntityView.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/objentity/ObjEntityView.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/objentity/ObjEntityView.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/objentity/attrinfo/ObjAttributeInfoDialog.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/objentity/attrinfo/ObjAttributeInfoDialog.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/objentity/attrinfo/ObjAttributeInfoDialog.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/objentity/attrinfo/ObjAttributeInfoDialog.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/objentity/attrinfo/ObjAttributePathNavigatorPanel.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/objentity/attrinfo/ObjAttributePathNavigatorPanel.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/objentity/attrinfo/ObjAttributePathNavigatorPanel.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/objentity/attrinfo/ObjAttributePathNavigatorPanel.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/objentity/attrinfo/ObjAttributeTableCellEditor.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/objentity/attrinfo/ObjAttributeTableCellEditor.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/objentity/attrinfo/ObjAttributeTableCellEditor.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/objentity/attrinfo/ObjAttributeTableCellEditor.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/objentity/attrinfo/OverrideEmbeddableAttributeTableModel.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/objentity/attrinfo/OverrideEmbeddableAttributeTableModel.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/objentity/attrinfo/OverrideEmbeddableAttributeTableModel.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/objentity/attrinfo/OverrideEmbeddableAttributeTableModel.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/objentity/callbacks/CallbackDescriptorTableModel.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/objentity/callbacks/CallbackDescriptorTableModel.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/objentity/callbacks/CallbackDescriptorTableModel.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/objentity/callbacks/CallbackDescriptorTableModel.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/objentity/callbacks/CallbackType.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/objentity/callbacks/CallbackType.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/objentity/callbacks/CallbackType.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/objentity/callbacks/CallbackType.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/objentity/callbacks/ObjCallbackMethod.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/objentity/callbacks/ObjCallbackMethod.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/objentity/callbacks/ObjCallbackMethod.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/objentity/callbacks/ObjCallbackMethod.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/objentity/callbacks/ObjEntityCallbacksView.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/objentity/callbacks/ObjEntityCallbacksView.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/objentity/callbacks/ObjEntityCallbacksView.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/objentity/callbacks/ObjEntityCallbacksView.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/objentity/classname/ClassNameUpdaterController.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/objentity/classname/ClassNameUpdaterController.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/objentity/classname/ClassNameUpdaterController.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/objentity/classname/ClassNameUpdaterController.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/objentity/duplicates/DuplicatedAttributesDialog.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/objentity/duplicates/DuplicatedAttributesDialog.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/objentity/duplicates/DuplicatedAttributesDialog.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/objentity/duplicates/DuplicatedAttributesDialog.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/objentity/main/ObjEntityMainView.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/objentity/main/ObjEntityMainView.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/objentity/main/ObjEntityMainView.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/objentity/main/ObjEntityMainView.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/objentity/properties/DbAttributePathComboBoxEditor.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/objentity/properties/DbAttributePathComboBoxEditor.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/objentity/properties/DbAttributePathComboBoxEditor.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/objentity/properties/DbAttributePathComboBoxEditor.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/objentity/properties/DbAttributePathComboBoxRenderer.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/objentity/properties/DbAttributePathComboBoxRenderer.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/objentity/properties/DbAttributePathComboBoxRenderer.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/objentity/properties/DbAttributePathComboBoxRenderer.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/objentity/properties/DbRelationshipPathComboBoxEditor.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/objentity/properties/DbRelationshipPathComboBoxEditor.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/objentity/properties/DbRelationshipPathComboBoxEditor.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/objentity/properties/DbRelationshipPathComboBoxEditor.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/objentity/properties/ObjAttributePanel.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/objentity/properties/ObjAttributePanel.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/objentity/properties/ObjAttributePanel.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/objentity/properties/ObjAttributePanel.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/objentity/properties/ObjAttributeTableModel.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/objentity/properties/ObjAttributeTableModel.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/objentity/properties/ObjAttributeTableModel.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/objentity/properties/ObjAttributeTableModel.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/objentity/properties/ObjEntityPropertiesView.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/objentity/properties/ObjEntityPropertiesView.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/objentity/properties/ObjEntityPropertiesView.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/objentity/properties/ObjEntityPropertiesView.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/objentity/properties/ObjRelationshipPanel.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/objentity/properties/ObjRelationshipPanel.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/objentity/properties/ObjRelationshipPanel.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/objentity/properties/ObjRelationshipPanel.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/objentity/properties/ObjRelationshipTableModel.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/objentity/properties/ObjRelationshipTableModel.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/objentity/properties/ObjRelationshipTableModel.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/objentity/properties/ObjRelationshipTableModel.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/objentity/properties/PathChooserComboBoxCellEditor.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/objentity/properties/PathChooserComboBoxCellEditor.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/objentity/properties/PathChooserComboBoxCellEditor.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/objentity/properties/PathChooserComboBoxCellEditor.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/objentity/relinfo/ObjRelationshipInfoDialog.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/objentity/relinfo/ObjRelationshipInfoDialog.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/objentity/relinfo/ObjRelationshipInfoDialog.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/objentity/relinfo/ObjRelationshipInfoDialog.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/objentity/relinfo/ObjRelationshipPathNavigatorPanel.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/objentity/relinfo/ObjRelationshipPathNavigatorPanel.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/objentity/relinfo/ObjRelationshipPathNavigatorPanel.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/objentity/relinfo/ObjRelationshipPathNavigatorPanel.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/procedure/ProcedureParameterTab.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/procedure/ProcedureParameterTab.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/procedure/ProcedureParameterTab.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/procedure/ProcedureParameterTab.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/procedure/ProcedureParameterTableModel.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/procedure/ProcedureParameterTableModel.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/procedure/ProcedureParameterTableModel.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/procedure/ProcedureParameterTableModel.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/procedure/ProcedureQueryView.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/procedure/ProcedureQueryView.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/procedure/ProcedureQueryView.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/procedure/ProcedureQueryView.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/procedure/ProcedureTab.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/procedure/ProcedureTab.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/procedure/ProcedureTab.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/procedure/ProcedureTab.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/procedure/ProcedureTabbedView.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/procedure/ProcedureTabbedView.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/procedure/ProcedureTabbedView.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/procedure/ProcedureTabbedView.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/query/BaseQueryMainTab.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/query/BaseQueryMainTab.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/query/BaseQueryMainTab.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/query/BaseQueryMainTab.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/query/ExistingSelectionProcessor.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/query/ExistingSelectionProcessor.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/query/ExistingSelectionProcessor.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/query/ExistingSelectionProcessor.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/query/ObjectQueryPropertiesPanel.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/query/ObjectQueryPropertiesPanel.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/query/ObjectQueryPropertiesPanel.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/query/ObjectQueryPropertiesPanel.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/query/PrefetchModel.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/query/PrefetchModel.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/query/PrefetchModel.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/query/PrefetchModel.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/query/RawQueryPropertiesPanel.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/query/RawQueryPropertiesPanel.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/query/RawQueryPropertiesPanel.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/query/RawQueryPropertiesPanel.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/query/RootSelectionHandler.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/query/RootSelectionHandler.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/query/RootSelectionHandler.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/query/RootSelectionHandler.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/query/SelectPropertiesPanel.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/query/SelectPropertiesPanel.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/query/SelectPropertiesPanel.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/query/SelectPropertiesPanel.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/query/ejbql/EjbqlQueryMainTab.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/query/ejbql/EjbqlQueryMainTab.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/query/ejbql/EjbqlQueryMainTab.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/query/ejbql/EjbqlQueryMainTab.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/query/ejbql/EjbqlQueryPropertiesPanel.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/query/ejbql/EjbqlQueryPropertiesPanel.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/query/ejbql/EjbqlQueryPropertiesPanel.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/query/ejbql/EjbqlQueryPropertiesPanel.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/query/ejbql/EjbqlQueryScriptsTab.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/query/ejbql/EjbqlQueryScriptsTab.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/query/ejbql/EjbqlQueryScriptsTab.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/query/ejbql/EjbqlQueryScriptsTab.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/query/ejbql/EjbqlSyntax.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/query/ejbql/EjbqlSyntax.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/query/ejbql/EjbqlSyntax.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/query/ejbql/EjbqlSyntax.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/query/ejbql/EjbqlTabbedView.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/query/ejbql/EjbqlTabbedView.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/query/ejbql/EjbqlTabbedView.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/query/ejbql/EjbqlTabbedView.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/query/selectquery/AddPrefetchUndoableEdit.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/query/selectquery/AddPrefetchUndoableEdit.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/query/selectquery/AddPrefetchUndoableEdit.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/query/selectquery/AddPrefetchUndoableEdit.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/query/selectquery/SelectQueryMainTab.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/query/selectquery/SelectQueryMainTab.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/query/selectquery/SelectQueryMainTab.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/query/selectquery/SelectQueryMainTab.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/query/selectquery/SelectQueryOrderingTab.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/query/selectquery/SelectQueryOrderingTab.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/query/selectquery/SelectQueryOrderingTab.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/query/selectquery/SelectQueryOrderingTab.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/query/selectquery/SelectQueryPrefetchTab.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/query/selectquery/SelectQueryPrefetchTab.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/query/selectquery/SelectQueryPrefetchTab.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/query/selectquery/SelectQueryPrefetchTab.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/query/selectquery/SelectQueryTabbedView.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/query/selectquery/SelectQueryTabbedView.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/query/selectquery/SelectQueryTabbedView.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/query/selectquery/SelectQueryTabbedView.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/query/sqltemplate/AddPrefetchUndoableEditForSqlTemplate.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/query/sqltemplate/AddPrefetchUndoableEditForSqlTemplate.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/query/sqltemplate/AddPrefetchUndoableEditForSqlTemplate.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/query/sqltemplate/AddPrefetchUndoableEditForSqlTemplate.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/query/sqltemplate/SQLSyntax.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/query/sqltemplate/SQLSyntax.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/query/sqltemplate/SQLSyntax.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/query/sqltemplate/SQLSyntax.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/query/sqltemplate/SQLTemplateMainTab.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/query/sqltemplate/SQLTemplateMainTab.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/query/sqltemplate/SQLTemplateMainTab.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/query/sqltemplate/SQLTemplateMainTab.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/query/sqltemplate/SQLTemplatePrefetchTab.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/query/sqltemplate/SQLTemplatePrefetchTab.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/query/sqltemplate/SQLTemplatePrefetchTab.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/query/sqltemplate/SQLTemplatePrefetchTab.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/query/sqltemplate/SQLTemplateScriptsTab.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/query/sqltemplate/SQLTemplateScriptsTab.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/query/sqltemplate/SQLTemplateScriptsTab.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/query/sqltemplate/SQLTemplateScriptsTab.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/query/sqltemplate/SQLTemplateTabbedView.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/query/sqltemplate/SQLTemplateTabbedView.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/query/sqltemplate/SQLTemplateTabbedView.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/query/sqltemplate/SQLTemplateTabbedView.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/overwrite/OverwriteDialog.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/overwrite/OverwriteDialog.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/overwrite/OverwriteDialog.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/overwrite/OverwriteDialog.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/querytype/QueryTypeDialog.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/querytype/QueryTypeDialog.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/querytype/QueryTypeDialog.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/querytype/QueryTypeDialog.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/tree/ProjectTree.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/tree/ProjectTree.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/tree/ProjectTree.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/tree/ProjectTree.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/tree/ProjectTreeFactory.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/tree/ProjectTreeFactory.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/tree/ProjectTreeFactory.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/tree/ProjectTreeFactory.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/tree/ProjectTreeModel.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/tree/ProjectTreeModel.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/tree/ProjectTreeModel.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/tree/ProjectTreeModel.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/tree/treefilter/TreeFilterPopup.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/tree/treefilter/TreeFilterPopup.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/tree/treefilter/TreeFilterPopup.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/tree/treefilter/TreeFilterPopup.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/validator/AttributeErrorMsg.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/validator/AttributeErrorMsg.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/validator/AttributeErrorMsg.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/validator/AttributeErrorMsg.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/validator/DataMapErrorMsg.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/validator/DataMapErrorMsg.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/validator/DataMapErrorMsg.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/validator/DataMapErrorMsg.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/validator/DomainErrorMsg.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/validator/DomainErrorMsg.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/validator/DomainErrorMsg.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/validator/DomainErrorMsg.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/validator/EmbeddableAttributeErrorMsg.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/validator/EmbeddableAttributeErrorMsg.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/validator/EmbeddableAttributeErrorMsg.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/validator/EmbeddableAttributeErrorMsg.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/validator/EmbeddableErrorMsg.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/validator/EmbeddableErrorMsg.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/validator/EmbeddableErrorMsg.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/validator/EmbeddableErrorMsg.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/validator/EntityErrorMsg.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/validator/EntityErrorMsg.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/validator/EntityErrorMsg.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/validator/EntityErrorMsg.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/validator/ProcedureErrorMsg.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/validator/ProcedureErrorMsg.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/validator/ProcedureErrorMsg.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/validator/ProcedureErrorMsg.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/validator/ProcedureParameterErrorMsg.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/validator/ProcedureParameterErrorMsg.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/validator/ProcedureParameterErrorMsg.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/validator/ProcedureParameterErrorMsg.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/validator/ProjectValidatorDialog.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/validator/ProjectValidatorDialog.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/validator/ProjectValidatorDialog.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/validator/ProjectValidatorDialog.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/validator/QueryErrorMsg.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/validator/QueryErrorMsg.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/validator/QueryErrorMsg.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/validator/QueryErrorMsg.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/validator/RelationshipErrorMsg.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/validator/RelationshipErrorMsg.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/validator/RelationshipErrorMsg.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/validator/RelationshipErrorMsg.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/validator/ValidationDisplayHandler.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/validator/ValidationDisplayHandler.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/validator/ValidationDisplayHandler.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/validator/ValidationDisplayHandler.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/unsavedchanges/UnsavedChangesDialog.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/unsavedchanges/UnsavedChangesDialog.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/unsavedchanges/UnsavedChangesDialog.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/unsavedchanges/UnsavedChangesDialog.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/validation/ValidationDialog.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/validation/ValidationDialog.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/validation/ValidationDialog.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/validation/ValidationDialog.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/welcome/BackgroundPanel.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/welcome/BackgroundPanel.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/welcome/BackgroundPanel.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/welcome/BackgroundPanel.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/welcome/RecentFileListModel.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/welcome/RecentFileListModel.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/welcome/RecentFileListModel.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/welcome/RecentFileListModel.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/welcome/RecentFileListRenderer.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/welcome/RecentFileListRenderer.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/welcome/RecentFileListRenderer.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/welcome/RecentFileListRenderer.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/welcome/WelcomeScreen.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/welcome/WelcomeScreen.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/welcome/WelcomeScreen.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/welcome/WelcomeScreen.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/welcome/WelcomeScreenMainPanel.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/welcome/WelcomeScreenMainPanel.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/welcome/WelcomeScreenMainPanel.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/welcome/WelcomeScreenMainPanel.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/undo/BaseRemovePropertyUndoableEdit.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/undo/BaseRemovePropertyUndoableEdit.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/undo/BaseRemovePropertyUndoableEdit.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/undo/BaseRemovePropertyUndoableEdit.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/undo/CayenneUndoManager.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/undo/CayenneUndoManager.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/undo/CayenneUndoManager.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/undo/CayenneUndoManager.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/undo/CayenneUndoableEdit.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/undo/CayenneUndoableEdit.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/undo/CayenneUndoableEdit.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/undo/CayenneUndoableEdit.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/undo/ChangePKGeneratorUndoableEdit.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/undo/ChangePKGeneratorUndoableEdit.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/undo/ChangePKGeneratorUndoableEdit.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/undo/ChangePKGeneratorUndoableEdit.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/undo/CreateCallbackMethodUndoableEdit.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/undo/CreateCallbackMethodUndoableEdit.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/undo/CreateCallbackMethodUndoableEdit.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/undo/CreateCallbackMethodUndoableEdit.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/undo/CreateDataMapUndoableEdit.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/undo/CreateDataMapUndoableEdit.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/undo/CreateDataMapUndoableEdit.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/undo/CreateDataMapUndoableEdit.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/undo/CreateDbAttributeUndoableEdit.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/undo/CreateDbAttributeUndoableEdit.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/undo/CreateDbAttributeUndoableEdit.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/undo/CreateDbAttributeUndoableEdit.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/undo/CreateDbEntityUndoableEdit.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/undo/CreateDbEntityUndoableEdit.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/undo/CreateDbEntityUndoableEdit.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/undo/CreateDbEntityUndoableEdit.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/undo/CreateDbRelationshipUndoableEdit.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/undo/CreateDbRelationshipUndoableEdit.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/undo/CreateDbRelationshipUndoableEdit.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/undo/CreateDbRelationshipUndoableEdit.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/undo/CreateEmbAttributeUndoableEdit.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/undo/CreateEmbAttributeUndoableEdit.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/undo/CreateEmbAttributeUndoableEdit.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/undo/CreateEmbAttributeUndoableEdit.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/undo/CreateEmbeddableUndoableEdit.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/undo/CreateEmbeddableUndoableEdit.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/undo/CreateEmbeddableUndoableEdit.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/undo/CreateEmbeddableUndoableEdit.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/undo/CreateObjAttributeUndoableEdit.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/undo/CreateObjAttributeUndoableEdit.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/undo/CreateObjAttributeUndoableEdit.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/undo/CreateObjAttributeUndoableEdit.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/undo/CreateObjEntityUndoableEdit.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/undo/CreateObjEntityUndoableEdit.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/undo/CreateObjEntityUndoableEdit.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/undo/CreateObjEntityUndoableEdit.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/undo/CreateObjRelationshipUndoableEdit.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/undo/CreateObjRelationshipUndoableEdit.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/undo/CreateObjRelationshipUndoableEdit.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/undo/CreateObjRelationshipUndoableEdit.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/undo/CreateProcedureParameterUndoableEdit.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/undo/CreateProcedureParameterUndoableEdit.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/undo/CreateProcedureParameterUndoableEdit.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/undo/CreateProcedureParameterUndoableEdit.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/undo/CreateProcedureUndoableEdit.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/undo/CreateProcedureUndoableEdit.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/undo/CreateProcedureUndoableEdit.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/undo/CreateProcedureUndoableEdit.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/undo/CreateQueryUndoableEdit.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/undo/CreateQueryUndoableEdit.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/undo/CreateQueryUndoableEdit.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/undo/CreateQueryUndoableEdit.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/undo/DbEntitySyncUndoableEdit.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/undo/DbEntitySyncUndoableEdit.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/undo/DbEntitySyncUndoableEdit.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/undo/DbEntitySyncUndoableEdit.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/undo/DbImportTreeUndoableEdit.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/undo/DbImportTreeUndoableEdit.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/undo/DbImportTreeUndoableEdit.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/undo/DbImportTreeUndoableEdit.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/undo/DbRelationshipUndoableEdit.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/undo/DbRelationshipUndoableEdit.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/undo/DbRelationshipUndoableEdit.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/undo/DbRelationshipUndoableEdit.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/undo/InferRelationshipsUndoableEdit.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/undo/InferRelationshipsUndoableEdit.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/undo/InferRelationshipsUndoableEdit.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/undo/InferRelationshipsUndoableEdit.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/undo/ObjRelationshipUndoableEdit.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/undo/ObjRelationshipUndoableEdit.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/undo/ObjRelationshipUndoableEdit.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/undo/ObjRelationshipUndoableEdit.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/undo/PasteCompoundUndoableEdit.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/undo/PasteCompoundUndoableEdit.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/undo/PasteCompoundUndoableEdit.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/undo/PasteCompoundUndoableEdit.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/undo/PasteUndoableEdit.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/undo/PasteUndoableEdit.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/undo/PasteUndoableEdit.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/undo/PasteUndoableEdit.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/undo/RemoveCallbackMethodUndoableEdit.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/undo/RemoveCallbackMethodUndoableEdit.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/undo/RemoveCallbackMethodUndoableEdit.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/undo/RemoveCallbackMethodUndoableEdit.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/undo/RemoveCompoundUndoableEdit.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/undo/RemoveCompoundUndoableEdit.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/undo/RemoveCompoundUndoableEdit.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/undo/RemoveCompoundUndoableEdit.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/undo/RemoveDbAttributeUndoableEdit.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/undo/RemoveDbAttributeUndoableEdit.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/undo/RemoveDbAttributeUndoableEdit.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/undo/RemoveDbAttributeUndoableEdit.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/undo/RemoveDbRelationshipUndoableEdit.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/undo/RemoveDbRelationshipUndoableEdit.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/undo/RemoveDbRelationshipUndoableEdit.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/undo/RemoveDbRelationshipUndoableEdit.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/undo/RemoveEmbeddableAttributeUndoableEdit.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/undo/RemoveEmbeddableAttributeUndoableEdit.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/undo/RemoveEmbeddableAttributeUndoableEdit.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/undo/RemoveEmbeddableAttributeUndoableEdit.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/undo/RemoveObjAttributeUndoableEdit.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/undo/RemoveObjAttributeUndoableEdit.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/undo/RemoveObjAttributeUndoableEdit.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/undo/RemoveObjAttributeUndoableEdit.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/undo/RemoveObjRelationshipUndoableEdit.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/undo/RemoveObjRelationshipUndoableEdit.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/undo/RemoveObjRelationshipUndoableEdit.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/undo/RemoveObjRelationshipUndoableEdit.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/undo/RemoveUndoableEdit.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/undo/RemoveUndoableEdit.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/undo/RemoveUndoableEdit.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/undo/RemoveUndoableEdit.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/undo/TextCompoundEdit.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/undo/TextCompoundEdit.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/undo/TextCompoundEdit.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/undo/TextCompoundEdit.java
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/undo/UpdateValidationConfigUndoableEdit.java b/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/undo/UpdateValidationConfigUndoableEdit.java
similarity index 100%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/undo/UpdateValidationConfigUndoableEdit.java
rename to cayenne-modeler/src/main/java/org/apache/cayenne/modeler/undo/UpdateValidationConfigUndoableEdit.java
diff --git a/modeler/cayenne-modeler/src/main/resources/META-INF/services/org.slf4j.spi.SLF4JServiceProvider b/cayenne-modeler/src/main/resources/META-INF/services/org.slf4j.spi.SLF4JServiceProvider
similarity index 100%
rename from modeler/cayenne-modeler/src/main/resources/META-INF/services/org.slf4j.spi.SLF4JServiceProvider
rename to cayenne-modeler/src/main/resources/META-INF/services/org.slf4j.spi.SLF4JServiceProvider
diff --git a/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/CayenneModeler.png b/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/CayenneModeler.png
similarity index 100%
rename from modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/CayenneModeler.png
rename to cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/CayenneModeler.png
diff --git a/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-arrow-closed.png b/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-arrow-closed.png
similarity index 100%
rename from modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-arrow-closed.png
rename to cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-arrow-closed.png
diff --git a/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-arrow-open.png b/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-arrow-open.png
similarity index 100%
rename from modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-arrow-open.png
rename to cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-arrow-open.png
diff --git a/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-attribute.png b/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-attribute.png
similarity index 100%
rename from modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-attribute.png
rename to cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-attribute.png
diff --git a/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-backward.png b/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-backward.png
similarity index 100%
rename from modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-backward.png
rename to cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-backward.png
diff --git a/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-copy.png b/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-copy.png
similarity index 100%
rename from modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-copy.png
rename to cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-copy.png
diff --git a/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-create-method.png b/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-create-method.png
similarity index 100%
rename from modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-create-method.png
rename to cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-create-method.png
diff --git a/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-cut.png b/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-cut.png
similarity index 100%
rename from modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-cut.png
rename to cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-cut.png
diff --git a/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-datamap.png b/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-datamap.png
similarity index 100%
rename from modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-datamap.png
rename to cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-datamap.png
diff --git a/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-dbentity.png b/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-dbentity.png
similarity index 100%
rename from modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-dbentity.png
rename to cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-dbentity.png
diff --git a/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-dbi-catalog.png b/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-dbi-catalog.png
similarity index 100%
rename from modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-dbi-catalog.png
rename to cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-dbi-catalog.png
diff --git a/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-dbi-column.png b/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-dbi-column.png
similarity index 100%
rename from modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-dbi-column.png
rename to cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-dbi-column.png
diff --git a/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-dbi-config.png b/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-dbi-config.png
similarity index 100%
rename from modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-dbi-config.png
rename to cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-dbi-config.png
diff --git a/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-dbi-excludeColumn.png b/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-dbi-excludeColumn.png
similarity index 100%
rename from modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-dbi-excludeColumn.png
rename to cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-dbi-excludeColumn.png
diff --git a/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-dbi-excludeProcedure.png b/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-dbi-excludeProcedure.png
similarity index 100%
rename from modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-dbi-excludeProcedure.png
rename to cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-dbi-excludeProcedure.png
diff --git a/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-dbi-excludeTable.png b/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-dbi-excludeTable.png
similarity index 100%
rename from modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-dbi-excludeTable.png
rename to cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-dbi-excludeTable.png
diff --git a/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-dbi-includeColumn.png b/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-dbi-includeColumn.png
similarity index 100%
rename from modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-dbi-includeColumn.png
rename to cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-dbi-includeColumn.png
diff --git a/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-dbi-includeProcedure.png b/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-dbi-includeProcedure.png
similarity index 100%
rename from modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-dbi-includeProcedure.png
rename to cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-dbi-includeProcedure.png
diff --git a/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-dbi-includeTable.png b/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-dbi-includeTable.png
similarity index 100%
rename from modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-dbi-includeTable.png
rename to cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-dbi-includeTable.png
diff --git a/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-dbi-refresh.png b/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-dbi-refresh.png
similarity index 100%
rename from modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-dbi-refresh.png
rename to cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-dbi-refresh.png
diff --git a/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-dbi-runImport.png b/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-dbi-runImport.png
similarity index 100%
rename from modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-dbi-runImport.png
rename to cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-dbi-runImport.png
diff --git a/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-dbi-schema.png b/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-dbi-schema.png
similarity index 100%
rename from modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-dbi-schema.png
rename to cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-dbi-schema.png
diff --git a/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-dbi-sort.png b/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-dbi-sort.png
similarity index 100%
rename from modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-dbi-sort.png
rename to cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-dbi-sort.png
diff --git a/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-disable.png b/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-disable.png
similarity index 100%
rename from modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-disable.png
rename to cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-disable.png
diff --git a/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-dom.png b/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-dom.png
similarity index 100%
rename from modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-dom.png
rename to cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-dom.png
diff --git a/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-down.png b/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-down.png
similarity index 100%
rename from modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-down.png
rename to cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-down.png
diff --git a/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-edit.png b/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-edit.png
similarity index 100%
rename from modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-edit.png
rename to cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-edit.png
diff --git a/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-embeddable.png b/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-embeddable.png
similarity index 100%
rename from modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-embeddable.png
rename to cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-embeddable.png
diff --git a/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-eomodel.png b/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-eomodel.png
similarity index 100%
rename from modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-eomodel.png
rename to cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-eomodel.png
diff --git a/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-error.png b/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-error.png
similarity index 100%
rename from modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-error.png
rename to cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-error.png
diff --git a/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-filter.png b/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-filter.png
similarity index 100%
rename from modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-filter.png
rename to cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-filter.png
diff --git a/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-find_and_replace.png b/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-find_and_replace.png
similarity index 100%
rename from modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-find_and_replace.png
rename to cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-find_and_replace.png
diff --git a/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-forward.png b/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-forward.png
similarity index 100%
rename from modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-forward.png
rename to cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-forward.png
diff --git a/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-gen_java.png b/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-gen_java.png
similarity index 100%
rename from modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-gen_java.png
rename to cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-gen_java.png
diff --git a/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-info.png b/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-info.png
similarity index 100%
rename from modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-info.png
rename to cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-info.png
diff --git a/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-inheritance.png b/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-inheritance.png
similarity index 100%
rename from modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-inheritance.png
rename to cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-inheritance.png
diff --git a/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-move_down.png b/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-move_down.png
similarity index 100%
rename from modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-move_down.png
rename to cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-move_down.png
diff --git a/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-move_up.png b/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-move_up.png
similarity index 100%
rename from modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-move_up.png
rename to cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-move_up.png
diff --git a/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-new.png b/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-new.png
similarity index 100%
rename from modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-new.png
rename to cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-new.png
diff --git a/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-new_embeddable.png b/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-new_embeddable.png
similarity index 100%
rename from modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-new_embeddable.png
rename to cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-new_embeddable.png
diff --git a/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-new_objentity.png b/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-new_objentity.png
similarity index 100%
rename from modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-new_objentity.png
rename to cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-new_objentity.png
diff --git a/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-new_query.png b/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-new_query.png
similarity index 100%
rename from modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-new_query.png
rename to cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-new_query.png
diff --git a/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-objentity.png b/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-objentity.png
similarity index 100%
rename from modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-objentity.png
rename to cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-objentity.png
diff --git a/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-open.png b/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-open.png
similarity index 100%
rename from modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-open.png
rename to cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-open.png
diff --git a/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-paste.png b/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-paste.png
similarity index 100%
rename from modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-paste.png
rename to cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-paste.png
diff --git a/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-plus.png b/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-plus.png
similarity index 100%
rename from modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-plus.png
rename to cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-plus.png
diff --git a/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-query.png b/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-query.png
similarity index 100%
rename from modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-query.png
rename to cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-query.png
diff --git a/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-redo.png b/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-redo.png
similarity index 100%
rename from modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-redo.png
rename to cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-redo.png
diff --git a/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-refresh.png b/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-refresh.png
similarity index 100%
rename from modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-refresh.png
rename to cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-refresh.png
diff --git a/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-relationship.png b/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-relationship.png
similarity index 100%
rename from modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-relationship.png
rename to cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-relationship.png
diff --git a/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-remove.png b/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-remove.png
similarity index 100%
rename from modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-remove.png
rename to cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-remove.png
diff --git a/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-save-as-image.png b/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-save-as-image.png
similarity index 100%
rename from modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-save-as-image.png
rename to cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-save-as-image.png
diff --git a/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-save.png b/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-save.png
similarity index 100%
rename from modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-save.png
rename to cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-save.png
diff --git a/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-sort-asc.png b/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-sort-asc.png
similarity index 100%
rename from modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-sort-asc.png
rename to cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-sort-asc.png
diff --git a/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-sort-desc.png b/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-sort-desc.png
similarity index 100%
rename from modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-sort-desc.png
rename to cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-sort-desc.png
diff --git a/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-stored-procedure.png b/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-stored-procedure.png
similarity index 100%
rename from modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-stored-procedure.png
rename to cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-stored-procedure.png
diff --git a/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-sync.png b/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-sync.png
similarity index 100%
rename from modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-sync.png
rename to cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-sync.png
diff --git a/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-trash.png b/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-trash.png
similarity index 100%
rename from modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-trash.png
rename to cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-trash.png
diff --git a/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-tree-collapse.png b/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-tree-collapse.png
similarity index 100%
rename from modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-tree-collapse.png
rename to cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-tree-collapse.png
diff --git a/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-undo.png b/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-undo.png
similarity index 100%
rename from modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-undo.png
rename to cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-undo.png
diff --git a/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-up.png b/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-up.png
similarity index 100%
rename from modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-up.png
rename to cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-up.png
diff --git a/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-zoom-in.png b/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-zoom-in.png
similarity index 100%
rename from modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-zoom-in.png
rename to cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-zoom-in.png
diff --git a/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-zoom-out.png b/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-zoom-out.png
similarity index 100%
rename from modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-zoom-out.png
rename to cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-zoom-out.png
diff --git a/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/logo.jpg b/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/logo.jpg
similarity index 100%
rename from modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/logo.jpg
rename to cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/logo.jpg
diff --git a/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/welcome/welcome-screen-left-bg.jpg b/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/welcome/welcome-screen-left-bg.jpg
similarity index 100%
rename from modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/welcome/welcome-screen-left-bg.jpg
rename to cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/welcome/welcome-screen-left-bg.jpg
diff --git a/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/welcome/welcome-screen-new-btn-hover.png b/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/welcome/welcome-screen-new-btn-hover.png
similarity index 100%
rename from modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/welcome/welcome-screen-new-btn-hover.png
rename to cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/welcome/welcome-screen-new-btn-hover.png
diff --git a/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/welcome/welcome-screen-new-btn.png b/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/welcome/welcome-screen-new-btn.png
similarity index 100%
rename from modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/welcome/welcome-screen-new-btn.png
rename to cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/welcome/welcome-screen-new-btn.png
diff --git a/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/welcome/welcome-screen-open-btn-hover.png b/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/welcome/welcome-screen-open-btn-hover.png
similarity index 100%
rename from modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/welcome/welcome-screen-open-btn-hover.png
rename to cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/welcome/welcome-screen-open-btn-hover.png
diff --git a/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/welcome/welcome-screen-open-btn.png b/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/welcome/welcome-screen-open-btn.png
similarity index 100%
rename from modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/welcome/welcome-screen-open-btn.png
rename to cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/welcome/welcome-screen-open-btn.png
diff --git a/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/welcome/welcome-screen-right-bg.jpg b/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/welcome/welcome-screen-right-bg.jpg
similarity index 100%
rename from modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/welcome/welcome-screen-right-bg.jpg
rename to cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/welcome/welcome-screen-right-bg.jpg
diff --git a/modeler/cayenne-modeler/src/test/java/org/apache/cayenne/modeler/CayenneModelerValidationIT.java b/cayenne-modeler/src/test/java/org/apache/cayenne/modeler/CayenneModelerValidationIT.java
similarity index 100%
rename from modeler/cayenne-modeler/src/test/java/org/apache/cayenne/modeler/CayenneModelerValidationIT.java
rename to cayenne-modeler/src/test/java/org/apache/cayenne/modeler/CayenneModelerValidationIT.java
diff --git a/modeler/cayenne-modeler/src/test/java/org/apache/cayenne/modeler/CliArgsTest.java b/cayenne-modeler/src/test/java/org/apache/cayenne/modeler/CliArgsTest.java
similarity index 100%
rename from modeler/cayenne-modeler/src/test/java/org/apache/cayenne/modeler/CliArgsTest.java
rename to cayenne-modeler/src/test/java/org/apache/cayenne/modeler/CliArgsTest.java
diff --git a/modeler/cayenne-modeler/src/test/java/org/apache/cayenne/modeler/MainTest.java b/cayenne-modeler/src/test/java/org/apache/cayenne/modeler/MainTest.java
similarity index 100%
rename from modeler/cayenne-modeler/src/test/java/org/apache/cayenne/modeler/MainTest.java
rename to cayenne-modeler/src/test/java/org/apache/cayenne/modeler/MainTest.java
diff --git a/modeler/cayenne-modeler/src/test/java/org/apache/cayenne/modeler/editor/dbimport/DbImportSorterTest.java b/cayenne-modeler/src/test/java/org/apache/cayenne/modeler/editor/dbimport/DbImportSorterTest.java
similarity index 100%
rename from modeler/cayenne-modeler/src/test/java/org/apache/cayenne/modeler/editor/dbimport/DbImportSorterTest.java
rename to cayenne-modeler/src/test/java/org/apache/cayenne/modeler/editor/dbimport/DbImportSorterTest.java
diff --git a/modeler/cayenne-modeler/src/test/java/org/apache/cayenne/modeler/editor/dbimport/tree/BaseNodeTest.java b/cayenne-modeler/src/test/java/org/apache/cayenne/modeler/editor/dbimport/tree/BaseNodeTest.java
similarity index 100%
rename from modeler/cayenne-modeler/src/test/java/org/apache/cayenne/modeler/editor/dbimport/tree/BaseNodeTest.java
rename to cayenne-modeler/src/test/java/org/apache/cayenne/modeler/editor/dbimport/tree/BaseNodeTest.java
diff --git a/modeler/cayenne-modeler/src/test/java/org/apache/cayenne/modeler/editor/dbimport/tree/CatalogNodeTest.java b/cayenne-modeler/src/test/java/org/apache/cayenne/modeler/editor/dbimport/tree/CatalogNodeTest.java
similarity index 100%
rename from modeler/cayenne-modeler/src/test/java/org/apache/cayenne/modeler/editor/dbimport/tree/CatalogNodeTest.java
rename to cayenne-modeler/src/test/java/org/apache/cayenne/modeler/editor/dbimport/tree/CatalogNodeTest.java
diff --git a/modeler/cayenne-modeler/src/test/java/org/apache/cayenne/modeler/editor/dbimport/tree/ColumnNodeTest.java b/cayenne-modeler/src/test/java/org/apache/cayenne/modeler/editor/dbimport/tree/ColumnNodeTest.java
similarity index 100%
rename from modeler/cayenne-modeler/src/test/java/org/apache/cayenne/modeler/editor/dbimport/tree/ColumnNodeTest.java
rename to cayenne-modeler/src/test/java/org/apache/cayenne/modeler/editor/dbimport/tree/ColumnNodeTest.java
diff --git a/modeler/cayenne-modeler/src/test/java/org/apache/cayenne/modeler/editor/dbimport/tree/SchemaNodeTest.java b/cayenne-modeler/src/test/java/org/apache/cayenne/modeler/editor/dbimport/tree/SchemaNodeTest.java
similarity index 100%
rename from modeler/cayenne-modeler/src/test/java/org/apache/cayenne/modeler/editor/dbimport/tree/SchemaNodeTest.java
rename to cayenne-modeler/src/test/java/org/apache/cayenne/modeler/editor/dbimport/tree/SchemaNodeTest.java
diff --git a/modeler/cayenne-modeler/src/test/java/org/apache/cayenne/modeler/editor/dbimport/tree/SchemaProcedureNodeTest.java b/cayenne-modeler/src/test/java/org/apache/cayenne/modeler/editor/dbimport/tree/SchemaProcedureNodeTest.java
similarity index 100%
rename from modeler/cayenne-modeler/src/test/java/org/apache/cayenne/modeler/editor/dbimport/tree/SchemaProcedureNodeTest.java
rename to cayenne-modeler/src/test/java/org/apache/cayenne/modeler/editor/dbimport/tree/SchemaProcedureNodeTest.java
diff --git a/modeler/cayenne-modeler/src/test/java/org/apache/cayenne/modeler/editor/dbimport/tree/SchemaTableNodeTest.java b/cayenne-modeler/src/test/java/org/apache/cayenne/modeler/editor/dbimport/tree/SchemaTableNodeTest.java
similarity index 100%
rename from modeler/cayenne-modeler/src/test/java/org/apache/cayenne/modeler/editor/dbimport/tree/SchemaTableNodeTest.java
rename to cayenne-modeler/src/test/java/org/apache/cayenne/modeler/editor/dbimport/tree/SchemaTableNodeTest.java
diff --git a/modeler/cayenne-modeler/src/test/java/org/apache/cayenne/modeler/editor/templateeditor/ArtifactsConfiguratorTest.java b/cayenne-modeler/src/test/java/org/apache/cayenne/modeler/editor/templateeditor/ArtifactsConfiguratorTest.java
similarity index 100%
rename from modeler/cayenne-modeler/src/test/java/org/apache/cayenne/modeler/editor/templateeditor/ArtifactsConfiguratorTest.java
rename to cayenne-modeler/src/test/java/org/apache/cayenne/modeler/editor/templateeditor/ArtifactsConfiguratorTest.java
diff --git a/modeler/cayenne-modeler/src/test/java/org/apache/cayenne/modeler/editor/templateeditor/EditorTemplateLoaderTest.java b/cayenne-modeler/src/test/java/org/apache/cayenne/modeler/editor/templateeditor/EditorTemplateLoaderTest.java
similarity index 100%
rename from modeler/cayenne-modeler/src/test/java/org/apache/cayenne/modeler/editor/templateeditor/EditorTemplateLoaderTest.java
rename to cayenne-modeler/src/test/java/org/apache/cayenne/modeler/editor/templateeditor/EditorTemplateLoaderTest.java
diff --git a/modeler/cayenne-modeler/src/test/java/org/apache/cayenne/modeler/editor/templateeditor/EditorTemplateSaverTest.java b/cayenne-modeler/src/test/java/org/apache/cayenne/modeler/editor/templateeditor/EditorTemplateSaverTest.java
similarity index 100%
rename from modeler/cayenne-modeler/src/test/java/org/apache/cayenne/modeler/editor/templateeditor/EditorTemplateSaverTest.java
rename to cayenne-modeler/src/test/java/org/apache/cayenne/modeler/editor/templateeditor/EditorTemplateSaverTest.java
diff --git a/modeler/cayenne-modeler/src/test/java/org/apache/cayenne/modeler/editor/templateeditor/PreviewActionConfiguratorTest.java b/cayenne-modeler/src/test/java/org/apache/cayenne/modeler/editor/templateeditor/PreviewActionConfiguratorTest.java
similarity index 100%
rename from modeler/cayenne-modeler/src/test/java/org/apache/cayenne/modeler/editor/templateeditor/PreviewActionConfiguratorTest.java
rename to cayenne-modeler/src/test/java/org/apache/cayenne/modeler/editor/templateeditor/PreviewActionConfiguratorTest.java
diff --git a/modeler/cayenne-modeler/src/test/java/org/apache/cayenne/modeler/event/display/DomainDisplayEventTest.java b/cayenne-modeler/src/test/java/org/apache/cayenne/modeler/event/display/DomainDisplayEventTest.java
similarity index 100%
rename from modeler/cayenne-modeler/src/test/java/org/apache/cayenne/modeler/event/display/DomainDisplayEventTest.java
rename to cayenne-modeler/src/test/java/org/apache/cayenne/modeler/event/display/DomainDisplayEventTest.java
diff --git a/modeler/cayenne-modeler/src/test/java/org/apache/cayenne/modeler/event/model/DataMapEventTest.java b/cayenne-modeler/src/test/java/org/apache/cayenne/modeler/event/model/DataMapEventTest.java
similarity index 100%
rename from modeler/cayenne-modeler/src/test/java/org/apache/cayenne/modeler/event/model/DataMapEventTest.java
rename to cayenne-modeler/src/test/java/org/apache/cayenne/modeler/event/model/DataMapEventTest.java
diff --git a/modeler/cayenne-modeler/src/test/java/org/apache/cayenne/modeler/event/model/DbAttributeEventTest.java b/cayenne-modeler/src/test/java/org/apache/cayenne/modeler/event/model/DbAttributeEventTest.java
similarity index 100%
rename from modeler/cayenne-modeler/src/test/java/org/apache/cayenne/modeler/event/model/DbAttributeEventTest.java
rename to cayenne-modeler/src/test/java/org/apache/cayenne/modeler/event/model/DbAttributeEventTest.java
diff --git a/modeler/cayenne-modeler/src/test/java/org/apache/cayenne/modeler/event/model/DbEntityEventTest.java b/cayenne-modeler/src/test/java/org/apache/cayenne/modeler/event/model/DbEntityEventTest.java
similarity index 100%
rename from modeler/cayenne-modeler/src/test/java/org/apache/cayenne/modeler/event/model/DbEntityEventTest.java
rename to cayenne-modeler/src/test/java/org/apache/cayenne/modeler/event/model/DbEntityEventTest.java
diff --git a/modeler/cayenne-modeler/src/test/java/org/apache/cayenne/modeler/event/model/DbRelationshipEventTest.java b/cayenne-modeler/src/test/java/org/apache/cayenne/modeler/event/model/DbRelationshipEventTest.java
similarity index 100%
rename from modeler/cayenne-modeler/src/test/java/org/apache/cayenne/modeler/event/model/DbRelationshipEventTest.java
rename to cayenne-modeler/src/test/java/org/apache/cayenne/modeler/event/model/DbRelationshipEventTest.java
diff --git a/modeler/cayenne-modeler/src/test/java/org/apache/cayenne/modeler/event/model/DomainEventTest.java b/cayenne-modeler/src/test/java/org/apache/cayenne/modeler/event/model/DomainEventTest.java
similarity index 100%
rename from modeler/cayenne-modeler/src/test/java/org/apache/cayenne/modeler/event/model/DomainEventTest.java
rename to cayenne-modeler/src/test/java/org/apache/cayenne/modeler/event/model/DomainEventTest.java
diff --git a/modeler/cayenne-modeler/src/test/java/org/apache/cayenne/modeler/event/model/ModelEventTest.java b/cayenne-modeler/src/test/java/org/apache/cayenne/modeler/event/model/ModelEventTest.java
similarity index 100%
rename from modeler/cayenne-modeler/src/test/java/org/apache/cayenne/modeler/event/model/ModelEventTest.java
rename to cayenne-modeler/src/test/java/org/apache/cayenne/modeler/event/model/ModelEventTest.java
diff --git a/modeler/cayenne-modeler/src/test/java/org/apache/cayenne/modeler/mcp/McpHandshakeWriterTest.java b/cayenne-modeler/src/test/java/org/apache/cayenne/modeler/mcp/McpHandshakeWriterTest.java
similarity index 100%
rename from modeler/cayenne-modeler/src/test/java/org/apache/cayenne/modeler/mcp/McpHandshakeWriterTest.java
rename to cayenne-modeler/src/test/java/org/apache/cayenne/modeler/mcp/McpHandshakeWriterTest.java
diff --git a/modeler/cayenne-modeler/src/test/java/org/apache/cayenne/modeler/pref/migration/toV5/_3_GeneralPrefsMigrationTest.java b/cayenne-modeler/src/test/java/org/apache/cayenne/modeler/pref/migration/toV5/_3_GeneralPrefsMigrationTest.java
similarity index 100%
rename from modeler/cayenne-modeler/src/test/java/org/apache/cayenne/modeler/pref/migration/toV5/_3_GeneralPrefsMigrationTest.java
rename to cayenne-modeler/src/test/java/org/apache/cayenne/modeler/pref/migration/toV5/_3_GeneralPrefsMigrationTest.java
diff --git a/modeler/cayenne-modeler/src/test/java/org/apache/cayenne/modeler/pref/migration/toV5/_8_RemoveRedundantPathIndexMigrationTest.java b/cayenne-modeler/src/test/java/org/apache/cayenne/modeler/pref/migration/toV5/_8_RemoveRedundantPathIndexMigrationTest.java
similarity index 100%
rename from modeler/cayenne-modeler/src/test/java/org/apache/cayenne/modeler/pref/migration/toV5/_8_RemoveRedundantPathIndexMigrationTest.java
rename to cayenne-modeler/src/test/java/org/apache/cayenne/modeler/pref/migration/toV5/_8_RemoveRedundantPathIndexMigrationTest.java
diff --git a/modeler/cayenne-modeler/src/test/java/org/apache/cayenne/modeler/ui/action/EOModelFileFilterTest.java b/cayenne-modeler/src/test/java/org/apache/cayenne/modeler/ui/action/EOModelFileFilterTest.java
similarity index 100%
rename from modeler/cayenne-modeler/src/test/java/org/apache/cayenne/modeler/ui/action/EOModelFileFilterTest.java
rename to cayenne-modeler/src/test/java/org/apache/cayenne/modeler/ui/action/EOModelFileFilterTest.java
diff --git a/modeler/cayenne-modeler/src/test/java/org/apache/cayenne/modeler/ui/preferences/general/GeneralPrefsPanelTest.java b/cayenne-modeler/src/test/java/org/apache/cayenne/modeler/ui/preferences/general/GeneralPrefsPanelTest.java
similarity index 100%
rename from modeler/cayenne-modeler/src/test/java/org/apache/cayenne/modeler/ui/preferences/general/GeneralPrefsPanelTest.java
rename to cayenne-modeler/src/test/java/org/apache/cayenne/modeler/ui/preferences/general/GeneralPrefsPanelTest.java
diff --git a/modeler/cayenne-modeler/src/test/java/org/apache/cayenne/modeler/util/ApplicationFileFilterTest.java b/cayenne-modeler/src/test/java/org/apache/cayenne/modeler/util/ApplicationFileFilterTest.java
similarity index 100%
rename from modeler/cayenne-modeler/src/test/java/org/apache/cayenne/modeler/util/ApplicationFileFilterTest.java
rename to cayenne-modeler/src/test/java/org/apache/cayenne/modeler/util/ApplicationFileFilterTest.java
diff --git a/modeler/cayenne-modeler/src/test/java/org/apache/cayenne/modeler/util/DataMapFileFilterTest.java b/cayenne-modeler/src/test/java/org/apache/cayenne/modeler/util/DataMapFileFilterTest.java
similarity index 100%
rename from modeler/cayenne-modeler/src/test/java/org/apache/cayenne/modeler/util/DataMapFileFilterTest.java
rename to cayenne-modeler/src/test/java/org/apache/cayenne/modeler/util/DataMapFileFilterTest.java
diff --git a/modeler/cayenne-modeler/src/test/resources/org/apache/cayenne/modeler/cayenne-configured-validation.xml b/cayenne-modeler/src/test/resources/org/apache/cayenne/modeler/cayenne-configured-validation.xml
similarity index 100%
rename from modeler/cayenne-modeler/src/test/resources/org/apache/cayenne/modeler/cayenne-configured-validation.xml
rename to cayenne-modeler/src/test/resources/org/apache/cayenne/modeler/cayenne-configured-validation.xml
diff --git a/modeler/cayenne-wocompat/pom.xml b/cayenne-wocompat/pom.xml
similarity index 82%
rename from modeler/cayenne-wocompat/pom.xml
rename to cayenne-wocompat/pom.xml
index 969921215..b90e02b4b 100644
--- a/modeler/cayenne-wocompat/pom.xml
+++ b/cayenne-wocompat/pom.xml
@@ -19,8 +19,8 @@
 	<modelVersion>4.0.0</modelVersion>
 
 	<parent>
-		<groupId>org.apache.cayenne.modeler</groupId>
-		<artifactId>cayenne-modeler-parent</artifactId>
+		<groupId>org.apache.cayenne</groupId>
+		<artifactId>cayenne-parent</artifactId>
 		<version>5.0-SNAPSHOT</version>
 	</parent>
 
@@ -52,4 +52,20 @@
 			<scope>test</scope>
 		</dependency>
     </dependencies>
+
+	<build>
+		<plugins>
+			<!-- This ensures LICENSE and NOTICE inclusion in all jars -->
+			<plugin>
+				<artifactId>maven-remote-resources-plugin</artifactId>
+				<executions>
+					<execution>
+						<goals>
+							<goal>process</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+		</plugins>
+	</build>
 </project>
diff --git a/modeler/cayenne-wocompat/src/main/java/org/apache/cayenne/wocompat/EODbAttribute.java b/cayenne-wocompat/src/main/java/org/apache/cayenne/wocompat/EODbAttribute.java
similarity index 100%
rename from modeler/cayenne-wocompat/src/main/java/org/apache/cayenne/wocompat/EODbAttribute.java
rename to cayenne-wocompat/src/main/java/org/apache/cayenne/wocompat/EODbAttribute.java
diff --git a/modeler/cayenne-wocompat/src/main/java/org/apache/cayenne/wocompat/EOModelHelper.java b/cayenne-wocompat/src/main/java/org/apache/cayenne/wocompat/EOModelHelper.java
similarity index 100%
rename from modeler/cayenne-wocompat/src/main/java/org/apache/cayenne/wocompat/EOModelHelper.java
rename to cayenne-wocompat/src/main/java/org/apache/cayenne/wocompat/EOModelHelper.java
diff --git a/modeler/cayenne-wocompat/src/main/java/org/apache/cayenne/wocompat/EOModelProcessor.java b/cayenne-wocompat/src/main/java/org/apache/cayenne/wocompat/EOModelProcessor.java
similarity index 100%
rename from modeler/cayenne-wocompat/src/main/java/org/apache/cayenne/wocompat/EOModelProcessor.java
rename to cayenne-wocompat/src/main/java/org/apache/cayenne/wocompat/EOModelProcessor.java
diff --git a/modeler/cayenne-wocompat/src/main/java/org/apache/cayenne/wocompat/EOObjAttribute.java b/cayenne-wocompat/src/main/java/org/apache/cayenne/wocompat/EOObjAttribute.java
similarity index 100%
rename from modeler/cayenne-wocompat/src/main/java/org/apache/cayenne/wocompat/EOObjAttribute.java
rename to cayenne-wocompat/src/main/java/org/apache/cayenne/wocompat/EOObjAttribute.java
diff --git a/modeler/cayenne-wocompat/src/main/java/org/apache/cayenne/wocompat/EOObjEntity.java b/cayenne-wocompat/src/main/java/org/apache/cayenne/wocompat/EOObjEntity.java
similarity index 100%
rename from modeler/cayenne-wocompat/src/main/java/org/apache/cayenne/wocompat/EOObjEntity.java
rename to cayenne-wocompat/src/main/java/org/apache/cayenne/wocompat/EOObjEntity.java
diff --git a/modeler/cayenne-wocompat/src/main/java/org/apache/cayenne/wocompat/EOQuery.java b/cayenne-wocompat/src/main/java/org/apache/cayenne/wocompat/EOQuery.java
similarity index 100%
rename from modeler/cayenne-wocompat/src/main/java/org/apache/cayenne/wocompat/EOQuery.java
rename to cayenne-wocompat/src/main/java/org/apache/cayenne/wocompat/EOQuery.java
diff --git a/modeler/cayenne-wocompat/src/main/java/org/apache/cayenne/wocompat/EOSQLQuery.java b/cayenne-wocompat/src/main/java/org/apache/cayenne/wocompat/EOSQLQuery.java
similarity index 100%
rename from modeler/cayenne-wocompat/src/main/java/org/apache/cayenne/wocompat/EOSQLQuery.java
rename to cayenne-wocompat/src/main/java/org/apache/cayenne/wocompat/EOSQLQuery.java
diff --git a/modeler/cayenne-wocompat/src/main/java/org/apache/cayenne/wocompat/PlistDataStructureFactory.java b/cayenne-wocompat/src/main/java/org/apache/cayenne/wocompat/PlistDataStructureFactory.java
similarity index 100%
rename from modeler/cayenne-wocompat/src/main/java/org/apache/cayenne/wocompat/PlistDataStructureFactory.java
rename to cayenne-wocompat/src/main/java/org/apache/cayenne/wocompat/PlistDataStructureFactory.java
diff --git a/modeler/cayenne-wocompat/src/main/java/org/apache/cayenne/wocompat/PropertyListSerialization.java b/cayenne-wocompat/src/main/java/org/apache/cayenne/wocompat/PropertyListSerialization.java
similarity index 100%
rename from modeler/cayenne-wocompat/src/main/java/org/apache/cayenne/wocompat/PropertyListSerialization.java
rename to cayenne-wocompat/src/main/java/org/apache/cayenne/wocompat/PropertyListSerialization.java
diff --git a/modeler/cayenne-wocompat/src/main/java/org/apache/cayenne/wocompat/parser/DefaultPlistDataStructureFactory.java b/cayenne-wocompat/src/main/java/org/apache/cayenne/wocompat/parser/DefaultPlistDataStructureFactory.java
similarity index 100%
rename from modeler/cayenne-wocompat/src/main/java/org/apache/cayenne/wocompat/parser/DefaultPlistDataStructureFactory.java
rename to cayenne-wocompat/src/main/java/org/apache/cayenne/wocompat/parser/DefaultPlistDataStructureFactory.java
diff --git a/modeler/cayenne-wocompat/src/main/java/org/apache/cayenne/wocompat/parser/ParseException.java b/cayenne-wocompat/src/main/java/org/apache/cayenne/wocompat/parser/ParseException.java
similarity index 100%
rename from modeler/cayenne-wocompat/src/main/java/org/apache/cayenne/wocompat/parser/ParseException.java
rename to cayenne-wocompat/src/main/java/org/apache/cayenne/wocompat/parser/ParseException.java
diff --git a/modeler/cayenne-wocompat/src/main/java/org/apache/cayenne/wocompat/parser/Parser.java b/cayenne-wocompat/src/main/java/org/apache/cayenne/wocompat/parser/Parser.java
similarity index 100%
rename from modeler/cayenne-wocompat/src/main/java/org/apache/cayenne/wocompat/parser/Parser.java
rename to cayenne-wocompat/src/main/java/org/apache/cayenne/wocompat/parser/Parser.java
diff --git a/modeler/cayenne-wocompat/src/main/java/org/apache/cayenne/wocompat/parser/Parser.jj b/cayenne-wocompat/src/main/java/org/apache/cayenne/wocompat/parser/Parser.jj
similarity index 100%
rename from modeler/cayenne-wocompat/src/main/java/org/apache/cayenne/wocompat/parser/Parser.jj
rename to cayenne-wocompat/src/main/java/org/apache/cayenne/wocompat/parser/Parser.jj
diff --git a/modeler/cayenne-wocompat/src/main/java/org/apache/cayenne/wocompat/parser/ParserConstants.java b/cayenne-wocompat/src/main/java/org/apache/cayenne/wocompat/parser/ParserConstants.java
similarity index 100%
rename from modeler/cayenne-wocompat/src/main/java/org/apache/cayenne/wocompat/parser/ParserConstants.java
rename to cayenne-wocompat/src/main/java/org/apache/cayenne/wocompat/parser/ParserConstants.java
diff --git a/modeler/cayenne-wocompat/src/main/java/org/apache/cayenne/wocompat/parser/ParserTokenManager.java b/cayenne-wocompat/src/main/java/org/apache/cayenne/wocompat/parser/ParserTokenManager.java
similarity index 100%
rename from modeler/cayenne-wocompat/src/main/java/org/apache/cayenne/wocompat/parser/ParserTokenManager.java
rename to cayenne-wocompat/src/main/java/org/apache/cayenne/wocompat/parser/ParserTokenManager.java
diff --git a/modeler/cayenne-wocompat/src/main/java/org/apache/cayenne/wocompat/parser/SimpleCharStream.java b/cayenne-wocompat/src/main/java/org/apache/cayenne/wocompat/parser/SimpleCharStream.java
similarity index 100%
rename from modeler/cayenne-wocompat/src/main/java/org/apache/cayenne/wocompat/parser/SimpleCharStream.java
rename to cayenne-wocompat/src/main/java/org/apache/cayenne/wocompat/parser/SimpleCharStream.java
diff --git a/modeler/cayenne-wocompat/src/main/java/org/apache/cayenne/wocompat/parser/Token.java b/cayenne-wocompat/src/main/java/org/apache/cayenne/wocompat/parser/Token.java
similarity index 100%
rename from modeler/cayenne-wocompat/src/main/java/org/apache/cayenne/wocompat/parser/Token.java
rename to cayenne-wocompat/src/main/java/org/apache/cayenne/wocompat/parser/Token.java
diff --git a/modeler/cayenne-wocompat/src/main/java/org/apache/cayenne/wocompat/parser/TokenMgrError.java b/cayenne-wocompat/src/main/java/org/apache/cayenne/wocompat/parser/TokenMgrError.java
similarity index 100%
rename from modeler/cayenne-wocompat/src/main/java/org/apache/cayenne/wocompat/parser/TokenMgrError.java
rename to cayenne-wocompat/src/main/java/org/apache/cayenne/wocompat/parser/TokenMgrError.java
diff --git a/modeler/cayenne-wocompat/src/test/java/org/apache/cayenne/wocompat/EOModelHelperTest.java b/cayenne-wocompat/src/test/java/org/apache/cayenne/wocompat/EOModelHelperTest.java
similarity index 100%
rename from modeler/cayenne-wocompat/src/test/java/org/apache/cayenne/wocompat/EOModelHelperTest.java
rename to cayenne-wocompat/src/test/java/org/apache/cayenne/wocompat/EOModelHelperTest.java
diff --git a/modeler/cayenne-wocompat/src/test/java/org/apache/cayenne/wocompat/EOModelProcessorInheritanceTest.java b/cayenne-wocompat/src/test/java/org/apache/cayenne/wocompat/EOModelProcessorInheritanceTest.java
similarity index 100%
rename from modeler/cayenne-wocompat/src/test/java/org/apache/cayenne/wocompat/EOModelProcessorInheritanceTest.java
rename to cayenne-wocompat/src/test/java/org/apache/cayenne/wocompat/EOModelProcessorInheritanceTest.java
diff --git a/modeler/cayenne-wocompat/src/test/java/org/apache/cayenne/wocompat/EOModelProcessorTest.java b/cayenne-wocompat/src/test/java/org/apache/cayenne/wocompat/EOModelProcessorTest.java
similarity index 100%
rename from modeler/cayenne-wocompat/src/test/java/org/apache/cayenne/wocompat/EOModelProcessorTest.java
rename to cayenne-wocompat/src/test/java/org/apache/cayenne/wocompat/EOModelProcessorTest.java
diff --git a/modeler/cayenne-wocompat/src/test/java/org/apache/cayenne/wocompat/EOModelPrototypesTest.java b/cayenne-wocompat/src/test/java/org/apache/cayenne/wocompat/EOModelPrototypesTest.java
similarity index 100%
rename from modeler/cayenne-wocompat/src/test/java/org/apache/cayenne/wocompat/EOModelPrototypesTest.java
rename to cayenne-wocompat/src/test/java/org/apache/cayenne/wocompat/EOModelPrototypesTest.java
diff --git a/modeler/cayenne-wocompat/src/test/java/org/apache/cayenne/wocompat/EOQueryTest.java b/cayenne-wocompat/src/test/java/org/apache/cayenne/wocompat/EOQueryTest.java
similarity index 100%
rename from modeler/cayenne-wocompat/src/test/java/org/apache/cayenne/wocompat/EOQueryTest.java
rename to cayenne-wocompat/src/test/java/org/apache/cayenne/wocompat/EOQueryTest.java
diff --git a/modeler/cayenne-wocompat/src/test/java/org/apache/cayenne/wocompat/PropertyListSerializationTest.java b/cayenne-wocompat/src/test/java/org/apache/cayenne/wocompat/PropertyListSerializationTest.java
similarity index 100%
rename from modeler/cayenne-wocompat/src/test/java/org/apache/cayenne/wocompat/PropertyListSerializationTest.java
rename to cayenne-wocompat/src/test/java/org/apache/cayenne/wocompat/PropertyListSerializationTest.java
diff --git a/modeler/cayenne-wocompat/src/test/java/org/apache/cayenne/wocompat/parser/PropertyListParserTest.java b/cayenne-wocompat/src/test/java/org/apache/cayenne/wocompat/parser/PropertyListParserTest.java
similarity index 100%
rename from modeler/cayenne-wocompat/src/test/java/org/apache/cayenne/wocompat/parser/PropertyListParserTest.java
rename to cayenne-wocompat/src/test/java/org/apache/cayenne/wocompat/parser/PropertyListParserTest.java
diff --git a/modeler/cayenne-wocompat/src/test/resources/art-with-errors.eomodeld/Artist.plist b/cayenne-wocompat/src/test/resources/art-with-errors.eomodeld/Artist.plist
similarity index 100%
rename from modeler/cayenne-wocompat/src/test/resources/art-with-errors.eomodeld/Artist.plist
rename to cayenne-wocompat/src/test/resources/art-with-errors.eomodeld/Artist.plist
diff --git a/modeler/cayenne-wocompat/src/test/resources/art-with-errors.eomodeld/ArtistExhibit.plist b/cayenne-wocompat/src/test/resources/art-with-errors.eomodeld/ArtistExhibit.plist
similarity index 100%
rename from modeler/cayenne-wocompat/src/test/resources/art-with-errors.eomodeld/ArtistExhibit.plist
rename to cayenne-wocompat/src/test/resources/art-with-errors.eomodeld/ArtistExhibit.plist
diff --git a/modeler/cayenne-wocompat/src/test/resources/art-with-errors.eomodeld/DiagramLayout b/cayenne-wocompat/src/test/resources/art-with-errors.eomodeld/DiagramLayout
similarity index 100%
rename from modeler/cayenne-wocompat/src/test/resources/art-with-errors.eomodeld/DiagramLayout
rename to cayenne-wocompat/src/test/resources/art-with-errors.eomodeld/DiagramLayout
diff --git a/modeler/cayenne-wocompat/src/test/resources/art-with-errors.eomodeld/Exhibit.plist b/cayenne-wocompat/src/test/resources/art-with-errors.eomodeld/Exhibit.plist
similarity index 100%
rename from modeler/cayenne-wocompat/src/test/resources/art-with-errors.eomodeld/Exhibit.plist
rename to cayenne-wocompat/src/test/resources/art-with-errors.eomodeld/Exhibit.plist
diff --git a/modeler/cayenne-wocompat/src/test/resources/art-with-errors.eomodeld/Gallery.plist b/cayenne-wocompat/src/test/resources/art-with-errors.eomodeld/Gallery.plist
similarity index 100%
rename from modeler/cayenne-wocompat/src/test/resources/art-with-errors.eomodeld/Gallery.plist
rename to cayenne-wocompat/src/test/resources/art-with-errors.eomodeld/Gallery.plist
diff --git a/modeler/cayenne-wocompat/src/test/resources/art-with-errors.eomodeld/Painting.plist b/cayenne-wocompat/src/test/resources/art-with-errors.eomodeld/Painting.plist
similarity index 100%
rename from modeler/cayenne-wocompat/src/test/resources/art-with-errors.eomodeld/Painting.plist
rename to cayenne-wocompat/src/test/resources/art-with-errors.eomodeld/Painting.plist
diff --git a/modeler/cayenne-wocompat/src/test/resources/art-with-errors.eomodeld/PaintingInfo.plist b/cayenne-wocompat/src/test/resources/art-with-errors.eomodeld/PaintingInfo.plist
similarity index 100%
rename from modeler/cayenne-wocompat/src/test/resources/art-with-errors.eomodeld/PaintingInfo.plist
rename to cayenne-wocompat/src/test/resources/art-with-errors.eomodeld/PaintingInfo.plist
diff --git a/modeler/cayenne-wocompat/src/test/resources/art-with-errors.eomodeld/index.eomodeld b/cayenne-wocompat/src/test/resources/art-with-errors.eomodeld/index.eomodeld
similarity index 100%
rename from modeler/cayenne-wocompat/src/test/resources/art-with-errors.eomodeld/index.eomodeld
rename to cayenne-wocompat/src/test/resources/art-with-errors.eomodeld/index.eomodeld
diff --git a/modeler/cayenne-wocompat/src/test/resources/inheritance.eomodeld/AbstractEntity.plist b/cayenne-wocompat/src/test/resources/inheritance.eomodeld/AbstractEntity.plist
similarity index 100%
rename from modeler/cayenne-wocompat/src/test/resources/inheritance.eomodeld/AbstractEntity.plist
rename to cayenne-wocompat/src/test/resources/inheritance.eomodeld/AbstractEntity.plist
diff --git a/modeler/cayenne-wocompat/src/test/resources/inheritance.eomodeld/ConcreteEntityOne.plist b/cayenne-wocompat/src/test/resources/inheritance.eomodeld/ConcreteEntityOne.plist
similarity index 100%
rename from modeler/cayenne-wocompat/src/test/resources/inheritance.eomodeld/ConcreteEntityOne.plist
rename to cayenne-wocompat/src/test/resources/inheritance.eomodeld/ConcreteEntityOne.plist
diff --git a/modeler/cayenne-wocompat/src/test/resources/inheritance.eomodeld/DetailEntity.plist b/cayenne-wocompat/src/test/resources/inheritance.eomodeld/DetailEntity.plist
similarity index 100%
rename from modeler/cayenne-wocompat/src/test/resources/inheritance.eomodeld/DetailEntity.plist
rename to cayenne-wocompat/src/test/resources/inheritance.eomodeld/DetailEntity.plist
diff --git a/modeler/cayenne-wocompat/src/test/resources/inheritance.eomodeld/DiagramLayout b/cayenne-wocompat/src/test/resources/inheritance.eomodeld/DiagramLayout
similarity index 100%
rename from modeler/cayenne-wocompat/src/test/resources/inheritance.eomodeld/DiagramLayout
rename to cayenne-wocompat/src/test/resources/inheritance.eomodeld/DiagramLayout
diff --git a/modeler/cayenne-wocompat/src/test/resources/inheritance.eomodeld/HelperEntity.plist b/cayenne-wocompat/src/test/resources/inheritance.eomodeld/HelperEntity.plist
similarity index 100%
rename from modeler/cayenne-wocompat/src/test/resources/inheritance.eomodeld/HelperEntity.plist
rename to cayenne-wocompat/src/test/resources/inheritance.eomodeld/HelperEntity.plist
diff --git a/modeler/cayenne-wocompat/src/test/resources/inheritance.eomodeld/HelperFlatEntity.plist b/cayenne-wocompat/src/test/resources/inheritance.eomodeld/HelperFlatEntity.plist
similarity index 100%
rename from modeler/cayenne-wocompat/src/test/resources/inheritance.eomodeld/HelperFlatEntity.plist
rename to cayenne-wocompat/src/test/resources/inheritance.eomodeld/HelperFlatEntity.plist
diff --git a/modeler/cayenne-wocompat/src/test/resources/inheritance.eomodeld/SingleTableConcreteEntityOne.plist b/cayenne-wocompat/src/test/resources/inheritance.eomodeld/SingleTableConcreteEntityOne.plist
similarity index 100%
rename from modeler/cayenne-wocompat/src/test/resources/inheritance.eomodeld/SingleTableConcreteEntityOne.plist
rename to cayenne-wocompat/src/test/resources/inheritance.eomodeld/SingleTableConcreteEntityOne.plist
diff --git a/modeler/cayenne-wocompat/src/test/resources/inheritance.eomodeld/SingleTableConcreteEntityTwo.plist b/cayenne-wocompat/src/test/resources/inheritance.eomodeld/SingleTableConcreteEntityTwo.plist
similarity index 100%
rename from modeler/cayenne-wocompat/src/test/resources/inheritance.eomodeld/SingleTableConcreteEntityTwo.plist
rename to cayenne-wocompat/src/test/resources/inheritance.eomodeld/SingleTableConcreteEntityTwo.plist
diff --git a/modeler/cayenne-wocompat/src/test/resources/inheritance.eomodeld/SingleTableJoin.plist b/cayenne-wocompat/src/test/resources/inheritance.eomodeld/SingleTableJoin.plist
similarity index 100%
rename from modeler/cayenne-wocompat/src/test/resources/inheritance.eomodeld/SingleTableJoin.plist
rename to cayenne-wocompat/src/test/resources/inheritance.eomodeld/SingleTableJoin.plist
diff --git a/modeler/cayenne-wocompat/src/test/resources/inheritance.eomodeld/XSingleTableAbstractEntity.plist b/cayenne-wocompat/src/test/resources/inheritance.eomodeld/XSingleTableAbstractEntity.plist
similarity index 100%
rename from modeler/cayenne-wocompat/src/test/resources/inheritance.eomodeld/XSingleTableAbstractEntity.plist
rename to cayenne-wocompat/src/test/resources/inheritance.eomodeld/XSingleTableAbstractEntity.plist
diff --git a/modeler/cayenne-wocompat/src/test/resources/inheritance.eomodeld/index.eomodeld b/cayenne-wocompat/src/test/resources/inheritance.eomodeld/index.eomodeld
similarity index 100%
rename from modeler/cayenne-wocompat/src/test/resources/inheritance.eomodeld/index.eomodeld
rename to cayenne-wocompat/src/test/resources/inheritance.eomodeld/index.eomodeld
diff --git a/modeler/cayenne-wocompat/src/test/resources/prototypes.eomodeld/DiagramLayout b/cayenne-wocompat/src/test/resources/prototypes.eomodeld/DiagramLayout
similarity index 100%
rename from modeler/cayenne-wocompat/src/test/resources/prototypes.eomodeld/DiagramLayout
rename to cayenne-wocompat/src/test/resources/prototypes.eomodeld/DiagramLayout
diff --git a/modeler/cayenne-wocompat/src/test/resources/prototypes.eomodeld/Document.plist b/cayenne-wocompat/src/test/resources/prototypes.eomodeld/Document.plist
similarity index 100%
rename from modeler/cayenne-wocompat/src/test/resources/prototypes.eomodeld/Document.plist
rename to cayenne-wocompat/src/test/resources/prototypes.eomodeld/Document.plist
diff --git a/modeler/cayenne-wocompat/src/test/resources/prototypes.eomodeld/EOPrototypes.plist b/cayenne-wocompat/src/test/resources/prototypes.eomodeld/EOPrototypes.plist
similarity index 100%
rename from modeler/cayenne-wocompat/src/test/resources/prototypes.eomodeld/EOPrototypes.plist
rename to cayenne-wocompat/src/test/resources/prototypes.eomodeld/EOPrototypes.plist
diff --git a/modeler/cayenne-wocompat/src/test/resources/prototypes.eomodeld/EOXYZPrototypes.plist b/cayenne-wocompat/src/test/resources/prototypes.eomodeld/EOXYZPrototypes.plist
similarity index 100%
rename from modeler/cayenne-wocompat/src/test/resources/prototypes.eomodeld/EOXYZPrototypes.plist
rename to cayenne-wocompat/src/test/resources/prototypes.eomodeld/EOXYZPrototypes.plist
diff --git a/modeler/cayenne-wocompat/src/test/resources/prototypes.eomodeld/Estimate.plist b/cayenne-wocompat/src/test/resources/prototypes.eomodeld/Estimate.plist
similarity index 100%
rename from modeler/cayenne-wocompat/src/test/resources/prototypes.eomodeld/Estimate.plist
rename to cayenne-wocompat/src/test/resources/prototypes.eomodeld/Estimate.plist
diff --git a/modeler/cayenne-wocompat/src/test/resources/prototypes.eomodeld/Invoice.plist b/cayenne-wocompat/src/test/resources/prototypes.eomodeld/Invoice.plist
similarity index 100%
rename from modeler/cayenne-wocompat/src/test/resources/prototypes.eomodeld/Invoice.plist
rename to cayenne-wocompat/src/test/resources/prototypes.eomodeld/Invoice.plist
diff --git a/modeler/cayenne-wocompat/src/test/resources/prototypes.eomodeld/VendorPO.plist b/cayenne-wocompat/src/test/resources/prototypes.eomodeld/VendorPO.plist
similarity index 100%
rename from modeler/cayenne-wocompat/src/test/resources/prototypes.eomodeld/VendorPO.plist
rename to cayenne-wocompat/src/test/resources/prototypes.eomodeld/VendorPO.plist
diff --git a/modeler/cayenne-wocompat/src/test/resources/prototypes.eomodeld/index.eomodeld b/cayenne-wocompat/src/test/resources/prototypes.eomodeld/index.eomodeld
similarity index 100%
rename from modeler/cayenne-wocompat/src/test/resources/prototypes.eomodeld/index.eomodeld
rename to cayenne-wocompat/src/test/resources/prototypes.eomodeld/index.eomodeld
diff --git a/modeler/cayenne-wocompat/src/test/resources/wotests/art.eomodeld/Artist.plist b/cayenne-wocompat/src/test/resources/wotests/art.eomodeld/Artist.plist
similarity index 100%
rename from modeler/cayenne-wocompat/src/test/resources/wotests/art.eomodeld/Artist.plist
rename to cayenne-wocompat/src/test/resources/wotests/art.eomodeld/Artist.plist
diff --git a/modeler/cayenne-wocompat/src/test/resources/wotests/art.eomodeld/ArtistExhibit.plist b/cayenne-wocompat/src/test/resources/wotests/art.eomodeld/ArtistExhibit.plist
similarity index 100%
rename from modeler/cayenne-wocompat/src/test/resources/wotests/art.eomodeld/ArtistExhibit.plist
rename to cayenne-wocompat/src/test/resources/wotests/art.eomodeld/ArtistExhibit.plist
diff --git a/modeler/cayenne-wocompat/src/test/resources/wotests/art.eomodeld/CustomTypes.plist b/cayenne-wocompat/src/test/resources/wotests/art.eomodeld/CustomTypes.plist
similarity index 100%
rename from modeler/cayenne-wocompat/src/test/resources/wotests/art.eomodeld/CustomTypes.plist
rename to cayenne-wocompat/src/test/resources/wotests/art.eomodeld/CustomTypes.plist
diff --git a/modeler/cayenne-wocompat/src/test/resources/wotests/art.eomodeld/DiagramLayout b/cayenne-wocompat/src/test/resources/wotests/art.eomodeld/DiagramLayout
similarity index 100%
rename from modeler/cayenne-wocompat/src/test/resources/wotests/art.eomodeld/DiagramLayout
rename to cayenne-wocompat/src/test/resources/wotests/art.eomodeld/DiagramLayout
diff --git a/modeler/cayenne-wocompat/src/test/resources/wotests/art.eomodeld/Exhibit.plist b/cayenne-wocompat/src/test/resources/wotests/art.eomodeld/Exhibit.plist
similarity index 100%
rename from modeler/cayenne-wocompat/src/test/resources/wotests/art.eomodeld/Exhibit.plist
rename to cayenne-wocompat/src/test/resources/wotests/art.eomodeld/Exhibit.plist
diff --git a/modeler/cayenne-wocompat/src/test/resources/wotests/art.eomodeld/ExhibitType.fspec b/cayenne-wocompat/src/test/resources/wotests/art.eomodeld/ExhibitType.fspec
similarity index 100%
rename from modeler/cayenne-wocompat/src/test/resources/wotests/art.eomodeld/ExhibitType.fspec
rename to cayenne-wocompat/src/test/resources/wotests/art.eomodeld/ExhibitType.fspec
diff --git a/modeler/cayenne-wocompat/src/test/resources/wotests/art.eomodeld/ExhibitType.plist b/cayenne-wocompat/src/test/resources/wotests/art.eomodeld/ExhibitType.plist
similarity index 100%
rename from modeler/cayenne-wocompat/src/test/resources/wotests/art.eomodeld/ExhibitType.plist
rename to cayenne-wocompat/src/test/resources/wotests/art.eomodeld/ExhibitType.plist
diff --git a/modeler/cayenne-wocompat/src/test/resources/wotests/art.eomodeld/Gallery.plist b/cayenne-wocompat/src/test/resources/wotests/art.eomodeld/Gallery.plist
similarity index 100%
rename from modeler/cayenne-wocompat/src/test/resources/wotests/art.eomodeld/Gallery.plist
rename to cayenne-wocompat/src/test/resources/wotests/art.eomodeld/Gallery.plist
diff --git a/modeler/cayenne-wocompat/src/test/resources/wotests/art.eomodeld/Painting.plist b/cayenne-wocompat/src/test/resources/wotests/art.eomodeld/Painting.plist
similarity index 100%
rename from modeler/cayenne-wocompat/src/test/resources/wotests/art.eomodeld/Painting.plist
rename to cayenne-wocompat/src/test/resources/wotests/art.eomodeld/Painting.plist
diff --git a/modeler/cayenne-wocompat/src/test/resources/wotests/art.eomodeld/PaintingInfo.plist b/cayenne-wocompat/src/test/resources/wotests/art.eomodeld/PaintingInfo.plist
similarity index 100%
rename from modeler/cayenne-wocompat/src/test/resources/wotests/art.eomodeld/PaintingInfo.plist
rename to cayenne-wocompat/src/test/resources/wotests/art.eomodeld/PaintingInfo.plist
diff --git a/modeler/cayenne-wocompat/src/test/resources/wotests/art.eomodeld/index.eomodeld b/cayenne-wocompat/src/test/resources/wotests/art.eomodeld/index.eomodeld
similarity index 100%
rename from modeler/cayenne-wocompat/src/test/resources/wotests/art.eomodeld/index.eomodeld
rename to cayenne-wocompat/src/test/resources/wotests/art.eomodeld/index.eomodeld
diff --git a/modeler/cayenne-wocompat/src/test/resources/wotests/cross-model-relationships.eomodeld/CrossModelRelTest.plist b/cayenne-wocompat/src/test/resources/wotests/cross-model-relationships.eomodeld/CrossModelRelTest.plist
similarity index 100%
rename from modeler/cayenne-wocompat/src/test/resources/wotests/cross-model-relationships.eomodeld/CrossModelRelTest.plist
rename to cayenne-wocompat/src/test/resources/wotests/cross-model-relationships.eomodeld/CrossModelRelTest.plist
diff --git a/modeler/cayenne-wocompat/src/test/resources/wotests/cross-model-relationships.eomodeld/DiagramLayout b/cayenne-wocompat/src/test/resources/wotests/cross-model-relationships.eomodeld/DiagramLayout
similarity index 100%
rename from modeler/cayenne-wocompat/src/test/resources/wotests/cross-model-relationships.eomodeld/DiagramLayout
rename to cayenne-wocompat/src/test/resources/wotests/cross-model-relationships.eomodeld/DiagramLayout
diff --git a/modeler/cayenne-wocompat/src/test/resources/wotests/cross-model-relationships.eomodeld/index.eomodeld b/cayenne-wocompat/src/test/resources/wotests/cross-model-relationships.eomodeld/index.eomodeld
similarity index 100%
rename from modeler/cayenne-wocompat/src/test/resources/wotests/cross-model-relationships.eomodeld/index.eomodeld
rename to cayenne-wocompat/src/test/resources/wotests/cross-model-relationships.eomodeld/index.eomodeld
diff --git a/modeler/cayenne-wocompat/src/test/resources/wotests/fetchspec.eomodeld/DiagramLayout b/cayenne-wocompat/src/test/resources/wotests/fetchspec.eomodeld/DiagramLayout
similarity index 100%
rename from modeler/cayenne-wocompat/src/test/resources/wotests/fetchspec.eomodeld/DiagramLayout
rename to cayenne-wocompat/src/test/resources/wotests/fetchspec.eomodeld/DiagramLayout
diff --git a/modeler/cayenne-wocompat/src/test/resources/wotests/fetchspec.eomodeld/Entity1.fspec b/cayenne-wocompat/src/test/resources/wotests/fetchspec.eomodeld/Entity1.fspec
similarity index 100%
rename from modeler/cayenne-wocompat/src/test/resources/wotests/fetchspec.eomodeld/Entity1.fspec
rename to cayenne-wocompat/src/test/resources/wotests/fetchspec.eomodeld/Entity1.fspec
diff --git a/modeler/cayenne-wocompat/src/test/resources/wotests/fetchspec.eomodeld/Entity1.plist b/cayenne-wocompat/src/test/resources/wotests/fetchspec.eomodeld/Entity1.plist
similarity index 100%
rename from modeler/cayenne-wocompat/src/test/resources/wotests/fetchspec.eomodeld/Entity1.plist
rename to cayenne-wocompat/src/test/resources/wotests/fetchspec.eomodeld/Entity1.plist
diff --git a/modeler/cayenne-wocompat/src/test/resources/wotests/fetchspec.eomodeld/Entity2.plist b/cayenne-wocompat/src/test/resources/wotests/fetchspec.eomodeld/Entity2.plist
similarity index 100%
rename from modeler/cayenne-wocompat/src/test/resources/wotests/fetchspec.eomodeld/Entity2.plist
rename to cayenne-wocompat/src/test/resources/wotests/fetchspec.eomodeld/Entity2.plist
diff --git a/modeler/cayenne-wocompat/src/test/resources/wotests/fetchspec.eomodeld/index.eomodeld b/cayenne-wocompat/src/test/resources/wotests/fetchspec.eomodeld/index.eomodeld
similarity index 100%
rename from modeler/cayenne-wocompat/src/test/resources/wotests/fetchspec.eomodeld/index.eomodeld
rename to cayenne-wocompat/src/test/resources/wotests/fetchspec.eomodeld/index.eomodeld
diff --git a/modeler/cayenne-wocompat/src/test/resources/wotests/flattened.eomodeld/Artist.plist b/cayenne-wocompat/src/test/resources/wotests/flattened.eomodeld/Artist.plist
similarity index 100%
rename from modeler/cayenne-wocompat/src/test/resources/wotests/flattened.eomodeld/Artist.plist
rename to cayenne-wocompat/src/test/resources/wotests/flattened.eomodeld/Artist.plist
diff --git a/modeler/cayenne-wocompat/src/test/resources/wotests/flattened.eomodeld/ArtistExhibit.plist b/cayenne-wocompat/src/test/resources/wotests/flattened.eomodeld/ArtistExhibit.plist
similarity index 100%
rename from modeler/cayenne-wocompat/src/test/resources/wotests/flattened.eomodeld/ArtistExhibit.plist
rename to cayenne-wocompat/src/test/resources/wotests/flattened.eomodeld/ArtistExhibit.plist
diff --git a/modeler/cayenne-wocompat/src/test/resources/wotests/flattened.eomodeld/Exhibit.plist b/cayenne-wocompat/src/test/resources/wotests/flattened.eomodeld/Exhibit.plist
similarity index 100%
rename from modeler/cayenne-wocompat/src/test/resources/wotests/flattened.eomodeld/Exhibit.plist
rename to cayenne-wocompat/src/test/resources/wotests/flattened.eomodeld/Exhibit.plist
diff --git a/modeler/cayenne-wocompat/src/test/resources/wotests/flattened.eomodeld/index.eomodeld b/cayenne-wocompat/src/test/resources/wotests/flattened.eomodeld/index.eomodeld
similarity index 100%
rename from modeler/cayenne-wocompat/src/test/resources/wotests/flattened.eomodeld/index.eomodeld
rename to cayenne-wocompat/src/test/resources/wotests/flattened.eomodeld/index.eomodeld
diff --git a/modeler/pom.xml b/modeler/pom.xml
deleted file mode 100644
index 4b9461f89..000000000
--- a/modeler/pom.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-	Licensed to the Apache Software Foundation (ASF) under one
-	or more contributor license agreements.  See the NOTICE file
-	distributed with this work for additional information
-	regarding copyright ownership.  The ASF licenses this file
-	to you under the Apache License, Version 2.0 (the
-	"License"); you may not use this file except in compliance
-	with the License.  You may obtain a copy of the License at
-
-		https://www.apache.org/licenses/LICENSE-2.0
-
-	Unless required by applicable law or agreed to in writing,
-	software distributed under the License is distributed on an
-	"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-	KIND, either express or implied.  See the License for the
-	specific language governing permissions and limitations
-	under the License.   
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
-	<modelVersion>4.0.0</modelVersion>
-
-	<parent>
-		<groupId>org.apache.cayenne</groupId>
-		<artifactId>cayenne-parent</artifactId>
-		<version>5.0-SNAPSHOT</version>
-	</parent>
-
-	<artifactId>cayenne-modeler-parent</artifactId>
-	<groupId>org.apache.cayenne.modeler</groupId>
-	<name>cayenne-modeler-parent: Cayenne Modeler Parent</name>
-	<packaging>pom</packaging>
-	
-	<modules>
-		<module>cayenne-wocompat</module>
-		<module>cayenne-modeler-prefs</module>
-		<module>cayenne-modeler</module>
-	</modules>
-
-	<build>
-		<plugins>
-			<!-- This ensures LICENSE and NOTICE inclusion in all jars -->
-            <plugin>
-                <artifactId>maven-remote-resources-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>process</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-</project>
diff --git a/pom.xml b/pom.xml
index 6c7a7460b..ed69828be 100644
--- a/pom.xml
+++ b/pom.xml
@@ -117,13 +117,15 @@
         <module>cayenne-jcache</module>
         <module>cayenne-lifecycle</module>
         <module>cayenne-mcp-server</module>
+        <module>cayenne-modeler</module>
+        <module>cayenne-modeler-prefs</module>
         <module>cayenne-project</module>
         <module>cayenne-project-compatibility</module>
         <module>cayenne-velocity</module>
         <module>cayenne-osgi</module>
         <module>cayenne-maven-plugin</module>
         <module>cayenne-maven-plugin-itest</module>
-        <module>modeler</module>
+        <module>cayenne-wocompat</module>
         <module>tutorials</module>
         <module>docs</module>
         <module>cayenne-assembly</module>

(cayenne) 01/02: Collapsing platform builds into cayenne-modeler

[aa...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

asf-gitbox-commits pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cayenne.git

commit 397cc81f9675078b2994574c0ee2d6d5d94e4e4c
Author: Andrus Adamchik <an...@objectstyle.com>
AuthorDate: Thu Aug 27 15:00:31 2026 -0400

    Collapsing platform builds into cayenne-modeler
    
    * no need for separate platform modules
    * cleanup: "assembly" module name must match the directory name
    * cleanup: removing "-add-exports java.desktop/com.sun.java.swing.plaf.windows=ALL-UNNAMED" from Windows assembly.
      Presumably no longer in use?
---
 build-tools/rat-excludes                           |   2 +-
 {assembly => cayenne-assembly}/pom.xml             |  27 +-----
 .../assemblies/generic/assembly-generic.xml        |  17 ++--
 .../src/main/resources/assemblies/mac}/README.txt  |   0
 .../main/resources/assemblies/mac/assembly-mac.xml |  24 ++---
 .../main/resources/assemblies/mac/background.tiff  | Bin
 .../main/resources/assemblies/mac/create-dmg.sh    |   0
 .../main/resources/assemblies/src/assembly-src.xml |   0
 .../assemblies/windows/assembly-windows.xml        |  17 ++--
 modeler/cayenne-modeler-generic/pom.xml            |  62 -------------
 modeler/cayenne-modeler-mac/pom.xml                |  73 ---------------
 modeler/cayenne-modeler-win/pom.xml                |  75 ----------------
 modeler/cayenne-modeler/pom.xml                    |  99 +++++++++++++++++++++
 .../src/japplication/resources/CayenneModeler.icns | Bin
 .../src/japplication/resources/CayenneModeler.ico  | Bin
 modeler/pom.xml                                    |   3 -
 pom.xml                                            |   2 +-
 17 files changed, 126 insertions(+), 275 deletions(-)

diff --git a/build-tools/rat-excludes b/build-tools/rat-excludes
index 5e5bd3e0e..7d3e39020 100644
--- a/build-tools/rat-excludes
+++ b/build-tools/rat-excludes
@@ -46,4 +46,4 @@
 # ASF and distribution text that carries no header by convention
 KEYS
 RELEASE-NOTES.txt
-modeler/cayenne-modeler-mac/src/main/resources/README.txt
+cayenne-assembly/src/main/resources/assemblies/mac/README.txt
diff --git a/assembly/pom.xml b/cayenne-assembly/pom.xml
similarity index 93%
rename from assembly/pom.xml
rename to cayenne-assembly/pom.xml
index cb3f03d3c..45344e928 100644
--- a/assembly/pom.xml
+++ b/cayenne-assembly/pom.xml
@@ -226,13 +226,6 @@
 		<profile>
 			<!-- GENERIC cross-platform assembly. Can be created on any platform -->
 			<id>generic</id>
-			<dependencies>
-				<dependency>
-					<groupId>org.apache.cayenne.modeler</groupId>
-					<artifactId>cayenne-modeler-generic</artifactId>
-					<version>${project.version}</version>
-				</dependency>
-			</dependencies>
 			<build>
 				<plugins>
 					<plugin>
@@ -276,13 +269,6 @@
 		<profile>
 			<!-- MAC assembly (can only be run on Mac) -->
 			<id>mac</id>
-			<dependencies>
-				<dependency>
-					<groupId>org.apache.cayenne.modeler</groupId>
-					<artifactId>cayenne-modeler-mac</artifactId>
-					<version>${project.version}</version>
-				</dependency>
-			</dependencies>
 			<properties>
 				<content.dir>cayenne-${project.version}</content.dir>
 			</properties>
@@ -348,9 +334,9 @@
 						<groupId>org.codehaus.mojo</groupId>
 						<artifactId>exec-maven-plugin</artifactId>
 						<executions>
-							<!-- chmod executable ... while japp plugin produces the correct 
-								permissions, jar/unjar operation resets 'x' flag, so the app becomes non-executable. 
-								Must fix that manually -->
+							<!-- chmod executable ... while japp plugin produces the correct permissions, the
+								 assembly copy resets the 'x' flag, so the app becomes non-executable.
+								 Must fix that manually -->
 							<execution>
 								<id>chmod-modeler</id>
 								<phase>package</phase>
@@ -388,13 +374,6 @@
 		<profile>
 			<!-- WINDOWS assembly (can only be run on Windows) -->
 			<id>windows</id>
-			<dependencies>
-				<dependency>
-					<groupId>org.apache.cayenne.modeler</groupId>
-					<artifactId>cayenne-modeler-win</artifactId>
-					<version>${project.version}</version>
-				</dependency>
-			</dependencies>
 			<build>
 				<plugins>
 					<!-- Make sure we are running on windows -->
diff --git a/assembly/src/main/resources/assemblies/generic/assembly-generic.xml b/cayenne-assembly/src/main/resources/assemblies/generic/assembly-generic.xml
similarity index 93%
rename from assembly/src/main/resources/assemblies/generic/assembly-generic.xml
rename to cayenne-assembly/src/main/resources/assemblies/generic/assembly-generic.xml
index 0bf452f98..0403f4713 100644
--- a/assembly/src/main/resources/assemblies/generic/assembly-generic.xml
+++ b/cayenne-assembly/src/main/resources/assemblies/generic/assembly-generic.xml
@@ -61,6 +61,11 @@
 				<include>KEYS</include>
 			</includes>
 		</fileSet>
+		<!-- Native Modeler launchers, built by the matching "generic" profile of "cayenne-modeler" -->
+		<fileSet>
+			<directory>../modeler/cayenne-modeler/target/apps/generic</directory>
+			<outputDirectory>bin</outputDirectory>
+		</fileSet>
 	</fileSets>
 	
 	<dependencySets>
@@ -101,18 +106,6 @@
 				</excludes>
 			</unpackOptions>
 		</dependencySet>
-		<dependencySet>
-			<outputDirectory>bin</outputDirectory>
-			<includes>
-				<include>org.apache.cayenne.modeler:cayenne-modeler-generic</include>
-			</includes>
-			<unpack>true</unpack>
-			<unpackOptions>
-				<excludes>
-					<exclude>META-INF/**</exclude>
-				</excludes>
-			</unpackOptions>
-		</dependencySet>
 		<dependencySet>
 			<outputDirectory>bin</outputDirectory>
 			<includes>
diff --git a/modeler/cayenne-modeler-mac/src/main/resources/README.txt b/cayenne-assembly/src/main/resources/assemblies/mac/README.txt
similarity index 100%
rename from modeler/cayenne-modeler-mac/src/main/resources/README.txt
rename to cayenne-assembly/src/main/resources/assemblies/mac/README.txt
diff --git a/assembly/src/main/resources/assemblies/mac/assembly-mac.xml b/cayenne-assembly/src/main/resources/assemblies/mac/assembly-mac.xml
similarity index 91%
rename from assembly/src/main/resources/assemblies/mac/assembly-mac.xml
rename to cayenne-assembly/src/main/resources/assemblies/mac/assembly-mac.xml
index cf5faf9cf..136a7e521 100644
--- a/assembly/src/main/resources/assemblies/mac/assembly-mac.xml
+++ b/cayenne-assembly/src/main/resources/assemblies/mac/assembly-mac.xml
@@ -59,6 +59,18 @@
 				<include>KEYS</include>
 			</includes>
 		</fileSet>
+		<fileSet>
+			<directory>src/main/resources/assemblies/mac</directory>
+			<outputDirectory>/</outputDirectory>
+			<includes>
+				<include>README.txt</include>
+			</includes>
+		</fileSet>
+		<!-- Native Modeler launchers, built by the matching "mac" profile of "cayenne-modeler" -->
+		<fileSet>
+			<directory>../modeler/cayenne-modeler/target/apps/mac</directory>
+			<outputDirectory>/</outputDirectory>
+		</fileSet>
 	</fileSets>
 
 	<dependencySets>
@@ -99,18 +111,6 @@
 				</excludes>
 			</unpackOptions>
 		</dependencySet>
-		<dependencySet>
-			<outputDirectory>/</outputDirectory>
-			<includes>
-				<include>org.apache.cayenne.modeler:cayenne-modeler-mac</include>
-			</includes>
-			<unpack>true</unpack>
-			<unpackOptions>
-				<excludes>
-					<exclude>META-INF/**</exclude>
-				</excludes>
-			</unpackOptions>
-		</dependencySet>
 		<dependencySet>
 			<outputDirectory>CayenneModeler.app/Contents/Resources/mcp/</outputDirectory>
 			<includes>
diff --git a/assembly/src/main/resources/assemblies/mac/background.tiff b/cayenne-assembly/src/main/resources/assemblies/mac/background.tiff
similarity index 100%
rename from assembly/src/main/resources/assemblies/mac/background.tiff
rename to cayenne-assembly/src/main/resources/assemblies/mac/background.tiff
diff --git a/assembly/src/main/resources/assemblies/mac/create-dmg.sh b/cayenne-assembly/src/main/resources/assemblies/mac/create-dmg.sh
similarity index 100%
rename from assembly/src/main/resources/assemblies/mac/create-dmg.sh
rename to cayenne-assembly/src/main/resources/assemblies/mac/create-dmg.sh
diff --git a/assembly/src/main/resources/assemblies/src/assembly-src.xml b/cayenne-assembly/src/main/resources/assemblies/src/assembly-src.xml
similarity index 100%
rename from assembly/src/main/resources/assemblies/src/assembly-src.xml
rename to cayenne-assembly/src/main/resources/assemblies/src/assembly-src.xml
diff --git a/assembly/src/main/resources/assemblies/windows/assembly-windows.xml b/cayenne-assembly/src/main/resources/assemblies/windows/assembly-windows.xml
similarity index 93%
rename from assembly/src/main/resources/assemblies/windows/assembly-windows.xml
rename to cayenne-assembly/src/main/resources/assemblies/windows/assembly-windows.xml
index c250f9e27..d5ccc6b3a 100644
--- a/assembly/src/main/resources/assemblies/windows/assembly-windows.xml
+++ b/cayenne-assembly/src/main/resources/assemblies/windows/assembly-windows.xml
@@ -59,6 +59,11 @@
 				<include>KEYS</include>
 			</includes>
 		</fileSet>
+		<!-- Native Modeler launchers, built by the matching "windows" profile of "cayenne-modeler" -->
+		<fileSet>
+			<directory>../modeler/cayenne-modeler/target/apps/windows</directory>
+			<outputDirectory>bin</outputDirectory>
+		</fileSet>
 	</fileSets>
 	
 	<dependencySets>
@@ -99,18 +104,6 @@
 				</excludes>
 			</unpackOptions>
 		</dependencySet>
-		<dependencySet>
-			<outputDirectory>bin</outputDirectory>
-			<includes>
-				<include>org.apache.cayenne.modeler:cayenne-modeler-win</include>
-			</includes>
-			<unpack>true</unpack>
-			<unpackOptions>
-				<excludes>
-					<exclude>META-INF/**</exclude>
-				</excludes>
-			</unpackOptions>
-		</dependencySet>
 		<dependencySet>
 			<outputDirectory>bin</outputDirectory>
 			<includes>
diff --git a/modeler/cayenne-modeler-generic/pom.xml b/modeler/cayenne-modeler-generic/pom.xml
deleted file mode 100644
index ef6c6d87a..000000000
--- a/modeler/cayenne-modeler-generic/pom.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor 
-	license agreements. See the NOTICE file distributed with this work for additional 
-	information regarding copyright ownership. The ASF licenses this file to 
-	you under the Apache License, Version 2.0 (the "License"); you may not use 
-	this file except in compliance with the License. You may obtain a copy of 
-	the License at https://www.apache.org/licenses/LICENSE-2.0 Unless required 
-	by applicable law or agreed to in writing, software distributed under the 
-	License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 
-	OF ANY KIND, either express or implied. See the License for the specific 
-	language governing permissions and limitations under the License. -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
-	<modelVersion>4.0.0</modelVersion>
-
-	<parent>
-		<groupId>org.apache.cayenne.modeler</groupId>
-		<artifactId>cayenne-modeler-parent</artifactId>
-		<version>5.0-SNAPSHOT</version>
-	</parent>
-
-	<artifactId>cayenne-modeler-generic</artifactId>
-	<name>cayenne-modeler-generic: Modeler Generic Assembly</name>
-	<packaging>jar</packaging>
-
-	<dependencies>
-
-		<dependency>
-			<groupId>org.apache.cayenne.modeler</groupId>
-			<artifactId>cayenne-modeler</artifactId>
-			<version>${project.version}</version>
-		</dependency>
-	</dependencies>
-
-	<profiles>
-		<profile>
-			<id>generic</id>
-			<build>
-				<plugins>
-					<plugin>
-						<groupId>org.objectstyle.japp</groupId>
-						<artifactId>japp-maven-plugin</artifactId>
-						<configuration>
-							<destDir>${project.build.outputDirectory}</destDir>
-							<name>CayenneModeler</name>
-							<mainClass>org.apache.cayenne.modeler.Main</mainClass>
-							<os>java</os>
-						</configuration>
-						<executions>
-							<execution>
-								<phase>generate-resources</phase>
-								<goals>
-									<goal>japp</goal>
-								</goals>
-							</execution>
-						</executions>
-					</plugin>
-				</plugins>
-			</build>
-		</profile>
-    </profiles>
-</project>
diff --git a/modeler/cayenne-modeler-mac/pom.xml b/modeler/cayenne-modeler-mac/pom.xml
deleted file mode 100644
index fe6ce14df..000000000
--- a/modeler/cayenne-modeler-mac/pom.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-	Licensed to the Apache Software Foundation (ASF) under one
-	or more contributor license agreements.  See the NOTICE file
-	distributed with this work for additional information
-	regarding copyright ownership.  The ASF licenses this file
-	to you under the Apache License, Version 2.0 (the
-	"License"); you may not use this file except in compliance
-	with the License.  You may obtain a copy of the License at
-	
-	https://www.apache.org/licenses/LICENSE-2.0
-	
-	Unless required by applicable law or agreed to in writing,
-	software distributed under the License is distributed on an
-	"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-	KIND, either express or implied.  See the License for the
-	specific language governing permissions and limitations
-	under the License.   
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
-	<modelVersion>4.0.0</modelVersion>
-
-	<parent>
-		<groupId>org.apache.cayenne.modeler</groupId>
-		<artifactId>cayenne-modeler-parent</artifactId>
-		<version>5.0-SNAPSHOT</version>
-	</parent>
-
-	<artifactId>cayenne-modeler-mac</artifactId>
-	<name>cayenne-modeler-mac: Modeler MacOS Assembly</name>
-	<packaging>jar</packaging>
-
-	<dependencies>
-		<dependency>
-			<groupId>org.apache.cayenne.modeler</groupId>
-			<artifactId>cayenne-modeler</artifactId>
-			<version>${project.version}</version>
-		</dependency>
-	</dependencies>
-
-    <profiles>
-		<profile>
-			<id>mac</id>
-			<build>
-				<plugins>
-					<plugin>
-						<groupId>org.objectstyle.japp</groupId>
-						<artifactId>japp-maven-plugin</artifactId>
-						<configuration>
-							<name>CayenneModeler</name>
-							<longName>${project.version}</longName>
-							<destDir>${project.build.outputDirectory}</destDir>
-							<mainClass>org.apache.cayenne.modeler.Main</mainClass>
-							<icon>src/japplication/resources/CayenneModeler.icns</icon>
-							<os>mac</os>
-							<jvm0>21</jvm0>
-							<jvm0Options>-Xmx500m -Dapple.laf.useScreenMenuBar=true</jvm0Options>
-						</configuration>
-						<executions>
-							<execution>
-								<phase>generate-resources</phase>
-								<goals>
-									<goal>japp</goal>
-								</goals>
-							</execution>
-						</executions>
-					</plugin>
-				</plugins>
-			</build>
-		</profile>
-	</profiles>
-</project>
diff --git a/modeler/cayenne-modeler-win/pom.xml b/modeler/cayenne-modeler-win/pom.xml
deleted file mode 100644
index e8da608b1..000000000
--- a/modeler/cayenne-modeler-win/pom.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-	Licensed to the Apache Software Foundation (ASF) under one
-	or more contributor license agreements.  See the NOTICE file
-	distributed with this work for additional information
-	regarding copyright ownership.  The ASF licenses this file
-	to you under the Apache License, Version 2.0 (the
-	"License"); you may not use this file except in compliance
-	with the License.  You may obtain a copy of the License at
-	
-	https://www.apache.org/licenses/LICENSE-2.0
-	
-	Unless required by applicable law or agreed to in writing,
-	software distributed under the License is distributed on an
-	"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-	KIND, either express or implied.  See the License for the
-	specific language governing permissions and limitations
-	under the License.   
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
-	<modelVersion>4.0.0</modelVersion>
-
-	<parent>
-		<groupId>org.apache.cayenne.modeler</groupId>
-		<artifactId>cayenne-modeler-parent</artifactId>
-		<version>5.0-SNAPSHOT</version>
-	</parent>
-
-	<artifactId>cayenne-modeler-win</artifactId>
-	<name>cayenne-modeler-win: Modeler Windows Assembly</name>
-	<packaging>jar</packaging>
-
-	<dependencies>
-
-		<dependency>
-			<groupId>org.apache.cayenne.modeler</groupId>
-			<artifactId>cayenne-modeler</artifactId>
-			<version>${project.version}</version>
-		</dependency>
-	</dependencies>
-
-	<profiles>
-		<!-- Avoid assembly of Modeler on normal build -->
-		<profile>
-			<id>windows</id>
-			<build>
-				<plugins>
-					<plugin>
-						<groupId>org.objectstyle.japp</groupId>
-						<artifactId>japp-maven-plugin</artifactId>
-						<configuration>
-							<name>CayenneModeler</name>
-							<longName>${project.version}</longName>
-							<destDir>${project.build.outputDirectory}</destDir>
-							<mainClass>org.apache.cayenne.modeler.Main</mainClass>
-							<icon>src/japplication/resources/CayenneModeler.ico</icon>
-							<os>windows</os>
-							<jvm0>21</jvm0>
-							<jvm0Options>-Xmx500m --add-exports java.desktop/com.sun.java.swing.plaf.windows=ALL-UNNAMED</jvm0Options>
-						</configuration>
-						<executions>
-							<execution>
-								<phase>generate-resources</phase>
-								<goals>
-									<goal>japp</goal>
-								</goals>
-							</execution>
-						</executions>					
-					</plugin>
-				</plugins>
-			</build>
-		</profile>
-    </profiles>
-</project>
diff --git a/modeler/cayenne-modeler/pom.xml b/modeler/cayenne-modeler/pom.xml
index 872339a40..79b99a3b0 100644
--- a/modeler/cayenne-modeler/pom.xml
+++ b/modeler/cayenne-modeler/pom.xml
@@ -91,4 +91,103 @@
 			<scope>test</scope>
 		</dependency>
 	</dependencies>
+	<!--
+		Native Modeler launchers, built into "target/apps/<platform>" and picked up from there by
+		"cayenne-assembly". Bound to "verify" rather than "package", as "japp" bundles the module's
+		own jar into the launcher, and same-phase plugin ordering would not guarantee it exists yet.
+		Each platform gets its own directory, so any combination of the profiles can be active at once.
+	-->
+	<profiles>
+		<!-- GENERIC cross-platform launcher: a runnable "CayenneModeler.jar". Builds on any OS -->
+		<profile>
+			<id>generic</id>
+			<build>
+				<plugins>
+					<plugin>
+						<groupId>org.objectstyle.japp</groupId>
+						<artifactId>japp-maven-plugin</artifactId>
+						<executions>
+							<execution>
+								<id>japp-generic</id>
+								<phase>verify</phase>
+								<goals>
+									<goal>japp</goal>
+								</goals>
+								<configuration>
+									<destDir>${project.build.directory}/apps/generic</destDir>
+									<name>CayenneModeler</name>
+									<mainClass>org.apache.cayenne.modeler.Main</mainClass>
+									<os>java</os>
+								</configuration>
+							</execution>
+						</executions>
+					</plugin>
+				</plugins>
+			</build>
+		</profile>
+
+		<!-- MACOS launcher: a "CayenneModeler.app" bundle. Builds on macOS -->
+		<profile>
+			<id>mac</id>
+			<build>
+				<plugins>
+					<plugin>
+						<groupId>org.objectstyle.japp</groupId>
+						<artifactId>japp-maven-plugin</artifactId>
+						<executions>
+							<execution>
+								<id>japp-mac</id>
+								<phase>verify</phase>
+								<goals>
+									<goal>japp</goal>
+								</goals>
+								<configuration>
+									<destDir>${project.build.directory}/apps/mac</destDir>
+									<name>CayenneModeler</name>
+									<longName>${project.version}</longName>
+									<mainClass>org.apache.cayenne.modeler.Main</mainClass>
+									<icon>src/japplication/resources/CayenneModeler.icns</icon>
+									<os>mac</os>
+									<jvm0>21</jvm0>
+									<jvm0Options>-Xmx500m -Dapple.laf.useScreenMenuBar=true</jvm0Options>
+								</configuration>
+							</execution>
+						</executions>
+					</plugin>
+				</plugins>
+			</build>
+		</profile>
+
+		<!-- WINDOWS launcher: "CayenneModeler.jar" plus a "CayenneModeler.exe". Builds on Windows -->
+		<profile>
+			<id>windows</id>
+			<build>
+				<plugins>
+					<plugin>
+						<groupId>org.objectstyle.japp</groupId>
+						<artifactId>japp-maven-plugin</artifactId>
+						<executions>
+							<execution>
+								<id>japp-windows</id>
+								<phase>verify</phase>
+								<goals>
+									<goal>japp</goal>
+								</goals>
+								<configuration>
+									<destDir>${project.build.directory}/apps/windows</destDir>
+									<name>CayenneModeler</name>
+									<longName>${project.version}</longName>
+									<mainClass>org.apache.cayenne.modeler.Main</mainClass>
+									<icon>src/japplication/resources/CayenneModeler.ico</icon>
+									<os>windows</os>
+									<jvm0>21</jvm0>
+									<jvm0Options>-Xmx500m</jvm0Options>
+								</configuration>
+							</execution>
+						</executions>
+					</plugin>
+				</plugins>
+			</build>
+		</profile>
+	</profiles>
 </project>
diff --git a/modeler/cayenne-modeler-mac/src/japplication/resources/CayenneModeler.icns b/modeler/cayenne-modeler/src/japplication/resources/CayenneModeler.icns
similarity index 100%
rename from modeler/cayenne-modeler-mac/src/japplication/resources/CayenneModeler.icns
rename to modeler/cayenne-modeler/src/japplication/resources/CayenneModeler.icns
diff --git a/modeler/cayenne-modeler-win/src/japplication/resources/CayenneModeler.ico b/modeler/cayenne-modeler/src/japplication/resources/CayenneModeler.ico
similarity index 100%
rename from modeler/cayenne-modeler-win/src/japplication/resources/CayenneModeler.ico
rename to modeler/cayenne-modeler/src/japplication/resources/CayenneModeler.ico
diff --git a/modeler/pom.xml b/modeler/pom.xml
index 3ff2d3e9b..4b9461f89 100644
--- a/modeler/pom.xml
+++ b/modeler/pom.xml
@@ -36,9 +36,6 @@
 		<module>cayenne-wocompat</module>
 		<module>cayenne-modeler-prefs</module>
 		<module>cayenne-modeler</module>
-		<module>cayenne-modeler-generic</module>
-		<module>cayenne-modeler-mac</module>
-		<module>cayenne-modeler-win</module>
 	</modules>
 
 	<build>
diff --git a/pom.xml b/pom.xml
index bf8da33c8..6c7a7460b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -126,7 +126,7 @@
         <module>modeler</module>
         <module>tutorials</module>
         <module>docs</module>
-        <module>assembly</module>
+        <module>cayenne-assembly</module>
     </modules>
     <issueManagement>
         <system>jira</system>