geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jdil...@apache.org
Subject svn commit: r451029 - in /geronimo/server/trunk/testsuite/deployment-testsuite: pom.xml test-deployments/pom.xml
Date Thu, 28 Sep 2006 20:40:51 GMT
Author: jdillon
Date: Thu Sep 28 13:40:51 2006
New Revision: 451029

URL: http://svn.apache.org/viewvc?view=rev&rev=451029
Log:
(GERONIMO-2444) Use integration-test packaging, moved deploy/undeploy to testsuite module

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=451029&r1=451028&r2=451029
==============================================================================
--- geronimo/server/trunk/testsuite/deployment-testsuite/pom.xml (original)
+++ geronimo/server/trunk/testsuite/deployment-testsuite/pom.xml Thu Sep 28 13:40:51 2006
@@ -53,6 +53,11 @@
         </dependency>
     </dependencies>
     
+    <!--
+    TODO: Hook up m-m-p to allow child modules to be built early during this modules
+          compile (or something) phase.
+    -->
+    
     <profiles>
         <profile>
             <id>default</id>
@@ -104,61 +109,6 @@
                                 </goals>
                                 <configuration>
                                     <background>true</background>
-                                </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>
-                            
-                            <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>${pom.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/${pom.version}/ear</moduleId>
                                 </configuration>
                             </execution>
                             

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=451029&r1=451028&r2=451029
==============================================================================
--- geronimo/server/trunk/testsuite/deployment-testsuite/test-deployments/pom.xml (original)
+++ geronimo/server/trunk/testsuite/deployment-testsuite/test-deployments/pom.xml Thu Sep
28 13:40:51 2006
@@ -33,7 +33,7 @@
     
     <artifactId>test-deployments</artifactId>
     <name>Geronimo TestSuite, Deployment :: Test Deployments</name>
-    <packaging>jar</packaging>
+    <packaging>integration-test</packaging>
     
     <description>
         Tests for the test-deployables.
@@ -47,5 +47,87 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
+    
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <configuration>
+                    <testFailureIgnore>true</testFailureIgnore>
+                </configuration>
+            </plugin>
+            
+            <plugin>
+                <groupId>org.apache.geronimo.plugins</groupId>
+                <artifactId>geronimo-maven-plugin</artifactId>
+                
+                <configuration>
+                    <logOutput>true</logOutput>
+                    <reporters>
+                        <reporter implementation="org.apache.geronimo.mavenplugins.geronimo.reporting.SurefireReporter">
+                            <reportsDirectory>${project.build.directory}/surefire-reports</reportsDirectory>
+                        </reporter>
+                    </reporters>
+                </configuration>
+                
+                <executions>
+                    <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>
+                    
+                    <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>${pom.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/${pom.version}/ear</moduleId>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
    
 </project>



Mime
View raw message