geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From xiam...@apache.org
Subject svn commit: r946547 [2/2] - in /geronimo/server/branches/2.2: ./ testsuite/ testsuite/commands-testsuite/ testsuite/concurrent-testsuite/ testsuite/concurrent-testsuite/concurrent-basic/concurrent-web-ear/ testsuite/console-testsuite/ testsuite/console...
Date Thu, 20 May 2010 07:25:55 GMT
Modified: geronimo/server/branches/2.2/testsuite/webservices-testsuite/jaxws-catalog-tests/catalog-ear/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/testsuite/webservices-testsuite/jaxws-catalog-tests/catalog-ear/pom.xml?rev=946547&r1=946546&r2=946547&view=diff
==============================================================================
--- geronimo/server/branches/2.2/testsuite/webservices-testsuite/jaxws-catalog-tests/catalog-ear/pom.xml
(original)
+++ geronimo/server/branches/2.2/testsuite/webservices-testsuite/jaxws-catalog-tests/catalog-ear/pom.xml
Thu May 20 07:25:53 2010
@@ -96,7 +96,7 @@
 					</plugin>
 					<plugin>
 						<groupId>org.apache.maven.plugins</groupId>
-						<artifactId>maven-surefire-plugin</artifactId>
+						<artifactId>maven-failsafe-plugin</artifactId>
 					</plugin>
 					<plugin>
 						<groupId>org.apache.geronimo.buildsupport</groupId>

Modified: geronimo/server/branches/2.2/testsuite/webservices-testsuite/jaxws-mtom-tests/mtom-ear/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/testsuite/webservices-testsuite/jaxws-mtom-tests/mtom-ear/pom.xml?rev=946547&r1=946546&r2=946547&view=diff
==============================================================================
--- geronimo/server/branches/2.2/testsuite/webservices-testsuite/jaxws-mtom-tests/mtom-ear/pom.xml
(original)
+++ geronimo/server/branches/2.2/testsuite/webservices-testsuite/jaxws-mtom-tests/mtom-ear/pom.xml
Thu May 20 07:25:53 2010
@@ -98,7 +98,7 @@
 					</plugin>
 					<plugin>
 						<groupId>org.apache.maven.plugins</groupId>
-						<artifactId>maven-surefire-plugin</artifactId>
+						<artifactId>maven-failsafe-plugin</artifactId>
 						<configuration>
 							<systemProperties>
 								<property>

Modified: geronimo/server/branches/2.2/testsuite/webservices-testsuite/jaxws-provider-tests/provider-ear/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/testsuite/webservices-testsuite/jaxws-provider-tests/provider-ear/pom.xml?rev=946547&r1=946546&r2=946547&view=diff
==============================================================================
--- geronimo/server/branches/2.2/testsuite/webservices-testsuite/jaxws-provider-tests/provider-ear/pom.xml
(original)
+++ geronimo/server/branches/2.2/testsuite/webservices-testsuite/jaxws-provider-tests/provider-ear/pom.xml
Thu May 20 07:25:53 2010
@@ -104,7 +104,7 @@
 					</plugin>
 					<plugin>
 						<groupId>org.apache.maven.plugins</groupId>
-						<artifactId>maven-surefire-plugin</artifactId>
+						<artifactId>maven-failsafe-plugin</artifactId>
 						<configuration>
 							<systemProperties>
 								<property>

Modified: geronimo/server/branches/2.2/testsuite/webservices-testsuite/jaxws-tests/jaxws-client/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/testsuite/webservices-testsuite/jaxws-tests/jaxws-client/pom.xml?rev=946547&r1=946546&r2=946547&view=diff
==============================================================================
--- geronimo/server/branches/2.2/testsuite/webservices-testsuite/jaxws-tests/jaxws-client/pom.xml
(original)
+++ geronimo/server/branches/2.2/testsuite/webservices-testsuite/jaxws-tests/jaxws-client/pom.xml
Thu May 20 07:25:53 2010
@@ -69,7 +69,7 @@
 					</plugin>
 					<plugin>
 						<groupId>org.apache.maven.plugins</groupId>
-						<artifactId>maven-surefire-plugin</artifactId>
+						<artifactId>maven-failsafe-plugin</artifactId>
 						<configuration>
 							<systemProperties>
 								<property>

