Repository: cayenne Updated Branches: refs/heads/master 47222e41c -> 78efdc3f9
Start generic version of the Modeler from Maven plugin Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/c3648c17 Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/c3648c17 Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/c3648c17 Branch: refs/heads/master Commit: c3648c17627b5592ebb43840c539c4f122bba87a Parents: 47222e4 Author: Nikita Timofeev <[email protected]> Authored: Wed May 17 16:29:51 2017 +0300 Committer: Nikita Timofeev <[email protected]> Committed: Wed May 17 16:29:51 2017 +0300 ---------------------------------------------------------------------- maven-plugins/cayenne-modeler-maven-plugin/pom.xml | 6 ++++++ .../main/java/org/apache/cayenne/tools/CayenneModelerMojo.java | 6 +++--- 2 files changed, 9 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cayenne/blob/c3648c17/maven-plugins/cayenne-modeler-maven-plugin/pom.xml ---------------------------------------------------------------------- diff --git a/maven-plugins/cayenne-modeler-maven-plugin/pom.xml b/maven-plugins/cayenne-modeler-maven-plugin/pom.xml index 22459dd..e9f78f7 100644 --- a/maven-plugins/cayenne-modeler-maven-plugin/pom.xml +++ b/maven-plugins/cayenne-modeler-maven-plugin/pom.xml @@ -63,6 +63,12 @@ </exclusions> </dependency> + <dependency> + <groupId>org.apache.cayenne.modeler</groupId> + <artifactId>cayenne-modeler-generic-ext</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> <groupId>org.apache.cayenne</groupId> <artifactId>cayenne-server</artifactId> http://git-wip-us.apache.org/repos/asf/cayenne/blob/c3648c17/maven-plugins/cayenne-modeler-maven-plugin/src/main/java/org/apache/cayenne/tools/CayenneModelerMojo.java ---------------------------------------------------------------------- diff --git a/maven-plugins/cayenne-modeler-maven-plugin/src/main/java/org/apache/cayenne/tools/CayenneModelerMojo.java b/maven-plugins/cayenne-modeler-maven-plugin/src/main/java/org/apache/cayenne/tools/CayenneModelerMojo.java index 75e08b8..847f20b 100644 --- a/maven-plugins/cayenne-modeler-maven-plugin/src/main/java/org/apache/cayenne/tools/CayenneModelerMojo.java +++ b/maven-plugins/cayenne-modeler-maven-plugin/src/main/java/org/apache/cayenne/tools/CayenneModelerMojo.java @@ -21,7 +21,7 @@ package org.apache.cayenne.tools; import java.io.File; -import org.apache.cayenne.modeler.Main; +import org.apache.cayenne.modeler.generic.GenericMain; import org.apache.maven.plugin.AbstractMojo; import org.apache.maven.plugin.MojoExecutionException; import org.apache.maven.plugin.MojoFailureException; @@ -70,9 +70,9 @@ public class CayenneModelerMojo extends AbstractMojo { // start the modeler with the provided model file, if it exists. File f = lookupModelFile(); if (f != null && f.exists() && !f.isDirectory()) { - Main.main(new String[] { f.getAbsolutePath() }); + GenericMain.main(new String[] { f.getAbsolutePath() }); } else { - Main.main(new String[] {}); + GenericMain.main(new String[] {}); } // Block until the modeler finishes executing.
