fix dist.xml and build pom.xml

teiid · Jan 28, 2016 · 9f9e0bc · 9f9e0bc
1 parent 4a0ef9e
commit 9f9e0bc
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 5 deletions.
diff --git a/build/assembly/jboss-as7/dist.xml b/build/assembly/jboss-as7/dist.xml
@@ -46,24 +46,33 @@
         <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>      
         <includes>
           <include>**/*.sh</include>
         </includes>   
         <fileMode>755</fileMode>  
-    </fileSet>--> 
+    </fileSet>
+          
           
     <fileSet>
         <directory>target/kits/jboss-as7/overlay</directory>
         <outputDirectory>/</outputDirectory>      
         <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
@@ -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>