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

[infinispan-commits at lists.jboss.org]

Author: manik.surtani at jboss.com
Date: 2009-11-13 10:26:39 -0500 (Fri, 13 Nov 2009)
New Revision: 1168

Modified:
   trunk/src/main/resources/assemblies/all.xml
   trunk/src/main/resources/assemblies/rest-server.xml
Log:
Better packaging

Modified: trunk/src/main/resources/assemblies/all.xml
===================================================================
--- trunk/src/main/resources/assemblies/all.xml	2009-11-13 15:25:25 UTC (rev 1167)
+++ trunk/src/main/resources/assemblies/all.xml	2009-11-13 15:26:39 UTC (rev 1168)
@@ -207,7 +207,7 @@
          </binaries>
       </moduleSet>
 
-      <!-- Tests for all modules except REST server -->
+      <!-- Tests for all modules except REST server and EC2 demo which are webapps -->
       <moduleSet>
          <includeSubModules>false</includeSubModules>
          <includes>
@@ -216,7 +216,6 @@
             <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-ec2-demo</include>
             <include>org.infinispan:infinispan-jopr-plugin</include>
             <include>org.infinispan:infinispan-tree</include>
             <include>org.infinispan:infinispan-query</include>
@@ -243,11 +242,12 @@
          </binaries>
       </moduleSet>
 
-      <!-- REST server module -->
+      <!-- REST server and ec2-demo module which are webapps -->
       <moduleSet>
          <includeSubModules>false</includeSubModules>
          <includes>
             <include>org.infinispan:infinispan-server-rest</include>
+            <include>org.infinispan:infinispan-ec2-demo</include>
          </includes>
          <sources>
             <includeModuleDirectory>false</includeModuleDirectory>
@@ -267,7 +267,6 @@
                   <outputDirectory>modules/${module.basedir.name}</outputDirectory>
                </dependencySet>
             </dependencySets>
-
          </binaries>
       </moduleSet>
    </moduleSets>

Modified: trunk/src/main/resources/assemblies/rest-server.xml
===================================================================
--- trunk/src/main/resources/assemblies/rest-server.xml	2009-11-13 15:25:25 UTC (rev 1167)
+++ trunk/src/main/resources/assemblies/rest-server.xml	2009-11-13 15:26:39 UTC (rev 1168)
@@ -1,17 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <assembly>
-  <id>infinispan-server-rest</id>
-  <formats>
-    <format>zip</format>
-  </formats>
+   <id>server-rest</id>
+   <formats>
+      <format>zip</format>
+   </formats>
 
-  <includeBaseDirectory>false</includeBaseDirectory>
-
-  <!-- We include the BRMS specifically, as its a single atomic war -->
-  <files>
-	<file>
-		<source>server/rest/target/infinispan.war</source>
-	</file>
-  </files>
-
+   <includeBaseDirectory>true</includeBaseDirectory>
+   <fileSets>
+      <fileSet>
+         <directory>server/rest/target</directory>
+         <outputDirectory>webapp</outputDirectory>
+         <includes>
+            <include>**/*.war</include>
+         </includes>
+      </fileSet>
+      <fileSet>
+         <directory>server/rest/src/main/resources</directory>
+         <outputDirectory>sample_clients</outputDirectory>
+         <includes>
+            <include>**/sample_*</include>
+         </includes>
+         <!-- make these executable -->
+         <fileMode>0755</fileMode>
+      </fileSet>
+   </fileSets>
 </assembly>
\ No newline at end of file