geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jdil...@apache.org
Subject svn commit: r653514 - in /geronimo/server/trunk/testsuite/security-testsuite: pom.xml src/ test-security/goals.txt test-security/pom.xml
Date Mon, 05 May 2008 15:55:13 GMT
Author: jdillon
Date: Mon May  5 08:55:12 2008
New Revision: 653514

URL: http://svn.apache.org/viewvc?rev=653514&view=rev
Log:
(GERONIMO-3980) Use shitty-maven-plugin instead of maven-maven-plugin to drive test builds

Added:
    geronimo/server/trunk/testsuite/security-testsuite/test-security/goals.txt   (with props)
Removed:
    geronimo/server/trunk/testsuite/security-testsuite/src/
Modified:
    geronimo/server/trunk/testsuite/security-testsuite/pom.xml
    geronimo/server/trunk/testsuite/security-testsuite/test-security/pom.xml

Modified: geronimo/server/trunk/testsuite/security-testsuite/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/security-testsuite/pom.xml?rev=653514&r1=653513&r2=653514&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/security-testsuite/pom.xml (original)
+++ geronimo/server/trunk/testsuite/security-testsuite/pom.xml Mon May  5 08:55:12 2008
@@ -39,14 +39,98 @@
     </description>
 
     <build>
+        <pluginManagement>
+            <plugins>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-surefire-plugin</artifactId>
+                    <configuration>
+                        <suiteXmlFiles>
+                            <suiteXmlFile>${project.build.directory}/test-classes/testng.xml</suiteXmlFile>
+                        </suiteXmlFiles>
+                        <systemProperties>
+                            <property>
+                                <name>geronimoVersion</name>
+                                <value>${version}</value>
+                            </property>
+                        </systemProperties>
+                    </configuration>
+                </plugin>
+            </plugins>
+        </pluginManagement>
+        
         <plugins>
             <plugin>
-                <!-- This plugin is needed for all suite poms. -->
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>selenium-maven-plugin</artifactId>
+                <inherited>false</inherited>
+            </plugin>
+            
+            <plugin>
+                <groupId>org.apache.geronimo.buildsupport</groupId>
+                <artifactId>geronimo-maven-plugin</artifactId>
+                <inherited>false</inherited>
+                <executions>
+                    <execution>
+                        <id>start</id>
+                        <phase>pre-integration-test</phase>
+                        <goals>
+                            <goal>start-server</goal>
+                        </goals>
+                        <configuration>
+                            <logOutput>true</logOutput>
+                            <background>true</background>
+                            <verifyTimeout>300</verifyTimeout>
+                            <optionSets>
+                                <optionSet>
+                                    <id>default</id>
+                                    <options>
+                                       <option>-XX:MaxPermSize=128m</option>
+                                    </options>
+                                </optionSet>
+                            </optionSets>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>stop</id>
+                        <phase>install</phase>
+                        <goals>
+                            <goal>stop-server</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>shitty-maven-plugin</artifactId>
+                <inherited>false</inherited>
+                <configuration>
+                    <projects>
+                        <fileset>
+                            <directory>${project.basedir}</directory>
+                            <includes>
+                                <include>*/pom.xml</include>
+                            </includes>
+                        </fileset>
+                    </projects>
+                </configuration>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>clean</goal>
+                            <goal>install</goal>
+                            <goal>test</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            
+            <plugin>
                 <groupId>org.apache.geronimo.buildsupport</groupId>
                 <artifactId>testsuite-maven-plugin</artifactId>
+                <inherited>false</inherited>
                 <executions>
                     <execution>
-                        <id>generate-surefire-xml</id>
                         <phase>install</phase>
                         <goals>
                             <goal>generate-surefire-xml</goal>
@@ -57,59 +141,4 @@
         </plugins>
     </build>
     
-    <profiles>
-        <profile>
-            <id>default</id>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
-            <!--
-            TODO: Hook up m-m-p to allow child modules to be built early during this modules
-                  compile (or something) phase.
-            -->
-            <build>
-                <plugins>
-                  <plugin>
-                        <!--
-                          One of the pom that this invokes using m-m-p has packaging set
to "pom".
-                          That expects it's parent (this pom) to be installed already.
-                          So installing it ahead before we invoke it in the integration-test
phase
-                        -->
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-install-plugin</artifactId>
-                        <inherited>false</inherited>
-                        <executions>
-                            <execution>
-                                <id>install-ahead</id>
-                                <phase>pre-integration-test</phase>
-                                <goals>
-                                    <goal>install</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                    </plugin>
-
-                    <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>
-
-                    <plugin>
-                        <groupId>org.apache.geronimo.genesis.plugins</groupId>
-                        <artifactId>maven-maven-plugin</artifactId>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-        
-        <profile>
-            <id>child</id>
-        </profile>
-    </profiles>
-    
 </project>

