Author: aadamchik
Date: Sat Nov 16 08:27:35 2013
New Revision: 1542480

URL: http://svn.apache.org/r1542480
Log:
CAY-1883 - Clean up Cayenne maven structure - get rid of aggregate modules

* moving maven-cayenne-modeler-plugin to plugins folder to align with its Maven 
group

Added:
    cayenne/main/trunk/plugins/maven-cayenne-modeler-plugin/
    cayenne/main/trunk/plugins/maven-cayenne-modeler-plugin/pom.xml
      - copied, changed from r1542479, 
cayenne/main/trunk/modeler/maven-cayenne-modeler-plugin/pom.xml
    cayenne/main/trunk/plugins/maven-cayenne-modeler-plugin/src/
    cayenne/main/trunk/plugins/maven-cayenne-modeler-plugin/src/main/
    cayenne/main/trunk/plugins/maven-cayenne-modeler-plugin/src/main/java/
    cayenne/main/trunk/plugins/maven-cayenne-modeler-plugin/src/main/java/org/
    
cayenne/main/trunk/plugins/maven-cayenne-modeler-plugin/src/main/java/org/apache/
    
cayenne/main/trunk/plugins/maven-cayenne-modeler-plugin/src/main/java/org/apache/cayenne/
    
cayenne/main/trunk/plugins/maven-cayenne-modeler-plugin/src/main/java/org/apache/cayenne/tools/
    
cayenne/main/trunk/plugins/maven-cayenne-modeler-plugin/src/main/java/org/apache/cayenne/tools/CayenneModelerMojo.java
      - copied, changed from r1542479, 
cayenne/main/trunk/modeler/maven-cayenne-modeler-plugin/src/main/java/org/apache/cayenne/tools/CayenneModelerMojo.java
Removed:
    cayenne/main/trunk/modeler/maven-cayenne-modeler-plugin/
Modified:
    cayenne/main/trunk/modeler/pom.xml
    cayenne/main/trunk/plugins/pom.xml

Modified: cayenne/main/trunk/modeler/pom.xml
URL: 
http://svn.apache.org/viewvc/cayenne/main/trunk/modeler/pom.xml?rev=1542480&r1=1542479&r2=1542480&view=diff
==============================================================================
--- cayenne/main/trunk/modeler/pom.xml (original)
+++ cayenne/main/trunk/modeler/pom.xml Sat Nov 16 08:27:35 2013
@@ -35,7 +35,6 @@
        <modules>
                <module>cayenne-wocompat</module>
                <module>cayenne-modeler</module>
-               <module>maven-cayenne-modeler-plugin</module>
        </modules>
 
        <build>

Copied: cayenne/main/trunk/plugins/maven-cayenne-modeler-plugin/pom.xml (from 
r1542479, cayenne/main/trunk/modeler/maven-cayenne-modeler-plugin/pom.xml)
URL: 
http://svn.apache.org/viewvc/cayenne/main/trunk/plugins/maven-cayenne-modeler-plugin/pom.xml?p2=cayenne/main/trunk/plugins/maven-cayenne-modeler-plugin/pom.xml&p1=cayenne/main/trunk/modeler/maven-cayenne-modeler-plugin/pom.xml&r1=1542479&r2=1542480&rev=1542480&view=diff
==============================================================================
--- cayenne/main/trunk/modeler/maven-cayenne-modeler-plugin/pom.xml (original)
+++ cayenne/main/trunk/plugins/maven-cayenne-modeler-plugin/pom.xml Sat Nov 16 
08:27:35 2013
@@ -21,15 +21,12 @@
 <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-parent</artifactId>
-               <groupId>org.apache.cayenne</groupId>
+               <artifactId>cayenne-plugins-parent</artifactId>
+               <groupId>org.apache.cayenne.plugins</groupId>
                <version>3.2M2-SNAPSHOT</version>
-               <relativePath>../../pom.xml</relativePath>
        </parent>
 
        <modelVersion>4.0.0</modelVersion>
-
-       <groupId>org.apache.cayenne.plugins</groupId>
        <artifactId>maven-cayenne-modeler-plugin</artifactId>
        <packaging>maven-plugin</packaging>
        <name>Cayenne Modeler Maven Plugin</name>

Copied: 
cayenne/main/trunk/plugins/maven-cayenne-modeler-plugin/src/main/java/org/apache/cayenne/tools/CayenneModelerMojo.java
 (from r1542479, 
cayenne/main/trunk/modeler/maven-cayenne-modeler-plugin/src/main/java/org/apache/cayenne/tools/CayenneModelerMojo.java)
URL: 
http://svn.apache.org/viewvc/cayenne/main/trunk/plugins/maven-cayenne-modeler-plugin/src/main/java/org/apache/cayenne/tools/CayenneModelerMojo.java?p2=cayenne/main/trunk/plugins/maven-cayenne-modeler-plugin/src/main/java/org/apache/cayenne/tools/CayenneModelerMojo.java&p1=cayenne/main/trunk/modeler/maven-cayenne-modeler-plugin/src/main/java/org/apache/cayenne/tools/CayenneModelerMojo.java&r1=1542479&r2=1542480&rev=1542480&view=diff
==============================================================================
    (empty)

Modified: cayenne/main/trunk/plugins/pom.xml
URL: 
http://svn.apache.org/viewvc/cayenne/main/trunk/plugins/pom.xml?rev=1542480&r1=1542479&r2=1542480&view=diff
==============================================================================
--- cayenne/main/trunk/plugins/pom.xml (original)
+++ cayenne/main/trunk/plugins/pom.xml Sat Nov 16 08:27:35 2013
@@ -31,5 +31,6 @@
 
        <modules>
                <module>maven-cayenne-plugin</module>
+               <module>maven-cayenne-modeler-plugin</module>
        </modules>
 </project>


Reply via email to