TEIID-2973: adding the deployment specific changes

build/assembly/jboss-as7/dist.xml

@@ -126,7 +126,7 @@
       <binaries>
         <includeDependencies>false</includeDependencies>
         <unpack>false</unpack>
-        <outputDirectory>modules/system/layers/base/org/jboss/teiid/olingo/main</outputDirectory>       
+        <outputDirectory>modules/system/layers/base/org/jboss/teiid/olingo/main</outputDirectory>
       </binaries>
     </moduleSet>
 
@@ -139,11 +139,22 @@
             <includeDependencies>false</includeDependencies>
             <unpack>false</unpack>
             <outputDirectory>modules/system/layers/base/org/jboss/teiid/main/deployments</outputDirectory>
-            <includes>
-                <include>org.jboss.teiid:teiid-olingo:war</include>
-            </includes>
+            <attachmentClassifier>odata4</attachmentClassifier>
         </binaries>
-    </moduleSet>           
+    </moduleSet> 
+
+    <moduleSet>
+        <useAllReactorProjects>true</useAllReactorProjects>
+        <includes>
+            <include>org.jboss.teiid:teiid-olingo</include>
+        </includes>
+        <binaries> 
+          <includeDependencies>false</includeDependencies>
+          <unpack>true</unpack>
+          <outputDirectory>.</outputDirectory>
+          <attachmentClassifier>dependencies</attachmentClassifier>
+        </binaries>
+    </moduleSet>              
 
     <!-- These are Teiid internal dependencies; to make JCA work -->
     <moduleSet>
@@ -169,11 +180,18 @@
                         <exclude>jaxen:jaxen</exclude>
                         <exclude>org.jboss:staxmapper</exclude>
                         <exclude>io.netty:netty</exclude>
+                        <exclude>org.apache.olingo:*</exclude>
                     </excludes>
                     <useProjectArtifact>true</useProjectArtifact>
                     <unpack>false</unpack>
                     <useTransitiveDependencies>true</useTransitiveDependencies>
                 </dependencySet>
+                <dependencySet>
+                    <includes>
+                        <include>org.apache.olingo:*</include>
+                    </includes>
+                    <outputDirectory>modules/system/layers/base/org/apache/olingo</outputDirectory>
+                </dependencySet>
             </dependencySets>
             <outputDirectory>modules/system/layers/base/org/jboss/teiid/main</outputDirectory>
         </binaries>

build/kits/jboss-as7/modules/system/layers/base/com/fasterxml/jackson/main/module.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module xmlns="urn:jboss:module:1.0" name="com.fasterxml.jackson">
+    <resources>
+        <resource-root path="jackson-core-${version.com.fasterxml.jackson.core}.jar" />
+    </resources>
+</module>

build/kits/jboss-as7/modules/system/layers/base/org/antlr/4.1/module.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module xmlns="urn:jboss:module:1.0" name="org.antlr" slot="4.1">
+    <resources>
+        <resource-root path="antlr4-runtime-${version.org.antlr}.jar" />
+    </resources>
+</module>

build/kits/jboss-as7/modules/system/layers/base/org/apache/commons/lang/3.3.2/module.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module xmlns="urn:jboss:module:1.0" name="org.apache.commons.lang" slot="3.3.2">
+    <resources>
+        <resource-root path="commons-lang3-${version.org.apache.commons}.jar" />
+    </resources>
+</module>

build/kits/jboss-as7/modules/system/layers/base/org/apache/olingo/main/module.xml

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module xmlns="urn:jboss:module:1.0" name="org.apache.olingo">
+    <resources>
+        <resource-root path="odata-commons-api-${version.org.apache.olingo}.jar" />
+        <resource-root path="odata-commons-core-${version.org.apache.olingo}.jar" />
+        <resource-root path="odata-server-api-${version.org.apache.olingo}.jar" />
+        <resource-root path="odata-server-core-${version.org.apache.olingo}.jar" />
+    </resources>
+
+    <dependencies>
+        <module name="javax.servlet.api"/>
+        <module name="javax.xml.stream.api"/>
+        <module name="org.apache.httpcomponents"/>
+        <module name="com.fasterxml.jackson"/>
+        <module name="org.slf4j"/>
+        <module name="org.codehaus.woodstox"/>
+        <module name="org.apache.commons.codec"/>
+        <module name="org.apache.commons.lang" slot="3.3.2"/>
+        <module name="org.antlr" slot="4.1"/>
+    </dependencies>
+
+</module>

