[jbpm-commits] JBoss JBPM SVN: r6227 - projects/jsf-console/branches/jsf-console-3.2-soa/console.

[do-not-reply at jboss.org]

Author: alex.guizar at jboss.com
Date: 2010-03-17 10:31:17 -0400 (Wed, 17 Mar 2010)
New Revision: 6227

Modified:
   projects/jsf-console/branches/jsf-console-3.2-soa/console/pom.xml
Log:
solve soa overlay conflict with primary console artifact, allowing for correct simultaneous deployment

Modified: projects/jsf-console/branches/jsf-console-3.2-soa/console/pom.xml
===================================================================
--- projects/jsf-console/branches/jsf-console-3.2-soa/console/pom.xml	2010-03-17 10:46:54 UTC (rev 6226)
+++ projects/jsf-console/branches/jsf-console-3.2-soa/console/pom.xml	2010-03-17 14:31:17 UTC (rev 6227)
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- ====================================================================== -->
-<!--  jBPM: Workflow in Java                                                -->
-<!--                                                                        -->
-<!--  Distributable under LGPL license.                                     -->
-<!--  See terms of license at http://www.gnu.org.                           -->
-<!-- ====================================================================== -->
+  <!-- ====================================================================== -->
+  <!--  jBPM: Workflow in Java                                                -->
+  <!--                                                                        -->
+  <!--  Distributable under LGPL license.                                     -->
+  <!--  See terms of license at http://www.gnu.org.                           -->
+  <!-- ====================================================================== -->
 
-<!-- $Id$ -->
+  <!-- $Id$ -->
 
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
@@ -56,7 +56,6 @@
   <profiles>
     <profile>
       <id>soa</id>
-
       <dependencies>
         <dependency>
           <groupId>org.jbpm.jbpm3</groupId>
@@ -70,19 +69,46 @@
         <plugins>
           <plugin>
             <artifactId>maven-war-plugin</artifactId>
-            <configuration>
-              <classifier>soa</classifier>
-              <primaryArtifact>false</primaryArtifact>
-              <overlays>
-                <overlay>
-                  <groupId>org.jbpm.jbpm3</groupId>
-                  <artifactId>soa-webapp</artifactId>
-                </overlay>
-                <overlay>
-                  <!-- empty groupId/artifactId means the current build -->
-                </overlay>
-              </overlays>
-            </configuration>
+
+            <executions>
+              <execution>
+                <id>default-war</id>
+                <goals>
+                  <goal>war</goal>
+                </goals>
+                <configuration>
+                  <overlays>
+                    <overlay>
+                      <groupId>org.jbpm.jbpm3</groupId>
+                      <artifactId>soa-webapp</artifactId>
+                      <skip>true</skip>
+                    </overlay>
+                  </overlays>
+                </configuration>
+              </execution>
+
+              <execution>
+                <id>soa-war</id>
+                <goals>
+                  <goal>war</goal>
+                </goals>
+                <configuration>
+                  <classifier>soa</classifier>
+                  <primaryArtifact>false</primaryArtifact>
+                  <webappDirectory>
+                    ${project.build.directory}/${project.build.finalName}-soa
+                  </webappDirectory>
+                  <overlays>
+                    <overlay>
+                      <groupId>org.jbpm.jbpm3</groupId>
+                      <artifactId>soa-webapp</artifactId>
+                    </overlay>
+                    <!-- empty groupId/artifactId means the current build -->
+                    <overlay />
+                  </overlays>
+                </configuration>
+              </execution>
+            </executions>
           </plugin>
         </plugins>
       </build>