geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ga...@apache.org
Subject svn commit: r936392 - in /geronimo/server/trunk/testsuite: ./ console-testsuite/ console-testsuite/advanced/ console-testsuite/basic/ corba-testsuite/ corba-testsuite/corba-helloworld/ corba-testsuite/corba-helloworld/corba-helloworld-ear/ corba-testsu...
Date Wed, 21 Apr 2010 17:04:02 GMT
Author: gawor
Date: Wed Apr 21 17:04:01 2010
New Revision: 936392

URL: http://svn.apache.org/viewvc?rev=936392&view=rev
Log:
GERONIMO-5262: Update corba-testsuites

Removed:
    geronimo/server/trunk/testsuite/console-testsuite/advanced/goals.txt
    geronimo/server/trunk/testsuite/console-testsuite/basic/goals.txt
    geronimo/server/trunk/testsuite/corba-testsuite/corba-helloworld/goals.txt
    geronimo/server/trunk/testsuite/corba-testsuite/corba-marshal/goals.txt
    geronimo/server/trunk/testsuite/corba-testsuite/corba-mytime/goals.txt
Modified:
    geronimo/server/trunk/testsuite/console-testsuite/advanced/pom.xml
    geronimo/server/trunk/testsuite/console-testsuite/basic/pom.xml
    geronimo/server/trunk/testsuite/console-testsuite/pom.xml
    geronimo/server/trunk/testsuite/corba-testsuite/corba-helloworld/corba-helloworld-ear/pom.xml
    geronimo/server/trunk/testsuite/corba-testsuite/corba-helloworld/corba-helloworld-ear/src/main/filtered-resources/META-INF/geronimo-application.xml
    geronimo/server/trunk/testsuite/corba-testsuite/corba-marshal/corba-marshal-ear/src/main/filtered-resources/META-INF/geronimo-application.xml
    geronimo/server/trunk/testsuite/corba-testsuite/corba-marshal/corba-marshal-ejb/pom.xml
    geronimo/server/trunk/testsuite/corba-testsuite/corba-mytime/corba-mytime-ear/pom.xml
    geronimo/server/trunk/testsuite/corba-testsuite/pom.xml
    geronimo/server/trunk/testsuite/pom.xml
    geronimo/server/trunk/testsuite/security-testsuite/pom.xml

Modified: geronimo/server/trunk/testsuite/console-testsuite/advanced/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/console-testsuite/advanced/pom.xml?rev=936392&r1=936391&r2=936392&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/console-testsuite/advanced/pom.xml (original)
+++ geronimo/server/trunk/testsuite/console-testsuite/advanced/pom.xml Wed Apr 21 17:04:01
2010
@@ -37,4 +37,23 @@
         Advanced test for the Geronimo console.
     </description>
 
+    <profiles>
+        <profile>
+            <id>it</id>
+            <build>
+                <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>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
+
 </project>

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?rev=936392&r1=936391&r2=936392&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/console-testsuite/basic/pom.xml (original)
+++ geronimo/server/trunk/testsuite/console-testsuite/basic/pom.xml Wed Apr 21 17:04:01 2010
@@ -37,4 +37,23 @@
         Basic test for the Geronimo console.
     </description>
 
+    <profiles>
+        <profile>
+            <id>it</id>
+            <build>
+                <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>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
+
 </project>

Modified: geronimo/server/trunk/testsuite/console-testsuite/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/console-testsuite/pom.xml?rev=936392&r1=936391&r2=936392&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/console-testsuite/pom.xml (original)
+++ geronimo/server/trunk/testsuite/console-testsuite/pom.xml Wed Apr 21 17:04:01 2010
@@ -38,36 +38,36 @@
         Geronimo console testsuite.
     </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>
-                        <systemProperties>
-                            <property>
-                                <name>geronimoVersion</name>
-                                <value>${version}</value>
-                            </property>
-                        </systemProperties>
-                    </configuration>
-                </plugin>
-            </plugins>
-        </pluginManagement>
-    </build>
     <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>basic</module>
-                <module>advanced</module>
-            </modules>
+            <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>
+                                <systemProperties>
+                                    <property>
+                                        <name>geronimoVersion</name>
+                                        <value>${version}</value>
+                                    </property>
+                                </systemProperties>
+                            </configuration>
+                        </plugin>
+                    </plugins>
+                </pluginManagement>
+            </build>
         </profile>
     </profiles>
 
+    <modules>
+        <module>basic</module>
+        <module>advanced</module>
+    </modules>
+
 </project>

Modified: geronimo/server/trunk/testsuite/corba-testsuite/corba-helloworld/corba-helloworld-ear/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/corba-testsuite/corba-helloworld/corba-helloworld-ear/pom.xml?rev=936392&r1=936391&r2=936392&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/corba-testsuite/corba-helloworld/corba-helloworld-ear/pom.xml
(original)
+++ geronimo/server/trunk/testsuite/corba-testsuite/corba-helloworld/corba-helloworld-ear/pom.xml
Wed Apr 21 17:04:01 2010
@@ -124,7 +124,7 @@
                     <!-- =====================================================================
-->
                     <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/corba-testsuite/corba-helloworld/corba-helloworld-ear/src/main/filtered-resources/META-INF/geronimo-application.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/corba-testsuite/corba-helloworld/corba-helloworld-ear/src/main/filtered-resources/META-INF/geronimo-application.xml?rev=936392&r1=936391&r2=936392&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/corba-testsuite/corba-helloworld/corba-helloworld-ear/src/main/filtered-resources/META-INF/geronimo-application.xml
