[embjopr-commits] EMBJOPR SVN: r881 - branches/EmbJopr-1.4.0-SN-EAP5/jsfunit.

[embjopr-commits at lists.jboss.org]

Author: ozizka at redhat.com
Date: 2010-03-18 13:12:45 -0400 (Thu, 18 Mar 2010)
New Revision: 881

Modified:
   branches/EmbJopr-1.4.0-SN-EAP5/jsfunit/pom.xml
Log:
* POM: Created dist-war profile for testing provided AS console WAR.

Modified: branches/EmbJopr-1.4.0-SN-EAP5/jsfunit/pom.xml
===================================================================
--- branches/EmbJopr-1.4.0-SN-EAP5/jsfunit/pom.xml	2010-02-22 18:49:48 UTC (rev 880)
+++ branches/EmbJopr-1.4.0-SN-EAP5/jsfunit/pom.xml	2010-03-18 17:12:45 UTC (rev 881)
@@ -22,6 +22,8 @@
       <cargo.jboss.bind.address>localhost</cargo.jboss.bind.address><!-- Address for JBoss AS to bind to. -->
       <htmlunit.browser>ff3</htmlunit.browser><!-- ff2 | ff3 | ie6 | ie7 -->
       <jboss.isSecured>true</jboss.isSecured><!-- true | false ;  True if JBoss AS/EAP is secured. Only informative for EJTT - has no effect on AS. -->
+
+      <as.dist.war></as.dist.war> <!-- Used for overlaying a distribution war. -->
    </properties>
 
    <parent>
@@ -178,6 +180,12 @@
          <version>2.4</version>
       </dependency>
       <dependency>
+         <groupId>commons-codec</groupId>
+         <artifactId>commons-codec</artifactId>
+         <version>1.3</version>
+         <scope>compile</scope>
+      </dependency>
+      <dependency>
          <groupId>org.jboss.integration</groupId>
          <artifactId>jboss-profileservice-spi</artifactId>          
          <version>5.1.0.GA</version> <!-- 5.1.0.SP1 -->
@@ -212,9 +220,41 @@
 
    <profiles>
 
+     <!-- JBoss AS - WAR from distribution -->
+     <profile>
+         <id>dist-war</id>
+         <activation>
+           <file><exists>${as.dist.war}</exists></file>
+         </activation>
+         <dependencies>
+            <dependency>
+               <groupId>org.jboss.jopr</groupId>
+               <artifactId>jopr-embedded-dist</artifactId>
+               <version>0.0.0</version>
+               <type>war</type>
+               <scope>system</scope>
+               <systemPath>${as.dist.war}</systemPath>
+            </dependency>
+         </dependencies>
+         <build>
+           <plugins>
+             <plugin> <artifactId>maven-antrun-plugin</artifactId>
+               <executions> <execution> <phase>initialize</phase>  <goals><goal>run</goal></goals> <configuration> <tasks>
+                 <echo>  *** dist-war profile activated. ***  </echo>
+               </tasks> </configuration> </execution> </executions>
+             </plugin>
+           </plugins>
+         </build>
+     </profile>
+
+
      <!-- JBoss AS 4.2 -->
-      <profile>
-         <id>jboss4.2</id>
+     <profile>
+         <id>jboss42-war</id>
+         <activation>
+            <file><missing>${as.dist.war}</missing></file>
+            <property><name>jboss42</name><value>true</value></property>
+         </activation>
          <dependencies>
             <dependency>
                <groupId>org.jboss.jopr</groupId>
@@ -223,7 +263,13 @@
                <type>war</type>
             </dependency>
          </dependencies>
+     </profile>
 
+     <profile>
+         <id>jboss42</id>
+         <properties>
+           <jboss42>true</jboss42>
+         </properties>
          <build>
             <plugins>
 
@@ -237,7 +283,7 @@
                      <container>
                         <containerId>jboss42x</containerId>
                         <home>${JBOSS_HOME}</home>
-                        <log>${basedir}/target/jboss4.2.logs/cargo.log</log>
+                        <log>${basedir}/target/jboss42-logs/cargo.log</log>
                         <timeout>600000</timeout>   <!-- 10 minutes -->
                         <systemProperties>
                            <jboss.server.log.threshold>ALL</jboss.server.log.threshold>
@@ -332,7 +378,11 @@
 
       <!-- JBoss AS 5.x -->
       <profile>
-         <id>jboss5x</id>
+         <id>jboss5x-war</id>
+         <activation>
+            <file><missing>${as.dist.war}</missing></file>
+            <property><name>jboss5x</name><value>true</value></property>
+         </activation>
          <dependencies>
             <dependency>
                <groupId>org.jboss.jopr</groupId>
@@ -340,14 +390,14 @@
                <version>${project.version}</version>
                <type>war</type>
             </dependency>
-            <dependency>
-               <groupId>commons-codec</groupId>
-               <artifactId>commons-codec</artifactId>
-               <version>1.3</version>
-               <scope>compile</scope>
-            </dependency>
          </dependencies>
+      </profile>
 
+      <profile>
+         <id>jboss5x</id>
+         <properties>
+           <jboss5x>true</jboss5x>
+         </properties>
          <build>
             <plugins>
 
@@ -465,7 +515,7 @@
                      <container>
                         <containerId>jboss5x</containerId>
                         <home>${JBOSS_HOME}</home> <!-- Binaries used by Cargo. -->
-                        <log>${basedir}/target/jboss5.x.logs/cargo.log</log>
+                        <log>${basedir}/target/jboss5x-logs/cargo.log</log>
                         <timeout>420000</timeout> <!-- 7 minutes -->
                         <systemProperties>
                            <!-- Used in jboss-log4j.xml. See /testdata/... -->