[teiid-commits] teiid SVN: r2026 - in trunk: build/assembly/adminshell and 1 other directory.

[teiid-commits at lists.jboss.org]

Author: rareddy
Date: 2010-04-06 11:41:40 -0400 (Tue, 06 Apr 2010)
New Revision: 2026

Removed:
   trunk/build/assembly/adminshell/adminshell-dependencies.xml
Modified:
   trunk/build/assembly/adminshell/adminshell-dist.xml
   trunk/pom.xml
Log:
TEIID-1036: making the scripts executable and simplifying the deployment file.

Deleted: trunk/build/assembly/adminshell/adminshell-dependencies.xml
===================================================================
--- trunk/build/assembly/adminshell/adminshell-dependencies.xml	2010-04-05 21:54:25 UTC (rev 2025)
+++ trunk/build/assembly/adminshell/adminshell-dependencies.xml	2010-04-06 15:41:40 UTC (rev 2026)
@@ -1,39 +0,0 @@
-<!--This script builds a JAR for the CDK -->
-<assembly>
-  
-  <id>adminshell-dependencies</id>
-  
-  <formats>
-    <format>dir</format>
-  </formats>
-  
-  <includeBaseDirectory>false</includeBaseDirectory>
-  <baseDirectory>teiid-adminshell</baseDirectory>
-    
-  <moduleSets>
-    <moduleSet>
-        <includeSubModules>true</includeSubModules>
-               
-        <includes>
-        	<include>org.jboss.teiid:teiid-adminshell</include>
-        </includes>
-                        
-        <binaries>        
-          <includeDependencies>true</includeDependencies>
-          <unpack>false</unpack>
-                                    
-          <dependencySets>
-            <dependencySet>
-              <useProjectArtifact>true</useProjectArtifact>
-              <unpack>false</unpack>
-              <useTransitiveDependencies>true</useTransitiveDependencies>
-              <useDefaultExcludes>true</useDefaultExcludes>
-            </dependencySet>
-          </dependencySets>
-          
-        </binaries>
-      
-    </moduleSet>
-  </moduleSets>
-    
-</assembly>
\ No newline at end of file

Modified: trunk/build/assembly/adminshell/adminshell-dist.xml
===================================================================
--- trunk/build/assembly/adminshell/adminshell-dist.xml	2010-04-05 21:54:25 UTC (rev 2025)
+++ trunk/build/assembly/adminshell/adminshell-dist.xml	2010-04-06 15:41:40 UTC (rev 2026)
@@ -10,23 +10,49 @@
   <includeBaseDirectory>true</includeBaseDirectory>
   <baseDirectory>teiid-adminshell-${version}</baseDirectory>
 
-
+  <moduleSets>
+    <moduleSet>
+        <includeSubModules>true</includeSubModules>
+               
+        <includes>
+            <include>org.jboss.teiid:teiid-adminshell</include>
+        </includes>
+                        
+        <binaries>        
+          <includeDependencies>true</includeDependencies>
+          <unpack>false</unpack>
+                                    
+          <dependencySets>
+            <dependencySet>
+              <useProjectArtifact>true</useProjectArtifact>
+              <unpack>false</unpack>
+              <useTransitiveDependencies>true</useTransitiveDependencies>
+              <useDefaultExcludes>true</useDefaultExcludes>
+            </dependencySet>
+          </dependencySets>
+          <outputDirectory>lib</outputDirectory>
+        </binaries>
+      
+    </moduleSet>
+  </moduleSets>
+  
   <fileSets>
-  
-    <fileSet>
-      <directory>target/distribution/teiid-${version}-adminshell-dependencies.dir</directory>
-      <includes>
-        <include>*.jar</include>
-      </includes>
-      <outputDirectory>lib</outputDirectory>      
-    </fileSet>
       
     <fileSet>
         <directory>build/kit-adminshell</directory>
         <outputDirectory>/</outputDirectory>      
+        <includes>
+          <include>**/*.sh</include>
+        </includes>   
+        <fileMode>755</fileMode>      
+    </fileSet> 
+          
+    <fileSet>
+        <directory>build/kit-adminshell</directory>
+        <outputDirectory>/</outputDirectory>      
         <excludes>
-          <exclude>**/*.foo</exclude>
-        </excludes>        
+          <exclude>**/*.sh</exclude>
+        </excludes>      
     </fileSet>      
     
     <fileSet>
@@ -38,7 +64,5 @@
     </fileSet>
         
   </fileSets>
-
-
     
 </assembly>
\ No newline at end of file

Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml	2010-04-05 21:54:25 UTC (rev 2025)
+++ trunk/pom.xml	2010-04-06 15:41:40 UTC (rev 2026)
@@ -82,7 +82,6 @@
 								<descriptor>build/assembly/src.xml</descriptor>
 								<descriptor>build/assembly/client-jar.xml</descriptor>
                                 <descriptor>build/assembly/jboss-container/dist.xml</descriptor>
-                                <descriptor>build/assembly/adminshell/adminshell-dependencies.xml</descriptor>
                                 <descriptor>build/assembly/adminshell/adminshell-dist.xml</descriptor>
 								<descriptor>documentation/assembly/docs.xml</descriptor>
 							</descriptors>