This is an automated email from the ASF dual-hosted git repository.
ntimofeev pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/cayenne.git
from 473e943e9 CAY-2772 Bootique-style module "extenders" for smoother
configuration - cleanup Crypto module
add f75cda1eb hide templates folder in PreferenceDialog
add 3b22257ee new template workflow
add a737d973f add tests
add 2c120fa0b migrate template from String to CgenTemplate
add 5b728bf9c enabled/disable template editor buttons
add 887528177 del unused
add 337ff19bf add testTemplateTransferToCgenConfiguration to Maven and Ant
plugins. Fix gradle cgenTest
add f70fdff17 added templates updating to UpgradeHandler_V11
add 793ff0872 JavaDoc
add 74147d6d6 del unused
add 0d96b4a96 cleanup
new e9f3501da Merge remote-tracking branch 'parent/pr/529' into asf-master
The 1 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:
.../apache/cayenne/tools/CayenneGeneratorTask.java | 21 +-
.../cayenne/tools/CayenneGeneratorTaskTest.java | 76 ++-
.../org/apache/cayenne/gen/CgenConfiguration.java | 95 ++--
.../java/org/apache/cayenne/gen/CgenTemplate.java | 35 +-
.../apache/cayenne/gen/ClassGenerationAction.java | 165 +++---
.../java/org/apache/cayenne/gen/TemplateType.java | 48 +-
.../apache/cayenne/gen/xml/CgenConfigHandler.java | 111 ++--
.../apache/cayenne/gen/xml/CgenSaverDelegate.java | 9 -
.../apache/cayenne/gen/TemplateLocationTest.java | 6 +-
.../java/org/apache/cayenne/tools/CgenTask.java | 54 +-
.../org/apache/cayenne/tools/CgenTaskTest.java | 14 +-
.../upgrade/handlers/UpgradeHandler_V11.java | 118 +++-
.../upgrade/handlers/UpgradeHandler_V11Test.java | 31 +-
.../project/upgrade/handlers/test-map-v10.map.xml | 8 +-
.../project/upgrade/handlers/velocityTemplate.txt | 1 +
.../apache/cayenne/tools/CayenneGeneratorMojo.java | 612 +++++++++++----------
.../cayenne/tools/CayenneGeneratorMojoTest.java | 52 ++
.../{pom.xml => pomTransferPluginToCgen.xml} | 14 +-
.../resources/cgen/project-to-test/testTemplate.vm | 3 +-
modeler/cayenne-modeler/pom.xml | 6 +
.../org/apache/cayenne/modeler/Application.java | 6 -
.../cayenne/modeler/CodeTemplateManager.java | 153 ------
.../modeler/dialog/cgen/TemplateDialog.java | 88 ---
.../modeler/dialog/cgen/TemplateDialogView.java | 136 -----
.../pref/CreateTemplateFromDefaultController.java | 241 --------
.../modeler/dialog/pref/PreferenceDialog.java | 11 +-
.../modeler/dialog/pref/TemplateCreator.java | 166 ------
.../modeler/dialog/pref/TemplateCreatorView.java | 90 ---
.../modeler/dialog/pref/TemplatePreferences.java | 186 -------
.../dialog/pref/TemplatePreferencesView.java | 91 ---
.../dialog/templateeditor/FileTemplateSaver.java | 60 --
.../templateeditor/TemplateEditorController.java | 194 -------
.../dialog/templateeditor/TemplateLoader.java | 58 --
.../modeler/editor/cgen/ClassesTabController.java | 3 +
.../editor/cgen/CodeGeneratorController.java | 12 +
.../editor/cgen/StandardModeController.java | 276 ++++------
.../modeler/editor/cgen/StandardModePanel.java | 199 +++----
.../cgen/templateeditor/ArtefactsConfigurator.java | 31 +-
.../DataMapArtefactsConfigurator.java | 54 +-
.../cgen/templateeditor/EditorTemplateLoader.java | 89 +++
.../cgen/templateeditor/EditorTemplateSaver.java | 104 ++++
.../EmbeddableArtefactsConfigurator.java | 54 +-
.../EntityArtefactsConfigurator.java} | 105 ++--
.../templateeditor/FindAndReplaceController.java | 16 +-
.../cgen}/templateeditor/FindAndReplaceView.java | 2 +-
.../cgen}/templateeditor/FindController.java | 18 +-
.../cgen}/templateeditor/FindView.java | 2 +-
.../templateeditor/PreviewActionConfigurator.java | 112 ++++
.../PreviewClassGenerationFactory.java | 4 +-
.../templateeditor/PreviewGenerationAction.java | 14 +-
.../templateeditor/TemplateEditorController.java | 275 +++++++++
.../cgen}/templateeditor/TemplateEditorView.java | 35 +-
.../cgen}/templateeditor/VelocityTokenMaker.java | 7 +-
.../templateeditor/ArtifactsConfiguratorTest.java | 112 ++++
.../templateeditor/EditorTemplateLoaderTest.java | 86 +++
.../templateeditor/EditorTemplateSaverTest.java | 67 +++
.../PreviewActionConfiguratorTest.java | 109 ++++
57 files changed, 2271 insertions(+), 2474 deletions(-)
copy
cayenne-server/src/test/java/org/apache/cayenne/testdo/relationships/ReflexiveAndToOne.java
=> cayenne-cgen/src/main/java/org/apache/cayenne/gen/CgenTemplate.java (62%)
create mode 100644
cayenne-project/src/test/resources/org/apache/cayenne/project/upgrade/handlers/velocityTemplate.txt
copy
maven-plugins/cayenne-maven-plugin/src/test/resources/cgen/project-to-test/{pom.xml
=> pomTransferPluginToCgen.xml} (70%)
copy cayenne-server/src/test/resources/ddl/db2/drop-update-sp.sql =>
maven-plugins/cayenne-maven-plugin/src/test/resources/cgen/project-to-test/testTemplate.vm
(96%)
delete mode 100644
modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/CodeTemplateManager.java
delete mode 100644
modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/cgen/TemplateDialog.java
delete mode 100644
modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/cgen/TemplateDialogView.java
delete mode 100644
modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/pref/CreateTemplateFromDefaultController.java
delete mode 100644
modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/pref/TemplateCreator.java
delete mode 100644
modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/pref/TemplateCreatorView.java
delete mode 100644
modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/pref/TemplatePreferences.java
delete mode 100644
modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/pref/TemplatePreferencesView.java
delete mode 100644
modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/templateeditor/FileTemplateSaver.java
delete mode 100644
modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/templateeditor/TemplateEditorController.java
delete mode 100644
modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/templateeditor/TemplateLoader.java
copy
cayenne-server/src/main/java/org/apache/cayenne/template/parser/ExpressionNode.java
=>
modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/cgen/templateeditor/ArtefactsConfigurator.java
(66%)
copy
cayenne-server/src/test/java/org/apache/cayenne/query/MockQueryRouter.java =>
modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/cgen/templateeditor/DataMapArtefactsConfigurator.java
(50%)
create mode 100644
modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/cgen/templateeditor/EditorTemplateLoader.java
create mode 100644
modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/cgen/templateeditor/EditorTemplateSaver.java
copy
cayenne-server/src/test/java/org/apache/cayenne/query/MockQueryRouter.java =>
modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/cgen/templateeditor/EmbeddableArtefactsConfigurator.java
(50%)
copy
modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/{graph/ObjEntityCellMetadata.java
=> editor/cgen/templateeditor/EntityArtefactsConfigurator.java} (52%)
rename
modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/{dialog =>
editor/cgen}/templateeditor/FindAndReplaceController.java (90%)
rename
modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/{dialog =>
editor/cgen}/templateeditor/FindAndReplaceView.java (97%)
rename
modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/{dialog =>
editor/cgen}/templateeditor/FindController.java (88%)
rename
modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/{dialog =>
editor/cgen}/templateeditor/FindView.java (98%)
create mode 100644
modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/cgen/templateeditor/PreviewActionConfigurator.java
rename
modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/{dialog =>
editor/cgen}/templateeditor/PreviewClassGenerationFactory.java (93%)
rename
modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/{dialog =>
editor/cgen}/templateeditor/PreviewGenerationAction.java (74%)
create mode 100644
modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/cgen/templateeditor/TemplateEditorController.java
rename
modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/{dialog =>
editor/cgen}/templateeditor/TemplateEditorView.java (82%)
rename
modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/{dialog =>
editor/cgen}/templateeditor/VelocityTokenMaker.java (99%)
create mode 100644
modeler/cayenne-modeler/src/test/java/org/apache/cayenne/modeler/editor/templateeditor/ArtifactsConfiguratorTest.java
create mode 100644
modeler/cayenne-modeler/src/test/java/org/apache/cayenne/modeler/editor/templateeditor/EditorTemplateLoaderTest.java
create mode 100644
modeler/cayenne-modeler/src/test/java/org/apache/cayenne/modeler/editor/templateeditor/EditorTemplateSaverTest.java
create mode 100644
modeler/cayenne-modeler/src/test/java/org/apache/cayenne/modeler/editor/templateeditor/PreviewActionConfiguratorTest.java
