You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by aa...@apache.org on 2010/08/24 17:42:53 UTC
svn commit: r988602 - in /cayenne/main/trunk: assembly/
assembly/src/main/resources/assemblies/ framework/ modeler/
modeler/cayenne-modeler-generic/
Author: aadamchik
Date: Tue Aug 24 15:42:52 2010
New Revision: 988602
URL: http://svn.apache.org/viewvc?rev=988602&view=rev
Log:
CAY-1475 Move cayenne-modeler module out of framework/ and out of the assembly binary
* post move - fixing the poms
Modified:
cayenne/main/trunk/assembly/pom.xml
cayenne/main/trunk/assembly/src/main/resources/assemblies/assembly-generic.xml
cayenne/main/trunk/assembly/src/main/resources/assemblies/assembly-mac.xml
cayenne/main/trunk/assembly/src/main/resources/assemblies/assembly-windows.xml
cayenne/main/trunk/framework/pom.xml
cayenne/main/trunk/modeler/cayenne-modeler-generic/pom.xml
cayenne/main/trunk/modeler/pom.xml
Modified: cayenne/main/trunk/assembly/pom.xml
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/assembly/pom.xml?rev=988602&r1=988601&r2=988602&view=diff
==============================================================================
--- cayenne/main/trunk/assembly/pom.xml (original)
+++ cayenne/main/trunk/assembly/pom.xml Tue Aug 24 15:42:52 2010
@@ -141,7 +141,7 @@
<dependencies>
<dependency>
<groupId>org.apache.cayenne</groupId>
- <artifactId>cayenne-modeler-java</artifactId>
+ <artifactId>cayenne-modeler-generic</artifactId>
<version>${version}</version>
</dependency>
</dependencies>
Modified: cayenne/main/trunk/assembly/src/main/resources/assemblies/assembly-generic.xml
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/assembly/src/main/resources/assemblies/assembly-generic.xml?rev=988602&r1=988601&r2=988602&view=diff
==============================================================================
--- cayenne/main/trunk/assembly/src/main/resources/assemblies/assembly-generic.xml (original)
+++ cayenne/main/trunk/assembly/src/main/resources/assemblies/assembly-generic.xml Tue Aug 24 15:42:52 2010
@@ -52,7 +52,6 @@
<includes>
<include>org.apache.cayenne:cayenne-server</include>
<include>org.apache.cayenne:cayenne-client</include>
- <include>org.apache.cayenne:cayenne-modeler</include>
<include>org.apache.cayenne:cayenne-tools</include>
</includes>
</dependencySet>
@@ -82,7 +81,7 @@
<dependencySet>
<outputDirectory>bin</outputDirectory>
<includes>
- <include>org.apache.cayenne:cayenne-modeler-java</include>
+ <include>org.apache.cayenne:cayenne-modeler-generic</include>
</includes>
<unpack>true</unpack>
<unpackOptions>
Modified: cayenne/main/trunk/assembly/src/main/resources/assemblies/assembly-mac.xml
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/assembly/src/main/resources/assemblies/assembly-mac.xml?rev=988602&r1=988601&r2=988602&view=diff
==============================================================================
--- cayenne/main/trunk/assembly/src/main/resources/assemblies/assembly-mac.xml (original)
+++ cayenne/main/trunk/assembly/src/main/resources/assemblies/assembly-mac.xml Tue Aug 24 15:42:52 2010
@@ -52,7 +52,6 @@
<includes>
<include>org.apache.cayenne:cayenne-server</include>
<include>org.apache.cayenne:cayenne-client</include>
- <include>org.apache.cayenne:cayenne-modeler</include>
<include>org.apache.cayenne:cayenne-tools</include>
</includes>
</dependencySet>
Modified: cayenne/main/trunk/assembly/src/main/resources/assemblies/assembly-windows.xml
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/assembly/src/main/resources/assemblies/assembly-windows.xml?rev=988602&r1=988601&r2=988602&view=diff
==============================================================================
--- cayenne/main/trunk/assembly/src/main/resources/assemblies/assembly-windows.xml (original)
+++ cayenne/main/trunk/assembly/src/main/resources/assemblies/assembly-windows.xml Tue Aug 24 15:42:52 2010
@@ -52,7 +52,6 @@
<includes>
<include>org.apache.cayenne:cayenne-server</include>
<include>org.apache.cayenne:cayenne-client</include>
- <include>org.apache.cayenne:cayenne-modeler</include>
<include>org.apache.cayenne:cayenne-tools</include>
</includes>
</dependencySet>
Modified: cayenne/main/trunk/framework/pom.xml
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/pom.xml?rev=988602&r1=988601&r2=988602&view=diff
==============================================================================
--- cayenne/main/trunk/framework/pom.xml (original)
+++ cayenne/main/trunk/framework/pom.xml Tue Aug 24 15:42:52 2010
@@ -56,9 +56,7 @@
<module>cayenne-server</module>
<module>cayenne-client</module>
<module>cayenne-tools</module>
- <module>cayenne-modeler</module>
<module>maven-cayenne-plugin</module>
- <module>maven-cayenne-modeler-plugin</module>
</modules>
</profile>
<profile>
@@ -76,9 +74,7 @@
<module>cayenne-server</module>
<module>cayenne-client</module>
<module>cayenne-tools</module>
- <module>cayenne-modeler</module>
<module>maven-cayenne-plugin</module>
- <module>maven-cayenne-modeler-plugin</module>
</modules>
</profile>
</profiles>
Modified: cayenne/main/trunk/modeler/cayenne-modeler-generic/pom.xml
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/modeler/cayenne-modeler-generic/pom.xml?rev=988602&r1=988601&r2=988602&view=diff
==============================================================================
--- cayenne/main/trunk/modeler/cayenne-modeler-generic/pom.xml (original)
+++ cayenne/main/trunk/modeler/cayenne-modeler-generic/pom.xml Tue Aug 24 15:42:52 2010
@@ -29,8 +29,8 @@
<version>3.1-SNAPSHOT</version>
</parent>
- <artifactId>cayenne-modeler-java</artifactId>
- <name>Cayenne Modeler Java</name>
+ <artifactId>cayenne-modeler-generic</artifactId>
+ <name>Cayenne Modeler Generic</name>
<packaging>jar</packaging>
<dependencies>
Modified: cayenne/main/trunk/modeler/pom.xml
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/modeler/pom.xml?rev=988602&r1=988601&r2=988602&view=diff
==============================================================================
--- cayenne/main/trunk/modeler/pom.xml (original)
+++ cayenne/main/trunk/modeler/pom.xml Tue Aug 24 15:42:52 2010
@@ -33,6 +33,11 @@
<groupId>org.apache.cayenne.parents</groupId>
<name>Cayenne Modeler Parent</name>
<packaging>pom</packaging>
+
+ <modules>
+ <module>cayenne-modeler</module>
+ <module>maven-cayenne-modeler-plugin</module>
+ </modules>
<build>
<plugins>
@@ -50,7 +55,7 @@
<id>generic</id>
<modules>
<module>cayenne-modeler-generic-ext</module>
- <module>cayenne-modeler-java</module>
+ <module>cayenne-modeler-generic</module>
</modules>
</profile>
<profile>