[teiid-commits] teiid SVN: r3952 - in branches/7.4.x/build: assembly and 1 other directories.

[teiid-commits at lists.jboss.org]

Author: van.halbert
Date: 2012-03-24 10:23:27 -0400 (Sat, 24 Mar 2012)
New Revision: 3952

Added:
   branches/7.4.x/build/assembly/console-jar.xml
Modified:
   branches/7.4.x/build/assembly/jboss-container/dist.xml
   branches/7.4.x/build/pom.xml
Log:
TEIID-1982 changed to repackage teiid-console.jar used in jboss kit admin console to contain the teiid-client.jar

Added: branches/7.4.x/build/assembly/console-jar.xml
===================================================================
--- branches/7.4.x/build/assembly/console-jar.xml	                        (rev 0)
+++ branches/7.4.x/build/assembly/console-jar.xml	2012-03-24 14:23:27 UTC (rev 3952)
@@ -0,0 +1,36 @@
+<!--This script builds a JAR for the Embedded Server Installation -->
+<assembly>
+  
+  <id>console</id>
+  
+  <formats>
+    <format>jar</format>
+  </formats>
+  
+  <includeBaseDirectory>false</includeBaseDirectory>
+  <baseDirectory>teiid-client</baseDirectory>
+    
+  <moduleSets>
+    <moduleSet>
+        <includeSubModules>true</includeSubModules>
+        <useAllReactorProjects>true</useAllReactorProjects>
+
+        <includes>
+            <include>org.jboss.teiid:teiid-client</include>
+            <include>org.jboss.teiid:teiid-common-core</include>
+            <include>org.jboss.teiid:teiid-console</include>	
+        </includes>
+        
+        <binaries>
+          <includeDependencies>false</includeDependencies>
+          <unpack>true</unpack>
+          <outputDirectory></outputDirectory>
+          <includes>
+            <include>:jar:*</include>
+          </includes>
+        </binaries>
+      
+    </moduleSet>
+  </moduleSets>
+
+</assembly>
\ No newline at end of file

Modified: branches/7.4.x/build/assembly/jboss-container/dist.xml
===================================================================
--- branches/7.4.x/build/assembly/jboss-container/dist.xml	2012-03-23 20:09:17 UTC (rev 3951)
+++ branches/7.4.x/build/assembly/jboss-container/dist.xml	2012-03-24 14:23:27 UTC (rev 3952)
@@ -53,6 +53,16 @@
         <directoryMode>0755</directoryMode>        
     </fileSet>
     
+    <!-- Include the JOPR plugin --> 
+    <fileSet>
+      <directory>target</directory>
+      <includes>
+        <include>teiid-${version}-console.jar</include>
+      </includes>
+      <outputDirectory>deploy/admin-console.war/plugins</outputDirectory>
+      <fileMode>0644</fileMode>
+    </fileSet>    
+    
 	<!-- We may want to do this if including multiple doc types or languages
 	     as the parent directory structure will be copied.  However the parent
 	     directory permissions still seem wrong.
@@ -205,7 +215,7 @@
     </moduleSet>
         
     <!-- Include the JOPR plugin -->    
-    <moduleSet>
+    <!--moduleSet>
         <includeSubModules>true</includeSubModules>
         <useAllReactorProjects>true</useAllReactorProjects>
 
@@ -220,6 +230,6 @@
           <fileMode>0644</fileMode>
         </binaries>
       
-    </moduleSet>        
+    </moduleSet-->        
     </moduleSets>  
 </assembly>

Modified: branches/7.4.x/build/pom.xml
===================================================================
--- branches/7.4.x/build/pom.xml	2012-03-23 20:09:17 UTC (rev 3951)
+++ branches/7.4.x/build/pom.xml	2012-03-24 14:23:27 UTC (rev 3952)
@@ -99,12 +99,12 @@
                   <descriptor>assembly/src.xml</descriptor>
                   <descriptor>assembly/docs.xml</descriptor>
                   <descriptor>assembly/client-jar.xml</descriptor>
+                  <descriptor>assembly/console-jar.xml</descriptor>                  
                   <descriptor>assembly/jboss-container/dist.xml</descriptor>
                   <descriptor>assembly/adminshell/adminshell-dist.xml</descriptor>
                 </descriptors>
               </configuration>
-            </plugin>
-
+            </plugin>          
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>exec-maven-plugin</artifactId>