build/kits/jboss-as7/modules/system/layers/base/org/jboss/teiid/main/deployments/deployments.properties

@@ -1,2 +1,2 @@
 teiid-odata-${project.version}.war
-teiid-olingo-${project.version}.war
+teiid-olingo-${project.version}-odata4.war

build/kits/jboss-as7/modules/system/layers/base/org/jboss/teiid/olingo/main/module.xml

@@ -1,21 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module xmlns="urn:jboss:module:1.0" name="org.jboss.teiid.olingo">
     <resources>
-    <!-- 
         <resource-root path="teiid-olingo-${project.version}.jar" />
-        <resource-root path="olingo-commons-api-${version.org.apache.olingo}.jar" />
-        <resource-root path="olingo-commons-core-${version.org.apache.olingo}.jar" />
-        <resource-root path="olingo-server-api-${version.org.apache.olingo}.jar" />
-        <resource-root path="olingo-server-core-${version.org.apache.olingo}.jar" />
-        -->
     </resources>
 
     <dependencies>
-         <!-- 
+        <module name="javax.servlet.api"/>    
         <module name="org.apache.olingo" />
-         -->
-        <module name="org.jboss.teiid" />
-        <module name="org.apache.httpcomponents"/>
+        <module name="org.jboss.teiid.common-core" />
+        <module name="org.jboss.teiid.client" />
+        <module name="org.jboss.teiid.admin"/>
+        <module name="org.jboss.teiid.api"/>
+        <module name="org.jboss.teiid"/>
     </dependencies>
 
 </module>

olingo/dependencies.xml

@@ -0,0 +1,48 @@
+<assembly>
+
+  <id>dependencies</id>
+
+  <formats>
+    <format>zip</format>
+  </formats>
+
+  <includeBaseDirectory>false</includeBaseDirectory>
+  <baseDirectory>modules</baseDirectory>
+
+  <dependencySets>
+    <dependencySet>
+      <outputDirectory>${jbossas-module-root}/org/apache/olingo/main</outputDirectory>
+      <useTransitiveDependencies>false</useTransitiveDependencies>
+      <includes>
+        <include>org.apache.olingo:*</include>
+      </includes>
+      <useProjectArtifact>false</useProjectArtifact>
+    </dependencySet>
+    <dependencySet>
+      <outputDirectory>${jbossas-module-root}/org/antlr/4.1</outputDirectory>
+      <useTransitiveDependencies>false</useTransitiveDependencies>
+      <includes>
+        <include>org.antlr:antlr4-runtime</include>
+      </includes>
+      <useProjectArtifact>false</useProjectArtifact>
+    </dependencySet>
+    <dependencySet>
+      <outputDirectory>${jbossas-module-root}/org/apache/commons/lang/3.3.2</outputDirectory>
+      <useTransitiveDependencies>false</useTransitiveDependencies>
+      <includes>
+        <include>org.apache.commons:commons-lang3</include>
+      </includes>
+      <useProjectArtifact>false</useProjectArtifact>
+    </dependencySet> 
+    <dependencySet>
+      <outputDirectory>${jbossas-module-root}/com/fasterxml/jackson/main</outputDirectory>
+      <useTransitiveDependencies>false</useTransitiveDependencies>
+      <includes>
+        <include>com.fasterxml.jackson.core:jackson-core</include>
+      </includes>
+      <useProjectArtifact>false</useProjectArtifact>
+    </dependencySet>         
+
+  </dependencySets>  
+
+</assembly>