Author: aadamchik
Date: Sat Nov 16 21:17:22 2013
New Revision: 1542571
URL: http://svn.apache.org/r1542571
Log:
CAY-1883 - Clean up Cayenne maven structure - get rid of aggregate modules
* moving cayenne-client, cayenne-server one level up to follow their Maven
coordinates
Added:
cayenne/main/trunk/cayenne-client/
cayenne/main/trunk/cayenne-client/pom.xml
- copied, changed from r1542567,
cayenne/main/trunk/framework/cayenne-client/pom.xml
cayenne/main/trunk/cayenne-client/src/
cayenne/main/trunk/cayenne-client/src/main/
cayenne/main/trunk/cayenne-client/src/main/aggregator/
cayenne/main/trunk/cayenne-client/src/main/aggregator/excludes.txt
- copied, changed from r1542567,
cayenne/main/trunk/framework/cayenne-client/src/main/aggregator/excludes.txt
cayenne/main/trunk/cayenne-server/
cayenne/main/trunk/cayenne-server/pom.xml
- copied, changed from r1542567,
cayenne/main/trunk/framework/cayenne-server/pom.xml
Removed:
cayenne/main/trunk/framework/
Modified:
cayenne/main/trunk/pom.xml
Copied: cayenne/main/trunk/cayenne-client/pom.xml (from r1542567,
cayenne/main/trunk/framework/cayenne-client/pom.xml)
URL:
http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-client/pom.xml?p2=cayenne/main/trunk/cayenne-client/pom.xml&p1=cayenne/main/trunk/framework/cayenne-client/pom.xml&r1=1542567&r2=1542571&rev=1542571&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-client/pom.xml (original)
+++ cayenne/main/trunk/cayenne-client/pom.xml Sat Nov 16 21:17:22 2013
@@ -23,7 +23,6 @@
<groupId>org.apache.cayenne</groupId>
<artifactId>cayenne-parent</artifactId>
<version>3.2M2-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
</parent>
<artifactId>cayenne-client</artifactId>
<packaging>jar</packaging>
Copied: cayenne/main/trunk/cayenne-client/src/main/aggregator/excludes.txt
(from r1542567,
cayenne/main/trunk/framework/cayenne-client/src/main/aggregator/excludes.txt)
URL:
http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-client/src/main/aggregator/excludes.txt?p2=cayenne/main/trunk/cayenne-client/src/main/aggregator/excludes.txt&p1=cayenne/main/trunk/framework/cayenne-client/src/main/aggregator/excludes.txt&r1=1542567&r2=1542571&rev=1542571&view=diff
==============================================================================
(empty)
Copied: cayenne/main/trunk/cayenne-server/pom.xml (from r1542567,
cayenne/main/trunk/framework/cayenne-server/pom.xml)
URL:
http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-server/pom.xml?p2=cayenne/main/trunk/cayenne-server/pom.xml&p1=cayenne/main/trunk/framework/cayenne-server/pom.xml&r1=1542567&r2=1542571&rev=1542571&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-server/pom.xml (original)
+++ cayenne/main/trunk/cayenne-server/pom.xml Sat Nov 16 21:17:22 2013
@@ -23,7 +23,6 @@
<groupId>org.apache.cayenne</groupId>
<artifactId>cayenne-parent</artifactId>
<version>3.2M2-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
</parent>
<artifactId>cayenne-server</artifactId>
<packaging>jar</packaging>
Modified: cayenne/main/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/cayenne/main/trunk/pom.xml?rev=1542571&r1=1542570&r2=1542571&view=diff
==============================================================================
--- cayenne/main/trunk/pom.xml (original)
+++ cayenne/main/trunk/pom.xml Sat Nov 16 21:17:22 2013
@@ -35,7 +35,8 @@
<module>buildtools</module>
<module>cayenne-di</module>
<module>cayenne-core</module>
- <module>framework</module>
+ <module>cayenne-server</module>
+ <module>cayenne-client</module>
<module>cayenne-tools</module>
<module>cayenne-project</module>
<module>cayenne-lifecycle</module>
