updated maven assembly and added hal console

teiid · Apr 7, 2014 · 37e8b95 · 37e8b95
1 parent f3d8760
commit 37e8b95
Show file tree

Hide file tree

Showing 4 changed files with 63 additions and 30 deletions.
diff --git a/build/assembly/jboss-as7/dist.xml b/build/assembly/jboss-as7/dist.xml
@@ -210,7 +210,7 @@
                     <useProjectArtifact>true</useProjectArtifact>
                     <unpack>false</unpack>
                     <useTransitiveDependencies>false</useTransitiveDependencies>
-                    <useDefaultExcludes>true</useDefaultExcludes>
+                    <!--useDefaultExcludes>true</useDefaultExcludes-->
                 </dependencySet>
             </dependencySets>          
           <outputDirectory>modules/system/layers/base/org/jboss/teiid/resource-adapter/file/main</outputDirectory>
@@ -235,7 +235,7 @@
                     <useProjectArtifact>true</useProjectArtifact>
                     <unpack>false</unpack>
                     <useTransitiveDependencies>false</useTransitiveDependencies>
-                    <useDefaultExcludes>true</useDefaultExcludes>
+                    <!--useDefaultExcludes>true</useDefaultExcludes-->
                 </dependencySet>
             </dependencySets>          
           <outputDirectory>modules/system/layers/base/org/jboss/teiid/resource-adapter/ldap/main</outputDirectory>
@@ -260,7 +260,7 @@
                     <useProjectArtifact>true</useProjectArtifact>
                     <unpack>false</unpack>
                     <useTransitiveDependencies>false</useTransitiveDependencies>
-                    <useDefaultExcludes>true</useDefaultExcludes>
+                    <!--useDefaultExcludes>true</useDefaultExcludes-->
                 </dependencySet>
             </dependencySets>          
           <outputDirectory>modules/system/layers/base/org/jboss/teiid/resource-adapter/salesforce/main</outputDirectory>
@@ -285,7 +285,7 @@
                     <useProjectArtifact>true</useProjectArtifact>
                     <unpack>false</unpack>
                     <useTransitiveDependencies>false</useTransitiveDependencies>
-                    <useDefaultExcludes>true</useDefaultExcludes>
+                    <!--useDefaultExcludes>true</useDefaultExcludes-->
                 </dependencySet>
             </dependencySets>          
           <outputDirectory>modules/system/layers/base/org/jboss/teiid/resource-adapter/google/main</outputDirectory>
@@ -310,7 +310,7 @@
                     <useProjectArtifact>true</useProjectArtifact>
                     <unpack>false</unpack>
                     <useTransitiveDependencies>false</useTransitiveDependencies>
-                    <useDefaultExcludes>true</useDefaultExcludes>
+                    <!--useDefaultExcludes>true</useDefaultExcludes-->
                 </dependencySet>
             </dependencySets>          
           <outputDirectory>modules/system/layers/base/org/jboss/teiid/resource-adapter/mongodb/main</outputDirectory>
@@ -335,7 +335,7 @@
                     <useProjectArtifact>true</useProjectArtifact>
                     <unpack>false</unpack>
                     <useTransitiveDependencies>false</useTransitiveDependencies>
-                    <useDefaultExcludes>true</useDefaultExcludes>
+                    <!--useDefaultExcludes>true</useDefaultExcludes-->
                 </dependencySet>
             </dependencySets>          
           <outputDirectory>modules/system/layers/base/org/jboss/teiid/resource-adapter/webservice/main</outputDirectory>
@@ -360,7 +360,7 @@
                     <useProjectArtifact>true</useProjectArtifact>
                     <unpack>false</unpack>
                     <useTransitiveDependencies>false</useTransitiveDependencies>
-                    <useDefaultExcludes>true</useDefaultExcludes>
+                    <!--useDefaultExcludes>true</useDefaultExcludes-->
                 </dependencySet>
             </dependencySets>          
           <outputDirectory>modules/system/layers/base/org/jboss/teiid/resource-adapter/infinispan/main</outputDirectory>
@@ -385,7 +385,7 @@
                     <useProjectArtifact>true</useProjectArtifact>
                     <unpack>false</unpack>
                     <useTransitiveDependencies>false</useTransitiveDependencies>
-                    <useDefaultExcludes>true</useDefaultExcludes>
+                    <!--useDefaultExcludes>true</useDefaultExcludes-->
                 </dependencySet>
             </dependencySets>          
           <outputDirectory>modules/system/layers/base/org/jboss/teiid/resource-adapter/infinispan/6.2</outputDirectory>
@@ -412,7 +412,7 @@
                     <useProjectArtifact>true</useProjectArtifact>
                     <unpack>false</unpack>
                     <useTransitiveDependencies>false</useTransitiveDependencies>
-                    <useDefaultExcludes>true</useDefaultExcludes>
+                    <!--useDefaultExcludes>true</useDefaultExcludes-->
                 </dependencySet>
             </dependencySets>          
           <outputDirectory>modules/system/layers/base/org/jboss/teiid/translator/jdbc/main</outputDirectory>
