[federate-commits] Federate SVN: r40 - in trunk: build/assembly/embedded and 1 other directory.

[federate-commits at lists.jboss.org]

Author: rareddy
Date: 2008-11-26 15:08:22 -0500 (Wed, 26 Nov 2008)
New Revision: 40

Added:
   trunk/build/assembly/embedded/embedded-connector-dependencies.xml
Modified:
   trunk/build/assembly/embedded/embedded-dependencies.xml
   trunk/build/assembly/embedded/embedded-dist.xml
   trunk/pom.xml
Log:
FEDERATE-12: removing the unnecessary jars from embedded-kit, also separating the connector specific dependencies to "extension" directory

Added: trunk/build/assembly/embedded/embedded-connector-dependencies.xml
===================================================================
--- trunk/build/assembly/embedded/embedded-connector-dependencies.xml	                        (rev 0)
+++ trunk/build/assembly/embedded/embedded-connector-dependencies.xml	2008-11-26 20:08:22 UTC (rev 40)
@@ -0,0 +1,48 @@
+<!--This script builds a JAR for a Federate Embedded Server Installation -->
+<assembly>
+  
+  <id>connector-dependencies</id>
+  
+  <formats>
+    <format>dir</format>
+  </formats>
+  
+  <includeBaseDirectory>false</includeBaseDirectory>
+  <baseDirectory>federate-embedded</baseDirectory>
+    
+  <moduleSets>
+    <moduleSet>
+        <includeSubModules>true</includeSubModules>
+               
+        <includes>        	
+            <include>org.federate:connector-jdbc</include>
+            <include>org.federate:connector-xml</include>
+            <include>org.federate:connector-loopback</include>
+            <include>org.federate:connector-text</include>
+            <include>org.federate:connector-ldap</include>
+            <include>org.federate:connector-salesforce</include>
+            <include>org.federate:salesforce-api</include>
+        </includes>
+        
+        <binaries>        
+          <includeDependencies>true</includeDependencies>
+          <unpack>true</unpack>
+                                    
+          <dependencySets>
+            <dependencySet>
+              <useProjectArtifact>false</useProjectArtifact>
+              <unpack>false</unpack>
+              <useTransitiveDependencies>false</useTransitiveDependencies>
+              <useDefaultExcludes>true</useDefaultExcludes>
+              <excludes>
+                <exclude>federate*</exclude>
+              </excludes>              
+            </dependencySet>
+          </dependencySets>
+          
+        </binaries>
+      
+    </moduleSet>
+  </moduleSets>
+    
+</assembly>
\ No newline at end of file


Property changes on: trunk/build/assembly/embedded/embedded-connector-dependencies.xml
___________________________________________________________________
Name: svn:mime-type
   + text/plain

Modified: trunk/build/assembly/embedded/embedded-dependencies.xml
===================================================================
--- trunk/build/assembly/embedded/embedded-dependencies.xml	2008-11-26 15:05:44 UTC (rev 39)
+++ trunk/build/assembly/embedded/embedded-dependencies.xml	2008-11-26 20:08:22 UTC (rev 40)
@@ -26,15 +26,7 @@
             <include>org.federate:federate-embedded</include>
         	<include>org.federate:federate-engine</include>
         	<include>org.federate:federate-metadata</include>
-        	<include>org.federate:federate-txn-jbossts</include>
-        	
-            <include>org.federate:connector-jdbc</include>
-            <include>org.federate:connector-xml</include>
-            <include>org.federate:connector-loopback</include>
-            <include>org.federate:connector-text</include>
-            <include>org.federate:connector-ldap</include>
-            <include>org.federate:connector-salesforce</include>
-            <include>org.federate:salesforce-api</include>
+        	<include>org.federate:federate-txn-jbossts</include>        	
         </includes>
         
         <binaries>        
@@ -49,6 +41,13 @@
               <useDefaultExcludes>true</useDefaultExcludes>
               <excludes>
                 <exclude>federate*</exclude>
+                
+                <!-- these should have been excluded by module dependency structure, but until we fix those this will help-->
+                <exclude>antlr*</exclude>
+                <exclude>bsh*</exclude>
+                <exclude>jgroups*</exclude>
+                <exclude>netty*</exclude>
+                <exclude>stringtemplate*</exclude>
               </excludes>              
             </dependencySet>
           </dependencySets>

Modified: trunk/build/assembly/embedded/embedded-dist.xml
===================================================================
--- trunk/build/assembly/embedded/embedded-dist.xml	2008-11-26 15:05:44 UTC (rev 39)
+++ trunk/build/assembly/embedded/embedded-dist.xml	2008-11-26 20:08:22 UTC (rev 40)
@@ -37,6 +37,14 @@
       </includes>
       <outputDirectory>lib</outputDirectory>      
     </fileSet>    
+    
+    <fileSet>
+      <directory>target/distribution/federate-${version}-connector-dependencies.dir</directory>
+      <includes>
+        <include>*.jar</include>
+      </includes>
+      <outputDirectory>extensions</outputDirectory>      
+    </fileSet>      
 
     <fileSet>
         <directory>build/kit-embedded</directory>

Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml	2008-11-26 15:05:44 UTC (rev 39)
+++ trunk/pom.xml	2008-11-26 20:08:22 UTC (rev 40)
@@ -124,6 +124,7 @@
                     <descriptor>build/assembly/bin.xml</descriptor>
                     <descriptor>build/assembly/embedded/embedded-jar.xml</descriptor>
                     <descriptor>build/assembly/embedded/embedded-dependencies.xml</descriptor>
+                    <descriptor>build/assembly/embedded/embedded-connector-dependencies.xml</descriptor>
 		            <descriptor>build/assembly/embedded/embedded-dist.xml</descriptor>
 		        </descriptors>
 		        <outputDirectory>target/distribution</outputDirectory>