[embjopr-commits] EMBJOPR SVN: r911 - branches/EmbJopr-1.4.0-SN-EAP5/jsfunit.
embjopr-commits at lists.jboss.org
embjopr-commits at lists.jboss.org
Tue Apr 6 20:06:55 EDT 2010
Author: ozizka at redhat.com
Date: 2010-04-06 20:06:55 -0400 (Tue, 06 Apr 2010)
New Revision: 911
Modified:
branches/EmbJopr-1.4.0-SN-EAP5/jsfunit/pom.xml
Log:
* POM reorganized.
Modified: branches/EmbJopr-1.4.0-SN-EAP5/jsfunit/pom.xml
===================================================================
--- branches/EmbJopr-1.4.0-SN-EAP5/jsfunit/pom.xml 2010-04-02 17:33:06 UTC (rev 910)
+++ branches/EmbJopr-1.4.0-SN-EAP5/jsfunit/pom.xml 2010-04-07 00:06:55 UTC (rev 911)
@@ -1,10 +1,17 @@
<?xml version="1.0"?>
+<!--
+ - metainfo
+ - deps
+ - profiles
+ - build
+ -->
<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">
<modelVersion>4.0.0</modelVersion>
<properties>
+ <container></container> <!-- jboss5x | jboss6x -->
<as5></as5>
<as6></as6>
@@ -510,9 +517,9 @@
<configuration>
<wait>false</wait>
<container>
- <containerId>jboss5x</containerId>
+ <containerId>${container}</containerId>
<home>${JBOSS_HOME}</home> <!-- Binaries used by Cargo. -->
- <log>${basedir}/target/jboss5x-logs/cargo.log</log>
+ <log>${basedir}/target/${container}-logs/cargo.log</log>
<timeout>420000</timeout> <!-- 7 minutes -->
<systemProperties>
<!-- Used in jboss-log4j.xml. See /testdata/... -->
@@ -562,7 +569,7 @@
</configfile>
<!-- Open Tomcat's HTTP logging valve -->
<configfile>
- <file>${basedir}/testdata/jboss-configuration/deploy/jbossweb.sar/server.xml</file>
+ <file>${basedir}/testdata/${container}-configuration/deploy/jbossweb.sar/server.xml</file>
<tofile>deploy/jbossweb.sar/server.xml</tofile>
</configfile>
<!-- JMX Console Users -->
@@ -584,19 +591,21 @@
<!-- Deploy the test files -->
<files>
+ <!-- Only for 5.x -->
<copy>
<file>${basedir}/testdata/destinations</file>
<toDir>deploy</toDir>
</copy>
+
<copy>
<file>${basedir}/testdata/datasources/testFiles</file>
<toDir>deploy</toDir>
</copy>
- <copy>
+ <copy>
<file>${basedir}/testdata/connfactories</file>
<toDir>deploy</toDir>
- </copy>
- <copy>
+ </copy>
+ <copy>
<file>${basedir}/testdata/rar/embjoprtestadapter.rar</file>
<toDir>deploy</toDir>
</copy>
@@ -626,91 +635,20 @@
+ <!--=============================================================
+ == JBoss 5.x ==
+ =============================================================-->
<profile>
<id>jboss5x</id>
<properties>
<jboss5x>true</jboss5x>
+ <container>jboss5x</container>
</properties>
<build>
<plugins>
- <!-- AntRun - Exctract the war to let Cargo plugin deploy it. -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-antrun-plugin</artifactId>
- <executions>
- <!-- Extract WAR (SEAM bug) - rename to _archive.war and unzip to a .war dir. . -->
- <execution>
- <id>extract_war_for_cargo</id>
- <phase>package</phase> <goals><goal>run</goal></goals>
- <configuration><tasks>
- <echo>Extracting war...</echo>
- <move file="${project.build.directory}/${project.build.finalName}.${project.packaging}"
- toFile="${project.build.directory}/${project.build.finalName}_archive.${project.packaging}"/>
- <unzip src="${project.build.directory}/${project.build.finalName}_archive.${project.packaging}"
- dest="${project.build.directory}/${project.build.finalName}.${project.packaging}"/>
- <echo> *** Disabling navtree AJAX... *** </echo>
- <replace file="${project.build.directory}/${project.build.finalName}.${project.packaging}/WEB-INF/facelets/resourceNavigation.xhtml"
- token="switchType="ajax" value="switchType="server"/>
- </tasks></configuration>
- </execution>
- <!-- Write "Don't kill" to hudson log/ -->
- <execution>
- <id>dont_kill_appeal</id>
- <phase>pre-integration-test</phase> <goals><goal>run</goal></goals>
- <configuration><tasks>
- <echo>########################## Please don't kill this job unless it takes more than four hours.</echo>
- <echo>########################## There's no logging visible on Hudson during test run.</echo>
- </tasks></configuration>
- </execution>
- <!-- Delete the exploded WAR and rename the archive back. -->
- <execution>
- <id>rename-the-artifact-back</id>
- <phase>post-integration-test</phase> <goals><goal>run</goal></goals>
- <configuration><tasks>
- <echo>Renaming exploded war and renaming the zip back to the artifact name.</echo>
- <move file="${project.build.directory}/${project.build.finalName}.${project.packaging}" toFile="${project.build.directory}/${project.build.finalName}_exploded.${project.packaging}"/>
- <move file="${project.build.directory}/${project.build.finalName}_archive.${project.packaging}"
- toFile="${project.build.directory}/${project.build.finalName}.${project.packaging}"/>
- </tasks></configuration>
- </execution>
- </executions>
- </plugin>
-
- <!-- Exctract the war to let Cargo plugin deploy it.
- <plugin>
- <artifactId>maven-dependency-plugin</artifactId>
- <executions>
- <execution>
- <id>explode-war</id>
- <phase>pre-integration-test</phase>
- <goals>
- <goal>unpack</goal>
- </goals>
- <configuration>
- <outputDirectory>${project.build.directory}/${project.build.finalName}_for_cargo_EMBJOPR-235.${project.packaging}</outputDirectory>
- <overWriteReleases>true</overWriteReleases>
- <overWriteSnapshots>true</overWriteSnapshots>
- <includes>**\/*</includes>
- <excludes></excludes>
- <artifactItems>
- <artifactItem>
- <groupId>org.jboss.jopr</groupId>
- <artifactId>jopr-embedded-jsfunit</artifactId>
- <version>${project.version}</version>
- <type>war</type>
- </artifactItem>
- </artifactItems>
- </configuration>
- </execution>
- </executions>
- </plugin>
- -->
-
-
-
<!-- Surefire plugin (for AS 5) -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -788,64 +726,46 @@
</executions>
</plugin>
- <!-- XSLT plugin - To separate the reports by package. Each execution separates one. -->
- <!-- Disabled - bug:
- javax.xml.transform.TransformerException: javax.xml.transform.TransformerException:
- com.sun.org.apache.xml.internal.utils.WrappedRuntimeException: Premature end of file.
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>xslt-maven-plugin</artifactId>
- <executions>
- <execution><id>xslt-as5</id><phase>post-integration-test</phase><goals><goal>transform</goal></goals>
- <configuration>
- <fileNameReplacement>TEST-org.jboss.jopr.jsfunit.as5.xml</fileNameReplacement>
- <parameters><packageName>org.jboss.jopr.jsfunit.as5.</packageName></parameters>
- </configuration>
- </execution>
- <execution><id>xslt-war</id><phase>post-integration-test</phase><goals><goal>transform</goal></goals>
- <configuration>
- <fileNameReplacement>TEST-org.jboss.jopr.jsfunit.as5.app.war.xml</fileNameReplacement>
- <parameters><packageName>org.jboss.jopr.jsfunit.as5.app.war.</packageName></parameters>
- </configuration>
- </execution>
- <execution><id>xslt-ear</id><phase>post-integration-test</phase><goals><goal>transform</goal></goals>
- <configuration>
- <fileNameReplacement>TEST-org.jboss.jopr.jsfunit.as5.app.ear.xml</fileNameReplacement>
- <parameters><packageName>org.jboss.jopr.jsfunit.as5.app.ear.</packageName></parameters>
- </configuration>
- </execution>
- <execution><id>xslt-rar</id><phase>post-integration-test</phase><goals><goal>transform</goal></goals>
- <configuration>
- <fileNameReplacement>TEST-org.jboss.jopr.jsfunit.as5.app.rar.xml</fileNameReplacement>
- <parameters><packageName>org.jboss.jopr.jsfunit.as5.app.rar.</packageName></parameters>
- </configuration>
- </execution>
- <execution><id>xslt-ejb</id><phase>post-integration-test</phase><goals><goal>transform</goal></goals>
- <configuration>
- <fileNameReplacement>TEST-org.jboss.jopr.jsfunit.as5.app.ejb.xml</fileNameReplacement>
- <parameters><packageName>org.jboss.jopr.jsfunit.as5.app.ejb.</packageName></parameters>
- </configuration>
- </execution>
- <execution><id>xslt-datasources</id><phase>post-integration-test</phase><goals><goal>transform</goal></goals>
- <configuration>
- <fileNameReplacement>TEST-org.jboss.jopr.jsfunit.as5.app.datasources.xml</fileNameReplacement>
- <parameters><packageName>org.jboss.jopr.jsfunit.as5.app.datasources.</packageName></parameters>
- </configuration>
- </execution>
- <execution><id>xslt-jmsDestinations</id><phase>post-integration-test</phase><goals><goal>transform</goal></goals>
- <configuration>
- <fileNameReplacement>TEST-org.jboss.jopr.jsfunit.as5.app.jmsDestinations.xml</fileNameReplacement>
- <parameters><packageName>org.jboss.jopr.jsfunit.as5.app.jmsDestinations.</packageName></parameters>
- </configuration>
- </execution>
- </executions>
- </plugin>
- -->
-
</plugins>
</build>
</profile>
+
+ <!--=============================================================
+ == JBoss 6.x ==
+ =============================================================-->
+ <profile>
+ <id>jboss6x</id>
+ <properties>
+ <as6>true</as6>
+ <container>jboss6x</container>
+ </properties>
+
+ <!-- Exclude Seam's java.util.logging stuff to prevent java.lang.StackOverflowError
+ at org.jboss.logmanager.ExtLogRecord.<init>(ExtLogRecord.java:77) [jboss-logmanager.jar:] -->
+ <!-- But how? This would work for core, when creating the WAR.
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss.seam</groupId>
+ <artifactId>jboss-seam</artifactId>
+ <version>${seam.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss.seam</groupId>
+ <artifactId>jboss-seam-jul</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+ -->
+
+ </profile>
+
+
+
+
<!-- Debug profile - waits for debugger connection at port 4000.
The right time to connect is when Cargo plugin starts the server. -->
<profile>
@@ -1111,7 +1031,51 @@
<plugins>
+
+ <!-- AntRun - Exctract the war to let Cargo plugin deploy it. Originally in the jboss5x profile. -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <!-- Extract WAR (SEAM bug) - rename to _archive.war and unzip to a .war dir. . -->
+ <execution>
+ <id>extract_war_for_cargo</id>
+ <phase>package</phase> <goals><goal>run</goal></goals>
+ <configuration><tasks>
+ <echo>Extracting war...</echo>
+ <move file="${project.build.directory}/${project.build.finalName}.${project.packaging}"
+ toFile="${project.build.directory}/${project.build.finalName}_archive.${project.packaging}"/>
+ <unzip src="${project.build.directory}/${project.build.finalName}_archive.${project.packaging}"
+ dest="${project.build.directory}/${project.build.finalName}.${project.packaging}"/>
+ <echo> *** Disabling navtree AJAX... *** </echo>
+ <replace file="${project.build.directory}/${project.build.finalName}.${project.packaging}/WEB-INF/facelets/resourceNavigation.xhtml"
+ token="switchType="ajax" value="switchType="server"/>
+ </tasks></configuration>
+ </execution>
+ <!-- Write "Don't kill" to hudson log/ -->
+ <execution>
+ <id>dont_kill_appeal</id>
+ <phase>pre-integration-test</phase> <goals><goal>run</goal></goals>
+ <configuration><tasks>
+ <echo>########################## Please don't kill this job unless it takes more than four hours.</echo>
+ <echo>########################## There's no logging visible on Hudson during test run.</echo>
+ </tasks></configuration>
+ </execution>
+ <!-- Delete the exploded WAR and rename the archive back. -->
+ <execution>
+ <id>rename-the-artifact-back</id>
+ <phase>post-integration-test</phase> <goals><goal>run</goal></goals>
+ <configuration><tasks>
+ <echo>Renaming exploded war and renaming the zip back to the artifact name.</echo>
+ <move file="${project.build.directory}/${project.build.finalName}.${project.packaging}" toFile="${project.build.directory}/${project.build.finalName}_exploded.${project.packaging}"/>
+ <move file="${project.build.directory}/${project.build.finalName}_archive.${project.packaging}"
+ toFile="${project.build.directory}/${project.build.finalName}.${project.packaging}"/>
+ </tasks></configuration>
+ </execution>
+ </executions>
+ </plugin>
+
<!-- WAR: Add data to manifest, add JBoss Cache client JAR. -->
<plugin>
<artifactId>maven-war-plugin</artifactId>
More information about the embjopr-commits
mailing list