@@ -437,7 +437,7 @@
                     <useProjectArtifact>true</useProjectArtifact>
                     <unpack>false</unpack>
                     <useTransitiveDependencies>false</useTransitiveDependencies>
-                    <useDefaultExcludes>true</useDefaultExcludes>
+                    <!--useDefaultExcludes>true</useDefaultExcludes-->
                 </dependencySet>
             </dependencySets>          
           <outputDirectory>modules/system/layers/base/org/jboss/teiid/translator/loopback/main</outputDirectory>
@@ -461,7 +461,7 @@
                     <useProjectArtifact>true</useProjectArtifact>
                     <unpack>false</unpack>
                     <useTransitiveDependencies>false</useTransitiveDependencies>
-                    <useDefaultExcludes>true</useDefaultExcludes>
+                    <!--useDefaultExcludes>true</useDefaultExcludes-->
                 </dependencySet>
             </dependencySets>          
           <outputDirectory>modules/system/layers/base/org/jboss/teiid/translator/file/main</outputDirectory>
@@ -485,7 +485,7 @@
                     <useProjectArtifact>true</useProjectArtifact>
                     <unpack>false</unpack>
                     <useTransitiveDependencies>false</useTransitiveDependencies>
-                    <useDefaultExcludes>true</useDefaultExcludes>
+                    <!--useDefaultExcludes>true</useDefaultExcludes-->
                 </dependencySet>
             </dependencySets>          
           <outputDirectory>modules/system/layers/base/org/jboss/teiid/translator/ldap/main</outputDirectory>
@@ -509,7 +509,7 @@
                     <useProjectArtifact>true</useProjectArtifact>
                     <unpack>false</unpack>
                     <useTransitiveDependencies>false</useTransitiveDependencies>
-                    <useDefaultExcludes>true</useDefaultExcludes>
+                   <!--useDefaultExcludes>true</useDefaultExcludes-->
                 </dependencySet>
             </dependencySets>          
           <outputDirectory>modules/system/layers/base/org/jboss/teiid/translator/google/main</outputDirectory>
@@ -532,7 +532,7 @@
                     <useProjectArtifact>true</useProjectArtifact>
                     <unpack>false</unpack>
                     <useTransitiveDependencies>false</useTransitiveDependencies>
-                    <useDefaultExcludes>true</useDefaultExcludes>
+                    <!--useDefaultExcludes>true</useDefaultExcludes-->
                 </dependencySet>
             </dependencySets>          
           <outputDirectory>modules/system/layers/base/org/jboss/teiid/translator/google/api/main</outputDirectory>
@@ -556,7 +556,7 @@
                     <useProjectArtifact>true</useProjectArtifact>
                     <unpack>false</unpack>
                     <useTransitiveDependencies>false</useTransitiveDependencies>
-                    <useDefaultExcludes>true</useDefaultExcludes>
+                    <!--useDefaultExcludes>true</useDefaultExcludes-->
                 </dependencySet>
             </dependencySets>          
           <outputDirectory>modules/system/layers/base/org/jboss/teiid/translator/mongodb/api/main</outputDirectory>
@@ -580,7 +580,7 @@
                     <useProjectArtifact>true</useProjectArtifact>
                     <unpack>false</unpack>
                     <useTransitiveDependencies>false</useTransitiveDependencies>
-                    <useDefaultExcludes>true</useDefaultExcludes>
+                    <!--useDefaultExcludes>true</useDefaultExcludes-->
                 </dependencySet>
             </dependencySets>          
           <outputDirectory>modules/system/layers/base/org/jboss/teiid/translator/salesforce/main</outputDirectory>
@@ -603,7 +603,7 @@
                     <useProjectArtifact>true</useProjectArtifact>
                     <unpack>false</unpack>
                     <useTransitiveDependencies>false</useTransitiveDependencies>
-                    <useDefaultExcludes>true</useDefaultExcludes>
+                    <!--useDefaultExcludes>true</useDefaultExcludes-->
                 </dependencySet>
             </dependencySets>          
           <outputDirectory>modules/system/layers/base/org/jboss/teiid/translator/salesforce/api/main</outputDirectory>
@@ -626,7 +626,7 @@
                     <useProjectArtifact>true</useProjectArtifact>
                     <unpack>false</unpack>
                     <useTransitiveDependencies>false</useTransitiveDependencies>
-                    <useDefaultExcludes>true</useDefaultExcludes>
+                    <!--useDefaultExcludes>true</useDefaultExcludes-->
                 </dependencySet>
             </dependencySets>          
           <outputDirectory>modules/system/layers/base/org/jboss/teiid/translator/ws/main</outputDirectory>
@@ -650,7 +650,7 @@
                     <useProjectArtifact>true</useProjectArtifact>
                     <unpack>false</unpack>
                     <useTransitiveDependencies>false</useTransitiveDependencies>
-                    <useDefaultExcludes>true</useDefaultExcludes>
+                    <!--useDefaultExcludes>true</useDefaultExcludes-->
                 </dependencySet>
             </dependencySets>          
           <outputDirectory>modules/system/layers/base/org/jboss/teiid/translator/olap/main</outputDirectory>
