Author: aadamchik
Date: Sat Nov 16 21:19:29 2013
New Revision: 1542578
URL: http://svn.apache.org/r1542578
Log:
CAY-1883 - Clean up Cayenne maven structure - get rid of aggregate modules
* assembly descriptors to reflect the new module structure
Modified:
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
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=1542578&r1=1542577&r2=1542578&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
Sat Nov 16 21:19:29 2013
@@ -73,6 +73,8 @@
<dependencySet>
<outputDirectory>lib</outputDirectory>
<includes>
+ <include>org.apache.cayenne:cayenne-di</include>
+
<include>org.apache.cayenne:cayenne-core</include>
<include>org.apache.cayenne:cayenne-server</include>
<include>org.apache.cayenne:cayenne-client</include>
<include>org.apache.cayenne:cayenne-tools</include>
@@ -104,7 +106,7 @@
<dependencySet>
<outputDirectory>bin</outputDirectory>
<includes>
-
<include>org.apache.cayenne:cayenne-modeler-generic</include>
+
<include>org.apache.cayenne.modeler: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=1542578&r1=1542577&r2=1542578&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
Sat Nov 16 21:19:29 2013
@@ -73,6 +73,8 @@
<dependencySet>
<outputDirectory>lib</outputDirectory>
<includes>
+ <include>org.apache.cayenne:cayenne-di</include>
+
<include>org.apache.cayenne:cayenne-core</include>
<include>org.apache.cayenne:cayenne-server</include>
<include>org.apache.cayenne:cayenne-client</include>
<include>org.apache.cayenne:cayenne-tools</include>
@@ -104,7 +106,7 @@
<dependencySet>
<outputDirectory>../../</outputDirectory>
<includes>
-
<include>org.apache.cayenne:cayenne-modeler-mac</include>
+
<include>org.apache.cayenne.modeler:cayenne-modeler-mac</include>
</includes>
<unpack>true</unpack>
<unpackOptions>
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=1542578&r1=1542577&r2=1542578&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
Sat Nov 16 21:19:29 2013
@@ -73,6 +73,8 @@
<dependencySet>
<outputDirectory>lib</outputDirectory>
<includes>
+ <include>org.apache.cayenne:cayenne-di</include>
+
<include>org.apache.cayenne:cayenne-core</include>
<include>org.apache.cayenne:cayenne-server</include>
<include>org.apache.cayenne:cayenne-client</include>
<include>org.apache.cayenne:cayenne-tools</include>
@@ -104,7 +106,7 @@
<dependencySet>
<outputDirectory>bin</outputDirectory>
<includes>
-
<include>org.apache.cayenne:cayenne-modeler-win</include>
+
<include>org.apache.cayenne.modeler:cayenne-modeler-win</include>
</includes>
<unpack>true</unpack>
<unpackOptions>
