This is an automated email from the ASF dual-hosted git repository.
asf-gitbox-commits pushed a change to branch CAY-2935
in repository https://gitbox.apache.org/repos/asf/cayenne.git
discard 0ce07c943 CAY-2935 Upgrade Cayenne 5.0 to Java 21
discard 1c5fc254e CAY-2935 Upgrade Cayenne 5.0 to Java 21
discard e896454fc CAY-2935 Upgrade Cayenne 5.0 to Java 21
discard 82ce9705a CAY-2935 Upgrade Cayenne 5.0 to Java 21
discard 62b4fdea3 CAY-2935 Upgrade Cayenne 5.0 to Java 21
discard c8c79fe96 CAY-2935 Upgrade Cayenne 5.0 to Java 21
discard 5e61d38d4 CAY-2935 Upgrade Cayenne 5.0 to Java 21
add ea6faab7e addressing RAT violations
add 374ec4acc CAY-2937 Decomission "graph" support
add 7c20057c7 CAY-2937 Decomission "graph" support
add ca112646c CAY-2937 Decomission "graph" support
add 1623a5404 CAY-2937 Decomission "graph" support
add 131654cf1 CAY-2937 Decomission "graph" support
add 62f9377fb CAY-2914 CayenneModeler DB Import does not refresh for
"Table Types"
add 9552d5eb3 CAY-2914 CayenneModeler DB Import does not refresh for
"Table Types"
add 0383b95f6 CAT-2938 Modeler: prettier DB Import - part 1
add f0ca368d4 CAT-2938 Modeler: prettier DB Import - part 1
new fa631c814 CAY-2935 Upgrade Cayenne 5.0 to Java 21
new c03802b08 CAY-2935 Upgrade Cayenne 5.0 to Java 21
new 3893c3f08 CAY-2935 Upgrade Cayenne 5.0 to Java 21
new 61e520532 CAY-2935 Upgrade Cayenne 5.0 to Java 21
new 900764c89 CAY-2935 Upgrade Cayenne 5.0 to Java 21
new 37ca93598 CAY-2935 Upgrade Cayenne 5.0 to Java 21
new 25ec4c8e9 CAY-2935 Upgrade Cayenne 5.0 to Java 21
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (0ce07c943)
\
N -- N -- N refs/heads/CAY-2935 (25ec4c8e9)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 7 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:
RELEASE-NOTES.txt | 3 +
UPGRADE.txt | 4 +
cayenne-ant/src/test/resources/cgenTest.map.xml | 8 +-
cayenne-ant/src/test/resources/embeddable.map.xml | 6 +-
.../apache/cayenne/tools/cgen-dependent.map.xml | 6 +-
.../org/apache/cayenne/tools/cgen.map.xml | 6 +-
cayenne-ant/src/test/resources/testmap.map.xml | 6 +-
.../src/test/resources/cayenne-lifecycle.xml | 4 +-
.../src/test/resources/lifecycle-map.map.xml | 6 +-
.../src/test/resources/cayenne-lifecycle.xml | 6 +-
.../src/test/resources/lifecycle-map.map.xml | 8 +-
.../src/test/resources/cayenne-crypto.xml | 6 +-
cayenne-crypto/src/test/resources/datamap.map.xml | 6 +-
.../dbimport/DefaultDbImportActionTest.java | 18 +-
.../dbimport/cayenne-relationship-optimisation.xml | 4 +-
.../dbimport/relationship-optimisation.map.xml | 6 +-
.../org/apache/cayenne/tools/cgenMap.map.xml | 8 +-
.../apache/cayenne/tools/cgen_with_config.map.xml | 8 +-
.../org/apache/cayenne/tools/exclude_Table.map.xml | 6 +-
.../org/apache/cayenne/tools/test_datamap.map.xml | 6 +-
.../src/test/resources/cayenne-lifecycle.xml | 4 +-
.../src/test/resources/lifecycle-map.map.xml | 6 +-
.../src/test/resources/cayenne-client.xml | 4 +-
.../src/test/resources/embeddable.map.xml | 6 +-
.../src/test/resources/testmap.map.xml | 6 +-
.../src/test/resources/cgen/cayenne-testDomain.xml | 4 +-
.../test/resources/cgen/testAdditionalMap.map.xml | 6 +-
.../src/test/resources/cgen/testCgen.map.xml | 8 +-
.../src/test/resources/cgen/testCgenMap.map.xml | 8 +-
.../src/test/resources/cgen/testDomainMap.map.xml | 8 +-
.../testAddedFlattenedRelationship.map.xml | 6 +-
.../tools/dbimport/testComplexChangeOrder.map.xml | 6 +-
.../tools/dbimport/testConfigFromDataMap.map.xml | 8 +-
.../dbimport/testCustomObjectLayerSettings.map.xml | 6 +-
.../tools/dbimport/testDbAttributeChange.map.xml | 6 +-
.../tools/dbimport/testDropProcedure.map.xml | 6 +-
.../tools/dbimport/testExcludeRelationship.map.xml | 6 +-
.../tools/dbimport/testFkAttributeRename.map.xml | 6 +-
.../tools/dbimport/testForceDataMapSchema.map.xml | 6 +-
.../dbimport/testImportAddTableAndColumn.map.xml | 6 +-
.../dbimport/testImportNewRelationship.map.xml | 6 +-
.../tools/dbimport/testImportProcedure.map.xml | 6 +-
.../dbimport/testImportWithoutChanges.map.xml | 6 +-
.../cayenne/tools/dbimport/testInheritance.map.xml | 6 +-
.../cayenne/tools/dbimport/testJava7Types.map.xml | 6 +-
.../cayenne/tools/dbimport/testJava8Types.map.xml | 6 +-
.../dbimport/testPreserveCustomObjMappings.map.xml | 6 +-
.../dbimport/testPreserveRelationships.map.xml | 6 +-
.../tools/dbimport/testSameProcedure.map.xml | 6 +-
.../dbimport/testSkipPrimaryKeyLoading.map.xml | 6 +-
.../dbimport/testSkipRelationshipsLoading.map.xml | 6 +-
.../tools/dbimport/testTableTypesMap.map.xml | 8 +-
.../dbimport/testUnFlattensManyToMany.map.xml | 6 +-
.../compatibility/ProjectCompatibilityModule.java | 4 +-
.../compatibility/CompatibilityTestModule.java | 4 +-
.../CompatibilityUpgradeServiceIT.java | 6 +-
.../java/org/apache/cayenne/project/Project.java | 2 +-
.../org/apache/cayenne/project/ProjectModule.java | 4 +-
.../project/upgrade/handlers/UpgradeHandler.java | 41 +-
.../upgrade/handlers/UpgradeHandler_V12.java | 102 ++++
.../project/upgrade/DefaultUpgradeServiceTest.java | 46 +-
.../upgrade/handlers/UpgradeHandler_V12Test.java | 147 +++++
.../apache/cayenne/project/cayenne-PROJECT1.xml | 4 +-
.../apache/cayenne/project/cayenne-PROJECT2.xml | 4 +-
.../cayenne/project/testProjectMap1_1.map.xml | 6 +-
.../cayenne/project/testProjectMap1_2.map.xml | 6 +-
.../cayenne/project/testProjectMap2_1.map.xml | 6 +-
.../cayenne/project/testProjectMap2_2.map.xml | 6 +-
.../upgrade/handlers/cayenne-project-v11.xml | 2 +-
...enne-project-v5.xml => cayenne-project-v13.xml} | 2 +-
.../project/upgrade/v12/cayenne-project1.xml | 20 +-
.../cayenne/project/upgrade/v12/map1.map.xml | 24 +-
.../cayenne/project/upgrade/v12/project1.graph.xml | 7 +
.../configuration/DataChannelDescriptor.java | 4 +-
.../xml/XMLDataChannelDescriptorLoader.java | 92 ++--
.../cayenne/dba/mysql/MySQLLocalDateTimeType.java | 19 +
.../main/java/org/apache/cayenne/map/DataMap.java | 4 +-
.../org/apache/cayenne/schema/{11 => 12}/cgen.xsd | 8 +-
.../apache/cayenne/schema/{11 => 12}/dbimport.xsd | 8 +-
.../apache/cayenne/schema/{11 => 12}/domain.xsd | 8 +-
.../org/apache/cayenne/schema/{10 => 12}/info.xsd | 6 +-
.../apache/cayenne/schema/{11 => 12}/modelMap.xsd | 14 +-
.../cayenne/schema/{11 => 12}/validation.xsd | 6 +-
.../test/resources/annotation/cayenne-project.xml | 6 +-
.../resources/annotation/datamapAnnotation.map.xml | 6 +-
cayenne/src/test/resources/array-type.map.xml | 6 +-
cayenne/src/test/resources/binary-pk.map.xml | 6 +-
cayenne/src/test/resources/cay-2032.map.xml | 6 +-
.../test/resources/cay2641/cayenne-cay-2641.xml | 6 +-
.../src/test/resources/cay2641/datamapLazy.map.xml | 6 +-
.../test/resources/cay2666/cayenne-cay-2666.xml | 6 +-
cayenne/src/test/resources/cay2666/datamap.map.xml | 10 +-
.../src/test/resources/cay743/cayenne-domain.xml | 2 +-
cayenne/src/test/resources/cay743/map1.map.xml | 6 +-
cayenne/src/test/resources/cay743/map2.map.xml | 6 +-
cayenne/src/test/resources/cayenne-array-type.xml | 6 +-
cayenne/src/test/resources/cayenne-binary-pk.xml | 6 +-
cayenne/src/test/resources/cayenne-cay-2032.xml | 6 +-
cayenne/src/test/resources/cayenne-compound.xml | 6 +-
cayenne/src/test/resources/cayenne-date-time.xml | 6 +-
.../src/test/resources/cayenne-delete-rules.xml | 6 +-
cayenne/src/test/resources/cayenne-embeddable.xml | 6 +-
cayenne/src/test/resources/cayenne-empty.xml | 6 +-
cayenne/src/test/resources/cayenne-enum.xml | 6 +-
.../src/test/resources/cayenne-extended-type.xml | 6 +-
cayenne/src/test/resources/cayenne-generated.xml | 6 +-
cayenne/src/test/resources/cayenne-generic.xml | 6 +-
.../test/resources/cayenne-hybrid-data-object.xml | 6 +-
.../cayenne-inheritance-single-table1.xml | 6 +-
.../resources/cayenne-inheritance-vertical.xml | 6 +-
.../resources/cayenne-inheritance-with-enum.xml | 6 +-
cayenne/src/test/resources/cayenne-inheritance.xml | 6 +-
cayenne/src/test/resources/cayenne-json.xml | 6 +-
.../src/test/resources/cayenne-lazy-attributes.xml | 6 +-
.../test/resources/cayenne-legacy-date-time.xml | 6 +-
.../cayenne-lifecycle-callbacks-order.xml | 6 +-
cayenne/src/test/resources/cayenne-lifecycles.xml | 6 +-
cayenne/src/test/resources/cayenne-lob.xml | 6 +-
cayenne/src/test/resources/cayenne-locking.xml | 6 +-
cayenne/src/test/resources/cayenne-map-to-many.xml | 6 +-
.../src/test/resources/cayenne-meaningful-pk.xml | 6 +-
cayenne/src/test/resources/cayenne-misc-types.xml | 6 +-
.../cayenne-mixed-persistence-strategy.xml | 6 +-
cayenne/src/test/resources/cayenne-multi-tier.xml | 6 +-
cayenne/src/test/resources/cayenne-multinode.xml | 6 +-
cayenne/src/test/resources/cayenne-no-pk.xml | 6 +-
.../src/test/resources/cayenne-numeric-types.xml | 6 +-
cayenne/src/test/resources/cayenne-oneway-rels.xml | 6 +-
...ayenne.configuration.rop.server.test-config.xml | 6 +-
cayenne/src/test/resources/cayenne-people.xml | 6 +-
cayenne/src/test/resources/cayenne-primitive.xml | 6 +-
cayenne/src/test/resources/cayenne-qualified.xml | 6 +-
.../test/resources/cayenne-quoted-identifiers.xml | 6 +-
cayenne/src/test/resources/cayenne-reflexive.xml | 6 +-
.../resources/cayenne-relationships-activity.xml | 6 +-
.../cayenne-relationships-child-master.xml | 6 +-
.../test/resources/cayenne-relationships-clob.xml | 6 +-
.../cayenne-relationships-collection-to-many.xml | 6 +-
.../cayenne-relationships-delete-rules.xml | 6 +-
.../resources/cayenne-relationships-flattened.xml | 6 +-
.../cayenne-relationships-many-to-many-join.xml | 6 +-
.../cayenne-relationships-set-to-many.xml | 6 +-
.../resources/cayenne-relationships-to-many-fk.xml | 6 +-
.../resources/cayenne-relationships-to-one-fk.xml | 6 +-
.../src/test/resources/cayenne-relationships.xml | 6 +-
.../src/test/resources/cayenne-return-types.xml | 6 +-
cayenne/src/test/resources/cayenne-soft-delete.xml | 6 +-
cayenne/src/test/resources/cayenne-sus.xml | 6 +-
.../test/resources/cayenne-table-primitives.xml | 6 +-
cayenne/src/test/resources/cayenne-testmap.xml | 6 +-
cayenne/src/test/resources/cayenne-things.xml | 6 +-
cayenne/src/test/resources/cayenne-toone.xml | 6 +-
.../cayenne-unsupported-distinct-types.xml | 6 +-
cayenne/src/test/resources/cayenne-uuid.xml | 6 +-
.../src/test/resources/cayenne-weighted-sort.xml | 6 +-
cayenne/src/test/resources/compound.map.xml | 6 +-
cayenne/src/test/resources/custom-name-file.xml | 2 +-
cayenne/src/test/resources/date-time.map.xml | 6 +-
cayenne/src/test/resources/delete-rules.map.xml | 6 +-
cayenne/src/test/resources/embeddable.map.xml | 6 +-
cayenne/src/test/resources/empty.map.xml | 6 +-
cayenne/src/test/resources/enum.map.xml | 6 +-
cayenne/src/test/resources/extended-type.map.xml | 6 +-
cayenne/src/test/resources/generated.map.xml | 6 +-
cayenne/src/test/resources/generic.map.xml | 6 +-
.../src/test/resources/hybrid-data-object.map.xml | 6 +-
.../resources/inheritance-single-table1.map.xml | 6 +-
.../test/resources/inheritance-vertical.map.xml | 6 +-
.../test/resources/inheritance-with-enum.map.xml | 6 +-
cayenne/src/test/resources/inheritance.map.xml | 6 +-
cayenne/src/test/resources/json.map.xml | 6 +-
cayenne/src/test/resources/lazy-attributes.map.xml | 6 +-
.../src/test/resources/legacy-date-time.map.xml | 6 +-
.../resources/lifecycle-callbacks-order.map.xml | 6 +-
cayenne/src/test/resources/lifecycles.map.xml | 6 +-
cayenne/src/test/resources/lob.map.xml | 6 +-
cayenne/src/test/resources/locking.map.xml | 6 +-
cayenne/src/test/resources/map-db1.map.xml | 6 +-
cayenne/src/test/resources/map-db2.map.xml | 6 +-
cayenne/src/test/resources/map-to-many.map.xml | 6 +-
cayenne/src/test/resources/meaningful-pk.map.xml | 6 +-
cayenne/src/test/resources/misc-types.map.xml | 6 +-
.../resources/mixed-persistence-strategy.map.xml | 6 +-
cayenne/src/test/resources/multi-tier.map.xml | 6 +-
cayenne/src/test/resources/no-pk.map.xml | 6 +-
cayenne/src/test/resources/numeric-types.map.xml | 6 +-
cayenne/src/test/resources/oneway-rels.map.xml | 6 +-
.../configuration/xml/cayenne-testConfig1.xml | 2 +-
.../configuration/xml/cayenne-testConfig2.xml | 2 +-
.../configuration/xml/cayenne-testConfig3.xml | 2 +-
.../configuration/xml/testConfigMap2.map.xml | 6 +-
.../configuration/xml/testConfigMap3_1.map.xml | 6 +-
.../configuration/xml/testConfigMap3_2.map.xml | 6 +-
.../configuration/xml/testConfigMap4.map.xml | 8 +-
cayenne/src/test/resources/people.map.xml | 6 +-
cayenne/src/test/resources/primitive.map.xml | 6 +-
cayenne/src/test/resources/qualified.map.xml | 6 +-
.../src/test/resources/quoted-identifiers.map.xml | 6 +-
cayenne/src/test/resources/reflexive.map.xml | 6 +-
.../test/resources/relationships-activity.map.xml | 6 +-
.../resources/relationships-child-master.map.xml | 6 +-
.../src/test/resources/relationships-clob.map.xml | 6 +-
.../relationships-collection-to-many.map.xml | 6 +-
.../resources/relationships-delete-rules.map.xml | 6 +-
.../test/resources/relationships-flattened.map.xml | 6 +-
.../relationships-many-to-many-join.map.xml | 6 +-
.../resources/relationships-set-to-many.map.xml | 6 +-
.../resources/relationships-to-many-fk.map.xml | 6 +-
.../test/resources/relationships-to-one-fk.map.xml | 6 +-
cayenne/src/test/resources/relationships.map.xml | 6 +-
cayenne/src/test/resources/return-types.map.xml | 6 +-
cayenne/src/test/resources/soft-delete.map.xml | 6 +-
cayenne/src/test/resources/sus-map.map.xml | 6 +-
.../src/test/resources/table-primitives.map.xml | 6 +-
cayenne/src/test/resources/testmap.map.xml | 10 +-
cayenne/src/test/resources/things.map.xml | 6 +-
cayenne/src/test/resources/toone.map.xml | 6 +-
.../resources/unsupported-distinct-types.map.xml | 6 +-
cayenne/src/test/resources/uuid.map.xml | 6 +-
cayenne/src/test/resources/weighted-sort.map.xml | 6 +-
modeler/cayenne-modeler/pom.xml | 5 -
.../org/apache/cayenne/modeler/ModelerModule.java | 2 -
.../cayenne/modeler/graph/BaseGraphBuilder.java | 607 ---------------------
.../modeler/graph/DbEntityCellMetadata.java | 49 --
.../cayenne/modeler/graph/DbGraphBuilder.java | 137 -----
.../cayenne/modeler/graph/EntityCellMetadata.java | 76 ---
.../apache/cayenne/modeler/graph/GraphBuilder.java | 73 ---
.../org/apache/cayenne/modeler/graph/GraphMap.java | 135 -----
.../cayenne/modeler/graph/GraphRegistry.java | 111 ----
.../apache/cayenne/modeler/graph/GraphType.java | 57 --
.../modeler/graph/ObjEntityCellMetadata.java | 50 --
.../cayenne/modeler/graph/ObjGraphBuilder.java | 211 -------
.../apache/cayenne/modeler/project/CgenOps.java | 19 +
.../apache/cayenne/modeler/project/DataMapOps.java | 19 +
.../cayenne/modeler/project/DbAttributeOps.java | 19 +
.../cayenne/modeler/project/DbEntityOps.java | 19 +
.../cayenne/modeler/project/DbRelationshipOps.java | 19 +
.../cayenne/modeler/project/ObjEntityOps.java | 19 +
.../modeler/service/action/GlobalActions.java | 6 +-
.../modeler/service/graph/EntityHandler.java | 60 --
.../modeler/service/graph/GraphExtension.java | 71 ---
.../modeler/service/graph/GraphHandler.java | 94 ----
.../modeler/service/graph/GraphLoaderDelegate.java | 49 --
.../modeler/service/graph/GraphSaverDelegate.java | 69 ---
.../modeler/service/graph/GraphsRootHandler.java | 55 --
.../apache/cayenne/modeler/toolkit/AppToolBar.java | 19 +
.../modeler/toolkit/text/CMTextPaneEditorKit.java | 19 +
.../org/apache/cayenne/modeler/ui/MainToolBar.java | 19 +
.../org/apache/cayenne/modeler/ui/SearchPanel.java | 19 +
.../project/editor/datadomain/DataDomainView.java | 15 +-
.../datadomain/graph/DataDomainGraphTab.java | 196 -------
.../graph/action/EntityDisplayAction.java | 98 ----
.../graph/action/RebuildGraphAction.java | 48 --
.../graph/action/RemoveEntityAction.java | 67 ---
.../datadomain/graph/action/SaveAsImageAction.java | 105 ----
.../graph/action/ShowGraphEntityAction.java | 93 ----
.../datadomain/graph/action/ZoomInAction.java | 51 --
.../datadomain/graph/action/ZoomOutAction.java | 51 --
.../{TreeToolbarPanel.java => ConfigToolbar.java} | 12 +-
.../{SourceTargetPanel.java => DBSchemaPanel.java} | 8 +-
.../editor/datamap/dbimport/DbImportTree.java | 47 +-
.../datamap/dbimport/DbImportTreeCellEditor.java | 21 +-
.../datamap/dbimport/DbImportTreeCellRenderer.java | 24 +-
.../{DbImportModel.java => DbImportTreeModel.java} | 21 +-
.../editor/datamap/dbimport/DbImportView.java | 156 +++---
...{DefaultPopUpMenu.java => DbSchemaToolbar.java} | 42 +-
.../datamap/dbimport/PrintColumnsBiFunction.java | 2 +-
.../dbimport/ReverseEngineeringConfigPanel.java | 6 +-
.../dbimport/ReverseEngineeringTreePanel.java | 12 +-
.../datamap/dbimport/action/DeleteNodeAction.java | 4 +-
.../dbimport/action/DragAndDropNodeAction.java | 4 +-
.../dbimport/action/LoadDbSchemaAction.java | 16 +-
.../dbimport/action/MoveImportNodeAction.java | 4 +-
.../datamap/dbimport/tree/ColorTreeRenderer.java | 3 +-
.../editor/dbentity/main/DbEntityMainView.java | 3 -
.../editor/objentity/main/ObjEntityMainView.java | 3 -
.../modeler/ui/welcome/WelcomeScreenMainPanel.java | 19 +
.../modeler/cayenne-configured-validation.xml | 8 +-
pom.xml | 5 -
.../src/main/resources/cayenne-project.xml | 6 +-
.../tutorial/src/main/resources/datamap.map.xml | 6 +-
281 files changed, 1474 insertions(+), 3546 deletions(-)
create mode 100644
cayenne-project/src/main/java/org/apache/cayenne/project/upgrade/handlers/UpgradeHandler_V12.java
create mode 100644
cayenne-project/src/test/java/org/apache/cayenne/project/upgrade/handlers/UpgradeHandler_V12Test.java
copy
cayenne-project/src/test/resources/org/apache/cayenne/project/upgrade/handlers/{cayenne-project-v5.xml
=> cayenne-project-v13.xml} (74%)
copy cayenne-commitlog/src/test/resources/cayenne-lifecycle.xml =>
cayenne-project/src/test/resources/org/apache/cayenne/project/upgrade/v12/cayenne-project1.xml
(54%)
copy cayenne/src/test/resources/cay2666/datamap.map.xml =>
cayenne-project/src/test/resources/org/apache/cayenne/project/upgrade/v12/map1.map.xml
(61%)
create mode 100644
cayenne-project/src/test/resources/org/apache/cayenne/project/upgrade/v12/project1.graph.xml
copy cayenne/src/main/resources/org/apache/cayenne/schema/{11 => 12}/cgen.xsd
(93%)
copy cayenne/src/main/resources/org/apache/cayenne/schema/{11 =>
12}/dbimport.xsd (96%)
copy cayenne/src/main/resources/org/apache/cayenne/schema/{11 =>
12}/domain.xsd (96%)
copy cayenne/src/main/resources/org/apache/cayenne/schema/{10 => 12}/info.xsd
(92%)
copy cayenne/src/main/resources/org/apache/cayenne/schema/{11 =>
12}/modelMap.xsd (98%)
copy cayenne/src/main/resources/org/apache/cayenne/schema/{11 =>
12}/validation.xsd (92%)
delete mode 100644
modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/graph/BaseGraphBuilder.java
delete mode 100644
modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/graph/DbEntityCellMetadata.java
delete mode 100644
modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/graph/DbGraphBuilder.java
delete mode 100644
modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/graph/EntityCellMetadata.java
delete mode 100644
modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/graph/GraphBuilder.java
delete mode 100644
modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/graph/GraphMap.java
delete mode 100644
modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/graph/GraphRegistry.java
delete mode 100644
modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/graph/GraphType.java
delete mode 100644
modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/graph/ObjEntityCellMetadata.java
delete mode 100644
modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/graph/ObjGraphBuilder.java
delete mode 100644
modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/service/graph/EntityHandler.java
delete mode 100644
modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/service/graph/GraphExtension.java
delete mode 100644
modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/service/graph/GraphHandler.java
delete mode 100644
modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/service/graph/GraphLoaderDelegate.java
delete mode 100644
modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/service/graph/GraphSaverDelegate.java
delete mode 100644
modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/service/graph/GraphsRootHandler.java
delete mode 100644
modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datadomain/graph/DataDomainGraphTab.java
delete mode 100644
modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datadomain/graph/action/EntityDisplayAction.java
delete mode 100644
modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datadomain/graph/action/RebuildGraphAction.java
delete mode 100644
modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datadomain/graph/action/RemoveEntityAction.java
delete mode 100644
modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datadomain/graph/action/SaveAsImageAction.java
delete mode 100644
modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datadomain/graph/action/ShowGraphEntityAction.java
delete mode 100644
modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datadomain/graph/action/ZoomInAction.java
delete mode 100644
modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datadomain/graph/action/ZoomOutAction.java
rename
modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/{TreeToolbarPanel.java
=> ConfigToolbar.java} (94%)
rename
modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/{SourceTargetPanel.java
=> DBSchemaPanel.java} (98%)
rename
modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/{DbImportModel.java
=> DbImportTreeModel.java} (84%)
copy
modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/{DefaultPopUpMenu.java
=> DbSchemaToolbar.java} (53%)
