TEIID-3185: Moving the host environment for Teiid to be JBoss EAP 6.3…

….0.Alpha1
Teiid-Designer · Oct 24, 2014 · e526c66 · e526c66
1 parent 3235d06
commit e526c66
Show file tree

Hide file tree

Showing 10 changed files with 132 additions and 29 deletions.
diff --git a/build/pom.xml b/build/pom.xml
@@ -166,6 +166,71 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>jboss-eap-dist</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>unpack</goal>
+                        </goals>
+                        <configuration>
+                            <artifactItems>
+                                <artifactItem>
+                                    <groupId>org.jboss.as</groupId>
+                                    <artifactId>jboss-as-dist</artifactId>
+                                    <version>${version.org.jboss.as}</version>
+                                    <type>zip</type>
+                                    <overWrite>false</overWrite>
+                                    <outputDirectory>${project.build.directory}/uberzip</outputDirectory>
+                                </artifactItem>
+                            </artifactItems>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>teiid-dist</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>unpack</goal>
+                        </goals>
+                        <configuration>
+                            <artifactItems>
+                                <artifactItem>
+                                    <groupId>org.jboss.teiid</groupId>
+                                    <artifactId>teiid</artifactId>
+                                    <version>${project.version}</version>
+                                    <classifier>jboss-dist</classifier>
+                                    <type>zip</type>
+                                    <overWrite>false</overWrite>
+                                    <outputDirectory>${project.build.directory}/uberzip/jboss-eap-6.3</outputDirectory>
+                                </artifactItem>
+                            </artifactItems>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>console-dist</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>unpack</goal>
+                        </goals>
+                        <configuration>
+                            <artifactItems>
+                                <artifactItem>
+                                    <groupId>org.jboss.teiid.web-console</groupId>
+                                    <artifactId>teiid-console-dist</artifactId>
+                                    <version>1.2.0</version>
+                                    <classifier>jboss-as7</classifier>
+                                    <type>zip</type>
+                                    <overWrite>false</overWrite>
+                                    <outputDirectory>${project.build.directory}/uberzip/jboss-eap-6.3</outputDirectory>
+                                </artifactItem>
+                            </artifactItems>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
         </plugins>
     </build>
 

diff --git a/connectors/connector-ws/kits/embedded-dist.xml b/connectors/connector-ws/kits/embedded-dist.xml
@@ -30,6 +30,9 @@
                 <include>**/wsdl4j-*</include>
                 <include>**/neethi-*</include>
                 <include>**/xmlschema-*</include>
+                <include>**/spring-core-*</include>
+                <include>**/spring-context-*</include>
+                <include>**/spring-beans-*</include>
             </includes>           
         </fileSet>        
     </fileSets>

diff --git a/connectors/connector-ws/kits/jboss-as7-dist.xml b/connectors/connector-ws/kits/jboss-as7-dist.xml
@@ -42,6 +42,15 @@
             <includes>
                 <include>javax.ws.rs:javax.ws.rs-api</include>
             </includes>
-        </dependencySet>        
+        </dependencySet> 
+        <dependencySet>
+            <outputDirectory>${jbossas-module-root}/org/springframework/spring/main</outputDirectory>
+            <useTransitiveDependencies>false</useTransitiveDependencies>
+            <includes>
+                <include>org.springframework:spring-beans</include>
+                <include>org.springframework:spring-context</include>
+                <include>org.springframework:spring-core</include>
+            </includes>
+        </dependencySet>               
     </dependencySets>
 </assembly>
diff --git a/connectors/connector-ws/kits/jboss-as7/modules/org/springframework/spring/main/module.xml b/connectors/connector-ws/kits/jboss-as7/modules/org/springframework/spring/main/module.xml
@@ -0,0 +1,16 @@
+<module xmlns="urn:jboss:module:1.1" name="org.springframework.spring">
+  <resources>
+    <resource-root path="spring-beans-${version.org.springframework}.jar"/>
+    <resource-root path="spring-context-${version.org.springframework}.jar"/>    
+    <resource-root path="spring-core-${version.org.springframework}.jar"/>
+    <!-- 
+    <resource-root path="spring-asm.jar"/>
+    <resource-root path="spring-aop.jar"/>    
+    <resource-root path="spring-expression.jar"/>
+    <resource-root path="spring-tx.jar"/>
+     -->    
+  </resources>
+  <dependencies>
+    <module name="javax.api"/>
+  </dependencies>
+</module>
diff --git a/connectors/connector-ws/pom.xml b/connectors/connector-ws/pom.xml
@@ -70,7 +70,19 @@
         <dependency>
             <groupId>javax.ws.rs</groupId>
             <artifactId>javax.ws.rs-api</artifactId>
-        </dependency>        
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-beans</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-context</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-core</artifactId>
+        </dependency>
     </dependencies>
     <build>
         <plugins>

diff --git a/connectors/google-api/pom.xml b/connectors/google-api/pom.xml
@@ -10,11 +10,7 @@
   <name>Gogole API</name>
   <description>The java API for connecting Google services</description>
   <packaging>bundle</packaging>
-
-  <properties>
-    <version.com.google.guava>16.0.1</version.com.google.guava>
-  </properties>
-
+
   <dependencies>     
         <dependency>
             <groupId>javax.resource</groupId>
@@ -24,6 +20,7 @@
         <dependency>
 		  <groupId>com.google.guava</groupId>
 		  <artifactId>guava</artifactId>
+		  <scope>provided</scope>
 		</dependency>
 		<dependency>
 		  <groupId>org.apache.httpcomponents</groupId>

