You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by ga...@apache.org on 2010/04/21 21:01:20 UTC
svn commit: r936443 - in /geronimo/server/trunk/testsuite: ./
enterprise-testsuite/ enterprise-testsuite/ejb-tests/
enterprise-testsuite/ejb-tests/ejb-ear/
enterprise-testsuite/ejb-tests/ejb-war/ enterprise-testsuite/jms-tests/
enterprise-testsuite/jms...
Author: gawor
Date: Wed Apr 21 19:01:19 2010
New Revision: 936443
URL: http://svn.apache.org/viewvc?rev=936443&view=rev
Log:
GERONIMO-5262: Update enterprise-testsuite
Removed:
geronimo/server/trunk/testsuite/enterprise-testsuite/ejb-tests/goals.txt
geronimo/server/trunk/testsuite/enterprise-testsuite/jms-tests/goals.txt
geronimo/server/trunk/testsuite/enterprise-testsuite/jpa-tests/goals.txt
geronimo/server/trunk/testsuite/enterprise-testsuite/sec-client-tests/goals.txt
geronimo/server/trunk/testsuite/enterprise-testsuite/sec-tests/goals.txt
geronimo/server/trunk/testsuite/enterprise-testsuite/sec-tests/sec-client/goals.txt
Modified:
geronimo/server/trunk/testsuite/enterprise-testsuite/ejb-tests/ejb-ear/pom.xml
geronimo/server/trunk/testsuite/enterprise-testsuite/ejb-tests/ejb-war/pom.xml
geronimo/server/trunk/testsuite/enterprise-testsuite/ejb-tests/pom.xml
geronimo/server/trunk/testsuite/enterprise-testsuite/jms-tests/jms-ear/pom.xml
geronimo/server/trunk/testsuite/enterprise-testsuite/jms-tests/jms-ear/src/main/filtered-resources/META-INF/geronimo-application.xml
geronimo/server/trunk/testsuite/enterprise-testsuite/jms-tests/jms-ejb/pom.xml
geronimo/server/trunk/testsuite/enterprise-testsuite/jms-tests/jms-war/pom.xml
geronimo/server/trunk/testsuite/enterprise-testsuite/jpa-tests/jpa-ear/pom.xml
geronimo/server/trunk/testsuite/enterprise-testsuite/jpa-tests/jpa-ejb/pom.xml
geronimo/server/trunk/testsuite/enterprise-testsuite/pom.xml
geronimo/server/trunk/testsuite/enterprise-testsuite/sec-client-tests/pom.xml
geronimo/server/trunk/testsuite/enterprise-testsuite/sec-tests/sec-client/pom.xml
geronimo/server/trunk/testsuite/enterprise-testsuite/sec-tests/sec-ear/pom.xml
geronimo/server/trunk/testsuite/pom.xml
Modified: geronimo/server/trunk/testsuite/enterprise-testsuite/ejb-tests/ejb-ear/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/enterprise-testsuite/ejb-tests/ejb-ear/pom.xml?rev=936443&r1=936442&r2=936443&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/enterprise-testsuite/ejb-tests/ejb-ear/pom.xml (original)
+++ geronimo/server/trunk/testsuite/enterprise-testsuite/ejb-tests/ejb-ear/pom.xml Wed Apr 21 19:01:19 2010
@@ -93,16 +93,6 @@
</configuration>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <suiteXmlFiles>
- <suiteXmlFile>${project.build.testOutputDirectory}/testng.xml</suiteXmlFile>
- </suiteXmlFiles>
- </configuration>
- </plugin>
-
<!-- "ear" packaging doesn't process test resources -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -128,36 +118,44 @@
</execution>
</executions>
</plugin>
-
- <plugin>
- <groupId>org.apache.geronimo.buildsupport</groupId>
- <artifactId>geronimo-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>deploy</id>
- <phase>pre-integration-test</phase>
- <goals>
- <goal>deploy-module</goal>
- </goals>
- <configuration>
- <moduleArchive>${project.build.directory}/${artifactId}-${version}.ear</moduleArchive>
- </configuration>
- </execution>
-
- <execution>
- <id>undeploy</id>
- <phase>post-integration-test</phase>
- <goals>
- <goal>undeploy-module</goal>
- </goals>
- <configuration>
- <moduleId>${groupId}/${artifactId}/${version}/ear</moduleId>
- </configuration>
- </execution>
- </executions>
- </plugin>
</plugins>
</build>
+ <profiles>
+ <profile>
+ <id>it</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.geronimo.buildsupport</groupId>
+ <artifactId>geronimo-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>deploy-ears</id>
+ <phase>pre-integration-test</phase>
+ <goals>
+ <goal>deploy-module</goal>
+ </goals>
+ <configuration>
+ <moduleArchive>${project.build.directory}/${artifactId}-${version}.ear</moduleArchive>
+ </configuration>
+ </execution>
+ <execution>
+ <id>undeploy-ear-as-moduleId</id>
+ <phase>post-integration-test</phase>
+ <goals>
+ <goal>undeploy-module</goal>
+ </goals>
+ <configuration>
+ <moduleId>${groupId}/${artifactId}/${version}/ear</moduleId>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+
</project>
Modified: geronimo/server/trunk/testsuite/enterprise-testsuite/ejb-tests/ejb-war/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/enterprise-testsuite/ejb-tests/ejb-war/pom.xml?rev=936443&r1=936442&r2=936443&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/enterprise-testsuite/ejb-tests/ejb-war/pom.xml (original)
+++ geronimo/server/trunk/testsuite/enterprise-testsuite/ejb-tests/ejb-war/pom.xml Wed Apr 21 19:01:19 2010
@@ -46,14 +46,6 @@
<scope>provided</scope>
</dependency>
- <!--
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jsp_2.2_spec</artifactId>
- <scope>provided</scope>
- </dependency>
- -->
-
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-servlet_3.0_spec</artifactId>
Modified: geronimo/server/trunk/testsuite/enterprise-testsuite/ejb-tests/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/enterprise-testsuite/ejb-tests/pom.xml?rev=936443&r1=936442&r2=936443&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/enterprise-testsuite/ejb-tests/pom.xml (original)
+++ geronimo/server/trunk/testsuite/enterprise-testsuite/ejb-tests/pom.xml Wed Apr 21 19:01:19 2010
@@ -41,7 +41,7 @@
<artifactId>geronimo-ejb_3.1_spec</artifactId>
<scope>provided</scope>
</dependency>
-\
+
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-annotation_1.1_spec</artifactId>
Modified: geronimo/server/trunk/testsuite/enterprise-testsuite/jms-tests/jms-ear/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/enterprise-testsuite/jms-tests/jms-ear/pom.xml?rev=936443&r1=936442&r2=936443&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/enterprise-testsuite/jms-tests/jms-ear/pom.xml (original)
+++ geronimo/server/trunk/testsuite/enterprise-testsuite/jms-tests/jms-ear/pom.xml Wed Apr 21 19:01:19 2010
@@ -67,7 +67,6 @@
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-ejb_3.1_spec</artifactId>
- <version>1.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
</dependencies>
@@ -97,16 +96,6 @@
</configuration>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <suiteXmlFiles>
- <suiteXmlFile>${project.build.testOutputDirectory}/testng.xml</suiteXmlFile>
- </suiteXmlFiles>
- </configuration>
- </plugin>
-
<!-- "ear" packaging doesn't compile test classes -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -132,75 +121,59 @@
</execution>
</executions>
</plugin>
-
- <plugin>
- <groupId>org.apache.geronimo.buildsupport</groupId>
- <artifactId>geronimo-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>deploy</id>
- <phase>pre-integration-test</phase>
- <goals>
- <goal>deploy-module</goal>
- </goals>
- <configuration>
- <moduleArchive>${project.build.directory}/${artifactId}-${version}.ear</moduleArchive>
- </configuration>
- </execution>
-
- <execution>
- <id>undeploy</id>
- <phase>post-integration-test</phase>
- <goals>
- <goal>undeploy-module</goal>
- </goals>
- <configuration>
- <moduleId>${groupId}/${artifactId}/${version}/ear</moduleId>
- </configuration>
- </execution>
- </executions>
- </plugin>
</plugins>
</build>
- <profiles>
+ <profiles>
<profile>
- <!-- use to start up selenium when running a single test against an already-started server -->
- <id>standalone</id>
+ <id>it</id>
<build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-failsafe-plugin</artifactId>
+ <configuration>
+ <suiteXmlFiles>
+ <suiteXmlFile>${project.build.testOutputDirectory}/testng.xml</suiteXmlFile>
+ </suiteXmlFiles>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>selenium-maven-plugin</artifactId>
- <inherited>false</inherited>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.geronimo.buildsupport</groupId>
+ <artifactId>geronimo-maven-plugin</artifactId>
<executions>
<execution>
- <id>start</id>
+ <id>deploy-ears</id>
<phase>pre-integration-test</phase>
<goals>
- <goal>start-server</goal>
+ <goal>deploy-module</goal>
</goals>
<configuration>
- <logOutput>true</logOutput>
- <background>true</background>
- <systemProperties>
- <property>
- <name>browser</name>
- <value>${browser}</value>
- </property>
- </systemProperties>
+ <moduleArchive>${project.build.directory}/${artifactId}-${version}.ear</moduleArchive>
</configuration>
</execution>
<execution>
- <id>stop</id>
+ <id>undeploy-ear-as-moduleId</id>
<phase>post-integration-test</phase>
<goals>
- <goal>stop-server</goal>
+ <goal>undeploy-module</goal>
</goals>
+ <configuration>
+ <moduleId>${groupId}/${artifactId}/${version}/ear</moduleId>
+ </configuration>
</execution>
</executions>
</plugin>
-
</plugins>
</build>
</profile>
Modified: geronimo/server/trunk/testsuite/enterprise-testsuite/jms-tests/jms-ear/src/main/filtered-resources/META-INF/geronimo-application.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/enterprise-testsuite/jms-tests/jms-ear/src/main/filtered-resources/META-INF/geronimo-application.xml?rev=936443&r1=936442&r2=936443&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/enterprise-testsuite/jms-tests/jms-ear/src/main/filtered-resources/META-INF/geronimo-application.xml (original)
+++ geronimo/server/trunk/testsuite/enterprise-testsuite/jms-tests/jms-ear/src/main/filtered-resources/META-INF/geronimo-application.xml Wed Apr 21 19:01:19 2010
@@ -68,6 +68,7 @@
<external-path xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.2">
<dep:groupId>org.apache.geronimo.modules</dep:groupId>
<dep:artifactId>geronimo-activemq-ra</dep:artifactId>
+ <dep:version>${version}</dep:version>
<dep:type>rar</dep:type>
</external-path>
<connector xmlns="http://geronimo.apache.org/xml/ns/j2ee/connector-1.1">
Modified: geronimo/server/trunk/testsuite/enterprise-testsuite/jms-tests/jms-ejb/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/enterprise-testsuite/jms-tests/jms-ejb/pom.xml?rev=936443&r1=936442&r2=936443&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/enterprise-testsuite/jms-tests/jms-ejb/pom.xml (original)
+++ geronimo/server/trunk/testsuite/enterprise-testsuite/jms-tests/jms-ejb/pom.xml Wed Apr 21 19:01:19 2010
@@ -30,7 +30,7 @@
<version>3.0-SNAPSHOT</version>
</parent>
- <groupId>org.apache.geronimo.testsuite</groupId>
+ <name>Geronimo TestSuite :: Enterprise Testsuite :: JMS EJB</name>
<artifactId>jms-ejb</artifactId>
<packaging>ejb</packaging>
@@ -38,7 +38,6 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
- <version>1.5.0</version>
</dependency>
<dependency>
@@ -50,20 +49,18 @@
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jms_1.1_spec</artifactId>
- <version>1.1.1</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jta_1.1_spec</artifactId>
- <version>1.1.1</version>
<scope>provided</scope>
</dependency>
+
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-annotation_1.1_spec</artifactId>
- <version>1.0-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
</dependencies>
Modified: geronimo/server/trunk/testsuite/enterprise-testsuite/jms-tests/jms-war/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/enterprise-testsuite/jms-tests/jms-war/pom.xml?rev=936443&r1=936442&r2=936443&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/enterprise-testsuite/jms-tests/jms-war/pom.xml (original)
+++ geronimo/server/trunk/testsuite/enterprise-testsuite/jms-tests/jms-war/pom.xml Wed Apr 21 19:01:19 2010
@@ -39,14 +39,6 @@
</description>
<dependencies>
- <!--
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jsp_2.2_spec</artifactId>
- <scope>provided</scope>
- </dependency>
- -->
-
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-servlet_3.0_spec</artifactId>
@@ -62,7 +54,6 @@
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-annotation_1.1_spec</artifactId>
- <version>1.0-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
</dependencies>
Modified: geronimo/server/trunk/testsuite/enterprise-testsuite/jpa-tests/jpa-ear/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/enterprise-testsuite/jpa-tests/jpa-ear/pom.xml?rev=936443&r1=936442&r2=936443&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/enterprise-testsuite/jpa-tests/jpa-ear/pom.xml (original)
+++ geronimo/server/trunk/testsuite/enterprise-testsuite/jpa-tests/jpa-ear/pom.xml Wed Apr 21 19:01:19 2010
@@ -79,16 +79,6 @@
</configuration>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <suiteXmlFiles>
- <suiteXmlFile>${project.build.testOutputDirectory}/testng.xml</suiteXmlFile>
- </suiteXmlFiles>
- </configuration>
- </plugin>
-
<!-- "ear" packaging doesn't compile test classes -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -114,35 +104,62 @@
</execution>
</executions>
</plugin>
-
- <plugin>
- <groupId>org.apache.geronimo.buildsupport</groupId>
- <artifactId>geronimo-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>deploy</id>
- <phase>pre-integration-test</phase>
- <goals>
- <goal>deploy-module</goal>
- </goals>
- <configuration>
- <moduleArchive>${project.build.directory}/${artifactId}-${version}.ear</moduleArchive>
- </configuration>
- </execution>
-
- <execution>
- <id>undeploy</id>
- <phase>post-integration-test</phase>
- <goals>
- <goal>undeploy-module</goal>
- </goals>
- <configuration>
- <moduleId>${groupId}/${artifactId}/${version}/ear</moduleId>
- </configuration>
- </execution>
- </executions>
- </plugin>
</plugins>
</build>
+ <profiles>
+ <profile>
+ <id>it</id>
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-failsafe-plugin</artifactId>
+ <configuration>
+ <suiteXmlFiles>
+ <suiteXmlFile>${project.build.testOutputDirectory}/testng.xml</suiteXmlFile>
+ </suiteXmlFiles>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>selenium-maven-plugin</artifactId>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.geronimo.buildsupport</groupId>
+ <artifactId>geronimo-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>deploy-ears</id>
+ <phase>pre-integration-test</phase>
+ <goals>
+ <goal>deploy-module</goal>
+ </goals>
+ <configuration>
+ <moduleArchive>${project.build.directory}/${artifactId}-${version}.ear</moduleArchive>
+ </configuration>
+ </execution>
+ <execution>
+ <id>undeploy-ear-as-moduleId</id>
+ <phase>post-integration-test</phase>
+ <goals>
+ <goal>undeploy-module</goal>
+ </goals>
+ <configuration>
+ <moduleId>${groupId}/${artifactId}/${version}/ear</moduleId>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+
</project>
Modified: geronimo/server/trunk/testsuite/enterprise-testsuite/jpa-tests/jpa-ejb/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/enterprise-testsuite/jpa-tests/jpa-ejb/pom.xml?rev=936443&r1=936442&r2=936443&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/enterprise-testsuite/jpa-tests/jpa-ejb/pom.xml (original)
+++ geronimo/server/trunk/testsuite/enterprise-testsuite/jpa-tests/jpa-ejb/pom.xml Wed Apr 21 19:01:19 2010
@@ -58,7 +58,7 @@
<artifactId>geronimo-ejb_3.1_spec</artifactId>
<scope>provided</scope>
</dependency>
-\
+
<!-- the enhancer seems to need xerces -->
<dependency>
<groupId>xerces</groupId>
Modified: geronimo/server/trunk/testsuite/enterprise-testsuite/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/enterprise-testsuite/pom.xml?rev=936443&r1=936442&r2=936443&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/enterprise-testsuite/pom.xml (original)
+++ geronimo/server/trunk/testsuite/enterprise-testsuite/pom.xml Wed Apr 21 19:01:19 2010
@@ -46,18 +46,14 @@
- JavaMail
</description>
- <profiles>
- <profile>
- <id>all-subprojects</id>
- <!-- use for things like versions:set and perhaps release when build has to run on all projects -->
- <modules>
- <module>ejb-tests</module>
- <module>jms-tests</module>
- <module>jpa-tests</module>
- <module>sec-client-tests</module>
- <module>sec-tests</module>
- </modules>
- </profile>
- </profiles>
+ <modules>
+<!--
+ <module>ejb-tests</module>
+ <module>jms-tests</module>
+ <module>sec-tests</module>
+-->
+ <module>jpa-tests</module>
+ <module>sec-client-tests</module>
+ </modules>
</project>
Modified: geronimo/server/trunk/testsuite/enterprise-testsuite/sec-client-tests/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/enterprise-testsuite/sec-client-tests/pom.xml?rev=936443&r1=936442&r2=936443&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/enterprise-testsuite/sec-client-tests/pom.xml (original)
+++ geronimo/server/trunk/testsuite/enterprise-testsuite/sec-client-tests/pom.xml Wed Apr 21 19:01:19 2010
@@ -65,6 +65,7 @@
</plugins>
</build>
+
<profiles>
<profile>
<id>it</id>
@@ -72,7 +73,7 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
+ <artifactId>maven-failsafe-plugin</artifactId>
<configuration>
<systemProperties>
<property>
Modified: geronimo/server/trunk/testsuite/enterprise-testsuite/sec-tests/sec-client/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/enterprise-testsuite/sec-tests/sec-client/pom.xml?rev=936443&r1=936442&r2=936443&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/enterprise-testsuite/sec-tests/sec-client/pom.xml (original)
+++ geronimo/server/trunk/testsuite/enterprise-testsuite/sec-tests/sec-client/pom.xml Wed Apr 21 19:01:19 2010
@@ -31,7 +31,7 @@
</parent>
<artifactId>sec-client</artifactId>
- <name>Geronimo TestSuite :: Enterprise Testsuite :: App Client Security Test</name>
+ <name>Geronimo TestSuite :: Enterprise Testsuite :: Security - Client</name>
<packaging>jar</packaging>
<description>This project executes testcases for your testsuite</description>
@@ -73,61 +73,6 @@
</archive>
</configuration>
</plugin>
- <!--
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <systemProperties>
- <property>
- <name>clientLogFile</name>
- <value>${clientLogFile}</value>
- </property>
- </systemProperties>
- </configuration>
- </plugin>
-
- <plugin>
- <groupId>org.apache.geronimo.buildsupport</groupId>
- <artifactId>geronimo-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>deploy-client</id>
- <phase>pre-integration-test</phase>
- <goals>
- <goal>deploy-module</goal>
- </goals>
- <configuration>
- <moduleArchive>${project.build.directory}/${artifactId}-${version}.jar</moduleArchive>
- </configuration>
- </execution>
-
- <execution>
- <phase>pre-integration-test</phase>
- <id>run-client</id>
- <goals>
- <goal>run-client</goal>
- </goals>
- <configuration>
- <moduleId>JEE5/SecClient/1.1/jar</moduleId>
- <logOutput>true</logOutput>
- <logFile>${clientLogFile}</logFile>
- </configuration>
- </execution>
-
- <execution>
- <id>undeploy-client-as-moduleId</id>
- <phase>post-integration-test</phase>
- <goals>
- <goal>undeploy-module</goal>
- </goals>
- <configuration>
- <moduleId>JEE5/SecClientServer/1.1/jar</moduleId>
- </configuration>
- </execution>
- </executions>
- </plugin>
--->
</plugins>
</build>
Modified: geronimo/server/trunk/testsuite/enterprise-testsuite/sec-tests/sec-ear/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/enterprise-testsuite/sec-tests/sec-ear/pom.xml?rev=936443&r1=936442&r2=936443&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/enterprise-testsuite/sec-tests/sec-ear/pom.xml (original)
+++ geronimo/server/trunk/testsuite/enterprise-testsuite/sec-tests/sec-ear/pom.xml Wed Apr 21 19:01:19 2010
@@ -121,15 +121,15 @@
</plugin>
</plugins>
</build>
+
<profiles>
<profile>
<id>it</id>
<build>
<plugins>
-
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
+ <artifactId>maven-failsafe-plugin</artifactId>
<configuration>
<suiteXmlFiles>
<suiteXmlFile>${project.build.testOutputDirectory}/testng.xml</suiteXmlFile>
@@ -142,6 +142,7 @@
</systemProperties>
</configuration>
</plugin>
+
<plugin>
<groupId>org.apache.geronimo.buildsupport</groupId>
<artifactId>geronimo-maven-plugin</artifactId>
@@ -165,7 +166,6 @@
</goals>
<configuration>
<moduleId>JEE5/SecClient/1.1/jar</moduleId>
- <!--<moduleId>${groupId}/${artifactId}/${version/jar</moduleId>-->
<logOutput>true</logOutput>
<logFile>${clientLogFile}</logFile>
</configuration>
Modified: geronimo/server/trunk/testsuite/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/pom.xml?rev=936443&r1=936442&r2=936443&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/pom.xml (original)
+++ geronimo/server/trunk/testsuite/pom.xml Wed Apr 21 19:01:19 2010
@@ -149,11 +149,11 @@
<modules>
<module>commands-testsuite</module>
<module>corba-testsuite</module>
+ <module>enterprise-testsuite</module>
<!--
<module>concurrent-testsuite</module>
<module>console-testsuite</module>
<module>deployment-testsuite</module>
- <module>enterprise-testsuite</module>
-->
<module>security-testsuite</module>
<module>web-testsuite</module>