geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jdil...@apache.org
Subject svn commit: r479803 - in /geronimo/server/trunk/testsuite: ./ console-testsuite/ console-testsuite/basic/ console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/ console-testsuite/basic/src/test/resources/ deployment-testsuite/ dep...
Date Mon, 27 Nov 2006 23:26:56 GMT
Author: jdillon
Date: Mon Nov 27 15:26:54 2006
New Revision: 479803

URL: http://svn.apache.org/viewvc?view=rev&rev=479803
Log:
Dropped jdk14 testng javadocs
Using @Test for class (clarity)
Using Surefire 2.3-SNAPSHOT, as that appears to work with TestNG w/JDK 1.5 annos
Using consistent spacing between elements
Dropped unused maven-invoker-plugin config
Put versioning of plugins all in the top-level build/pluginManagement
Added missing license on new xml files

Modified:
    geronimo/server/trunk/testsuite/console-testsuite/basic/pom.xml
    geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/ExtendedSelenium.java
    geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/LinkCheckTest.java
    geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/SeleniumTestSupport.java
    geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/SimpleLoginTest.java
    geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/resources/testng.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/deployment-testsuite/test-deployments/src/test/java/org/apache/geronimo/testsuite/deployment/Ear13Test.java
    geronimo/server/trunk/testsuite/deployment-testsuite/test-deployments/src/test/java/org/apache/geronimo/testsuite/deployment/Ear14Test.java
    geronimo/server/trunk/testsuite/deployment-testsuite/test-deployments/src/test/java/org/apache/geronimo/testsuite/deployment/ExtendedSelenium.java
    geronimo/server/trunk/testsuite/deployment-testsuite/test-deployments/src/test/java/org/apache/geronimo/testsuite/deployment/SeleniumTestSupport.java
    geronimo/server/trunk/testsuite/deployment-testsuite/test-deployments/src/test/resources/testng.xml
    geronimo/server/trunk/testsuite/ejbcontainer-testsuite/pom.xml
    geronimo/server/trunk/testsuite/ejbcontainer-testsuite/test-ejbcontainer/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=479803&r1=479802&r2=479803
==============================================================================
--- geronimo/server/trunk/testsuite/console-testsuite/basic/pom.xml (original)
+++ geronimo/server/trunk/testsuite/console-testsuite/basic/pom.xml Mon Nov 27 15:26:54 2006
@@ -17,20 +17,26 @@
     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>2.0-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
@@ -42,9 +48,10 @@
             <groupId>org.testng</groupId>
             <artifactId>testng</artifactId>
             <classifier>jdk15</classifier>
+            <scope>test</scope>
         </dependency>
     </dependencies>
-
+    
     <profiles>
         <profile>
             <id>child</id>
@@ -62,4 +69,5 @@
             </build>
         </profile>
     </profiles>
+
 </project>

Modified: geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/ExtendedSelenium.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/ExtendedSelenium.java?view=diff&rev=479803&r1=479802&r2=479803
==============================================================================
--- geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/ExtendedSelenium.java
(original)
+++ geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/ExtendedSelenium.java
Mon Nov 27 15:26:54 2006
@@ -40,9 +40,10 @@
      * Remove a cookie from the browser.
      *
      * <p>
-     * This requires some custom hooks in <tt>user-extensions.js</tt>.  
+     * This requires some custom hooks in <tt>user-extensions.js</tt>.
      * When using the <tt>selenium-maven-plugin</tt> the defaults should be merged
      * into the <tt>user-extensions.js</tt> which is loaded by the server.