(original)
+++ geronimo/server/trunk/testsuite/corba-testsuite/corba-helloworld/corba-helloworld-ear/src/main/filtered-resources/META-INF/geronimo-application.xml
Wed Apr 21 17:04:01 2010
@@ -108,7 +108,7 @@
                     </dep:dependency>
                     <dep:dependency>
                         <dep:groupId>org.apache.geronimo.configs</dep:groupId>
-                        <dep:artifactId>client-transaction</dep:artifactId>
+                        <dep:artifactId>client-transaction-1_6</dep:artifactId>
                         <dep:version>${version}</dep:version>
                         <dep:type>car</dep:type>
                     </dep:dependency>

Modified: geronimo/server/trunk/testsuite/corba-testsuite/corba-marshal/corba-marshal-ear/src/main/filtered-resources/META-INF/geronimo-application.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/corba-testsuite/corba-marshal/corba-marshal-ear/src/main/filtered-resources/META-INF/geronimo-application.xml?rev=936392&r1=936391&r2=936392&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/corba-testsuite/corba-marshal/corba-marshal-ear/src/main/filtered-resources/META-INF/geronimo-application.xml
(original)
+++ geronimo/server/trunk/testsuite/corba-testsuite/corba-marshal/corba-marshal-ear/src/main/filtered-resources/META-INF/geronimo-application.xml
Wed Apr 21 17:04:01 2010
@@ -103,7 +103,7 @@
                     </dep:dependency>
                     <dep:dependency>
                         <dep:groupId>org.apache.geronimo.configs</dep:groupId>
-                        <dep:artifactId>client-transaction</dep:artifactId>
+                        <dep:artifactId>client-transaction-1_6</dep:artifactId>
                         <dep:version>${version}</dep:version>
                         <dep:type>car</dep:type>
                     </dep:dependency>

Modified: geronimo/server/trunk/testsuite/corba-testsuite/corba-marshal/corba-marshal-ejb/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/corba-testsuite/corba-marshal/corba-marshal-ejb/pom.xml?rev=936392&r1=936391&r2=936392&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/corba-testsuite/corba-marshal/corba-marshal-ejb/pom.xml
(original)
+++ geronimo/server/trunk/testsuite/corba-testsuite/corba-marshal/corba-marshal-ejb/pom.xml
Wed Apr 21 17:04:01 2010
@@ -1,4 +1,3 @@
-\
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
     Licensed to the Apache Software Foundation (ASF) under one

Modified: geronimo/server/trunk/testsuite/corba-testsuite/corba-mytime/corba-mytime-ear/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/corba-testsuite/corba-mytime/corba-mytime-ear/pom.xml?rev=936392&r1=936391&r2=936392&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/corba-testsuite/corba-mytime/corba-mytime-ear/pom.xml
(original)
+++ geronimo/server/trunk/testsuite/corba-testsuite/corba-mytime/corba-mytime-ear/pom.xml
Wed Apr 21 17:04:01 2010
@@ -118,19 +118,29 @@
             
         </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.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <suiteXmlFiles>
-                                <suiteXmlFile>${project.build.testOutputDirectory}/testng.xml</suiteXmlFile>
-                            </suiteXmlFiles>
-                        </configuration>
+                        <groupId>org.codehaus.mojo</groupId>
+                        <artifactId>selenium-maven-plugin</artifactId>
                     </plugin>
 
                     <!-- Start the Geronimo server in the pre-integration-test and

Modified: geronimo/server/trunk/testsuite/corba-testsuite/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/corba-testsuite/pom.xml?rev=936392&r1=936391&r2=936392&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/corba-testsuite/pom.xml (original)
+++ geronimo/server/trunk/testsuite/corba-testsuite/pom.xml Wed Apr 21 17:04:01 2010
@@ -37,16 +37,13 @@
     <description>
         Test Geronimo CORBA Functions
     </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>corba-helloworld</module>
-                <module>corba-marshal</module>
-                <module>corba-mytime</module>
-            </modules>
-        </profile>
-    </profiles>
+
+    <modules>
+<!--
+        <module>corba-helloworld</module>
+-->
+        <module>corba-marshal</module>
+        <module>corba-mytime</module>
+    </modules>
 
 </project>

Modified: geronimo/server/trunk/testsuite/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/pom.xml?rev=936392&r1=936391&r2=936392&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/pom.xml (original)
+++ geronimo/server/trunk/testsuite/pom.xml Wed Apr 21 17:04:01 2010
@@ -148,10 +148,10 @@
 
     <modules>
         <module>commands-testsuite</module>
+        <module>corba-testsuite</module>
 <!--
         <module>concurrent-testsuite</module>
         <module>console-testsuite</module>
-        <module>corba-testsuite</module>
         <module>deployment-testsuite</module>
         <module>enterprise-testsuite</module>
 -->

Modified: geronimo/server/trunk/testsuite/security-testsuite/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/security-testsuite/pom.xml?rev=936392&r1=936391&r2=936392&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/security-testsuite/pom.xml (original)
+++ geronimo/server/trunk/testsuite/security-testsuite/pom.xml Wed Apr 21 17:04:01 2010
@@ -38,21 +38,26 @@
         Geronimo security testsuite.
     </description>
 
-    <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>
-    </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>
+            </build>
+        </profile>
+    </profiles>
 
     <modules>
         <module>test-security</module>



Mime
View raw message