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 20:04:02 UTC
svn commit: r936405 - in
/geronimo/server/trunk/testsuite/deployment-testsuite: ./ deployment-tests/
jca-cms-tests/ jca-cms-tests/jca-cms-ear/
jca-cms-tests/jca-cms-ear/src/main/filtered-resources/
jca-cms-tests/jca-cms-ear/src/main/filtered-resources/...
Author: gawor
Date: Wed Apr 21 18:04:01 2010
New Revision: 936405
URL: http://svn.apache.org/viewvc?rev=936405&view=rev
Log:
GERONIMO-5262: Update deployment-testsuite
Added:
geronimo/server/trunk/testsuite/deployment-testsuite/jca-cms-tests/jca-cms-ear/src/main/filtered-resources/ (props changed)
- copied from r935940, geronimo/server/trunk/testsuite/deployment-testsuite/jca-cms-tests/jca-cms-ear/src/main/resources/
geronimo/server/trunk/testsuite/deployment-testsuite/manifestcp-tests/manifestcp-ear/src/main/filtered-resources/ (props changed)
- copied from r935940, geronimo/server/trunk/testsuite/deployment-testsuite/manifestcp-tests/manifestcp-ear/src/main/resources/
Removed:
geronimo/server/trunk/testsuite/deployment-testsuite/deployment-tests/goals.txt
geronimo/server/trunk/testsuite/deployment-testsuite/jca-cms-tests/goals.txt
geronimo/server/trunk/testsuite/deployment-testsuite/jca-cms-tests/jca-cms-ear/src/main/resources/
geronimo/server/trunk/testsuite/deployment-testsuite/manifestcp-tests/goals.txt
geronimo/server/trunk/testsuite/deployment-testsuite/manifestcp-tests/manifestcp-ear/src/main/resources/
Modified:
geronimo/server/trunk/testsuite/deployment-testsuite/deployment-tests/pom.xml
geronimo/server/trunk/testsuite/deployment-testsuite/jca-cms-tests/jca-cms-ear/pom.xml
geronimo/server/trunk/testsuite/deployment-testsuite/jca-cms-tests/jca-cms-ear/src/main/filtered-resources/META-INF/geronimo-application.xml
geronimo/server/trunk/testsuite/deployment-testsuite/jca-cms-tests/jca-cms-war/pom.xml
geronimo/server/trunk/testsuite/deployment-testsuite/manifestcp-tests/manifestcp-ear/pom.xml
geronimo/server/trunk/testsuite/deployment-testsuite/manifestcp-tests/manifestcp-jar2/pom.xml
geronimo/server/trunk/testsuite/deployment-testsuite/pom.xml
Modified: geronimo/server/trunk/testsuite/deployment-testsuite/deployment-tests/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/deployment-testsuite/deployment-tests/pom.xml?rev=936405&r1=936404&r2=936405&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/deployment-testsuite/deployment-tests/pom.xml (original)
+++ geronimo/server/trunk/testsuite/deployment-testsuite/deployment-tests/pom.xml Wed Apr 21 18:04:01 2010
@@ -37,88 +37,98 @@
Tests for the test-deployables.
</description>
- <build>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <suiteXmlFiles>
- <suiteXmlFile>${project.build.testOutputDirectory}/testng.xml</suiteXmlFile>
- </suiteXmlFiles>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
-
- <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>
- <modules>
- <!-- Deploy only 1 module until https://issues.apache.org/jira/browse/GERONIMO-3199 is fixed. -->
- <!--
- <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>
-
- <!-- Comment the following block until https://issues.apache.org/jira/browse/GERONIMO-3199 is fixed. -->
- <!--
- <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>
+ <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>
+ <modules>
+ <!-- Deploy only 1 module until https://issues.apache.org/jira/browse/GERONIMO-3199 is fixed. -->
+ <!--
+ <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>
+
+ <!-- Comment the following block until https://issues.apache.org/jira/browse/GERONIMO-3199 is fixed. -->
+ <!--
+ <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/deployment-testsuite/jca-cms-tests/jca-cms-ear/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/deployment-testsuite/jca-cms-tests/jca-cms-ear/pom.xml?rev=936405&r1=936404&r2=936405&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/deployment-testsuite/jca-cms-tests/jca-cms-ear/pom.xml (original)
+++ geronimo/server/trunk/testsuite/deployment-testsuite/jca-cms-tests/jca-cms-ear/pom.xml Wed Apr 21 18:04:01 2010
@@ -66,20 +66,6 @@
</dependencies>
<build>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <suiteXmlFiles>
- <suiteXmlFile>${project.build.testOutputDirectory}/testng.xml</suiteXmlFile>
- </suiteXmlFiles>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
-
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -129,35 +115,62 @@
</execution>
</executions>
</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-module</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>
Propchange: geronimo/server/trunk/testsuite/deployment-testsuite/jca-cms-tests/jca-cms-ear/src/main/filtered-resources/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Apr 21 18:04:01 2010
@@ -0,0 +1 @@
+/geronimo/server/branches/2.2/testsuite/deployment-testsuite/jca-cms-tests/jca-cms-ear/src/main/resources:832538,885058
Modified: geronimo/server/trunk/testsuite/deployment-testsuite/jca-cms-tests/jca-cms-ear/src/main/filtered-resources/META-INF/geronimo-application.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/deployment-testsuite/jca-cms-tests/jca-cms-ear/src/main/filtered-resources/META-INF/geronimo-application.xml?rev=936405&r1=935940&r2=936405&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/deployment-testsuite/jca-cms-tests/jca-cms-ear/src/main/filtered-resources/META-INF/geronimo-application.xml (original)
+++ geronimo/server/trunk/testsuite/deployment-testsuite/jca-cms-tests/jca-cms-ear/src/main/filtered-resources/META-INF/geronimo-application.xml Wed Apr 21 18:04:01 2010
@@ -106,9 +106,9 @@
</reference>
</gbean>
<gbean name="test-cms-credentials"
- class="org.apache.geronimo.connector.outbound.security.PasswordCredentialLoginModuleWrapperGBean">
+ class="org.apache.geronimo.connector.wrapper.outbound.security.PasswordCredentialLoginModuleWrapper">
<attribute name="loginModuleClass">
- org.apache.geronimo.connector.outbound.security.CallerIdentityPasswordCredentialLoginModule
+ org.apache.geronimo.connector.wrapper.outbound.security.CallerIdentityPasswordCredentialLoginModule
</attribute>
<reference name="ManagedConnectionFactoryWrapper">
<name>cmsds</name>
Modified: geronimo/server/trunk/testsuite/deployment-testsuite/jca-cms-tests/jca-cms-war/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/deployment-testsuite/jca-cms-tests/jca-cms-war/pom.xml?rev=936405&r1=936404&r2=936405&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/deployment-testsuite/jca-cms-tests/jca-cms-war/pom.xml (original)
+++ geronimo/server/trunk/testsuite/deployment-testsuite/jca-cms-tests/jca-cms-war/pom.xml Wed Apr 21 18:04:01 2010
@@ -55,16 +55,4 @@
</dependency>
</dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-war-plugin</artifactId>
- <configuration>
- <webXml>${pom.basedir}/src/main/webapp/WEB-INF/web.xml</webXml>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
</project>
Modified: geronimo/server/trunk/testsuite/deployment-testsuite/manifestcp-tests/manifestcp-ear/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/deployment-testsuite/manifestcp-tests/manifestcp-ear/pom.xml?rev=936405&r1=936404&r2=936405&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/deployment-testsuite/manifestcp-tests/manifestcp-ear/pom.xml (original)
+++ geronimo/server/trunk/testsuite/deployment-testsuite/manifestcp-tests/manifestcp-ear/pom.xml Wed Apr 21 18:04:01 2010
@@ -79,35 +79,43 @@
</modules>
</configuration>
</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-module</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>
Propchange: geronimo/server/trunk/testsuite/deployment-testsuite/manifestcp-tests/manifestcp-ear/src/main/filtered-resources/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Apr 21 18:04:01 2010
@@ -0,0 +1 @@
+/geronimo/server/branches/2.2/testsuite/deployment-testsuite/manifestcp-tests/manifestcp-ear/src/main/resources:832538,885058
Modified: geronimo/server/trunk/testsuite/deployment-testsuite/manifestcp-tests/manifestcp-jar2/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/deployment-testsuite/manifestcp-tests/manifestcp-jar2/pom.xml?rev=936405&r1=936404&r2=936405&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/deployment-testsuite/manifestcp-tests/manifestcp-jar2/pom.xml (original)
+++ geronimo/server/trunk/testsuite/deployment-testsuite/manifestcp-tests/manifestcp-jar2/pom.xml Wed Apr 21 18:04:01 2010
@@ -33,13 +33,4 @@
<artifactId>manifestcp-jar2</artifactId>
<name>Geronimo TestSuite :: Deployment Testsuite :: Manifest Classpath JAR</name>
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
-</project>
\ No newline at end of file
+</project>
Modified: geronimo/server/trunk/testsuite/deployment-testsuite/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/deployment-testsuite/pom.xml?rev=936405&r1=936404&r2=936405&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/deployment-testsuite/pom.xml (original)
+++ geronimo/server/trunk/testsuite/deployment-testsuite/pom.xml Wed Apr 21 18:04:01 2010
@@ -37,16 +37,11 @@
<description>
Geronimo deployment testsuite.
</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>deployment-tests</module>
- <module>jca-cms-tests</module>
- <module>manifestcp-tests</module>
- </modules>
- </profile>
- </profiles>
+
+ <modules>
+ <module>deployment-tests</module>
+ <module>jca-cms-tests</module>
+ <module>manifestcp-tests</module>
+ </modules>
</project>