From 9f9e0bc9b371ffc6dcbba260cd57b1b622707f97 Mon Sep 17 00:00:00 2001
From: Van Halbert <vhalbert@redhat.com>
Date: Thu, 28 Jan 2016 16:42:35 -0600
Subject: [PATCH] fix dist.xml and build pom.xml

---
 build/assembly/jboss-as7/dist.xml | 17 +++++++++++++----
 build/pom.xml                     |  1 -
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/build/assembly/jboss-as7/dist.xml b/build/assembly/jboss-as7/dist.xml
index 4c6e9c506d..87715d43bf 100644
--- a/build/assembly/jboss-as7/dist.xml
+++ b/build/assembly/jboss-as7/dist.xml
@@ -46,8 +46,16 @@
         <outputDirectory>modules</outputDirectory>
     </fileSet>       
         
-    <!-- do not includes standalone-teiid.xml, will install using cli scripts -->
-     
+    <fileSet>
+         <directory>target/kits/jboss-as7/overlay/standalone</directory>
+        <outputDirectory>standalone</outputDirectory>      
+     </fileSet> 
+          
+     <!-- 
+     	  the following filesets are not used because the overlay directories
+     	  have to individually included
+     	    -->
+     	    
     <!--fileSet>
         <directory>target/kits/jboss-as7/overlay</directory>
         <outputDirectory>/</outputDirectory>      
@@ -55,7 +63,8 @@
           <include>**/*.sh</include>
         </includes>   
         <fileMode>755</fileMode>  
-    </fileSet>--> 
+    </fileSet>
+          
           
     <fileSet>
         <directory>target/kits/jboss-as7/overlay</directory>
@@ -63,7 +72,7 @@
         <excludes>
           <exclude>**/*.sh</exclude>
         </excludes>      
-    </fileSet>
+    </fileSet--> 
     
     <!--fileSet>
         <directory>target/kits/jboss-as7/overlay</directory>
diff --git a/build/pom.xml b/build/pom.xml
index d5b2d2a499..a84eb81097 100644
--- a/build/pom.xml
+++ b/build/pom.xml
@@ -279,7 +279,6 @@
                                 <descriptor>assembly/src.xml</descriptor>
                                 <descriptor>assembly/client-jar.xml</descriptor>
                                 <descriptor>assembly/console-jar.xml</descriptor>
-                                <descriptor>assembly/jboss-as7/dist.xml</descriptor>
                                 <descriptor>assembly/adminshell/adminshell-dist.xml</descriptor>
                                 <descriptor>assembly/embedded-dist.xml</descriptor>
 		                        <descriptor>assembly/jboss-as7/dist.xml</descriptor>