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

[infinispan-commits at lists.jboss.org]

Author: manik.surtani at jboss.com
Date: 2009-09-25 11:33:44 -0400 (Fri, 25 Sep 2009)
New Revision: 862

Modified:
   trunk/src/main/resources/assemblies/all.xml
   trunk/src/main/resources/assemblies/bin.xml
Log:
Packaging for query and rest server modules.

Modified: trunk/src/main/resources/assemblies/all.xml
===================================================================
--- trunk/src/main/resources/assemblies/all.xml	2009-09-25 15:25:03 UTC (rev 861)
+++ trunk/src/main/resources/assemblies/all.xml	2009-09-25 15:33:44 UTC (rev 862)
@@ -118,6 +118,7 @@
             <include>org.infinispan:infinispan-gui-demo</include>
             <include>org.infinispan:infinispan-jopr-plugin</include>
             <include>org.infinispan:infinispan-tree</include>
+            <include>org.infinispan:infinispan-query</include>
          </includes>
          <sources>
             <includeModuleDirectory>false</includeModuleDirectory>
@@ -180,6 +181,7 @@
 
          </sources>
 
+         <!-- All modules except core and REST server -->
          <binaries>
 
             <outputDirectory>modules/${module.basedir.name}</outputDirectory>
@@ -191,7 +193,8 @@
             <dependencySets>
                <dependencySet>
                   <excludes>
-                     <exclude>infinispan-core*</exclude>
+                     <exclude>org.infinispan:infinispan-core</exclude>
+                     <exclude>org.infinispan:infinispan-server-rest</exclude>
                   </excludes>
                   <useTransitiveDependencies>true</useTransitiveDependencies>
                   <useTransitiveFiltering>true</useTransitiveFiltering>
@@ -202,11 +205,19 @@
          </binaries>
       </moduleSet>
 
+      <!-- Tests for all modules except REST server -->
       <moduleSet>
          <includeSubModules>false</includeSubModules>
-         <excludes>
-            <exclude>org.infinispan:infinispan-tools</exclude>
-         </excludes>
+         <includes>
+            <include>org.infinispan:infinispan-cachestore-bdbje</include>
+            <include>org.infinispan:infinispan-cachestore-jdbc</include>
+            <include>org.infinispan:infinispan-cachestore-jdbm</include>
+            <include>org.infinispan:infinispan-cachestore-s3</include>
+            <include>org.infinispan:infinispan-gui-demo</include>
+            <include>org.infinispan:infinispan-jopr-plugin</include>
+            <include>org.infinispan:infinispan-tree</include>
+            <include>org.infinispan:infinispan-query</include>
+         </includes>         
          <binaries>
             <attachmentClassifier>tests</attachmentClassifier>
             <outputDirectory>test/modules/${module.basedir.name}</outputDirectory>
@@ -229,6 +240,33 @@
          </binaries>
       </moduleSet>
 
+      <!-- REST server module -->
+      <moduleSet>
+         <includeSubModules>false</includeSubModules>
+         <includes>
+            <include>org.infinispan:infinispan-server-rest</include>
+         </includes>
+         <sources>
+            <includeModuleDirectory>false</includeModuleDirectory>
+         </sources>
+
+         <binaries>
+            <outputDirectory>modules/${module.basedir.name}</outputDirectory>
+            <outputFileNameMapping>
+               ${module.artifactId}.${module.extension}
+            </outputFileNameMapping>
+            <unpack>false</unpack>
+            <dependencySets>
+               <dependencySet>
+                  <includes>
+                     <include>NONEXISTENT_DEPENDENCY*</include>
+                  </includes>
+                  <outputDirectory>modules/${module.basedir.name}</outputDirectory>
+               </dependencySet>
+            </dependencySets>
+
+         </binaries>
+      </moduleSet>
    </moduleSets>
 
    <fileSets>

Modified: trunk/src/main/resources/assemblies/bin.xml
===================================================================
--- trunk/src/main/resources/assemblies/bin.xml	2009-09-25 15:25:03 UTC (rev 861)
+++ trunk/src/main/resources/assemblies/bin.xml	2009-09-25 15:33:44 UTC (rev 862)
@@ -115,7 +115,6 @@
             <include>org.infinispan:infinispan-jopr-plugin</include>
             <include>org.infinispan:infinispan-tree</include>
             <include>org.infinispan:infinispan-query</include>
-            <include>org.infinispan:infinispan-server-rest</include>
          </includes>
          <sources>
             <includeModuleDirectory>false</includeModuleDirectory>
@@ -194,6 +193,33 @@
          </binaries>
       </moduleSet>
 
+      <moduleSet>
+         <includeSubModules>false</includeSubModules>
+         <includes>
+            <include>org.infinispan:infinispan-server-rest</include>
+         </includes>
+         <sources>
+            <includeModuleDirectory>false</includeModuleDirectory>
+         </sources>
+
+         <binaries>
+            <outputDirectory>modules/${module.basedir.name}</outputDirectory>
+            <unpack>false</unpack>
+            <outputFileNameMapping>
+               ${module.artifactId}.${module.extension}
+            </outputFileNameMapping>
+            <dependencySets>
+               <dependencySet>
+                  <includes>
+                     <include>NONEXISTENT_DEPENDENCY*</include>
+                  </includes>
+                  <outputDirectory>modules/${module.basedir.name}</outputDirectory>
+               </dependencySet>
+            </dependencySets>
+
+         </binaries>
+      </moduleSet>
+
    </moduleSets>
 
    <fileSets>