diff --git a/install.sh b/install.sh
@@ -10,17 +10,13 @@ TEIID_DIST=teiid-${TEIID_VERSION}-jboss-dist.zip
 
 SOURCES=(
     "jboss-eap.zip"
-    "resteasy-jaxrs.zip"
     "teiid-console-dist.zip"
 )
 
 declare -A SOURCE_URL SOURCE_SHA1
 
-SOURCE_URL["jboss-eap.zip"]="http://download.jboss.org/jbosseap/6/jboss-eap-6.1.0.Alpha/jboss-eap-6.1.0.Alpha.zip"
-SOURCE_SHA1["jboss-eap.zip"]="630d81f83b851077e3ad129924502bbdf0c1552a"
-
-SOURCE_URL["resteasy-jaxrs.zip"]="http://sourceforge.net/projects/resteasy/files/Resteasy%20JAX-RS/2.3.6.Final/resteasy-jaxrs-2.3.6.Final-all.zip"
-SOURCE_SHA1["resteasy-jaxrs.zip"]="cfcb2aaa60cd954d04e73cc7e99509ec38b5538a"
+SOURCE_URL["jboss-eap.zip"]="http://maven.repository.redhat.com/techpreview/eap6/6.3.0.Alpha/maven-repository/org/jboss/as/jboss-as-dist/7.4.0.Final-redhat-4/jboss-as-dist-7.4.0.Final-redhat-4.zip"
+SOURCE_SHA1["jboss-eap.zip"]="15978363d25acee751afa35af582548dace95480"
 
 SOURCE_URL["teiid-console-dist.zip"]="http://sourceforge.net/projects/teiid/files/webconsole/1.2/Final/teiid-console-dist-1.2.0.Final-jboss-as7.zip"
 SOURCE_SHA1["teiid-console-dist.zip"]="7b57b77520f2894b0f48a385f7dcff03898bb514"
@@ -81,25 +77,17 @@ echo "Unpacking JBoss..."
 unzip -q ../jboss-eap.zip
 echo
 
-## Patch JAX-RS.
-echo "Patching JAX-RS module..."
-rm -rf jboss-eap-6.1/modules/system/layers/base/org/jboss/resteasy/resteasy-jaxrs
-unzip -qo ../resteasy-jaxrs.zip
-unzip -q resteasy-jaxrs-*/resteasy-jboss-modules-*.zip
-mv -f org/jboss/resteasy/resteasy-jaxrs jboss-eap-6.1/modules/system/layers/base/org/jboss/resteasy/resteasy-jaxrs
-echo
-
 ## Install Teiid.
 echo "Installing Teiid..."
-cd jboss-eap-6.1
+cd jboss-eap-6.3
 unzip -q -o ../../teiid-console-dist.zip
 unzip -q -o ../../$TEIID_DIST
 cd ..
 echo
 
 ## Package server.
 echo "Zipping up install..."
-mv -f jboss-eap-6.1 teiid-${TEIID_VERSION}
+mv -f jboss-eap-6.3 teiid-${TEIID_VERSION}
 rm -f ../teiid-${TEIID_VERSION}.zip
 zip -r -q ../teiid-${TEIID_VERSION}.zip teiid-${TEIID_VERSION}
 cd ..

diff --git a/pom.xml b/pom.xml
@@ -25,6 +25,7 @@
         <version.org.hibernate.search>4.4.0.Final</version.org.hibernate.search> <!-- versions required by infinispan 6.1 --> 
         <version.jaxen>1.1.4</version.jaxen> <!-- NOTE changing to use bom version of 1.1.3 will cause a build issue in teiid-engine -->
         <version.org.mongodb.mongo-java-driver>2.12.3</version.org.mongodb.mongo-java-driver>
+        <version.org.jboss.as>7.4.0.Final-redhat-4</version.org.jboss.as>
 
         <!-- Not in integration BOM; Need to check these jboss-parent BOM-->
         <version.org.jboss.jboss-vfs>3.2.2.Final-redhat-1</version.org.jboss.jboss-vfs>
@@ -1365,7 +1366,22 @@
                 <groupId>javax.ws.rs</groupId>
                 <artifactId>javax.ws.rs-api</artifactId>
                 <version>${version.javax.ws.rs}</version>
-            </dependency>        
+            </dependency>
+            <dependency>
+                <groupId>org.springframework</groupId>
+                <artifactId>spring-beans</artifactId>
+                <version>${version.org.springframework}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.springframework</groupId>
+                <artifactId>spring-context</artifactId>
+                <version>${version.org.springframework}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.springframework</groupId>
+                <artifactId>spring-core</artifactId>
+                <version>${version.org.springframework}</version>
+            </dependency>
         </dependencies>
 	</dependencyManagement>
 	<modules>

diff --git a/settings.xml b/settings.xml
@@ -62,8 +62,8 @@ http://maven.apache.org/xsd/settings-1.0.0.xsd">
       <repositories>
         <repository>
           <id>jboss-eap-alpha</id>
-          <name>JBoss EAP6.1 Alpha</name>
-          <url>http://maven.repository.redhat.com/techpreview/eap6/6.1.0.Alpha1/maven-repository/</url>
+          <name>JBoss EAP 6.3.0.Alpha</name>
+          <url>http://maven.repository.redhat.com/techpreview/eap6/6.3.0.Alpha/maven-repository/</url>
           <layout>default</layout>
           <releases>
             <enabled>true</enabled>

diff --git a/test-integration/common/pom.xml b/test-integration/common/pom.xml
@@ -62,9 +62,6 @@
     <profiles>
     <profile>
         <id>arquillian-tests</id>
-       <activation>
-            <activeByDefault>true</activeByDefault>
-        </activation>        
         <dependencies>
             <dependency>
                 <groupId>org.jboss.spec</groupId>