cayenne-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aadamc...@apache.org
Subject svn commit: r1542479 - in /cayenne/main/trunk: ./ framework/ framework/maven-cayenne-plugin/ plugins/ plugins/maven-cayenne-plugin/ plugins/maven-cayenne-plugin/src/ plugins/maven-cayenne-plugin/src/main/ plugins/maven-cayenne-plugin/src/main/java/ plu...
Date Sat, 16 Nov 2013 08:26:34 GMT
Author: aadamchik
Date: Sat Nov 16 08:26:33 2013
New Revision: 1542479

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

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

Added:
    cayenne/main/trunk/plugins/
    cayenne/main/trunk/plugins/maven-cayenne-plugin/
    cayenne/main/trunk/plugins/maven-cayenne-plugin/pom.xml
      - copied, changed from r1542478, cayenne/main/trunk/framework/maven-cayenne-plugin/pom.xml
    cayenne/main/trunk/plugins/maven-cayenne-plugin/src/
    cayenne/main/trunk/plugins/maven-cayenne-plugin/src/main/
    cayenne/main/trunk/plugins/maven-cayenne-plugin/src/main/java/
    cayenne/main/trunk/plugins/maven-cayenne-plugin/src/main/java/org/
    cayenne/main/trunk/plugins/maven-cayenne-plugin/src/main/java/org/apache/
    cayenne/main/trunk/plugins/maven-cayenne-plugin/src/main/java/org/apache/cayenne/
    cayenne/main/trunk/plugins/maven-cayenne-plugin/src/main/java/org/apache/cayenne/tools/
    cayenne/main/trunk/plugins/maven-cayenne-plugin/src/main/java/org/apache/cayenne/tools/CayenneGeneratorMojo.java
      - copied, changed from r1542478, cayenne/main/trunk/framework/maven-cayenne-plugin/src/main/java/org/apache/cayenne/tools/CayenneGeneratorMojo.java
    cayenne/main/trunk/plugins/maven-cayenne-plugin/src/main/java/org/apache/cayenne/tools/DbGeneratorMojo.java
      - copied, changed from r1542478, cayenne/main/trunk/framework/maven-cayenne-plugin/src/main/java/org/apache/cayenne/tools/DbGeneratorMojo.java
    cayenne/main/trunk/plugins/maven-cayenne-plugin/src/main/java/org/apache/cayenne/tools/DbImporterMojo.java
      - copied, changed from r1542478, cayenne/main/trunk/framework/maven-cayenne-plugin/src/main/java/org/apache/cayenne/tools/DbImporterMojo.java
    cayenne/main/trunk/plugins/maven-cayenne-plugin/src/main/java/org/apache/cayenne/tools/MavenLogger.java
      - copied, changed from r1542478, cayenne/main/trunk/framework/maven-cayenne-plugin/src/main/java/org/apache/cayenne/tools/MavenLogger.java
    cayenne/main/trunk/plugins/maven-cayenne-plugin/src/main/resources/
    cayenne/main/trunk/plugins/maven-cayenne-plugin/src/main/resources/META-INF/
    cayenne/main/trunk/plugins/maven-cayenne-plugin/src/main/resources/META-INF/m2e/
    cayenne/main/trunk/plugins/maven-cayenne-plugin/src/main/resources/META-INF/m2e/lifecycle-mapping-metadata.xml
      - copied, changed from r1542478, cayenne/main/trunk/framework/maven-cayenne-plugin/src/main/resources/META-INF/m2e/lifecycle-mapping-metadata.xml
    cayenne/main/trunk/plugins/maven-cayenne-plugin/src/test/
    cayenne/main/trunk/plugins/maven-cayenne-plugin/src/test/java/
    cayenne/main/trunk/plugins/maven-cayenne-plugin/src/test/java/org/
    cayenne/main/trunk/plugins/maven-cayenne-plugin/src/test/java/org/apache/
    cayenne/main/trunk/plugins/maven-cayenne-plugin/src/test/java/org/apache/cayenne/
    cayenne/main/trunk/plugins/maven-cayenne-plugin/src/test/java/org/apache/cayenne/tools/
    cayenne/main/trunk/plugins/maven-cayenne-plugin/src/test/java/org/apache/cayenne/tools/CayenneGeneratorMojoTest.java
      - copied, changed from r1542478, cayenne/main/trunk/framework/maven-cayenne-plugin/src/test/java/org/apache/cayenne/tools/CayenneGeneratorMojoTest.java
    cayenne/main/trunk/plugins/maven-cayenne-plugin/src/test/java/org/apache/cayenne/tools/DbImporterMojoTest.java
      - copied, changed from r1542478, cayenne/main/trunk/framework/maven-cayenne-plugin/src/test/java/org/apache/cayenne/tools/DbImporterMojoTest.java
    cayenne/main/trunk/plugins/maven-cayenne-plugin/src/test/resources/
    cayenne/main/trunk/plugins/maven-cayenne-plugin/src/test/resources/cgen/
    cayenne/main/trunk/plugins/maven-cayenne-plugin/src/test/resources/cgen/cayenne-testDomain.xml
      - copied, changed from r1542478, cayenne/main/trunk/framework/maven-cayenne-plugin/src/test/resources/cgen/cayenne-testDomain.xml
    cayenne/main/trunk/plugins/maven-cayenne-plugin/src/test/resources/cgen/project-to-test/
    cayenne/main/trunk/plugins/maven-cayenne-plugin/src/test/resources/cgen/project-to-test/pom.xml
      - copied, changed from r1542478, cayenne/main/trunk/framework/maven-cayenne-plugin/src/test/resources/cgen/project-to-test/pom.xml
    cayenne/main/trunk/plugins/maven-cayenne-plugin/src/test/resources/cgen/testDomainMap.map.xml
      - copied, changed from r1542478, cayenne/main/trunk/framework/maven-cayenne-plugin/src/test/resources/cgen/testDomainMap.map.xml
    cayenne/main/trunk/plugins/maven-cayenne-plugin/src/test/resources/org/
    cayenne/main/trunk/plugins/maven-cayenne-plugin/src/test/resources/org/apache/
    cayenne/main/trunk/plugins/maven-cayenne-plugin/src/test/resources/org/apache/cayenne/
    cayenne/main/trunk/plugins/maven-cayenne-plugin/src/test/resources/org/apache/cayenne/tools/
    cayenne/main/trunk/plugins/maven-cayenne-plugin/src/test/resources/org/apache/cayenne/tools/dbimporter-pom1.xml
      - copied, changed from r1542478, cayenne/main/trunk/framework/maven-cayenne-plugin/src/test/resources/org/apache/cayenne/tools/dbimporter-pom1.xml
    cayenne/main/trunk/plugins/maven-cayenne-plugin/src/test/resources/org/apache/cayenne/tools/dbimporter-pom2.xml
      - copied, changed from r1542478, cayenne/main/trunk/framework/maven-cayenne-plugin/src/test/resources/org/apache/cayenne/tools/dbimporter-pom2.xml
    cayenne/main/trunk/plugins/maven-cayenne-plugin/src/test/resources/org/apache/cayenne/tools/dbimporter-pom3.xml
      - copied, changed from r1542478, cayenne/main/trunk/framework/maven-cayenne-plugin/src/test/resources/org/apache/cayenne/tools/dbimporter-pom3.xml
    cayenne/main/trunk/plugins/pom.xml
      - copied, changed from r1542478, cayenne/main/trunk/framework/pom.xml
