You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by nt...@apache.org on 2017/02/13 12:30:02 UTC
cayenne git commit: CAY-1980 rename "maven-cayenne-modeler-plugin" to
"cayenne-modeler-maven-plugin"
Repository: cayenne
Updated Branches:
refs/heads/master fd8234d35 -> 86d306474
CAY-1980 rename "maven-cayenne-modeler-plugin" to "cayenne-modeler-maven-plugin"
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/86d30647
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/86d30647
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/86d30647
Branch: refs/heads/master
Commit: 86d306474c39346f75b297ada8b0e01d252c89f2
Parents: fd8234d
Author: Nikita Timofeev <st...@gmail.com>
Authored: Mon Feb 13 15:29:24 2017 +0300
Committer: Nikita Timofeev <st...@gmail.com>
Committed: Mon Feb 13 15:29:24 2017 +0300
----------------------------------------------------------------------
docs/doc/src/main/resources/UPGRADE.txt | 2 +
.../cayenne-modeler-maven-plugin/pom.xml | 111 +++++++++++++++++++
.../cayenne/tools/CayenneModelerMojo.java | 85 ++++++++++++++
.../maven-cayenne-modeler-plugin/pom.xml | 111 -------------------
.../cayenne/tools/CayenneModelerMojo.java | 85 --------------
maven-plugins/pom.xml | 2 +-
6 files changed, 199 insertions(+), 197 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cayenne/blob/86d30647/docs/doc/src/main/resources/UPGRADE.txt
----------------------------------------------------------------------
diff --git a/docs/doc/src/main/resources/UPGRADE.txt b/docs/doc/src/main/resources/UPGRADE.txt
index 95790aa..0607064 100644
--- a/docs/doc/src/main/resources/UPGRADE.txt
+++ b/docs/doc/src/main/resources/UPGRADE.txt
@@ -6,6 +6,8 @@ IMPORTANT: be sure to read all notes for the intermediate releases between your
-------------------------------------------------------------------------------
UPGRADING TO 4.0.M5
+* Per CAY-1980 "maven-cayenne-modeler-plugin" renamed to "cayenne-modeler-maven-plugin"
+
* Per CAY-2225 CacheInvalidationFilter has been changed to support custom invalidation rules,
in addition to the rule based on @CacheGroups annotation.
If you have used it previously, you should change its binding to runtime from direct binding in
http://git-wip-us.apache.org/repos/asf/cayenne/blob/86d30647/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
new file mode 100644
index 0000000..adb8064
--- /dev/null
+++ b/maven-plugins/cayenne-modeler-maven-plugin/pom.xml
@@ -0,0 +1,111 @@
+<?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
+
+ http://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">
+
+ <parent>
+ <artifactId>cayenne-maven-plugins-parent</artifactId>
+ <groupId>org.apache.cayenne.plugins</groupId>
+ <version>4.0.M5-SNAPSHOT</version>
+ </parent>
+
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>cayenne-modeler-maven-plugin</artifactId>
+ <packaging>maven-plugin</packaging>
+ <name>cayenne-modeler-maven-plugin: Cayenne Modeler Maven Plugin</name>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-plugin-api</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-artifact</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-project</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.maven.plugin-tools</groupId>
+ <artifactId>maven-plugin-tools-api</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.cayenne.modeler</groupId>
+ <artifactId>cayenne-modeler</artifactId>
+ <version>${project.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>foundrylogic.vpp</groupId>
+ <artifactId>vpp</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.cayenne</groupId>
+ <artifactId>cayenne-server</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-plugin-plugin</artifactId>
+ <configuration>
+ <goalPrefix>cayenne-modeler</goalPrefix>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <profiles>
+ <profile>
+ <id>code-quality</id>
+
+ <activation>
+ <property>
+ <name>!fast-and-dirty</name>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ <!--<configuration>
+ <suppressionsLocation>${project.basedir}/cayenne-checkstyle-suppression.xml</suppressionsLocation>
+ </configuration>-->
+ </plugin>
+ <plugin>
+ <artifactId>maven-pmd-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+
+</project>
+
http://git-wip-us.apache.org/repos/asf/cayenne/blob/86d30647/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
new file mode 100644
index 0000000..75e08b8
--- /dev/null
+++ b/maven-plugins/cayenne-modeler-maven-plugin/src/main/java/org/apache/cayenne/tools/CayenneModelerMojo.java
@@ -0,0 +1,85 @@
+/*****************************************************************
+ * 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
+ *
+ * http://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.
+ ****************************************************************/
+
+package org.apache.cayenne.tools;
+
+import java.io.File;
+
+import org.apache.cayenne.modeler.Main;
+import org.apache.maven.plugin.AbstractMojo;
+import org.apache.maven.plugin.MojoExecutionException;
+import org.apache.maven.plugin.MojoFailureException;
+import org.apache.maven.project.MavenProject;
+
+/**
+ * Maven mojo to start up the Cayenne modeler from the command-line.
+ *
+ * @since 3.0
+ *
+ * @prefix cayenne-modeler
+ * @goal run
+ */
+public class CayenneModelerMojo extends AbstractMojo {
+
+ /**
+ * Name of the model file to open.
+ *
+ * @parameter expression="${modeler.modelFile}
+ */
+ private File modelFile;
+
+ /**
+ * Project instance.
+ *
+ * @parameter default-value="${project}"
+ * @required
+ * @readonly
+ */
+ private MavenProject project;
+
+ private File lookupModelFile() {
+ if (modelFile != null && modelFile.isFile()) {
+ return modelFile;
+ }
+
+ return null;
+ }
+
+ public void execute() throws MojoExecutionException, MojoFailureException {
+ // setup the system property to tell the modeler where to generate the
+ // java source files.
+ System.setProperty("cayenne.cgen.destdir", project.getBuild()
+ .getSourceDirectory());
+
+ // 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() });
+ } else {
+ Main.main(new String[] {});
+ }
+
+ // Block until the modeler finishes executing.
+ try {
+ Thread.currentThread().join();
+ } catch (InterruptedException e) {
+ e.printStackTrace();
+ }
+ }
+}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/86d30647/maven-plugins/maven-cayenne-modeler-plugin/pom.xml
----------------------------------------------------------------------
diff --git a/maven-plugins/maven-cayenne-modeler-plugin/pom.xml b/maven-plugins/maven-cayenne-modeler-plugin/pom.xml
deleted file mode 100644
index 8c3b4ab..0000000
--- a/maven-plugins/maven-cayenne-modeler-plugin/pom.xml
+++ /dev/null
@@ -1,111 +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
-
- http://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">
-
- <parent>
- <artifactId>cayenne-maven-plugins-parent</artifactId>
- <groupId>org.apache.cayenne.plugins</groupId>
- <version>4.0.M5-SNAPSHOT</version>
- </parent>
-
- <modelVersion>4.0.0</modelVersion>
- <artifactId>maven-cayenne-modeler-plugin</artifactId>
- <packaging>maven-plugin</packaging>
- <name>maven-cayenne-modeler-plugin: Cayenne Modeler Maven Plugin</name>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-plugin-api</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-artifact</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-project</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.maven.plugin-tools</groupId>
- <artifactId>maven-plugin-tools-api</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.cayenne.modeler</groupId>
- <artifactId>cayenne-modeler</artifactId>
- <version>${project.version}</version>
- <exclusions>
- <exclusion>
- <groupId>foundrylogic.vpp</groupId>
- <artifactId>vpp</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>org.apache.cayenne</groupId>
- <artifactId>cayenne-server</artifactId>
- <version>${project.version}</version>
- </dependency>
-
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-plugin-plugin</artifactId>
- <configuration>
- <goalPrefix>cayenne-modeler</goalPrefix>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
- <profiles>
- <profile>
- <id>code-quality</id>
-
- <activation>
- <property>
- <name>!fast-and-dirty</name>
- </property>
- </activation>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-checkstyle-plugin</artifactId>
- <!--<configuration>
- <suppressionsLocation>${project.basedir}/cayenne-checkstyle-suppression.xml</suppressionsLocation>
- </configuration>-->
- </plugin>
- <plugin>
- <artifactId>maven-pmd-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
-
-</project>
-
http://git-wip-us.apache.org/repos/asf/cayenne/blob/86d30647/maven-plugins/maven-cayenne-modeler-plugin/src/main/java/org/apache/cayenne/tools/CayenneModelerMojo.java
----------------------------------------------------------------------
diff --git a/maven-plugins/maven-cayenne-modeler-plugin/src/main/java/org/apache/cayenne/tools/CayenneModelerMojo.java b/maven-plugins/maven-cayenne-modeler-plugin/src/main/java/org/apache/cayenne/tools/CayenneModelerMojo.java
deleted file mode 100644
index 75e08b8..0000000
--- a/maven-plugins/maven-cayenne-modeler-plugin/src/main/java/org/apache/cayenne/tools/CayenneModelerMojo.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/*****************************************************************
- * 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
- *
- * http://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.
- ****************************************************************/
-
-package org.apache.cayenne.tools;
-
-import java.io.File;
-
-import org.apache.cayenne.modeler.Main;
-import org.apache.maven.plugin.AbstractMojo;
-import org.apache.maven.plugin.MojoExecutionException;
-import org.apache.maven.plugin.MojoFailureException;
-import org.apache.maven.project.MavenProject;
-
-/**
- * Maven mojo to start up the Cayenne modeler from the command-line.
- *
- * @since 3.0
- *
- * @prefix cayenne-modeler
- * @goal run
- */
-public class CayenneModelerMojo extends AbstractMojo {
-
- /**
- * Name of the model file to open.
- *
- * @parameter expression="${modeler.modelFile}
- */
- private File modelFile;
-
- /**
- * Project instance.
- *
- * @parameter default-value="${project}"
- * @required
- * @readonly
- */
- private MavenProject project;
-
- private File lookupModelFile() {
- if (modelFile != null && modelFile.isFile()) {
- return modelFile;
- }
-
- return null;
- }
-
- public void execute() throws MojoExecutionException, MojoFailureException {
- // setup the system property to tell the modeler where to generate the
- // java source files.
- System.setProperty("cayenne.cgen.destdir", project.getBuild()
- .getSourceDirectory());
-
- // 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() });
- } else {
- Main.main(new String[] {});
- }
-
- // Block until the modeler finishes executing.
- try {
- Thread.currentThread().join();
- } catch (InterruptedException e) {
- e.printStackTrace();
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/86d30647/maven-plugins/pom.xml
----------------------------------------------------------------------
diff --git a/maven-plugins/pom.xml b/maven-plugins/pom.xml
index 813ef93..dddbb18 100644
--- a/maven-plugins/pom.xml
+++ b/maven-plugins/pom.xml
@@ -24,7 +24,7 @@
<modules>
<module>cayenne-maven-plugin</module>
<module>maven-cayenne-plugin</module>
- <module>maven-cayenne-modeler-plugin</module>
+ <module>cayenne-modeler-maven-plugin</module>
</modules>
<dependencyManagement>