JBPM-3772, BZ 854704: moving assembly files (etc.) to specific war mo…

…dules to fix signature file problems.

jbpm-distribution/pom.xml

@@ -45,42 +45,6 @@
               </descriptors>
             </configuration>
           </execution>
-          <execution>
-            <id>console-server-wars</id>
-            <phase>package</phase>
-            <goals>
-              <goal>single</goal>
-            </goals>
-            <configuration>
-              <finalName>jbpm-gwt-console-server-${project.version}</finalName>
-              <descriptors>
-                <descriptor>src/main/assembly/gwt-console-server-ee6.xml</descriptor>
-              </descriptors>
-              <archive>
-                <manifestEntries>
-                  <Dependencies>org.jboss.netty</Dependencies>
-                </manifestEntries>
-              </archive>
-            </configuration>
-          </execution>
-          <execution>
-            <id>human-task-wars</id>
-            <phase>package</phase>
-            <goals>
-              <goal>single</goal>
-            </goals>
-            <configuration>
-              <finalName>jbpm-human-task-${project.version}</finalName>
-              <descriptors>
-                <descriptor>src/main/assembly/human-task-war-ee6.xml</descriptor>
-              </descriptors>
-              <archive>
-                <manifestEntries>
-                  <Dependencies>org.jboss.netty</Dependencies>
-                </manifestEntries>
-              </archive>
-            </configuration>
-          </execution>
         </executions>
       </plugin>
     </plugins>
@@ -145,19 +109,6 @@
       <artifactId>jbpm-docs</artifactId>
       <type>jdocbook</type>
     </dependency>
-
-    <!-- EE 6 compatibility -->
-    <dependency>
-      <groupId>org.jbpm</groupId>
-      <artifactId>jbpm-gwt-console-server</artifactId>
-      <type>war</type>
-    </dependency>
-    <dependency>
-      <groupId>org.jbpm</groupId>
-      <artifactId>jbpm-human-task-war</artifactId>
-      <type>war</type>
-      <version>${jbpm.version}</version>
-    </dependency>
   </dependencies>
 
 </project>

jbpm-gwt/jbpm-gwt-console-server/pom.xml

@@ -90,5 +90,53 @@
           </plugin>
        </plugins>  		
   	</pluginManagement>
+    <!--  It's necessary to build the EE6 war here instead of in jbpm-distribution 
+          because of problems caused by signing the wars -->
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-antrun-plugin</artifactId>
+        <version>1.6</version>
+        <executions>
+          <execution>
+            <id>unpack-war</id>
+            <phase>package</phase>
+            <configuration>
+              <target>
+                <unzip
+                  src="${project.build.directory}/${project.artifactId}-${project.version}.war"
+                  dest="${project.build.directory}/upacked-war" />
+              </target>
+            </configuration>
+            <goals>
+              <goal>run</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-assembly-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>ee6</id>
+            <phase>package</phase>
+            <goals>
+              <goal>single</goal>
+            </goals>
+            <configuration>
+              <descriptors>
+                <descriptor>src/main/assembly/gwt-console-server-ee6.xml</descriptor>
+              </descriptors>
+              <archive>
+                <manifestEntries>
+                  <Dependencies>org.jboss.netty</Dependencies>
+                </manifestEntries>
+              </archive>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
   </build>
 </project>

jbpm-gwt/jbpm-gwt-console-server/src/main/assembly/gwt-console-server-ee6.xml

@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<assembly
+  xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
+
+  <!-- Note: This works on jboss-as-web-7.0 and jboss-as-7.0 -->
+  <id>EE6</id>
+  <formats>
+    <format>war</format>
+  </formats>
+
+  <includeBaseDirectory>false</includeBaseDirectory>
+
+  <fileSets>
+    <fileSet>
+      <directory>${project.build.directory}/upacked-war</directory>
+      <outputDirectory>/</outputDirectory>
+      <excludes>
+        <exclude>WEB-INF/classes/META-INF/persistence.xml</exclude>
+
+        <!-- possible signature info -->
+        <exclude>META-INF/*.SF</exclude>
+        <exclude>META-INF/*.RSA</exclude>
+
+        <!-- jars -->
+        <exclude>WEB-INF/lib/netty-*.jar</exclude>
+
+        <!-- hibernate 3 transitive deps -->
+        <exclude>WEB-INF/lib/hibernate*.jar</exclude>
+        <exclude>WEB-INF/lib/dom4j-*.jar</exclude>
+
+        <!-- from dom4j -->
+        <exclude>WEB-INF/lib/jaxen-*.jar</exclude>
+        <exclude>WEB-INF/lib/jaxme-api-*.jar</exclude>
+        <exclude>WEB-INF/lib/pull-parser-*.jar</exclude>
+        <exclude>WEB-INF/lib/relaxngDatatype-*.jar</exclude>
+        <exclude>WEB-INF/lib/stax-api-1.0.jar</exclude>
+        <exclude>WEB-INF/lib/xml-apis-*.jar</exclude>
+        <exclude>WEB-INF/lib/xpp3-*.jar</exclude>
+        <exclude>WEB-INF/lib/xsdlib-*.jar</exclude>
+
+        <!-- from jaxen -->
+        <!-- <exclude>WEB-INF/lib/jdom-*.jar</exclude> needed by jbpm-workitems? -->
+        <exclude>WEB-INF/lib/xercesImpl-*.jar</exclude>
+        <exclude>WEB-INF/lib/xmlParserAPIs-*.jar</exclude>
+        <exclude>WEB-INF/lib/xom-*.jar</exclude>
+
+        <!-- from xom -->
+        <exclude>WEB-INF/lib/icu4j-*.jar</exclude>
+        <exclude>WEB-INF/lib/tagsoup-*.jar</exclude>
+        <exclude>WEB-INF/lib/xalan-*.jar</exclude>
+
+        <!-- from xalan -->
+        <exclude>WEB-INF/lib/serializer-*.jar</exclude>
+      </excludes>
+    </fileSet>
+  </fileSets>
+  <files>
+    <file>
+      <source>src/main/assembly/resources/gwt-console-server-persistence-JPA2.xml</source>
+      <destName>WEB-INF/classes/META-INF/persistence.xml</destName>
+    </file>
+    <file>
+      <source>src/main/assembly/resources/ProcessInstanceInfoMapping-JPA2.xml</source>
+      <destName>WEB-INF/classes/META-INF/ProcessInstanceInfoMapping.xml</destName>
+    </file>
+  </files>
+
+</assembly>