geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jdil...@apache.org
Subject svn commit: r442885 - in /geronimo/server/trunk/testsuite/deployment-testsuite: ./ test-deployments/ test-deployments/src/test/java/org/apache/geronimo/testsuite/deployment/
Date Wed, 13 Sep 2006 07:52:02 GMT
Author: jdillon
Date: Wed Sep 13 00:52:01 2006
New Revision: 442885

URL: http://svn.apache.org/viewvc?view=rev&rev=442885
Log:
Hook up basic, basic (maybe too basic) tests for testsupport/test-deployment-* ears

Added:
    geronimo/server/trunk/testsuite/deployment-testsuite/test-deployments/src/test/java/org/apache/geronimo/testsuite/deployment/Ear13Test.java
      - copied, changed from r442884, geronimo/server/trunk/testsuite/deployment-testsuite/test-deployments/src/test/java/org/apache/geronimo/testsuite/deployment/TestEar13Test.java
    geronimo/server/trunk/testsuite/deployment-testsuite/test-deployments/src/test/java/org/apache/geronimo/testsuite/deployment/Ear14Test.java
      - copied, changed from r442884, geronimo/server/trunk/testsuite/deployment-testsuite/test-deployments/src/test/java/org/apache/geronimo/testsuite/deployment/TestEar14Test.java
Removed:
    geronimo/server/trunk/testsuite/deployment-testsuite/test-deployments/src/test/java/org/apache/geronimo/testsuite/deployment/TestEar13Test.java
    geronimo/server/trunk/testsuite/deployment-testsuite/test-deployments/src/test/java/org/apache/geronimo/testsuite/deployment/TestEar14Test.java
Modified:
    geronimo/server/trunk/testsuite/deployment-testsuite/pom.xml
    geronimo/server/trunk/testsuite/deployment-testsuite/test-deployments/pom.xml

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=442885&r1=442884&r2=442885
==============================================================================
--- geronimo/server/trunk/testsuite/deployment-testsuite/pom.xml (original)
+++ geronimo/server/trunk/testsuite/deployment-testsuite/pom.xml Wed Sep 13 00:52:01 2006
@@ -90,18 +90,52 @@
                                 <id>start-server</id>
                                 <phase>pre-integration-test</phase>
                                 <goals>
-                                    <goal>start</goal>
+                                    <goal>start-server</goal>
                                 </goals>
                                 <configuration>
                                     <background>true</background>
+                                    <!--
+                                    HACK: For now need to refresh the install since we
+                                          do not have an easy way to automate undeploy.
+                                    -->
+                                    <refresh>true</refresh>
                                 </configuration>
                             </execution>
                             
                             <execution>
+                                <id>deploy-ears</id>
+                                <phase>pre-integration-test</phase>
+                                <goals>
+                                    <goal>deploy-module</goal>
+                                </goals>
+                                <configuration>
+                                    <modules>
+                                        <module>
+                                            <groupId>org.apache.geronimo.testsupport</groupId>
+                                            <artifactId>test-ear-j2ee_1.3</artifactId>
+                                            <version>${pom.version}</version>
+                                            <type>ear</type>
+                                        </module>
+                                        
+                                        <module>
+                                            <groupId>org.apache.geronimo.testsupport</groupId>
+                                            <artifactId>test-ear-j2ee_1.4</artifactId>
+                                            <version>${pom.version}</version>
+                                            <type>ear</type>
+                                        </module>
+                                    </modules>
+                                </configuration>
+                            </execution>
+                            
+                            <!--
+                            TODO: Undeploy
+                            -->
+                            
+                            <execution>
                                 <id>stop-server</id>
                                 <phase>post-integration-test</phase>
                                 <goals>
-                                    <goal>stop</goal>
+                                    <goal>stop-server</goal>
                                 </goals>
                             </execution>
                         </executions>

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=442885&r1=442884&r2=442885
==============================================================================
--- geronimo/server/trunk/testsuite/deployment-testsuite/test-deployments/pom.xml (original)
+++ geronimo/server/trunk/testsuite/deployment-testsuite/test-deployments/pom.xml Wed Sep
13 00:52:01 2006
@@ -31,7 +31,7 @@
         <relativePath>../pom.xml</relativePath>
     </parent>
     
-    <artifactId>basic</artifactId>
+    <artifactId>test-deployments</artifactId>
     <name>Geronimo TestSuite, Deployment :: Test Deployments</name>
     <packaging>jar</packaging>
     

Copied: geronimo/server/trunk/testsuite/deployment-testsuite/test-deployments/src/test/java/org/apache/geronimo/testsuite/deployment/Ear13Test.java
(from r442884, geronimo/server/trunk/testsuite/deployment-testsuite/test-deployments/src/test/java/org/apache/geronimo/testsuite/deployment/TestEar13Test.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=442885&p1=geronimo/server/trunk/testsuite/deployment-testsuite/test-deployments/src/test/java/org/apache/geronimo/testsuite/deployment/TestEar13Test.java&r1=442884&p2=geronimo/server/trunk/testsuite/deployment-testsuite/test-deployments/src/test/java/org/apache/geronimo/testsuite/deployment/Ear13Test.java&r2=442885
==============================================================================
--- geronimo/server/trunk/testsuite/deployment-testsuite/test-deployments/src/test/java/org/apache/geronimo/testsuite/deployment/TestEar13Test.java
(original)
+++ geronimo/server/trunk/testsuite/deployment-testsuite/test-deployments/src/test/java/org/apache/geronimo/testsuite/deployment/Ear13Test.java
Wed Sep 13 00:52:01 2006
@@ -24,7 +24,7 @@
  *
  * @version $Rev$ $Date$
  */
-public class TestEar13Test
+public class Ear13Test
     extends SeleniumTestSupport
 {
     /**

Copied: geronimo/server/trunk/testsuite/deployment-testsuite/test-deployments/src/test/java/org/apache/geronimo/testsuite/deployment/Ear14Test.java
(from r442884, geronimo/server/trunk/testsuite/deployment-testsuite/test-deployments/src/test/java/org/apache/geronimo/testsuite/deployment/TestEar14Test.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=442885&p1=geronimo/server/trunk/testsuite/deployment-testsuite/test-deployments/src/test/java/org/apache/geronimo/testsuite/deployment/TestEar14Test.java&r1=442884&p2=geronimo/server/trunk/testsuite/deployment-testsuite/test-deployments/src/test/java/org/apache/geronimo/testsuite/deployment/Ear14Test.java&r2=442885
==============================================================================
--- geronimo/server/trunk/testsuite/deployment-testsuite/test-deployments/src/test/java/org/apache/geronimo/testsuite/deployment/TestEar14Test.java
(original)
+++ geronimo/server/trunk/testsuite/deployment-testsuite/test-deployments/src/test/java/org/apache/geronimo/testsuite/deployment/Ear14Test.java
Wed Sep 13 00:52:01 2006
@@ -24,7 +24,7 @@
  *
  * @version $Rev$ $Date$
  */
-public class TestEar14Test
+public class Ear14Test
     extends SeleniumTestSupport
 {
     /**



Mime
View raw message