Modified: geronimo/server/branches/2.2/testsuite/webservices-testsuite/jaxws-tests/jaxws-ejb-sec/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/testsuite/webservices-testsuite/jaxws-tests/jaxws-ejb-sec/pom.xml?rev=946547&r1=946546&r2=946547&view=diff
==============================================================================
--- geronimo/server/branches/2.2/testsuite/webservices-testsuite/jaxws-tests/jaxws-ejb-sec/pom.xml
(original)
+++ geronimo/server/branches/2.2/testsuite/webservices-testsuite/jaxws-tests/jaxws-ejb-sec/pom.xml
Thu May 20 07:25:53 2010
@@ -84,7 +84,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/branches/2.2/testsuite/webservices-testsuite/jaxws-tests/jaxws-ejb/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/testsuite/webservices-testsuite/jaxws-tests/jaxws-ejb/pom.xml?rev=946547&r1=946546&r2=946547&view=diff
==============================================================================
--- geronimo/server/branches/2.2/testsuite/webservices-testsuite/jaxws-tests/jaxws-ejb/pom.xml
(original)
+++ geronimo/server/branches/2.2/testsuite/webservices-testsuite/jaxws-tests/jaxws-ejb/pom.xml
Thu May 20 07:25:53 2010
@@ -76,7 +76,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/branches/2.2/testsuite/webservices-testsuite/jaxws-tests/jaxws-partial/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/testsuite/webservices-testsuite/jaxws-tests/jaxws-partial/pom.xml?rev=946547&r1=946546&r2=946547&view=diff
==============================================================================
--- geronimo/server/branches/2.2/testsuite/webservices-testsuite/jaxws-tests/jaxws-partial/pom.xml
(original)
+++ geronimo/server/branches/2.2/testsuite/webservices-testsuite/jaxws-tests/jaxws-partial/pom.xml
Thu May 20 07:25:53 2010
@@ -40,7 +40,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/branches/2.2/testsuite/webservices-testsuite/jaxws-tests/jaxws-rest-war/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/testsuite/webservices-testsuite/jaxws-tests/jaxws-rest-war/pom.xml?rev=946547&r1=946546&r2=946547&view=diff
==============================================================================
--- geronimo/server/branches/2.2/testsuite/webservices-testsuite/jaxws-tests/jaxws-rest-war/pom.xml
(original)
+++ geronimo/server/branches/2.2/testsuite/webservices-testsuite/jaxws-tests/jaxws-rest-war/pom.xml
Thu May 20 07:25:53 2010
@@ -47,7 +47,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/branches/2.2/testsuite/webservices-testsuite/jaxws-tests/jaxws-war-sec/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/testsuite/webservices-testsuite/jaxws-tests/jaxws-war-sec/pom.xml?rev=946547&r1=946546&r2=946547&view=diff
==============================================================================
--- geronimo/server/branches/2.2/testsuite/webservices-testsuite/jaxws-tests/jaxws-war-sec/pom.xml
(original)
+++ geronimo/server/branches/2.2/testsuite/webservices-testsuite/jaxws-tests/jaxws-war-sec/pom.xml
Thu May 20 07:25:53 2010
@@ -65,7 +65,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/branches/2.2/testsuite/webservices-testsuite/jaxws-tests/jaxws-war/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/testsuite/webservices-testsuite/jaxws-tests/jaxws-war/pom.xml?rev=946547&r1=946546&r2=946547&view=diff
==============================================================================
--- geronimo/server/branches/2.2/testsuite/webservices-testsuite/jaxws-tests/jaxws-war/pom.xml
(original)
+++ geronimo/server/branches/2.2/testsuite/webservices-testsuite/jaxws-tests/jaxws-war/pom.xml
Thu May 20 07:25:53 2010
@@ -49,7 +49,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/branches/2.2/testsuite/webservices-testsuite/jaxws-wsa-tests/wsa-ear/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/testsuite/webservices-testsuite/jaxws-wsa-tests/wsa-ear/pom.xml?rev=946547&r1=946546&r2=946547&view=diff
==============================================================================
--- geronimo/server/branches/2.2/testsuite/webservices-testsuite/jaxws-wsa-tests/wsa-ear/pom.xml
(original)
+++ geronimo/server/branches/2.2/testsuite/webservices-testsuite/jaxws-wsa-tests/wsa-ear/pom.xml
Thu May 20 07:25:53 2010
@@ -68,6 +68,17 @@
 		<profile>
 			<id>child</id>
 			<build>
+                <resources>
+                    <resource>
+                        <directory>src/test/resources</directory>
+                        <filtering>false</filtering>
+                        <targetPath>${project.build.testOutputDirectory}</targetPath>
+                    </resource>
+                    <resource>
+                        <directory>src/main/filtered-resources</directory>
+                        <filtering>true</filtering>
+                    </resource>                
+                </resources>
 				<plugins>
 					<plugin>
 						<artifactId>maven-ear-plugin</artifactId>