+     * </p>
      */
     public void removeCookie(final String name, final String path) {
         this.getEval("selenium.removeCookie('" + name + "', '" + path + "')");

Modified: geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/LinkCheckTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/LinkCheckTest.java?view=diff&rev=479803&r1=479802&r2=479803
==============================================================================
--- geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/LinkCheckTest.java
(original)
+++ geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/LinkCheckTest.java
Mon Nov 27 15:26:54 2006
@@ -26,12 +26,10 @@
  *
  * @version $Rev$ $Date$
  */
+@Test
 public class LinkCheckTest
     extends ConsoleTestSupport
 {
-    /**
-     * @testng.test
-     */
     @Test
     public void testServerInfoLink() throws Exception {
         login();

Modified: geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/SeleniumTestSupport.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/SeleniumTestSupport.java?view=diff&rev=479803&r1=479802&r2=479803
==============================================================================
--- geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/SeleniumTestSupport.java
(original)
+++ geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/SeleniumTestSupport.java
Mon Nov 27 15:26:54 2006
@@ -53,9 +53,6 @@
         return selenium;
     }
     
-    /**
-     * @testng.before-suite
-     */
     @BeforeSuite
     protected void startSeleniumClient() throws Exception {
         log.info("Starting Selenium client");
@@ -64,9 +61,6 @@
         selenium.start();
     }
     
-    /**
-     * @testng.after-suite
-     */
     @AfterSuite
     protected void stopSeleniumClient() throws Exception {
         log.info("Stopping Selenium client");

Modified: geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/SimpleLoginTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/SimpleLoginTest.java?view=diff&rev=479803&r1=479802&r2=479803
==============================================================================
--- geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/SimpleLoginTest.java
(original)
+++ geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/SimpleLoginTest.java
Mon Nov 27 15:26:54 2006
@@ -26,12 +26,10 @@
  *
  * @version $Rev$ $Date$
  */
+@Test
 public class SimpleLoginTest
     extends ConsoleTestSupport
 {
-    /**
-     * @testng.test
-     */
     @Test
     public void testLogin() throws Exception {
         login();
@@ -39,18 +37,12 @@
         selenium.removeCookie("JSESSIONID", "/");
     }
     
-    /**
-     * @testng.test
-     */
     @Test
     public void testLoginAndLogout() throws Exception {
         login();
         logout();
     }
     
-    /**
-     * @testng.test
-     */
     @Test
     public void testClickSomeLinks() throws Exception {
         login();

Modified: geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/resources/testng.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/resources/testng.xml?view=diff&rev=479803&r1=479802&r2=479803
==============================================================================
--- geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/resources/testng.xml
(original)
+++ geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/resources/testng.xml
Mon Nov 27 15:26:54 2006
@@ -1,8 +1,32 @@
-<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd" >
-<suite name="Suite1" verbose="1" >
-    <test name="basic-console"   >
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+    
+     http://www.apache.org/licenses/LICENSE-2.0
+    
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+-->
+
+<!-- $Rev$ $Date$ -->
+
+<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd">
+
+<suite name="Suite1" verbose="1">
+    <test name="basic-console">
         <packages>
-            <package name="org.apache.geronimo.testsuite.console" />
+            <package name="org.apache.geronimo.testsuite.console"/>
         </packages>
     </test>
 </suite>
+

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=479803&r1=479802&r2=479803
==============================================================================
--- geronimo/server/trunk/testsuite/console-testsuite/pom.xml (original)
+++ geronimo/server/trunk/testsuite/console-testsuite/pom.xml Mon Nov 27 15:26:54 2006
@@ -17,7 +17,9 @@
     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>
@@ -42,11 +44,13 @@
             <groupId>org.openqa.selenium.client-drivers</groupId>
             <artifactId>selenium-java-client-driver</artifactId>
         </dependency>
+        
         <dependency>
             <groupId>org.openqa.selenium.server</groupId>
             <artifactId>selenium-server</artifactId>
         </dependency>
     </dependencies>
+    
     <build>
         <plugins>
             <plugin>
@@ -64,22 +68,26 @@
             </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>
@@ -94,6 +102,7 @@
                                     <moduleId>org.apache.geronimo.configs/webconsole-jetty/${version}/car</moduleId>
                                 </configuration>
                             </execution>
+                            
                             <execution>
                                 <id>stop-console</id>
                                 <phase>post-integration-test</phase>
@@ -109,6 +118,7 @@
                 </plugins>
             </build>
         </profile>
+        
         <profile>
             <id>child</id>
         </profile>

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=479803&r1=479802&r2=479803
==============================================================================
--- geronimo/server/trunk/testsuite/deployment-testsuite/pom.xml (original)
+++ geronimo/server/trunk/testsuite/deployment-testsuite/pom.xml Mon Nov 27 15:26:54 2006
@@ -17,7 +17,9 @@
     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>
@@ -50,10 +52,11 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
+    
     <build>
         <plugins>
             <plugin>
-                <!--  This plugin is needed for all suite poms. -->
+                <!-- This plugin is needed for all suite poms. -->
                 <groupId>org.apache.geronimo.plugins</groupId>
                 <artifactId>testsuite-maven-plugin</artifactId>
                 <executions>
@@ -85,10 +88,12 @@
                         <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>
@@ -96,6 +101,7 @@
                 </plugins>
             </build>
         </profile>
+        
         <profile>
             <id>child</id>
         </profile>

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=479803&r1=479802&r2=479803
==============================================================================
--- geronimo/server/trunk/testsuite/deployment-testsuite/test-deployments/pom.xml (original)
+++ geronimo/server/trunk/testsuite/deployment-testsuite/test-deployments/pom.xml Mon Nov
27 15:26:54 2006
@@ -17,7 +17,9 @@
     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>
@@ -62,7 +64,7 @@
                             </suiteXmlFiles>
                         </configuration>
                     </plugin>
-            
+                    
                     <plugin>
                         <groupId>org.apache.geronimo.plugins</groupId>
                         <artifactId>geronimo-maven-plugin</artifactId>
@@ -81,7 +83,7 @@
                                             <version>${version}</version>
                                             <type>ear</type>
                                         </module>
-                                
+                                        
                                         <module>
                                             <groupId>org.apache.geronimo.testsupport</groupId>
                                             <artifactId>test-ear-j2ee_1.4</artifactId>
@@ -91,7 +93,7 @@
                                     </modules>
                                 </configuration>
                             </execution>
-                    
+                            
                             <execution>
                                 <id>undeploy-ear-as-module</id>
                                 <phase>post-integration-test</phase>
@@ -109,6 +111,7 @@
                                     </modules>
                                 </configuration>
                             </execution>
+                            
                             <execution>
                                 <id>undeploy-ear-as-moduleId</id>
                                 <phase>post-integration-test</phase>

Modified: geronimo/server/trunk/testsuite/deployment-testsuite/test-deployments/src/test/java/org/apache/geronimo/testsuite/deployment/Ear13Test.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/deployment-testsuite/test-deployments/src/test/java/org/apache/geronimo/testsuite/deployment/Ear13Test.java?view=diff&rev=479803&r1=479802&r2=479803
==============================================================================
--- geronimo/server/trunk/testsuite/deployment-testsuite/test-deployments/src/test/java/org/apache/geronimo/testsuite/deployment/Ear13Test.java
(original)
+++ geronimo/server/trunk/testsuite/deployment-testsuite/test-deployments/src/test/java/org/apache/geronimo/testsuite/deployment/Ear13Test.java
Mon Nov 27 15:26:54 2006
@@ -25,12 +25,10 @@
  *
  * @version $Rev$ $Date$
  */
+@Test
 public class Ear13Test
     extends SeleniumTestSupport
 {
-    /**
-     * @testng.test
-     */
     @Test
     public void testIndexContent() throws Exception {
         selenium.open("/test-1_3/");

Modified: geronimo/server/trunk/testsuite/deployment-testsuite/test-deployments/src/test/java/org/apache/geronimo/testsuite/deployment/Ear14Test.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/deployment-testsuite/test-deployments/src/test/java/org/apache/geronimo/testsuite/deployment/Ear14Test.java?view=diff&rev=479803&r1=479802&r2=479803
==============================================================================
--- geronimo/server/trunk/testsuite/deployment-testsuite/test-deployments/src/test/java/org/apache/geronimo/testsuite/deployment/Ear14Test.java
(original)
+++ geronimo/server/trunk/testsuite/deployment-testsuite/test-deployments/src/test/java/org/apache/geronimo/testsuite/deployment/Ear14Test.java
Mon Nov 27 15:26:54 2006
@@ -26,12 +26,10 @@
  *
  * @version $Rev$ $Date$
  */
+@Test
 public class Ear14Test
     extends SeleniumTestSupport
 {
-    /**
-     * @testng.test
-     */
     @Test
     public void testIndexContent() throws Exception {
         selenium.open("/test-1_4/");

Modified: geronimo/server/trunk/testsuite/deployment-testsuite/test-deployments/src/test/java/org/apache/geronimo/testsuite/deployment/ExtendedSelenium.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/deployment-testsuite/test-deployments/src/test/java/org/apache/geronimo/testsuite/deployment/ExtendedSelenium.java?view=diff&rev=479803&r1=479802&r2=479803
==============================================================================
--- geronimo/server/trunk/testsuite/deployment-testsuite/test-deployments/src/test/java/org/apache/geronimo/testsuite/deployment/ExtendedSelenium.java
(original)
+++ geronimo/server/trunk/testsuite/deployment-testsuite/test-deployments/src/test/java/org/apache/geronimo/testsuite/deployment/ExtendedSelenium.java
Mon Nov 27 15:26:54 2006
@@ -43,6 +43,7 @@
      * This requires some custom hooks in <tt>user-extensions.js</tt>.  
      * When using the <tt>selenium-maven-plugin</tt> the defaults should be merged
      * into the <tt>user-extensions.js</tt> which is loaded by the server.
+     * </p>
      */
     public void removeCookie(final String name, final String path) {
         this.getEval("selenium.removeCookie('" + name + "', '" + path + "')");

Modified: geronimo/server/trunk/testsuite/deployment-testsuite/test-deployments/src/test/java/org/apache/geronimo/testsuite/deployment/SeleniumTestSupport.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/deployment-testsuite/test-deployments/src/test/java/org/apache/geronimo/testsuite/deployment/SeleniumTestSupport.java?view=diff&rev=479803&r1=479802&r2=479803
==============================================================================
--- geronimo/server/trunk/testsuite/deployment-testsuite/test-deployments/src/test/java/org/apache/geronimo/testsuite/deployment/SeleniumTestSupport.java
(original)
+++ geronimo/server/trunk/testsuite/deployment-testsuite/test-deployments/src/test/java/org/apache/geronimo/testsuite/deployment/SeleniumTestSupport.java
Mon Nov 27 15:26:54 2006
@@ -53,9 +53,6 @@
         return selenium;
     }
     
-    /**
-     * @testng.before-suite
-     */
     @BeforeSuite
     protected void startSeleniumClient() throws Exception {
         log.info("Starting Selenium client");
@@ -64,9 +61,6 @@
         selenium.start();
     }
     
-    /**
-     * @testng.after-suite
-     */
     @AfterSuite
     protected void stopSeleniumClient() throws Exception {
         log.info("Stopping Selenium client");

Modified: geronimo/server/trunk/testsuite/deployment-testsuite/test-deployments/src/test/resources/testng.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/deployment-testsuite/test-deployments/src/test/resources/testng.xml?view=diff&rev=479803&r1=479802&r2=479803
==============================================================================
--- geronimo/server/trunk/testsuite/deployment-testsuite/test-deployments/src/test/resources/testng.xml
(original)
+++ geronimo/server/trunk/testsuite/deployment-testsuite/test-deployments/src/test/resources/testng.xml
Mon Nov 27 15:26:54 2006
@@ -1,8 +1,31 @@
-<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd" >
-<suite name="Suite1" verbose="1" >
-    <test name="deployment"   >
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+    
+     http://www.apache.org/licenses/LICENSE-2.0
+    
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+-->
+
+<!-- $Rev$ $Date$ -->
+
+<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd">
+
+<suite name="Suite1" verbose="1">
+    <test name="deployment">
         <packages>
-            <package name="org.apache.geronimo.testsuite.deployment" />
+            <package name="org.apache.geronimo.testsuite.deployment"/>
         </packages>
     </test>
 </suite>

Modified: geronimo/server/trunk/testsuite/ejbcontainer-testsuite/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/ejbcontainer-testsuite/pom.xml?view=diff&rev=479803&r1=479802&r2=479803
==============================================================================
--- geronimo/server/trunk/testsuite/ejbcontainer-testsuite/pom.xml (original)
+++ geronimo/server/trunk/testsuite/ejbcontainer-testsuite/pom.xml Mon Nov 27 15:26:54 2006
@@ -17,15 +17,20 @@
     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>testsuite</artifactId>
         <version>2.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
+    
     <artifactId>ejbcontainer-testsuite</artifactId>
     <name>Geronimo TestSuite, OpenEJB container</name>
     <packaging>pom</packaging>
@@ -80,6 +85,7 @@
                 </plugins>
             </build>
         </profile>
+        
         <profile>
             <id>child</id>
         </profile>

Modified: geronimo/server/trunk/testsuite/ejbcontainer-testsuite/test-ejbcontainer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/ejbcontainer-testsuite/test-ejbcontainer/pom.xml?view=diff&rev=479803&r1=479802&r2=479803
==============================================================================
--- geronimo/server/trunk/testsuite/ejbcontainer-testsuite/test-ejbcontainer/pom.xml (original)
+++ geronimo/server/trunk/testsuite/ejbcontainer-testsuite/test-ejbcontainer/pom.xml Mon Nov
27 15:26:54 2006
@@ -17,19 +17,24 @@
     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>ejbcontainer-testsuite</artifactId>
         <version>2.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
+    
     <artifactId>test-ejbcontainer</artifactId>
     <name>Geronimo TestSuite, EJB Container :: Test ejb modules</name>
     <packaging>jar</packaging>
+    
     <description>
         Tests for the ejb modules
     </description>
@@ -41,6 +46,7 @@
             <version>${openejbVersion}</version>
             <type>test-jar</type>
         </dependency>
+        
         <dependency>
             <groupId>org.apache.openejb</groupId>
             <artifactId>openejb-itests-core</artifactId>
@@ -81,7 +87,7 @@
                                     </modules>
                                 </configuration>
                             </execution>
-                    
+                            
                             <execution>
                                 <id>undeploy-modules</id>
                                 <phase>post-integration-test</phase>

Modified: geronimo/server/trunk/testsuite/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/pom.xml?view=diff&rev=479803&r1=479802&r2=479803
==============================================================================
--- geronimo/server/trunk/testsuite/pom.xml (original)
+++ geronimo/server/trunk/testsuite/pom.xml Mon Nov 27 15:26:54 2006
@@ -16,7 +16,10 @@
     KIND, either express or implied.  See the License for the
     specific language governing permissions and limitations
     under the License.
---><!-- $Rev$ $Date$ -->
+-->
+
+<!-- $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>
@@ -41,7 +44,6 @@
         They just need to be bound in the suites where needed and appropriate.
         The test poms under the suites should have this pom as their parent and set their
relativePath appropriately
         The test poms under the suites inherit an empty 'child' profile from here. But any
other build executions within the test poms should all be inside a 'child' profile.
-
     </description>
     
     <dependencyManagement>
@@ -52,6 +54,7 @@
                 <scope>test</scope>
                 <version>${version}</version>
             </dependency>
+            
             <dependency>
                 <groupId>org.testng</groupId>
                 <artifactId>testng</artifactId>
@@ -59,11 +62,13 @@
                 <version>5.1</version>
                 <scope>test</scope>
             </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>
@@ -71,6 +76,7 @@
             </dependency>
         </dependencies>
     </dependencyManagement>
+    
     <dependencies>
         <dependency>
             <groupId>org.apache.geronimo.testsupport</groupId>
@@ -95,20 +101,20 @@
                     <artifactId>selenium-maven-plugin</artifactId>
                     <version>${version}</version>
                 </plugin>
+                
                 <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-invoker-plugin</artifactId>
-                    <version>1.0-SNAPSHOT</version>
+                    <groupId>org.apache.geronimo.plugins</groupId>
+                    <artifactId>testsuite-maven-plugin</artifactId>
+                    <version>${version}</version>
                 </plugin>
                 
                 <!--
-                NOTE: Using custom maven-surefire-plugin that supports TestNG:
-                      http://testng.org/doc/maven.html
+                NOTE: Using 2.3-SNAPSHOT for TestNG w/JDK 1.5 support.
                 -->
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-surefire-plugin</artifactId>
-                    <version>2.8-SNAPSHOT</version>
+                    <version>2.3-SNAPSHOT</version>
                     <configuration>
                         <skip>true</skip>
                     </configuration>
@@ -123,6 +129,7 @@
                                 <skip>true</skip>
                             </configuration>
                         </execution>
+                        
                         <execution>
                             <id>integration</id>
                             <phase>integration-test</phase>
@@ -136,6 +143,7 @@
                         </execution>
                     </executions>
                 </plugin>
+                
                 <plugin>
                     <groupId>org.apache.geronimo.genesis.plugins</groupId>
                     <artifactId>maven-maven-plugin</artifactId>
@@ -157,6 +165,7 @@
                                 <goal>invoke</goal>
                             </goals>
                         </execution>
+                        
                         <execution>
                             <id>site-deploy</id>
                             <phase>site-deploy</phase>
@@ -172,6 +181,7 @@
                                 </parameters>
                             </configuration>
                         </execution>
+                        
                         <execution>
                             <id>clean</id>
                             <phase>clean</phase>
@@ -186,6 +196,7 @@
                         </execution>
                     </executions>
                 </plugin>
+                
                 <plugin>
                     <groupId>org.apache.geronimo.plugins</groupId>
                     <artifactId>geronimo-maven-plugin</artifactId>
@@ -212,13 +223,19 @@
         </plugins>
     </build>
 
+    <!--
+    WHAT?
+    
+    Put this into a profile if needed...
+    
     <distributionManagement>
         <site>
             <id>website</id>
             <url>file://${deployDirectory}/website</url>
         </site>
     </distributionManagement>
-
+    -->
+    
     <profiles>
         <profile>
             <id>default</id>
@@ -232,7 +249,6 @@
                         <plugin>
                             <groupId>org.apache.geronimo.plugins</groupId>
                             <artifactId>selenium-maven-plugin</artifactId>
-                        
                             <executions>
                                 <execution>
                                     <id>start-server</id>
@@ -247,7 +263,7 @@
                                 </execution>
                             </executions>
                         </plugin>
-                    
+                        
                         <plugin>
                             <groupId>org.apache.geronimo.plugins</groupId>
                             <artifactId>geronimo-maven-plugin</artifactId>
@@ -272,10 +288,10 @@
                                 </execution>
                             </executions>
                         </plugin>
+                        
                         <plugin>
                             <groupId>org.apache.geronimo.plugins</groupId>
                             <artifactId>testsuite-maven-plugin</artifactId>
-                            <version>${version}</version>
                             <executions>
                                 <execution>
                                     <id>generate-surefire-report</id>
@@ -311,6 +327,9 @@
         </profile>
     </profiles>
     
+    <!--
+    NOTE: This is needed to pull Selenium artifacts.
+    -->
     <repositories>
         <repository>
             <id>openqa</id>
@@ -328,13 +347,4 @@
         </repository>
     </repositories>
     
-    <!--
-    NOTE: This is the repository where maven-surefire-plugin:2.8-SNAPSHOT comes from.
-    -->
-    <pluginRepositories>
-        <pluginRepository>
-            <id>tapestry.javaforge</id>
-            <url>http://howardlewisship.com/repository</url>
-        </pluginRepository>
-    </pluginRepositories>
 </project>



Mime
View raw message