Removed:
    cayenne/main/trunk/framework/maven-cayenne-plugin/
Modified:
    cayenne/main/trunk/framework/pom.xml
    cayenne/main/trunk/pom.xml

Modified: cayenne/main/trunk/framework/pom.xml
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/pom.xml?rev=1542479&r1=1542478&r2=1542479&view=diff
==============================================================================
--- cayenne/main/trunk/framework/pom.xml (original)
+++ cayenne/main/trunk/framework/pom.xml Sat Nov 16 08:26:33 2013
@@ -34,7 +34,6 @@
 		<module>cayenne-core-unpublished</module>
 		<module>cayenne-server</module>
 		<module>cayenne-client</module>
-		<module>maven-cayenne-plugin</module>
 	</modules>
 	
 	<build>

Copied: cayenne/main/trunk/plugins/maven-cayenne-plugin/pom.xml (from r1542478, cayenne/main/trunk/framework/maven-cayenne-plugin/pom.xml)
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/plugins/maven-cayenne-plugin/pom.xml?p2=cayenne/main/trunk/plugins/maven-cayenne-plugin/pom.xml&p1=cayenne/main/trunk/framework/maven-cayenne-plugin/pom.xml&r1=1542478&r2=1542479&rev=1542479&view=diff
==============================================================================
--- cayenne/main/trunk/framework/maven-cayenne-plugin/pom.xml (original)
+++ cayenne/main/trunk/plugins/maven-cayenne-plugin/pom.xml Sat Nov 16 08:26:33 2013
@@ -13,15 +13,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-plugin</artifactId>
 	<packaging>maven-plugin</packaging>
 	<name>Cayenne Maven Plugin</name>

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

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

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

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