@@ -99,10 +110,10 @@
 								</goals>
 							</execution>
 						</executions>
-					</plugin>
+					</plugin>                    
 					<plugin>
 						<groupId>org.apache.maven.plugins</groupId>
-						<artifactId>maven-surefire-plugin</artifactId>
+						<artifactId>maven-failsafe-plugin</artifactId>
 						<configuration>
 							<systemProperties>
 								<property>

Modified: geronimo/server/branches/2.2/testsuite/webservices-testsuite/jaxws-wsa-tests/wsa-ejb/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/testsuite/webservices-testsuite/jaxws-wsa-tests/wsa-ejb/pom.xml?rev=946547&r1=946546&r2=946547&view=diff
==============================================================================
--- geronimo/server/branches/2.2/testsuite/webservices-testsuite/jaxws-wsa-tests/wsa-ejb/pom.xml
(original)
+++ geronimo/server/branches/2.2/testsuite/webservices-testsuite/jaxws-wsa-tests/wsa-ejb/pom.xml
Thu May 20 07:25:53 2010
@@ -47,9 +47,9 @@
 			<scope>provided</scope>
 		</dependency>
 	</dependencies>
-	<profiles>
+	<!--<profiles>
 		<profile>
-			<id>child</id>
+			<id>child</id>-->
 			<build>
 				<resources>
 					<resource>
@@ -74,7 +74,7 @@
 					</plugin>
 				</plugins>
 			</build>
-		</profile>
-	</profiles>
+		<!--</profile>
+	</profiles>-->
 </project>
 

Modified: geronimo/server/branches/2.2/testsuite/webservices-testsuite/jaxws-wsa-tests/wsa-war/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/testsuite/webservices-testsuite/jaxws-wsa-tests/wsa-war/pom.xml?rev=946547&r1=946546&r2=946547&view=diff
==============================================================================
--- geronimo/server/branches/2.2/testsuite/webservices-testsuite/jaxws-wsa-tests/wsa-war/pom.xml
(original)
+++ geronimo/server/branches/2.2/testsuite/webservices-testsuite/jaxws-wsa-tests/wsa-war/pom.xml
Thu May 20 07:25:53 2010
@@ -41,9 +41,9 @@
 			<scope>provided</scope>
 		</dependency>
 	</dependencies>
-	<profiles>
+	<!--<profiles>
 		<profile>
-			<id>child</id>
+			<id>child</id>-->
 			<build>
 				<resources>
 					<resource>
@@ -54,6 +54,6 @@
 					</resource>
 				</resources>
 			</build>
-		</profile>
-	</profiles>
+		<!--</profile>
+	</profiles>-->
 </project>

Modified: geronimo/server/branches/2.2/testsuite/webservices-testsuite/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/testsuite/webservices-testsuite/pom.xml?rev=946547&r1=946546&r2=946547&view=diff
==============================================================================
--- geronimo/server/branches/2.2/testsuite/webservices-testsuite/pom.xml (original)
+++ geronimo/server/branches/2.2/testsuite/webservices-testsuite/pom.xml Thu May 20 07:25:53
2010
@@ -39,8 +39,8 @@
     </description>
 	<build>
 		<plugins>
-			<plugin>
-				<!--  This plugin is needed for all suite poms. -->
+            <!--  TODO: testsuite-maven-plugin needs update to generate report from failsafe
execution results -->
+			<!--<plugin>				
 				<groupId>org.apache.geronimo.buildsupport</groupId>
 				<artifactId>testsuite-maven-plugin</artifactId>
 				<executions>
@@ -52,62 +52,8 @@
 						</goals>
 					</execution>
 				</executions>