Added: geronimo/server/trunk/testsuite/security-testsuite/test-security/goals.txt
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/security-testsuite/test-security/goals.txt?rev=653514&view=auto
==============================================================================
--- geronimo/server/trunk/testsuite/security-testsuite/test-security/goals.txt (added)
+++ geronimo/server/trunk/testsuite/security-testsuite/test-security/goals.txt Mon May  5
08:55:12 2008
@@ -0,0 +1 @@
+clean install

Propchange: geronimo/server/trunk/testsuite/security-testsuite/test-security/goals.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/testsuite/security-testsuite/test-security/goals.txt
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/server/trunk/testsuite/security-testsuite/test-security/goals.txt
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: geronimo/server/trunk/testsuite/security-testsuite/test-security/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/security-testsuite/test-security/pom.xml?rev=653514&r1=653513&r2=653514&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/security-testsuite/test-security/pom.xml (original)
+++ geronimo/server/trunk/testsuite/security-testsuite/test-security/pom.xml Mon May  5 08:55:12
2008
@@ -21,7 +21,7 @@
 <!-- $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>
@@ -29,16 +29,13 @@
         <artifactId>security-testsuite</artifactId>
         <version>2.2-SNAPSHOT</version>
     </parent>
-    
+
     <artifactId>test-security</artifactId>
     <name>Geronimo TestSuite :: Web Testsuite :: Test Security</name>
     <packaging>war</packaging>
-    
 
     <description>
         Tests for the test-deployables.
-        maven-maven-plugin:invoke executes the 'child' profile.
-        Since build executions are done here, a 'child' profile is explicitly defined here
to prevent inheriting other configurations and executions from parent.
     </description>
 
     <dependencies>
@@ -60,6 +57,11 @@
             <scope>provided</scope>
         </dependency>
 
+        <!--
+        TODO: Depend upon the geronimo-openejb plugin here instead to avoid needing
+              to reference these dependencies directly.
+        -->
+        
         <dependency>
             <groupId>org.apache.openejb</groupId>
             <artifactId>openejb-core</artifactId>
@@ -80,51 +82,36 @@
         </dependency>
     </dependencies>
 
-    <profiles>
-        <profile>
-            <id>child</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.geronimo.buildsupport</groupId>
+                <artifactId>geronimo-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>deploy</id>
+                        <phase>pre-integration-test</phase>
+                        <goals>
+                            <goal>deploy-module</goal>
+                        </goals>
+                        <configuration>
+                            <moduleArchive>${project.build.directory}/${artifactId}-${version}.war</moduleArchive>
+                        </configuration>
+                    </execution>
+
+                    <execution>
+                        <id>undeploy</id>
+                        <phase>post-integration-test</phase>
+                        <goals>
+                            <goal>undeploy-module</goal>
+                        </goals>
                         <configuration>
-                            <suiteXmlFiles>
-                                <suiteXmlFile>${project.build.directory}/test-classes/testng.xml</suiteXmlFile>
-                            </suiteXmlFiles>
+                            <moduleId>${groupId}/${artifactId}/${version}/war</moduleId>
                         </configuration>
-                    </plugin>
-                    
-                    <plugin>
-                        <groupId>org.apache.geronimo.buildsupport</groupId>
-                        <artifactId>geronimo-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>deploy-wars</id>
-                                <phase>pre-integration-test</phase>
-                                <goals>
-                                    <goal>deploy-module</goal>
-                                </goals>
-                                <configuration>
-                                  <moduleArchive>${project.build.directory}/${artifactId}-${version}.war</moduleArchive>
-                                </configuration>
-                            </execution>
-                            
-                            <execution>
-                                <id>undeploy-war-as-moduleId</id>
-                                <phase>post-integration-test</phase>
-                                <goals>
-                                    <goal>undeploy-module</goal>
-                                </goals>
-                                <configuration>
-                                    <moduleId>${groupId}/${artifactId}/${version}/war</moduleId>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
 
 </project>



Mime
View raw message