Copied: cayenne/main/trunk/plugins/maven-cayenne-plugin/src/main/resources/META-INF/m2e/lifecycle-mapping-metadata.xml
(from r1542478, cayenne/main/trunk/framework/maven-cayenne-plugin/src/main/resources/META-INF/m2e/lifecycle-mapping-metadata.xml)
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/plugins/maven-cayenne-plugin/src/main/resources/META-INF/m2e/lifecycle-mapping-metadata.xml?p2=cayenne/main/trunk/plugins/maven-cayenne-plugin/src/main/resources/META-INF/m2e/lifecycle-mapping-metadata.xml&p1=cayenne/main/trunk/framework/maven-cayenne-plugin/src/main/resources/META-INF/m2e/lifecycle-mapping-metadata.xml&r1=1542478&r2=1542479&rev=1542479&view=diff
==============================================================================
    (empty)

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

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

Copied: cayenne/main/trunk/plugins/maven-cayenne-plugin/src/test/resources/cgen/cayenne-testDomain.xml
(from r1542478, cayenne/main/trunk/framework/maven-cayenne-plugin/src/test/resources/cgen/cayenne-testDomain.xml)
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/plugins/maven-cayenne-plugin/src/test/resources/cgen/cayenne-testDomain.xml?p2=cayenne/main/trunk/plugins/maven-cayenne-plugin/src/test/resources/cgen/cayenne-testDomain.xml&p1=cayenne/main/trunk/framework/maven-cayenne-plugin/src/test/resources/cgen/cayenne-testDomain.xml&r1=1542478&r2=1542479&rev=1542479&view=diff
==============================================================================
    (empty)

Copied: cayenne/main/trunk/plugins/maven-cayenne-plugin/src/test/resources/cgen/project-to-test/pom.xml
(from r1542478, cayenne/main/trunk/framework/maven-cayenne-plugin/src/test/resources/cgen/project-to-test/pom.xml)
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/plugins/maven-cayenne-plugin/src/test/resources/cgen/project-to-test/pom.xml?p2=cayenne/main/trunk/plugins/maven-cayenne-plugin/src/test/resources/cgen/project-to-test/pom.xml&p1=cayenne/main/trunk/framework/maven-cayenne-plugin/src/test/resources/cgen/project-to-test/pom.xml&r1=1542478&r2=1542479&rev=1542479&view=diff
==============================================================================
    (empty)

Copied: cayenne/main/trunk/plugins/maven-cayenne-plugin/src/test/resources/cgen/testDomainMap.map.xml
(from r1542478, cayenne/main/trunk/framework/maven-cayenne-plugin/src/test/resources/cgen/testDomainMap.map.xml)
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/plugins/maven-cayenne-plugin/src/test/resources/cgen/testDomainMap.map.xml?p2=cayenne/main/trunk/plugins/maven-cayenne-plugin/src/test/resources/cgen/testDomainMap.map.xml&p1=cayenne/main/trunk/framework/maven-cayenne-plugin/src/test/resources/cgen/testDomainMap.map.xml&r1=1542478&r2=1542479&rev=1542479&view=diff
==============================================================================
    (empty)

Copied: cayenne/main/trunk/plugins/maven-cayenne-plugin/src/test/resources/org/apache/cayenne/tools/dbimporter-pom1.xml
(from r1542478, cayenne/main/trunk/framework/maven-cayenne-plugin/src/test/resources/org/apache/cayenne/tools/dbimporter-pom1.xml)
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/plugins/maven-cayenne-plugin/src/test/resources/org/apache/cayenne/tools/dbimporter-pom1.xml?p2=cayenne/main/trunk/plugins/maven-cayenne-plugin/src/test/resources/org/apache/cayenne/tools/dbimporter-pom1.xml&p1=cayenne/main/trunk/framework/maven-cayenne-plugin/src/test/resources/org/apache/cayenne/tools/dbimporter-pom1.xml&r1=1542478&r2=1542479&rev=1542479&view=diff
==============================================================================
    (empty)