@@ -673,7 +673,7 @@
                     <useProjectArtifact>true</useProjectArtifact>
                     <unpack>false</unpack>
                     <useTransitiveDependencies>false</useTransitiveDependencies>
-                    <useDefaultExcludes>true</useDefaultExcludes>
+                   <!--useDefaultExcludes>true</useDefaultExcludes-->
                 </dependencySet>
             </dependencySets>          
           <outputDirectory>modules/system/layers/base/org/jboss/teiid/translator/hive/main</outputDirectory>
@@ -695,7 +695,7 @@
                     <useProjectArtifact>true</useProjectArtifact>
                     <unpack>false</unpack>
                     <useTransitiveDependencies>false</useTransitiveDependencies>
-                    <useDefaultExcludes>true</useDefaultExcludes>
+                    <!--useDefaultExcludes>true</useDefaultExcludes-->
                 </dependencySet>
             </dependencySets>          
           <outputDirectory>modules/system/layers/base/org/jboss/teiid/translator/jpa/main</outputDirectory>
@@ -717,7 +717,7 @@
                       <useProjectArtifact>true</useProjectArtifact>
                       <unpack>false</unpack>
                       <useTransitiveDependencies>false</useTransitiveDependencies>
-                      <useDefaultExcludes>true</useDefaultExcludes>
+                      <!--useDefaultExcludes>true</useDefaultExcludes-->
                   </dependencySet>
               </dependencySets>          
               <outputDirectory>modules/system/layers/base/org/jboss/teiid/translator/object/main</outputDirectory>
@@ -739,7 +739,7 @@
                       <useProjectArtifact>true</useProjectArtifact>
                       <unpack>false</unpack>
                       <useTransitiveDependencies>false</useTransitiveDependencies>
-                      <useDefaultExcludes>true</useDefaultExcludes>
+                      <!--useDefaultExcludes>true</useDefaultExcludes-->
                   </dependencySet>
               </dependencySets>          
               <outputDirectory>modules/system/layers/base/org/jboss/teiid/translator/odata/main</outputDirectory>
@@ -762,7 +762,7 @@
                     <useProjectArtifact>true</useProjectArtifact>
                     <unpack>false</unpack>
                     <useTransitiveDependencies>false</useTransitiveDependencies>
-                    <useDefaultExcludes>true</useDefaultExcludes>
+                    <!--useDefaultExcludes>true</useDefaultExcludes-->
                 </dependencySet>
             </dependencySets>          
           <outputDirectory>modules/system/layers/base/org/jboss/teiid/translator/mongodb/main</outputDirectory>

diff --git a/...jboss-as7/modules/org/jboss/as/console/eap/hal-console-1.5.7.Final-redhat-3-resources.jar b/...jboss-as7/modules/org/jboss/as/console/eap/hal-console-1.5.7.Final-redhat-3-resources.jar
diff --git a/build/kits/jboss-as7/modules/org/jboss/as/console/eap/module.xml b/build/kits/jboss-as7/modules/org/jboss/as/console/eap/module.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+  ~ JBoss, Home of Professional Open Source.
+  ~ Copyright 2011, Red Hat, Inc., and individual contributors
+  ~ as indicated by the @author tags. See the copyright.txt file in the
+  ~ distribution for a full listing of individual contributors.
+  ~
+  ~ This is free software; you can redistribute it and/or modify it
+  ~ under the terms of the GNU Lesser General Public License as
+  ~ published by the Free Software Foundation; either version 2.1 of
+  ~ the License, or (at your option) any later version.
+  ~
+  ~ This software is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+  ~ Lesser General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU Lesser General Public
+  ~ License along with this software; if not, write to the Free
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+  -->
+
+<module xmlns="urn:jboss:module:1.1" name="org.jboss.as.console" slot="eap">
+    <properties>
+        <property name="jboss.api" value="private"/>
+    </properties>
+
+    <resources>
+        <resource-root path="hal-console-1.5.7.Final-redhat-3-resources.jar"/>
+    </resources>
+
+    <dependencies>
+        <!-- Do not add dependencies to the console as resources in any
+             dependencies could be served up through the HTTP interface. -->
+    </dependencies>
+</module>
diff --git a/pom.xml b/pom.xml
@@ -168,13 +168,8 @@
 					<version>${version.jar.plugin}</version>
 				</plugin>
 				<plugin>
-<<<<<<< HEAD
-                    <artifactId>maven-assembly-plugin</artifactId>
-                    <version>2.2-beta-6-m1-jboss</version>
-=======
 				  <artifactId>maven-assembly-plugin</artifactId>
 				  <version>2.4</version>
->>>>>>> c9deffa... TEIID-2889: updating the ASSEMBLY plugin version to 2.4 to fix a bug
 				</plugin>
 			</plugins>
 		</pluginManagement>
@@ -720,4 +715,4 @@
 		<module>admin</module>
         <module>odata</module>
     </modules>
-</project>
+</project>