You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by pr...@apache.org on 2006/11/18 06:33:21 UTC
svn commit: r476445 - in /geronimo/server/trunk/testsuite:
console-testsuite/basic/pom.xml console-testsuite/pom.xml
deployment-testsuite/pom.xml deployment-testsuite/test-deployments/pom.xml
pom.xml
Author: prasad
Date: Fri Nov 17 21:33:20 2006
New Revision: 476445
URL: http://svn.apache.org/viewvc?view=rev&rev=476445
Log:
* beautify pom
* execute testsuite-maven-plugin:fix-menu
* introduce <distributionManagement> and ${deployDirectory} cli param
Modified:
geronimo/server/trunk/testsuite/console-testsuite/basic/pom.xml
geronimo/server/trunk/testsuite/console-testsuite/pom.xml
geronimo/server/trunk/testsuite/deployment-testsuite/pom.xml
geronimo/server/trunk/testsuite/deployment-testsuite/test-deployments/pom.xml
geronimo/server/trunk/testsuite/pom.xml
Modified: geronimo/server/trunk/testsuite/console-testsuite/basic/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/console-testsuite/basic/pom.xml?view=diff&rev=476445&r1=476444&r2=476445
==============================================================================
--- geronimo/server/trunk/testsuite/console-testsuite/basic/pom.xml (original)
+++ geronimo/server/trunk/testsuite/console-testsuite/basic/pom.xml Fri Nov 17 21:33:20 2006
@@ -17,32 +17,30 @@
specific language governing permissions and limitations
under the License.
-->
-
<!-- $Rev$ $Date$ -->
-
<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>
-
+
<parent>
<groupId>org.apache.geronimo.testsuite</groupId>
<artifactId>console-testsuite</artifactId>
<version>1.2-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
-
+
<artifactId>basic</artifactId>
<name>Geronimo TestSuite, Console :: Basic</name>
<packaging>jar</packaging>
-
- <description>
- Basic test for the Geronimo console.
+
+ <description>Basic test for the Geronimo console.
Note the parent artifactId and the relativePath.
- Since no other build executions are done here, the profile is not explicitly defined. It inherits the 'child' profile from parent.
- maven-maven-plugin:invoke executes the 'child' profile.
+ Since no other build executions are done here, the profile is not explicitly
+ defined. It inherits the 'child' profile from parent. maven-maven-plugin:invoke
+ executes the 'child' profile.i
</description>
+</project>
- </project>
Modified: geronimo/server/trunk/testsuite/console-testsuite/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/console-testsuite/pom.xml?view=diff&rev=476445&r1=476444&r2=476445
==============================================================================
--- geronimo/server/trunk/testsuite/console-testsuite/pom.xml (original)
+++ geronimo/server/trunk/testsuite/console-testsuite/pom.xml Fri Nov 17 21:33:20 2006
@@ -22,8 +22,10 @@
<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>
+
<parent>
<groupId>org.apache.geronimo.testsuite</groupId>
<artifactId>testsuite</artifactId>
@@ -31,103 +33,106 @@
<relativePath>../pom.xml</relativePath>
</parent>
+
<artifactId>console-testsuite</artifactId>
<name>Geronimo TestSuite, Console</name>
<packaging>pom</packaging>
+
<description>
Geronimo console testsuite.
</description>
+
<dependencies>
- <dependency>
- <groupId>org.openqa.selenium.client-drivers</groupId>
- <artifactId>selenium-java-client-driver</artifactId>
- </dependency>
+ <dependency>
+ <groupId>org.openqa.selenium.client-drivers</groupId>
+ <artifactId>selenium-java-client-driver</artifactId>
+ </dependency>
- <dependency>
- <groupId>org.openqa.selenium.server</groupId>
+ <dependency>
+ <groupId>org.openqa.selenium.server</groupId>
<artifactId>selenium-server</artifactId>
</dependency>
</dependencies>
<build>
- <plugins>
- <plugin>
- <groupId>org.apache.geronimo.plugins</groupId>
- <artifactId>testsuite-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>generate-surefire-xml</id>
- <phase>post-integration-test</phase>
- <goals>
- <goal>generate-surefire-xml</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
- <profiles>
- <profile>
- <id>default</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
-
- <build>
<plugins>
-
- <plugin>
- <groupId>org.apache.geronimo.plugins</groupId>
- <artifactId>selenium-maven-plugin</artifactId>
- </plugin>
-
- <plugin>
- <groupId>org.apache.geronimo.genesis.plugins</groupId>
- <artifactId>maven-maven-plugin</artifactId>
- </plugin>
-
<plugin>
<groupId>org.apache.geronimo.plugins</groupId>
- <artifactId>geronimo-maven-plugin</artifactId>
-
+ <artifactId>testsuite-maven-plugin</artifactId>
<executions>
<execution>
- <id>start-webconsole</id>
- <phase>pre-integration-test</phase>
- <goals>
- <goal>start-module</goal>
- </goals>
- <configuration>
- <moduleId>org.apache.geronimo.configs/webconsole-jetty/${version}/car</moduleId>
- </configuration>
- </execution>
-
- <execution>
- <id>stop-console</id>
- <phase>post-integration-test</phase>
- <goals>
- <goal>stop-module</goal>
- </goals>
- <configuration>
- <moduleId>org.apache.geronimo.configs/webconsole-jetty/${version}/car</moduleId>
- </configuration>
- </execution>
-
+ <id>generate-surefire-xml</id>
+ <phase>post-integration-test</phase>
+ <goals>
+ <goal>generate-surefire-xml</goal>
+ </goals>
+ </execution>
</executions>
</plugin>
-
</plugins>
</build>
- </profile>
- <profile>
- <id>child</id>
- </profile>
+ <profiles>
+ <profile>
+ <id>default</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+
+ <build>
+ <plugins>
+
+ <plugin>
+ <groupId>org.apache.geronimo.plugins</groupId>
+ <artifactId>selenium-maven-plugin</artifactId>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.geronimo.genesis.plugins</groupId>
+ <artifactId>maven-maven-plugin</artifactId>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.geronimo.plugins</groupId>
+ <artifactId>geronimo-maven-plugin</artifactId>
+
+ <executions>
+ <execution>
+ <id>start-webconsole</id>
+ <phase>pre-integration-test</phase>
+ <goals>
+ <goal>start-module</goal>
+ </goals>
+ <configuration>
+ <moduleId>org.apache.geronimo.configs/webconsole-jetty/${version}/car</moduleId>
+ </configuration>
+ </execution>
+
+ <execution>
+ <id>stop-console</id>
+ <phase>post-integration-test</phase>
+ <goals>
+ <goal>stop-module</goal>
+ </goals>
+ <configuration>
+ <moduleId>org.apache.geronimo.configs/webconsole-jetty/${version}/car</moduleId>
+ </configuration>
+ </execution>
+
+ </executions>
+ </plugin>
+
+ </plugins>
+ </build>
+ </profile>
+
+ <profile>
+ <id>child</id>
+ </profile>
</profiles>
</project>
-
+
Modified: geronimo/server/trunk/testsuite/deployment-testsuite/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/deployment-testsuite/pom.xml?view=diff&rev=476445&r1=476444&r2=476445
==============================================================================
--- geronimo/server/trunk/testsuite/deployment-testsuite/pom.xml (original)
+++ geronimo/server/trunk/testsuite/deployment-testsuite/pom.xml Fri Nov 17 21:33:20 2006
@@ -22,8 +22,10 @@
<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>
+
<parent>
<groupId>org.apache.geronimo.testsuite</groupId>
<artifactId>testsuite</artifactId>
@@ -31,14 +33,17 @@
<relativePath>../pom.xml</relativePath>
</parent>
+
<artifactId>deployment-testsuite</artifactId>
<name>Geronimo TestSuite, Deployment</name>
<packaging>pom</packaging>
+
<description>
Geronimo deployment testsuite.
</description>
+
<dependencies>
<dependency>
<groupId>org.openqa.selenium.client-drivers</groupId>
@@ -46,6 +51,7 @@
<scope>test</scope>
</dependency>
+
<dependency>
<groupId>org.openqa.selenium.server</groupId>
<artifactId>selenium-server</artifactId>
@@ -54,62 +60,63 @@
</dependencies>
<build>
- <plugins>
-
- <plugin>
- <!-- This plugin is needed for all suite poms. -->
- <groupId>org.apache.geronimo.plugins</groupId>
- <artifactId>testsuite-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>generate-surefire-xml</id>
- <phase>post-integration-test</phase>
- <goals>
- <goal>generate-surefire-xml</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
- <profiles>
- <profile>
- <id>default</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
- <!--
- TODO: Hook up m-m-p to allow child modules to be built early during this modules
- compile (or something) phase.
- -->
- <build>
<plugins>
- <plugin>
- <groupId>org.apache.geronimo.plugins</groupId>
- <artifactId>selenium-maven-plugin</artifactId>
- </plugin>
<plugin>
+ <!-- This plugin is needed for all suite poms. -->
<groupId>org.apache.geronimo.plugins</groupId>
- <artifactId>geronimo-maven-plugin</artifactId>
- </plugin>
-
- <plugin>
- <groupId>org.apache.geronimo.genesis.plugins</groupId>
- <artifactId>maven-maven-plugin</artifactId>
+ <artifactId>testsuite-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>generate-surefire-xml</id>
+ <phase>post-integration-test</phase>
+ <goals>
+ <goal>generate-surefire-xml</goal>
+ </goals>
+ </execution>
+ </executions>
</plugin>
</plugins>
</build>
- </profile>
+
- <profile>
- <id>child</id>
- </profile>
+ <profiles>
+ <profile>
+ <id>default</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ <!--
+ TODO: Hook up m-m-p to allow child modules to be built early during this modules
+ compile (or something) phase.
+ -->
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.geronimo.plugins</groupId>
+ <artifactId>selenium-maven-plugin</artifactId>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.geronimo.plugins</groupId>
+ <artifactId>geronimo-maven-plugin</artifactId>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.geronimo.genesis.plugins</groupId>
+ <artifactId>maven-maven-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+
+ <profile>
+ <id>child</id>
+ </profile>
</profiles>
</project>
-
+
Modified: geronimo/server/trunk/testsuite/deployment-testsuite/test-deployments/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/deployment-testsuite/test-deployments/pom.xml?view=diff&rev=476445&r1=476444&r2=476445
==============================================================================
--- geronimo/server/trunk/testsuite/deployment-testsuite/test-deployments/pom.xml (original)
+++ geronimo/server/trunk/testsuite/deployment-testsuite/test-deployments/pom.xml Fri Nov 17 21:33:20 2006
@@ -22,8 +22,10 @@
<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>
+
<parent>
<groupId>org.apache.geronimo.testsuite</groupId>
<artifactId>deployment-testsuite</artifactId>
@@ -31,10 +33,12 @@
<relativePath>../pom.xml</relativePath>
</parent>
+
<artifactId>test-deployments</artifactId>
<name>Geronimo TestSuite, Deployment :: Test Deployments</name>
<packaging>jar</packaging>
+
<description>
Tests for the test-deployables.
@@ -45,82 +49,88 @@
</description>
- <profiles>
- <profile>
- <id>child</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <testFailureIgnore>true</testFailureIgnore>
- </configuration>
- </plugin>
+
+ <profiles>
+ <profile>
+ <id>child</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <testFailureIgnore>true</testFailureIgnore>
+ </configuration>
+ </plugin>
- <plugin>
- <groupId>org.apache.geronimo.plugins</groupId>
- <artifactId>geronimo-maven-plugin</artifactId>
+
+ <plugin>
+ <groupId>org.apache.geronimo.plugins</groupId>
+ <artifactId>geronimo-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>deploy-ears</id>
- <phase>pre-integration-test</phase>
- <goals>
- <goal>deploy-module</goal>
- </goals>
- <configuration>
- <modules>
- <module>
- <groupId>org.apache.geronimo.testsupport</groupId>
- <artifactId>test-ear-j2ee_1.3</artifactId>
- <version>${version}</version>
- <type>ear</type>
- </module>
+
+ <executions>
+ <execution>
+ <id>deploy-ears</id>
+ <phase>pre-integration-test</phase>
+ <goals>
+ <goal>deploy-module</goal>
+ </goals>
+ <configuration>
+ <modules>
+ <module>
+ <groupId>org.apache.geronimo.testsupport</groupId>
+ <artifactId>test-ear-j2ee_1.3</artifactId>
+ <version>${version}</version>
+ <type>ear</type>
+ </module>
- <module>
- <groupId>org.apache.geronimo.testsupport</groupId>
- <artifactId>test-ear-j2ee_1.4</artifactId>
- <version>${version}</version>
- <type>ear</type>
- </module>
- </modules>
- </configuration>
- </execution>
+
+ <module>
+ <groupId>org.apache.geronimo.testsupport</groupId>
+ <artifactId>test-ear-j2ee_1.4</artifactId>
+ <version>${version}</version>
+ <type>ear</type>
+ </module>
+ </modules>
+ </configuration>
+ </execution>
- <execution>
- <id>undeploy-ear-as-module</id>
- <phase>post-integration-test</phase>
- <goals>
- <goal>undeploy-module</goal>
- </goals>
- <configuration>
- <modules>
- <module>
- <groupId>org.apache.geronimo.testsupport</groupId>
- <artifactId>test-ear-j2ee_1.3</artifactId>
- <version>${version}</version>
- <type>ear</type>
- </module>
- </modules>
- </configuration>
- </execution>
- <execution>
- <id>undeploy-ear-as-moduleId</id>
- <phase>post-integration-test</phase>
- <goals>
- <goal>undeploy-module</goal>
- </goals>
- <configuration>
- <moduleId>org.apache.geronimo.testsupport/test-ear-j2ee_1.4/${version}/ear</moduleId>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
+ <execution>
+ <id>undeploy-ear-as-module</id>
+ <phase>post-integration-test</phase>
+ <goals>
+ <goal>undeploy-module</goal>
+ </goals>
+ <configuration>
+ <modules>
+ <module>
+ <groupId>org.apache.geronimo.testsupport</groupId>
+ <artifactId>test-ear-j2ee_1.3</artifactId>
+ <version>${version}</version>
+ <type>ear</type>
+ </module>
+ </modules>
+ </configuration>
+ </execution>
+
+ <execution>
+ <id>undeploy-ear-as-moduleId</id>
+ <phase>post-integration-test</phase>
+ <goals>
+ <goal>undeploy-module</goal>
+ </goals>
+ <configuration>
+ <moduleId>org.apache.geronimo.testsupport/test-ear-j2ee_1.4/${version}/ear</moduleId>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+
</project>
Modified: geronimo/server/trunk/testsuite/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/pom.xml?view=diff&rev=476445&r1=476444&r2=476445
==============================================================================
--- geronimo/server/trunk/testsuite/pom.xml (original)
+++ geronimo/server/trunk/testsuite/pom.xml Fri Nov 17 21:33:20 2006
@@ -22,8 +22,10 @@
<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>
+
<parent>
<groupId>org.apache.geronimo</groupId>
<artifactId>geronimo</artifactId>
@@ -31,13 +33,15 @@
<relativePath>../pom.xml</relativePath>
</parent>
+
<groupId>org.apache.geronimo.testsuite</groupId>
<artifactId>testsuite</artifactId>
<name>Geronimo TestSuite</name>
<packaging>pom</packaging>
+
<description>
- Geronimo integration testsuite. This contains 2 profiles, default and child.
+ Geronimo integration testsuite. This contains 2 profiles, default and child.
The default profile is used by the top level suites directly under this. The child profile is used by the test poms under the suites.
This pom defines the basic dependencies needed by most suites.
@@ -50,60 +54,61 @@
</description>
+
<dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>org.apache.geronimo.testsupport</groupId>
- <artifactId>testsupport-common</artifactId>
- <scope>test</scope>
- <version>${version}</version>
- </dependency>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.geronimo.testsupport</groupId>
+ <artifactId>testsupport-common</artifactId>
+ <scope>test</scope>
+ <version>${version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.1</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.testng</groupId>
+ <artifactId>testng</artifactId>
+ <classifier>jdk14</classifier>
+ <version>5.1</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.openqa.selenium.client-drivers</groupId>
+ <artifactId>selenium-java-client-driver</artifactId>
+ <version>0.8.1</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.openqa.selenium.server</groupId>
+ <artifactId>selenium-server</artifactId>
+ <version>0.8.1</version>
+ </dependency>
+
+ </dependencies>
+ </dependencyManagement>
+ <dependencies>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- </dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ </dependency>
<dependency>
<groupId>org.testng</groupId>
<artifactId>testng</artifactId>
<classifier>jdk14</classifier>
- <version>5.1</version>
</dependency>
<dependency>
- <groupId>org.openqa.selenium.client-drivers</groupId>
- <artifactId>selenium-java-client-driver</artifactId>
- <version>0.8.1</version>
+ <groupId>org.apache.geronimo.testsupport</groupId>
+ <artifactId>testsupport-common</artifactId>
+ <scope>test</scope>
</dependency>
-
- <dependency>
- <groupId>org.openqa.selenium.server</groupId>
- <artifactId>selenium-server</artifactId>
- <version>0.8.1</version>
- </dependency>
-
- </dependencies>
- </dependencyManagement>
-
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.testng</groupId>
- <artifactId>testng</artifactId>
- <classifier>jdk14</classifier>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.testsupport</groupId>
- <artifactId>testsupport-common</artifactId>
- <scope>test</scope>
- </dependency>
</dependencies>
<modules>
@@ -111,6 +116,7 @@
<module>deployment-testsuite</module>
</modules>
+
<build>
<pluginManagement>
<plugins>
@@ -121,6 +127,7 @@
<version>${version}</version>
</plugin>
+
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-invoker-plugin</artifactId>
@@ -135,10 +142,10 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.8-SNAPSHOT</version>
- <configuration>
- <skip>true</skip>
- </configuration>
- <executions>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ <executions>
<execution>
<id>test</id>
<phase>test</phase>
@@ -157,171 +164,191 @@
<goal>test</goal>
</goals>
<configuration>
- <testFailureIgnore>true</testFailureIgnore>
+ <testFailureIgnore>true</testFailureIgnore>
<skip>false</skip>
</configuration>
</execution>
- </executions>
+ </executions>
</plugin>
- <plugin>
- <groupId>org.apache.geronimo.genesis.plugins</groupId>
- <artifactId>maven-maven-plugin</artifactId>
-
- <configuration>
- <fileset>
- <basedir>${pom.basedir}</basedir>
- <includes>
- <include>*/pom.xml</include>
- </includes>
- </fileset>
- <profiles>
- <profile>child</profile>
- </profiles>
- </configuration>
+ <plugin>
+ <groupId>org.apache.geronimo.genesis.plugins</groupId>
+ <artifactId>maven-maven-plugin</artifactId>
+
+ <configuration>
+ <fileset>
+ <basedir>${pom.basedir}</basedir>
+ <includes>
+ <include>*/pom.xml</include>
+ </includes>
+ </fileset>
+ <profiles>
+ <profile>child</profile>
+ </profiles>
+ </configuration>
- <executions>
- <execution>
- <phase>integration-test</phase>
- <goals>
- <goal>invoke</goal>
- </goals>
- </execution>
- <execution>
- <id>site</id>
- <phase>site</phase>
+ <executions>
+ <execution>
+ <phase>integration-test</phase>
+ <goals>
+ <goal>invoke</goal>
+ </goals>
+ </execution>
+
+ <execution>
+ <id>site-deploy</id>
+ <phase>site-deploy</phase>
+ <goals>
+ <goal>invoke</goal>
+ </goals>
+ <configuration>
<goals>
- <goal>invoke</goal>
+ <goal>site-deploy</goal>
</goals>
- <configuration>
- <goals>
- <goal>site</goal>
- </goals>
- </configuration>
- </execution>
+ <parameters>
+ <deployDirectory>${deployDirectory}</deployDirectory>
+ </parameters>
+ </configuration>
+ </execution>
- <execution>
- <id>clean</id>
- <phase>clean</phase>
+ <execution>
+ <id>clean</id>
+ <phase>clean</phase>
+ <goals>
+ <goal>invoke</goal>
+ </goals>
+ <configuration>
<goals>
- <goal>invoke</goal>
- </goals>
- <configuration>
- <goals>
<goal>clean</goal>
- </goals>
- </configuration>
- </execution>
- </executions>
- </plugin>
+ </goals>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</pluginManagement>
</build>
+ <distributionManagement>
+ <site>
+ <id>website</id>
+ <url>file://${deployDirectory}/website</url>
+ </site>
+ </distributionManagement>
+
<profiles>
- <profile>
- <id>default</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
+ <profile>
+ <id>default</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+
+ <build>
+ <pluginManagement>
+ <plugins>
+
+ <plugin>
+ <groupId>org.apache.geronimo.plugins</groupId>
+ <artifactId>selenium-maven-plugin</artifactId>
+
- <build>
- <pluginManagement>
- <plugins>
+ <executions>
+ <execution>
+ <id>start-server</id>
+ <phase>pre-integration-test</phase>
+ <goals>
+ <goal>start</goal>
+ </goals>
+ <configuration>
+ <logOutput>true</logOutput>
+ <background>true</background>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
+
+ <plugin>
+ <groupId>org.apache.geronimo.plugins</groupId>
+ <artifactId>geronimo-maven-plugin</artifactId>
+
+ <configuration>
+ <reporters>
+ <reporter implementation="org.apache.geronimo.mavenplugins.geronimo.reporting.SurefireReporter">
+ <reportsDirectory>${project.build.directory}/surefire-reports</reportsDirectory>
+ </reporter>
+ </reporters>
+ </configuration>
+
+
+ <executions>
+ <execution>
+ <id>start-server</id>
+ <phase>pre-integration-test</phase>
+ <goals>
+ <goal>start-server</goal>
+ </goals>
+ <configuration>
+ <logOutput>true</logOutput>
+ <background>true</background>
+ <!-- EXAMPLE: Use the following option to re-use a single installation of the server for all tests -->
+ <installDirectory>c:\apache</installDirectory>
+ </configuration>
+ </execution>
+
+ <execution>
+ <id>stop-server</id>
+ <phase>install</phase>
+ <goals>
+ <goal>stop-server</goal>
+ </goals>
+ </execution>
+
+ </executions>
+ </plugin>
+
+ </plugins>
+ </pluginManagement>
+
+ <plugins>
<plugin>
+ <!--
+ FIXME: The [site:site] plugin executes twice in each of the child.
+ -->
<groupId>org.apache.geronimo.plugins</groupId>
- <artifactId>selenium-maven-plugin</artifactId>
-
+ <artifactId>testsuite-maven-plugin</artifactId>
+ <version>${version}</version>
<executions>
<execution>
- <id>start-server</id>
- <phase>pre-integration-test</phase>
+ <id>generate-surefire-report</id>
+ <phase>site</phase>
<goals>
- <goal>start</goal>
+ <goal>generate-surefire-report</goal>
</goals>
- <configuration>
- <logOutput>true</logOutput>
- <background>true</background>
- </configuration>
</execution>
- </executions>
- </plugin>
-
- <plugin>
- <groupId>org.apache.geronimo.plugins</groupId>
- <artifactId>geronimo-maven-plugin</artifactId>
-
- <configuration>
- <reporters>
- <reporter implementation="org.apache.geronimo.mavenplugins.geronimo.reporting.SurefireReporter">
- <reportsDirectory>${project.build.directory}/surefire-reports</reportsDirectory>
- </reporter>
- </reporters>
- </configuration>
-
- <executions>
<execution>
- <id>start-server</id>
- <phase>pre-integration-test</phase>
+ <id>fix-menu</id>
+ <phase>post-site</phase>
<goals>
- <goal>start-server</goal>
+ <goal>fix-menu</goal>
</goals>
- <configuration>
- <logOutput>true</logOutput>
- <background>true</background>
- <!-- EXAMPLE: Use the following option to re-use a single installation of the server for all tests -->
- <!--
- <installDirectory>c:\apache</installDirectory>
- -->
- </configuration>
</execution>
-
- <execution>
- <id>stop-server</id>
- <phase>install</phase>
- <goals>
- <goal>stop-server</goal>
- </goals>
- </execution>
-
</executions>
</plugin>
+ </plugins>
- </plugins>
- </pluginManagement>
+ </build>
+ </profile>
-
- <plugins>
- <plugin>
- <!--
- FIXME: This plugin executes twice in each of the child.
- -->
- <groupId>org.apache.geronimo.plugins</groupId>
- <artifactId>testsuite-maven-plugin</artifactId>
- <version>${version}</version>
- <executions>
- <execution>
- <id>generate-surefire-report</id>
- <phase>site</phase>
- <goals>
- <goal>generate-surefire-report</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
-
- </build>
- </profile>
-
- <profile>
- <id>child</id>
- </profile>
+ <profile>
+ <id>child</id>
+ </profile>
</profiles>
+
<repositories>
<repository>
<id>openqa</id>