[infinispan-commits] Infinispan SVN: r1243 - trunk/src/main/resources/assemblies.

[infinispan-commits at lists.jboss.org]

Author: mircea.markus
Date: 2009-11-30 14:44:37 -0500 (Mon, 30 Nov 2009)
New Revision: 1243

Modified:
   trunk/src/main/resources/assemblies/all.xml
Log:
[ISPN-283]-(Improve packaging of builds)- ongoing work

Modified: trunk/src/main/resources/assemblies/all.xml
===================================================================
--- trunk/src/main/resources/assemblies/all.xml	2009-11-30 18:33:34 UTC (rev 1242)
+++ trunk/src/main/resources/assemblies/all.xml	2009-11-30 19:44:37 UTC (rev 1243)
@@ -40,6 +40,7 @@
          </includes>
          <sources>
             <includeModuleDirectory>false</includeModuleDirectory>
+            <outputDirectory>src</outputDirectory>
 
             <fileSets>
 
@@ -92,7 +93,7 @@
 
          <binaries>
 
-            <outputDirectory>modules/${module.basedir.name}</outputDirectory>
+            <outputDirectory>.</outputDirectory>
             <outputFileNameMapping>
                ${module.artifactId}.${module.extension}
             </outputFileNameMapping>
@@ -100,8 +101,11 @@
 
             <dependencySets>
                <dependencySet>
+                  <excludes>
+                     <exclude>org.rhq.helpers:rhq-pluginAnnotations</exclude>
+                  </excludes>
                   <useTransitiveDependencies>false</useTransitiveDependencies>
-                  <outputDirectory>modules/${module.basedir.name}/lib</outputDirectory>
+                  <outputDirectory>./lib</outputDirectory>
                </dependencySet>
             </dependencySets>
 
@@ -126,6 +130,7 @@
          </includes>
          <sources>
             <includeModuleDirectory>false</includeModuleDirectory>
+            <outputDirectory>src</outputDirectory>
 
             <fileSets>
 
@@ -197,6 +202,9 @@
             <dependencySets>
                <dependencySet>
                   <excludes>
+                     <exclude>infinispan-core*</exclude>
+                     <exclude>net.jcip:jcip-annotations</exclude>
+                     <exclude>org.rhq.helpers:rhq-pluginAnnotations</exclude>
                      <exclude>org.infinispan:infinispan-core</exclude>
                      <exclude>org.infinispan:infinispan-server-rest</exclude>
                      <exclude>org.infinispan:infinispan-ec2-demo</exclude>                     
@@ -256,6 +264,7 @@
          </includes>
          <sources>
             <includeModuleDirectory>false</includeModuleDirectory>
+            <outputDirectory>src</outputDirectory>
          </sources>
 
          <binaries>