-			</plugin>
-		</plugins>
-		<pluginManagement>
-			<plugins>
-				<plugin>
-					<groupId>org.apache.maven.plugins</groupId>
-					<artifactId>maven-surefire-plugin</artifactId>
-					<version>2.5</version>
-					<configuration>
-						<skip>true</skip>
-						<testFailureIgnore>true</testFailureIgnore>
-						<reportsDirectory>${project.build.directory}/surefire-reports</reportsDirectory>
-						<reportFormat>plain</reportFormat>
-						<useFile>true</useFile>
-						<redirectTestOutputToFile>true</redirectTestOutputToFile>
-						<forkMode>once</forkMode>
-						<workingDirectory>${project.build.directory}</workingDirectory>
-						<suiteXmlFiles>
-                            <suiteXmlFile>${project.build.testOutputDirectory}/testng.xml</suiteXmlFile>
-                        </suiteXmlFiles>
-					</configuration>
-					<executions>
-						<execution>
-							<id>test</id>
-							<phase>test</phase>
-							<goals>
-								<goal>test</goal>
-							</goals>
-							<configuration>
-								<skip>true</skip>
-							</configuration>
-						</execution>
-						<execution>
-							<id>integration</id>
-							<phase>integration-test</phase>
-							<goals>
-								<goal>test</goal>
-							</goals>
-							<configuration>
-								<testFailureIgnore>true</testFailureIgnore>
-								<skip>false</skip>
-							</configuration>
-						</execution>
-					</executions>
-				</plugin>
-				<plugin>
-					<groupId>org.apache.maven.plugins</groupId>
-					<artifactId>maven-surefire-report-plugin</artifactId>
-					<version>2.5</version>
-					<configuration>
-						<aggregate>true</aggregate>
-						<outputDirectory>${project.build.outputDirectory}/surefire-reports</outputDirectory>
-					</configuration>
-				</plugin>
-			</plugins>
-		</pluginManagement>
+			</plugin>-->
+		</plugins>		
 	</build>
 
 	<profiles>

Modified: geronimo/server/branches/2.2/testsuite/webservices-testsuite/saaj-tests/saaj-client/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/testsuite/webservices-testsuite/saaj-tests/saaj-client/pom.xml?rev=946547&r1=946546&r2=946547&view=diff
==============================================================================
--- geronimo/server/branches/2.2/testsuite/webservices-testsuite/saaj-tests/saaj-client/pom.xml
(original)
+++ geronimo/server/branches/2.2/testsuite/webservices-testsuite/saaj-tests/saaj-client/pom.xml
Thu May 20 07:25:53 2010
@@ -67,7 +67,7 @@
 					</plugin>
 					<plugin>
 						<groupId>org.apache.maven.plugins</groupId>
-						<artifactId>maven-surefire-plugin</artifactId>
+						<artifactId>maven-failsafe-plugin</artifactId>
 						<configuration>
 							<systemProperties>
 								<property>

Modified: geronimo/server/branches/2.2/testsuite/webservices-testsuite/saaj-tests/saaj-war/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/testsuite/webservices-testsuite/saaj-tests/saaj-war/pom.xml?rev=946547&r1=946546&r2=946547&view=diff
==============================================================================
--- geronimo/server/branches/2.2/testsuite/webservices-testsuite/saaj-tests/saaj-war/pom.xml
(original)
+++ geronimo/server/branches/2.2/testsuite/webservices-testsuite/saaj-tests/saaj-war/pom.xml
Thu May 20 07:25:53 2010
@@ -62,7 +62,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/branches/2.2/testsuite/webservices-testsuite/stax-tests/stax-client/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/testsuite/webservices-testsuite/stax-tests/stax-client/pom.xml?rev=946547&r1=946546&r2=946547&view=diff
==============================================================================
--- geronimo/server/branches/2.2/testsuite/webservices-testsuite/stax-tests/stax-client/pom.xml
(original)
+++ geronimo/server/branches/2.2/testsuite/webservices-testsuite/stax-tests/stax-client/pom.xml
Thu May 20 07:25:53 2010
@@ -67,7 +67,7 @@
 					</plugin>
 					<plugin>
 						<groupId>org.apache.maven.plugins</groupId>
-						<artifactId>maven-surefire-plugin</artifactId>
+						<artifactId>maven-failsafe-plugin</artifactId>
 						<configuration>
 							<systemProperties>
 								<property>

Modified: geronimo/server/branches/2.2/testsuite/webservices-testsuite/stax-tests/stax-war/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/testsuite/webservices-testsuite/stax-tests/stax-war/pom.xml?rev=946547&r1=946546&r2=946547&view=diff
==============================================================================
--- geronimo/server/branches/2.2/testsuite/webservices-testsuite/stax-tests/stax-war/pom.xml
(original)
+++ geronimo/server/branches/2.2/testsuite/webservices-testsuite/stax-tests/stax-war/pom.xml
Thu May 20 07:25:53 2010
@@ -56,7 +56,7 @@
 				<plugins>
 					<plugin>
 						<groupId>org.apache.maven.plugins</groupId>
-						<artifactId>maven-surefire-plugin</artifactId>
+						<artifactId>maven-failsafe-plugin</artifactId>
 						<configuration>
 							<systemProperties>
 								<property>



Mime
View raw message