Copied: cayenne/main/trunk/plugins/maven-cayenne-plugin/src/test/resources/org/apache/cayenne/tools/dbimporter-pom2.xml
(from r1542478, cayenne/main/trunk/framework/maven-cayenne-plugin/src/test/resources/org/apache/cayenne/tools/dbimporter-pom2.xml)
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/plugins/maven-cayenne-plugin/src/test/resources/org/apache/cayenne/tools/dbimporter-pom2.xml?p2=cayenne/main/trunk/plugins/maven-cayenne-plugin/src/test/resources/org/apache/cayenne/tools/dbimporter-pom2.xml&p1=cayenne/main/trunk/framework/maven-cayenne-plugin/src/test/resources/org/apache/cayenne/tools/dbimporter-pom2.xml&r1=1542478&r2=1542479&rev=1542479&view=diff
==============================================================================
    (empty)

Copied: cayenne/main/trunk/plugins/maven-cayenne-plugin/src/test/resources/org/apache/cayenne/tools/dbimporter-pom3.xml
(from r1542478, cayenne/main/trunk/framework/maven-cayenne-plugin/src/test/resources/org/apache/cayenne/tools/dbimporter-pom3.xml)
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/plugins/maven-cayenne-plugin/src/test/resources/org/apache/cayenne/tools/dbimporter-pom3.xml?p2=cayenne/main/trunk/plugins/maven-cayenne-plugin/src/test/resources/org/apache/cayenne/tools/dbimporter-pom3.xml&p1=cayenne/main/trunk/framework/maven-cayenne-plugin/src/test/resources/org/apache/cayenne/tools/dbimporter-pom3.xml&r1=1542478&r2=1542479&rev=1542479&view=diff
==============================================================================
    (empty)

Copied: cayenne/main/trunk/plugins/pom.xml (from r1542478, cayenne/main/trunk/framework/pom.xml)
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/plugins/pom.xml?p2=cayenne/main/trunk/plugins/pom.xml&p1=cayenne/main/trunk/framework/pom.xml&r1=1542478&r2=1542479&rev=1542479&view=diff
==============================================================================
--- cayenne/main/trunk/framework/pom.xml (original)
+++ cayenne/main/trunk/plugins/pom.xml Sat Nov 16 08:26:33 2013
@@ -24,28 +24,12 @@
 		<artifactId>cayenne-parent</artifactId>
 		<version>3.2M2-SNAPSHOT</version>
 	</parent>
-	<groupId>org.apache.cayenne.parents</groupId>
-	<artifactId>cayenne-framework-parent</artifactId>
-	<name>Cayenne Framework Aggregator Project</name>
+	<groupId>org.apache.cayenne.plugins</groupId>
+	<artifactId>cayenne-plugins-parent</artifactId>
+	<name>Cayenne Maven Plugins</name>
 	<packaging>pom</packaging>
 
 	<modules>
-		<module>cayenne-di-unpublished</module>
-		<module>cayenne-core-unpublished</module>
-		<module>cayenne-server</module>
-		<module>cayenne-client</module>
 		<module>maven-cayenne-plugin</module>
 	</modules>
-	
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-deploy-plugin</artifactId>
-				<configuration>
-					<skip>true</skip>
-				</configuration>
-			</plugin>
-		</plugins>
-	</build>
 </project>

Modified: cayenne/main/trunk/pom.xml
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/pom.xml?rev=1542479&r1=1542478&r2=1542479&view=diff
==============================================================================
--- cayenne/main/trunk/pom.xml (original)
+++ cayenne/main/trunk/pom.xml Sat Nov 16 08:26:33 2013
@@ -39,6 +39,7 @@
 		<module>cayenne-lifecycle</module>
 		<module>itests</module>
 		<module>modeler</module>
+		<module>plugins</module>
 		<module>tutorials</module>
 		<module>docs</module>
 	</modules>



Mime
View raw message