[jboss-svn-commits] JBL Code SVN: r23300 - in labs/jbossrules/trunk: src/main/assembly and 1 other directory.

[jboss-svn-commits at lists.jboss.org]

Author: mark.proctor at jboss.com
Date: 2008-10-03 20:06:58 -0400 (Fri, 03 Oct 2008)
New Revision: 23300

Added:
   labs/jbossrules/trunk/src/main/assembly/pre-bin.xml
Modified:
   labs/jbossrules/trunk/pom.xml
   labs/jbossrules/trunk/src/main/assembly/bin.xml
Log:
-we first create a directory of the zip, via pre-bin, before zipping up to get over the duplicate dependencies issue in zips.

Modified: labs/jbossrules/trunk/pom.xml
===================================================================
--- labs/jbossrules/trunk/pom.xml	2008-10-03 22:41:55 UTC (rev 23299)
+++ labs/jbossrules/trunk/pom.xml	2008-10-04 00:06:58 UTC (rev 23300)
@@ -495,6 +495,7 @@
                     <version>2.2-beta-2</version>
                     <configuration>
                         <descriptors>
+                            <descriptor>src/main/assembly/pre-bin.xml</descriptor>
                             <descriptor>src/main/assembly/bin.xml</descriptor>
 			                <descriptor>src/main/assembly/guvnor.xml</descriptor>
                             <descriptor>src/main/assembly/src.xml</descriptor>

Modified: labs/jbossrules/trunk/src/main/assembly/bin.xml
===================================================================
--- labs/jbossrules/trunk/src/main/assembly/bin.xml	2008-10-03 22:41:55 UTC (rev 23299)
+++ labs/jbossrules/trunk/src/main/assembly/bin.xml	2008-10-04 00:06:58 UTC (rev 23300)
@@ -8,83 +8,13 @@
   <includeBaseDirectory>false</includeBaseDirectory>
   
   <fileSets>
-  
+
     <fileSet>
-      <includes>
-        <include>LICENSE-ASL-2.0.txt</include>
-        <include>JBossORG-EULA.txt</include>
-        <include>README_DEPENDENCIES.txt</include>
-      </includes>
-    </fileSet>
-    
-    <fileSet>
-       <directory>target/site/apidocs</directory>
-       <outputDirectory>documentation/apidocs</outputDirectory>
+       <directory>target/drools-${project.version}-pre-bin.dir</directory>      
+        <outputDirectory></outputDirectory>
     </fileSet>      
   </fileSets>  
 
