Author: aadamchik
Date: Thu Nov 6 07:07:27 2008
New Revision: 711871
URL: http://svn.apache.org/viewvc?rev=711871&view=rev
Log:
CAY-1133 Split Maven cayenne:modeler goal into a separate plugin from cgen and
others
a new project for the Modeler mojo
cleaning up pom dependencies
Added:
cayenne/main/trunk/framework/maven-cayenne-modeler-plugin/
cayenne/main/trunk/framework/maven-cayenne-modeler-plugin/.classpath
cayenne/main/trunk/framework/maven-cayenne-modeler-plugin/.project
- copied, changed from r709931,
cayenne/main/trunk/framework/maven-cayenne-plugin/.project
cayenne/main/trunk/framework/maven-cayenne-modeler-plugin/pom.xml
- copied, changed from r709931,
cayenne/main/trunk/framework/maven-cayenne-plugin/pom.xml
cayenne/main/trunk/framework/maven-cayenne-modeler-plugin/src/
cayenne/main/trunk/framework/maven-cayenne-modeler-plugin/src/main/
cayenne/main/trunk/framework/maven-cayenne-modeler-plugin/src/main/java/
cayenne/main/trunk/framework/maven-cayenne-modeler-plugin/src/main/java/org/
cayenne/main/trunk/framework/maven-cayenne-modeler-plugin/src/main/java/org/apache/
cayenne/main/trunk/framework/maven-cayenne-modeler-plugin/src/main/java/org/apache/cayenne/
cayenne/main/trunk/framework/maven-cayenne-modeler-plugin/src/main/java/org/apache/cayenne/tools/
cayenne/main/trunk/framework/maven-cayenne-modeler-plugin/src/main/java/org/apache/cayenne/tools/CayenneModelerMojo.java
- copied, changed from r709931,
cayenne/main/trunk/framework/maven-cayenne-plugin/src/main/java/org/apache/cayenne/tools/CayenneModelerMojo.java
Removed:
cayenne/main/trunk/framework/maven-cayenne-plugin/src/main/java/org/apache/cayenne/tools/CayenneModelerMojo.java
Modified:
cayenne/main/trunk/framework/maven-cayenne-plugin/.project
cayenne/main/trunk/framework/maven-cayenne-plugin/pom.xml
cayenne/main/trunk/framework/pom.xml
Added: cayenne/main/trunk/framework/maven-cayenne-modeler-plugin/.classpath
URL:
http://svn.apache.org/viewvc/cayenne/main/trunk/framework/maven-cayenne-modeler-plugin/.classpath?rev=711871&view=auto
==============================================================================
--- cayenne/main/trunk/framework/maven-cayenne-modeler-plugin/.classpath (added)
+++ cayenne/main/trunk/framework/maven-cayenne-modeler-plugin/.classpath Thu
Nov 6 07:07:27 2008
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" path="src/main/java"/>
+ <classpathentry kind="con"
path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="con"
path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
+ <classpathentry kind="output" path="target/classes"/>
+</classpath>
Copied: cayenne/main/trunk/framework/maven-cayenne-modeler-plugin/.project
(from r709931, cayenne/main/trunk/framework/maven-cayenne-plugin/.project)
URL:
http://svn.apache.org/viewvc/cayenne/main/trunk/framework/maven-cayenne-modeler-plugin/.project?p2=cayenne/main/trunk/framework/maven-cayenne-modeler-plugin/.project&p1=cayenne/main/trunk/framework/maven-cayenne-plugin/.project&r1=709931&r2=711871&rev=711871&view=diff
==============================================================================
--- cayenne/main/trunk/framework/maven-cayenne-plugin/.project (original)
+++ cayenne/main/trunk/framework/maven-cayenne-modeler-plugin/.project Thu Nov
6 07:07:27 2008
@@ -1,8 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>maven-cayenne-plugin</name>
- <comment>Apache Cayenne is a powerful, full-featured Java Object
- Relational Mapping framework currently in incubation.</comment>
+ <name>maven-cayenne-modeler-plugin</name>
+ <comment></comment>
<projects>
</projects>
<buildSpec>
Copied: cayenne/main/trunk/framework/maven-cayenne-modeler-plugin/pom.xml (from
r709931, cayenne/main/trunk/framework/maven-cayenne-plugin/pom.xml)
URL:
http://svn.apache.org/viewvc/cayenne/main/trunk/framework/maven-cayenne-modeler-plugin/pom.xml?p2=cayenne/main/trunk/framework/maven-cayenne-modeler-plugin/pom.xml&p1=cayenne/main/trunk/framework/maven-cayenne-plugin/pom.xml&r1=709931&r2=711871&rev=711871&view=diff
==============================================================================
--- cayenne/main/trunk/framework/maven-cayenne-plugin/pom.xml (original)
+++ cayenne/main/trunk/framework/maven-cayenne-modeler-plugin/pom.xml Thu Nov
6 07:07:27 2008
@@ -31,9 +31,9 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.cayenne.plugins</groupId>
- <artifactId>maven-cayenne-plugin</artifactId>
+ <artifactId>maven-cayenne-modeler-plugin</artifactId>
<packaging>maven-plugin</packaging>
- <name>Cayenne Maven Plugin</name>
+ <name>Cayenne Modeler Maven Plugin</name>
<dependencies>
<dependency>
@@ -82,24 +82,6 @@
<version>${version}</version>
</dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>foundrylogic.vpp</groupId>
- <artifactId>vpp</artifactId>
- <scope>compile</scope>
- </dependency>
-
- <!-- TODO: (KJM 10/03/2006) This should be a transitive
dependency of vpp. -->
- <dependency>
- <groupId>ant</groupId>
- <artifactId>ant</artifactId>
- <scope>compile</scope>
- </dependency>
</dependencies>
<build>
<plugins>
Copied:
cayenne/main/trunk/framework/maven-cayenne-modeler-plugin/src/main/java/org/apache/cayenne/tools/CayenneModelerMojo.java
(from r709931,
cayenne/main/trunk/framework/maven-cayenne-plugin/src/main/java/org/apache/cayenne/tools/CayenneModelerMojo.java)
URL:
http://svn.apache.org/viewvc/cayenne/main/trunk/framework/maven-cayenne-modeler-plugin/src/main/java/org/apache/cayenne/tools/CayenneModelerMojo.java?p2=cayenne/main/trunk/framework/maven-cayenne-modeler-plugin/src/main/java/org/apache/cayenne/tools/CayenneModelerMojo.java&p1=cayenne/main/trunk/framework/maven-cayenne-plugin/src/main/java/org/apache/cayenne/tools/CayenneModelerMojo.java&r1=709931&r2=711871&rev=711871&view=diff
==============================================================================
---
cayenne/main/trunk/framework/maven-cayenne-plugin/src/main/java/org/apache/cayenne/tools/CayenneModelerMojo.java
(original)
+++
cayenne/main/trunk/framework/maven-cayenne-modeler-plugin/src/main/java/org/apache/cayenne/tools/CayenneModelerMojo.java
Thu Nov 6 07:07:27 2008
@@ -19,34 +19,31 @@
package org.apache.cayenne.tools;
+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.cayenne.modeler.Main;
-
-import java.io.IOException;
/**
* Maven mojo to start up the Cayenne modeler from the command-line.
*
* @author Kevin Menard
* @since 3.0
- *
+ *
* @prefix cayenne
* @goal modeler
*/
public class CayenneModelerMojo extends AbstractMojo {
- public void execute() throws MojoExecutionException, MojoFailureException {
+ public void execute() throws MojoExecutionException,
MojoFailureException {
- // Start up the modeler.
- Main.main(new String[]{});
+ // Start up the modeler.
+ Main.main(new String[] {});
- // Block until the modeler finishes executing.
- try {
- Thread.currentThread().join();
- }
- catch (InterruptedException e) {
- e.printStackTrace();
- }
- }
+ // Block until the modeler finishes executing.
+ try {
+ Thread.currentThread().join();
+ } catch (InterruptedException e) {
+ e.printStackTrace();
+ }
+ }
}
Modified: cayenne/main/trunk/framework/maven-cayenne-plugin/.project
URL:
http://svn.apache.org/viewvc/cayenne/main/trunk/framework/maven-cayenne-plugin/.project?rev=711871&r1=711870&r2=711871&view=diff
==============================================================================
--- cayenne/main/trunk/framework/maven-cayenne-plugin/.project (original)
+++ cayenne/main/trunk/framework/maven-cayenne-plugin/.project Thu Nov 6
07:07:27 2008
@@ -1,8 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>maven-cayenne-plugin</name>
- <comment>Apache Cayenne is a powerful, full-featured Java Object
- Relational Mapping framework currently in incubation.</comment>
+ <comment></comment>
<projects>
</projects>
<buildSpec>
Modified: cayenne/main/trunk/framework/maven-cayenne-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/cayenne/main/trunk/framework/maven-cayenne-plugin/pom.xml?rev=711871&r1=711870&r2=711871&view=diff
==============================================================================
--- cayenne/main/trunk/framework/maven-cayenne-plugin/pom.xml (original)
+++ cayenne/main/trunk/framework/maven-cayenne-plugin/pom.xml Thu Nov 6
07:07:27 2008
@@ -72,12 +72,6 @@
<dependency>
<groupId>org.apache.cayenne</groupId>
- <artifactId>cayenne-modeler</artifactId>
- <version>${version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.cayenne</groupId>
<artifactId>cayenne-server</artifactId>
<version>${version}</version>
</dependency>
@@ -94,7 +88,6 @@
<scope>compile</scope>
</dependency>
- <!-- TODO: (KJM 10/03/2006) This should be a transitive
dependency of vpp. -->
<dependency>
<groupId>ant</groupId>
<artifactId>ant</artifactId>
Modified: cayenne/main/trunk/framework/pom.xml
URL:
http://svn.apache.org/viewvc/cayenne/main/trunk/framework/pom.xml?rev=711871&r1=711870&r2=711871&view=diff
==============================================================================
--- cayenne/main/trunk/framework/pom.xml (original)
+++ cayenne/main/trunk/framework/pom.xml Thu Nov 6 07:07:27 2008
@@ -44,6 +44,7 @@
<module>cayenne-client</module>
<module>cayenne-modeler</module>
<module>maven-cayenne-plugin</module>
+ <module>maven-cayenne-modeler-plugin</module>
</modules>
</profile>
<profile>
@@ -61,6 +62,7 @@
<module>cayenne-client</module>
<module>cayenne-modeler</module>
<module>maven-cayenne-plugin</module>
+ <module>maven-cayenne-modeler-plugin</module>
</modules>
</profile>
<profile>
@@ -70,4 +72,4 @@
</modules>
</profile>
</profiles>
-</project>
\ No newline at end of file
+</project>
