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

[infinispan-commits at lists.jboss.org]

Author: manik.surtani at jboss.com
Date: 2009-12-07 07:26:32 -0500 (Mon, 07 Dec 2009)
New Revision: 1260

Modified:
   trunk/src/main/resources/assemblies/all.xml
   trunk/src/main/resources/assemblies/bin.xml
Log:
Fixed packaging stuff - don't package unnecessary rubbish!

Modified: trunk/src/main/resources/assemblies/all.xml
===================================================================
--- trunk/src/main/resources/assemblies/all.xml	2009-12-07 12:22:53 UTC (rev 1259)
+++ trunk/src/main/resources/assemblies/all.xml	2009-12-07 12:26:32 UTC (rev 1260)
@@ -40,7 +40,6 @@
          </includes>
          <sources>
             <includeModuleDirectory>false</includeModuleDirectory>
-            <outputDirectory>src</outputDirectory>
 
             <fileSets>
 
@@ -53,6 +52,7 @@
                      <exclude>**/*.bat</exclude>
                      <exclude>**/*.cmd</exclude>
                      <exclude>**/*.py</exclude>
+                     <exclude>**/*.rb</exclude>
                   </excludes>
                </fileSet>
 
@@ -65,10 +65,20 @@
                      <include>**/*.bat</include>
                      <include>**/*.cmd</include>
                      <include>**/*.py</include>
+                     <include>**/*.rb</include>
                   </includes>
                   <fileMode>0777</fileMode>
                </fileSet>
 
+               <!-- schema (generated!) -->
+               <fileSet>
+                  <directory>target/classes</directory>
+                  <outputDirectory>etc</outputDirectory>
+                  <includes>
+                     <include>**/*.xsd</include>
+                  </includes>
+               </fileSet>
+
                <!-- Log4j XML -->
                <fileSet>
                   <directory>src/test/resources</directory>
@@ -127,7 +137,6 @@
          </includes>
          <sources>
             <includeModuleDirectory>false</includeModuleDirectory>
-            <outputDirectory>src</outputDirectory>
 
             <fileSets>
 
@@ -140,18 +149,10 @@
                      <exclude>**/*.bat</exclude>
                      <exclude>**/*.cmd</exclude>
                      <exclude>**/*.py</exclude>
+                     <exclude>**/*.rb</exclude>
                   </excludes>
                </fileSet>
 
-               <!-- schema (generated!) -->
-               <fileSet>
-                  <directory>target/classes</directory>
-                  <outputDirectory>etc</outputDirectory>
-                  <includes>
-                     <include>**/*.xsd</include>
-                  </includes>
-               </fileSet>
-
                <!-- Executable resources -->
                <fileSet>
                   <directory>src/main/resources</directory>
@@ -161,19 +162,11 @@
                      <include>**/*.bat</include>
                      <include>**/*.cmd</include>
                      <include>**/*.py</include>
+                     <include>**/*.rb</include>
                   </includes>
                   <fileMode>0777</fileMode>
                </fileSet>
 
-               <!-- Log4j XML -->
-               <fileSet>
-                  <directory>src/test/resources</directory>
-                  <outputDirectory>etc</outputDirectory>
-                  <includes>
-                     <include>log4j.xml</include>
-                  </includes>
-               </fileSet>
-
                <!-- EULAs and license files -->
                <fileSet>
                   <directory>src/main/release</directory>
@@ -222,10 +215,6 @@
             <include>org.infinispan:infinispan-server-rest</include>
             <include>org.infinispan:infinispan-ec2-demo</include>
          </includes>
-         <sources>
-            <includeModuleDirectory>false</includeModuleDirectory>
-            <outputDirectory>src</outputDirectory>
-         </sources>
 
          <binaries>
             <outputDirectory>modules/${module.basedir.name}</outputDirectory>

Modified: trunk/src/main/resources/assemblies/bin.xml
===================================================================
--- trunk/src/main/resources/assemblies/bin.xml	2009-12-07 12:22:53 UTC (rev 1259)
+++ trunk/src/main/resources/assemblies/bin.xml	2009-12-07 12:26:32 UTC (rev 1260)
@@ -45,6 +45,7 @@
                      <exclude>**/*.bat</exclude>
                      <exclude>**/*.cmd</exclude>
                      <exclude>**/*.py</exclude>
+                     <exclude>**/*.rb</exclude>
                   </excludes>
                </fileSet>
 
@@ -57,6 +58,7 @@
                      <include>**/*.bat</include>
                      <include>**/*.cmd</include>
                      <include>**/*.py</include>
+                     <include>**/*.rb</include>
                   </includes>
                   <fileMode>0777</fileMode>
                </fileSet>
@@ -70,6 +72,15 @@
                   </includes>
                </fileSet>
 
+               <!-- schema (generated!) -->
+               <fileSet>
+                  <directory>target/classes</directory>
+                  <outputDirectory>etc</outputDirectory>
+                  <includes>
+                     <include>**/*.xsd</include>
+                  </includes>
+               </fileSet>
+
                <!-- EULAs and license files -->
                <fileSet>
                   <directory>src/main/release</directory>
@@ -78,11 +89,6 @@
                      <include>**/*.txt</include>
                   </includes>
                </fileSet>
-
-               <fileSet>
-                  <directory>target/docbook</directory>
-                  <outputDirectory>doc/</outputDirectory>
-               </fileSet>
             </fileSets>
 
          </sources>
@@ -131,6 +137,7 @@
                      <exclude>**/*.bat</exclude>
                      <exclude>**/*.cmd</exclude>
                      <exclude>**/*.py</exclude>
+                     <exclude>**/*.py</exclude>
                   </excludes>
                </fileSet>
 
@@ -143,19 +150,11 @@
                      <include>**/*.bat</include>
                      <include>**/*.cmd</include>
                      <include>**/*.py</include>
+                     <include>**/*.rb</include>
                   </includes>
                   <fileMode>0777</fileMode>
                </fileSet>
 
-               <!-- Log4j XML -->
-               <fileSet>
-                  <directory>src/test/resources</directory>
-                  <outputDirectory>etc</outputDirectory>
-                  <includes>
-                     <include>log4j.xml</include>
-                  </includes>
-               </fileSet>
-
                <!-- EULAs and license files -->
                <fileSet>
                   <directory>src/main/release</directory>
@@ -164,17 +163,10 @@
                      <include>**/*.txt</include>
                   </includes>
                </fileSet>
-
-               <fileSet>
-                  <directory>target/docbook</directory>
-                  <outputDirectory>doc/</outputDirectory>
-               </fileSet>
             </fileSets>
-
          </sources>
 
          <binaries>
-
             <outputDirectory>modules/${module.basedir.name}</outputDirectory>
             <unpack>false</unpack>
             <outputFileNameMapping>