-  <moduleSets>
-    <moduleSet>
-    	<includes>
-    		<!-- note: we do not include BRMS here, as it is distributed as a single war, and a war includes all already -->
-    		<include>org.drools:drools-core</include>
-    		<include>org.drools:drools-compiler</include>
-    		<include>org.drools:drools-jsr94</include>
-    		<include>org.drools:drools-decisiontables</include>
-    		<include>org.drools:drools-templates</include>
-    		<include>org.drools:drools-clips</include>
-    		<include>org.drools:drools-dataloaders-jaxb</include>
-    		<include>org.drools:drools-dataloaders-smooks</include>
-    		<include>org.drools:drools-verifier</include>
-     		<include>org.drools:drools-ant</include>
-		<include>org.drools:drools-server</include>
-		<include>org.drools:drools-workitems</include>
-		<include>org.drools:drools-process-task</include>
-    	</includes>
-    	
-      <binaries>
-        <outputDirectory></outputDirectory>
-        <unpack>false</unpack> 
-        
-    	  <dependencySets>	
-    	    <dependencySet>
-    	      <outputDirectory>lib</outputDirectory>
-    	      <unpack>false</unpack>
-    	      <excludes> 
-    	         <exclude>org.drools:drools-*</exclude>
-    	      </excludes>
-              <useTransitiveDependencies>false</useTransitiveDependencies>
-    	    </dependencySet>  	         
-    	  </dependencySets>  	
-      </binaries>   
-	    
-    </moduleSet>
-    
-    <!--moduleSet>
-    	<includes>
-    		<include>org.drools:drools-documentation</include>
-    	</includes>
-    	
-      <binaries>
-        <outputDirectory>documentation</outputDirectory>
-        <outputFileNameMapping>manual</outputFileNameMapping>
-	      <unpack>true</unpack> 
-	      <unpackOptions>
-	          <includes>
-	            <include>shared/**</include>
-	            <include>html/**</include>
-	            <include>manual/html_single/**</include>
-	          </includes>    	              	      
-	          <excludes>
-	            <exclude>eclipse/**</exclude>
-	            <exclude>META-INF/**</exclude>
-	          </excludes>
-	      </unpackOptions>  	          
-      </binaries>   
-	    
-    </moduleSet-->    
-  </moduleSets>  
 
 
-
 </assembly>

Added: labs/jbossrules/trunk/src/main/assembly/pre-bin.xml
===================================================================
--- labs/jbossrules/trunk/src/main/assembly/pre-bin.xml	                        (rev 0)
+++ labs/jbossrules/trunk/src/main/assembly/pre-bin.xml	2008-10-04 00:06:58 UTC (rev 23300)
@@ -0,0 +1,90 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<assembly>
+  <id>pre-bin</id>
+  <formats>
+    <format>dir</format>
+  </formats>
+  
+  <includeBaseDirectory>false</includeBaseDirectory>
+  
+  <fileSets>
+  
+    <fileSet>
+      <includes>
+        <include>LICENSE-ASL-2.0.txt</include>
+        <include>JBossORG-EULA.txt</include>
+        <include>README_DEPENDENCIES.txt</include>
+      </includes>
+    </fileSet>
+    
+    <fileSet>
+       <directory>target/site/apidocs</directory>
+       <outputDirectory>documentation/apidocs</outputDirectory>
+    </fileSet>      
+  </fileSets>  
+
+  <moduleSets>
+    <moduleSet>
+    	<includes>
+    		<!-- note: we do not include BRMS here, as it is distributed as a single war, and a war includes all already -->
+    		<include>org.drools:drools-core</include>
+    		<include>org.drools:drools-compiler</include>
+    		<include>org.drools:drools-jsr94</include>
+    		<include>org.drools:drools-decisiontables</include>
+    		<include>org.drools:drools-templates</include>
+    		<include>org.drools:drools-clips</include>
+    		<include>org.drools:drools-dataloaders-jaxb</include>
+    		<include>org.drools:drools-dataloaders-smooks</include>
+    		<include>org.drools:drools-verifier</include>
+     		<include>org.drools:drools-ant</include>
+		<include>org.drools:drools-server</include>
+		<include>org.drools:drools-workitems</include>
+		<include>org.drools:drools-process-task</include>
+    	</includes>
+    	
+      <binaries>
+        <outputDirectory></outputDirectory>
+        <unpack>false</unpack> 
+        
+    	  <dependencySets>	
+    	    <dependencySet>
+    	      <outputDirectory>lib</outputDirectory>
+    	      <unpack>false</unpack>
+    	      <excludes> 
+    	         <exclude>org.drools:drools-*</exclude>
+    	      </excludes>
+              <useTransitiveDependencies>false</useTransitiveDependencies>
+    	    </dependencySet>  	         
+    	  </dependencySets>  	
+      </binaries>   
+	    
+    </moduleSet>
+    
+    <!--moduleSet>
+    	<includes>
+    		<include>org.drools:drools-documentation</include>
+    	</includes>
+    	
+      <binaries>
+        <outputDirectory>documentation</outputDirectory>
+        <outputFileNameMapping>manual</outputFileNameMapping>
+	      <unpack>true</unpack> 
+	      <unpackOptions>
+	          <includes>
+	            <include>shared/**</include>
+	            <include>html/**</include>
+	            <include>manual/html_single/**</include>
+	          </includes>    	              	      
+	          <excludes>
+	            <exclude>eclipse/**</exclude>
+	            <exclude>META-INF/**</exclude>
+	          </excludes>
+	      </unpackOptions>  	          
+      </binaries>   
+	    
+    </moduleSet-->    
+  </moduleSets>  
+
+
+
+</assembly>