geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pra...@apache.org
Subject svn commit: r494509 - in /geronimo/server/trunk/testsuite: jee5-testsuite/ webservices-testsuite/ webservices-testsuite/jaxb/ webservices-testsuite/jaxb/test-ejb/ webservices-testsuite/jaxb/test-war/ webservices-testsuite/stax/ webservices-testsuite/st...
Date Tue, 09 Jan 2007 18:25:53 GMT
Author: prasad
Date: Tue Jan  9 10:25:52 2007
New Revision: 494509

URL: http://svn.apache.org/viewvc?view=rev&rev=494509
Log:
* renaming jee5-testsuite to webservices-testsuite

Added:
    geronimo/server/trunk/testsuite/webservices-testsuite/
      - copied from r494091, geronimo/server/trunk/testsuite/jee5-testsuite/
Removed:
    geronimo/server/trunk/testsuite/jee5-testsuite/
Modified:
    geronimo/server/trunk/testsuite/webservices-testsuite/jaxb/pom.xml
    geronimo/server/trunk/testsuite/webservices-testsuite/jaxb/test-ejb/pom.xml
    geronimo/server/trunk/testsuite/webservices-testsuite/jaxb/test-war/pom.xml
    geronimo/server/trunk/testsuite/webservices-testsuite/pom.xml
    geronimo/server/trunk/testsuite/webservices-testsuite/stax/pom.xml
    geronimo/server/trunk/testsuite/webservices-testsuite/stax/test-ejb/pom.xml
    geronimo/server/trunk/testsuite/webservices-testsuite/stax/test-war/pom.xml

Modified: geronimo/server/trunk/testsuite/webservices-testsuite/jaxb/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/webservices-testsuite/jaxb/pom.xml?view=diff&rev=494509&r1=494091&r2=494509
==============================================================================
--- geronimo/server/trunk/testsuite/webservices-testsuite/jaxb/pom.xml (original)
+++ geronimo/server/trunk/testsuite/webservices-testsuite/jaxb/pom.xml Tue Jan  9 10:25:52 2007
@@ -18,59 +18,27 @@
     under the License.
 -->
 <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">
-  <parent>
-    <artifactId>jee5-testsuite</artifactId>
-    <groupId>org.apache.geronimo.testsuite</groupId>
-    <version>2.0-SNAPSHOT</version>
-    <relativePath>../pom.xml</relativePath>
-  </parent>
+    <parent>
+        <artifactId>webservices-testsuite</artifactId>
+        <groupId>org.apache.geronimo.testsuite</groupId>
+        <version>2.0-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
 
-  <modelVersion>4.0.0</modelVersion>
-  <artifactId>jaxb-testsuite</artifactId>
-  <packaging>pom</packaging>
-  <name>Geronimo TestSuite, JEE5 Test Suite, JAXB</name>
-  <description>Geronimo jee5-testsuite testsuite created from an archetype.</description>
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>jaxb-tests</artifactId>
+    <packaging>pom</packaging>
+    <name>Geronimo TestSuite :: WebServices TestSuite :: JAXB</name>
+    <description>Geronimo JEE5 Webservices JAXB tests</description>
 
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.geronimo.plugins</groupId>
-        <artifactId>testsuite-maven-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>generate-surefire-xml</id>
-            <phase>install</phase>
-            <goals>
-              <goal>generate-surefire-xml</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-  </build>
-
-  <profiles>
-    <profile>
-      <id>default</id>
-      <activation>
-        <activeByDefault>true</activeByDefault>
-      </activation>
-      <build>
-        <plugins>
-          <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>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
-    <profile>
-      <id>child</id>
-    </profile>
-  </profiles>
+    <profiles>
+        <profile>
+            <id>child</id>
+            <modules>
+                <module>test-war</module>
+                <module>test-ejb</module>
+            </modules>
+        </profile>
+    </profiles>
 
 </project>

Modified: geronimo/server/trunk/testsuite/webservices-testsuite/jaxb/test-ejb/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/webservices-testsuite/jaxb/test-ejb/pom.xml?view=diff&rev=494509&r1=494091&r2=494509
==============================================================================
--- geronimo/server/trunk/testsuite/webservices-testsuite/jaxb/test-ejb/pom.xml (original)
+++ geronimo/server/trunk/testsuite/webservices-testsuite/jaxb/test-ejb/pom.xml Tue Jan  9 10:25:52 2007
@@ -19,98 +19,115 @@
 -->
 
 <!-- $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>jaxb-testsuite</artifactId>
+        <artifactId>jaxb-tests</artifactId>
         <version>2.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
-    <artifactId>test-ejb</artifactId>
-    <name>Geronimo TestSuite, JEE5 Test Suite, JAXB :: Test EJB</name>
+    <artifactId>jaxb-ejb</artifactId>
+    <name>Geronimo TestSuite :: WebServices TestSuite :: JAXB EJB</name>
     <packaging>jar</packaging>
 
     <description>This project executes testcases for your testsuite</description>
 
     <dependencies>
-      <dependency>
-           <groupId>org.apache.geronimo.specs</groupId>
-           <artifactId>geronimo-ejb_2.1_spec</artifactId>
-       </dependency>
-
-       <dependency>
-           <groupId>org.apache.openejb</groupId>
-           <artifactId>openejb-core</artifactId>
-       </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-ejb_2.1_spec</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.openejb</groupId>
+            <artifactId>openejb-core</artifactId>
+        </dependency>
 
-       <dependency>
+        <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-kernel</artifactId>
             <version>${version}</version>
-       </dependency>
+        </dependency>
 
-       <dependency>
+        <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-security</artifactId>
             <version>${version}</version>
-       </dependency>
+        </dependency>
 
-       <dependency>
-             <groupId>javax.xml.bind</groupId>
-             <artifactId>jaxb-api</artifactId>
-             <scope>provided</scope>
-       </dependency>
-
-   </dependencies>
-
-   <profiles>
-        <profile>
-            <id>child</id>
-            <build>
-                <plugins>
-
-                  <plugin>
-                    <groupId>org.apache.geronimo.genesis.plugins</groupId>
-                    <artifactId>tools-maven-plugin</artifactId>
-                    <extensions>true</extensions>
-                  </plugin>
-
-                    <plugin>
-                        <groupId>org.apache.geronimo.plugins</groupId>
-                        <artifactId>geronimo-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>deploy-ejb</id>
-                                <phase>pre-integration-test</phase>
-                                <goals>
-                                    <goal>deploy-module</goal>
-                                </goals>
-                                <configuration>
-                                  <moduleArchive>${project.build.directory}/${artifactId}-${version}.jar</moduleArchive>
-                                </configuration>
-                            </execution>
+        <dependency>
+            <groupId>javax.xml.bind</groupId>
+            <artifactId>jaxb-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
+
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.geronimo.genesis.plugins</groupId>
+                <artifactId>tools-maven-plugin</artifactId>
+                <extensions>true</extensions>
+            </plugin>
+
+            <plugin>
+                <groupId>org.apache.geronimo.plugins</groupId>
+                <artifactId>testsuite-maven-plugin</artifactId>
+                <version>${version}</version>
+                <executions>
+                    <execution>
+                        <id>generate-surefire-xml</id>
+                        <phase>install</phase>
+                        <goals>
+                            <goal>generate-surefire-xml</goal>
+                        </goals>
+                        <!-- 
+                        Merging the configuration of this plugin with the one it inherits.
+                        Updating the reports in the grandparent directly as we'd have missed the boat for the parent's install phase.
+                        This plugin executes twice in Maven 2.0.4 (http://jira.codehaus.org/browse/MNG-2221)
+                        Maven.2.0.5 will fix it soon.
+                        -->
+                        <configuration>
+                            <grandParent>true</grandParent>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+
+            <plugin>
+                <groupId>org.apache.geronimo.plugins</groupId>
+                <artifactId>geronimo-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>deploy-ejb</id>
+                        <phase>pre-integration-test</phase>
+                        <goals>
+                            <goal>deploy-module</goal>
+                        </goals>
+                        <configuration>
+                            <moduleArchive>${project.build.directory}/${artifactId}-${version}.jar</moduleArchive>
+                        </configuration>
+                    </execution>
                             
-                            <execution>
-                                <id>undeploy-ejb-as-moduleId</id>
-                                <phase>post-integration-test</phase>
-                                <goals>
-                                    <goal>undeploy-module</goal>
-                                </goals>
-                                <configuration>
-                                    <moduleId>JEE5/JAXBEJB/1.1/car</moduleId>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
+                    <execution>
+                        <id>undeploy-ejb-as-moduleId</id>
+                        <phase>post-integration-test</phase>
+                        <goals>
+                            <goal>undeploy-module</goal>
+                        </goals>
+                        <configuration>
+                            <moduleId>JEE5/JAXBEJB/1.1/car</moduleId>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
 
 </project>
 

Modified: geronimo/server/trunk/testsuite/webservices-testsuite/jaxb/test-war/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/webservices-testsuite/jaxb/test-war/pom.xml?view=diff&rev=494509&r1=494091&r2=494509
==============================================================================
--- geronimo/server/trunk/testsuite/webservices-testsuite/jaxb/test-war/pom.xml (original)
+++ geronimo/server/trunk/testsuite/webservices-testsuite/jaxb/test-war/pom.xml Tue Jan  9 10:25:52 2007
@@ -24,90 +24,108 @@
 
     <parent>
         <groupId>org.apache.geronimo.testsuite</groupId>
-        <artifactId>jaxb-testsuite</artifactId>
+        <artifactId>jaxb-tests</artifactId>
         <version>2.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
-    <artifactId>test-war</artifactId>
-    <name>Geronimo TestSuite, JEE5 Test Suite, JAXB :: Test WAR</name>
+    <artifactId>jaxb-war</artifactId>
+    <name>Geronimo TestSuite :: WebServices TestSuite :: JAXB WAR</name>
     <packaging>war</packaging>
 
     <description>This project executes testcases for your testsuite</description>
 
     <dependencies>
-         <dependency>
-             <groupId>javax.xml.bind</groupId>
-             <artifactId>jaxb-api</artifactId>
-             <scope>provided</scope>
-         </dependency>
+        <dependency>
+            <groupId>javax.xml.bind</groupId>
+            <artifactId>jaxb-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
     </dependencies>
 
-   <profiles>
-        <profile>
-            <id>child</id>
-            <build>
-                <plugins>
-
-                  <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-surefire-plugin</artifactId>
-                    <configuration>
-                       <systemProperties>
-                          <property>
-                             <name>webAppName</name>
-                             <value>${artifactId}-${version}</value>
-                          </property>
-                       </systemProperties>
-                    </configuration>
-                  </plugin>
-
-                  <plugin>
-                    <groupId>org.apache.geronimo.genesis.plugins</groupId>
-                    <artifactId>tools-maven-plugin</artifactId>
-                    <extensions>true</extensions>
-                  </plugin>
-
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-war-plugin</artifactId>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.geronimo.plugins</groupId>
+                <artifactId>testsuite-maven-plugin</artifactId>
+                <version>${version}</version>
+                <executions>
+                    <execution>
+                        <id>generate-surefire-xml</id>
+                        <phase>install</phase>
+                        <goals>
+                            <goal>generate-surefire-xml</goal>
+                        </goals>
+                        <!-- 
+                        Merging the configuration of this plugin with the one it inherits.
+                        Updating the reports in the grandparent directly as we'd have missed the boat for the parent's install phase.
+                        This plugin executes twice in Maven 2.0.4 (http://jira.codehaus.org/browse/MNG-2221)
+                        Maven.2.0.5 will fix it soon.
+                        -->
                         <configuration>
-                            <webXml>${pom.basedir}/src/main/webapp/WEB-INF/web.xml</webXml>
-                            <warSourceIncludes>WEB-INF/lib/${artifactId}-${version}.jar, **/*.jsp, **/*.xml, **/*.class</warSourceIncludes>
+                            <grandParent>true</grandParent>
                         </configuration>
-                    </plugin>
-
-                    <plugin>
-                        <groupId>org.apache.geronimo.plugins</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>
+                </executions>
+            </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <configuration>
+                    <systemProperties>
+                        <property>
+                            <name>webAppName</name>
+                            <value>${artifactId}-${version}</value>
+                        </property>
+                    </systemProperties>
+                </configuration>
+            </plugin>
+
+            <plugin>
+                <groupId>org.apache.geronimo.genesis.plugins</groupId>
+                <artifactId>tools-maven-plugin</artifactId>
+                <extensions>true</extensions>
+            </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-war-plugin</artifactId>
+                <configuration>
+                    <webXml>${pom.basedir}/src/main/webapp/WEB-INF/web.xml</webXml>
+                    <warSourceIncludes>WEB-INF/lib/${artifactId}-${version}.jar, **/*.jsp, **/*.xml, **/*.class</warSourceIncludes>
+                </configuration>
+            </plugin>
+
+            <plugin>
+                <groupId>org.apache.geronimo.plugins</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>JEE5/JAXBServlet/1.1/car</moduleId>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
+                    <execution>
+                        <id>undeploy-war-as-moduleId</id>
+                        <phase>post-integration-test</phase>
+                        <goals>
+                            <goal>undeploy-module</goal>
+                        </goals>
+                        <configuration>
+                            <moduleId>JEE5/JAXBServlet/1.1/car</moduleId>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
 
 </project>
 

Modified: geronimo/server/trunk/testsuite/webservices-testsuite/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/webservices-testsuite/pom.xml?view=diff&rev=494509&r1=494091&r2=494509
==============================================================================
--- geronimo/server/trunk/testsuite/webservices-testsuite/pom.xml (original)
+++ geronimo/server/trunk/testsuite/webservices-testsuite/pom.xml Tue Jan  9 10:25:52 2007
@@ -28,17 +28,77 @@
         <relativePath>../pom.xml</relativePath>
     </parent>
 
-    <artifactId>jee5-testsuite</artifactId>
-    <name>Geronimo TestSuite, JEE5 Test Suite</name>
+    <artifactId>webservices-testsuite</artifactId>
+    <name>Geronimo TestSuite :: WebServices TestSuite</name>
     <packaging>pom</packaging>
+    <description>Tests JEE5 WebServices features. </description>
     
-    <description>
-        Tests JEE5 features.
-    </description>
-    
-    <modules>
-        <module>stax</module>
-        <module>jaxb</module>
-    </modules>
+     <build>
+        <plugins>
+            <plugin>
+                <!--  This plugin is needed for all suite poms. -->
+                <groupId>org.apache.geronimo.plugins</groupId>
+                <artifactId>testsuite-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>generate-surefire-xml</id>
+                        <phase>install</phase>
+                        <goals>
+                            <goal>generate-surefire-xml</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </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
+                        -->
+                        <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.apache.geronimo.plugins</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>

Modified: geronimo/server/trunk/testsuite/webservices-testsuite/stax/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/webservices-testsuite/stax/pom.xml?view=diff&rev=494509&r1=494091&r2=494509
==============================================================================
--- geronimo/server/trunk/testsuite/webservices-testsuite/stax/pom.xml (original)
+++ geronimo/server/trunk/testsuite/webservices-testsuite/stax/pom.xml Tue Jan  9 10:25:52 2007
@@ -18,59 +18,45 @@
     under the License.
 -->
 <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">
-  <parent>
-    <artifactId>jee5-testsuite</artifactId>
-    <groupId>org.apache.geronimo.testsuite</groupId>
-    <version>2.0-SNAPSHOT</version>
-    <relativePath>../pom.xml</relativePath>
-  </parent>
+    <parent>
+        <artifactId>webservices-testsuite</artifactId>
+        <groupId>org.apache.geronimo.testsuite</groupId>
+        <version>2.0-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
 
-  <modelVersion>4.0.0</modelVersion>
-  <artifactId>stax-testsuite</artifactId>
-  <packaging>pom</packaging>
-  <name>Geronimo TestSuite, JEE5 Test Suite, StAX</name>
-  <description>Geronimo jee5-testsuite testsuite created from an archetype.</description>
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>stax-tests</artifactId>
+    <packaging>pom</packaging>
+    <name>Geronimo TestSuite :: WebServices TestSuite :: StAX</name>
+    <description>Geronimo jee5-testsuite testsuite created from an archetype.</description>
 
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.geronimo.plugins</groupId>
-        <artifactId>testsuite-maven-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>generate-surefire-xml</id>
-            <phase>install</phase>
-            <goals>
-              <goal>generate-surefire-xml</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-  </build>
-
-  <profiles>
-    <profile>
-      <id>default</id>
-      <activation>
-        <activeByDefault>true</activeByDefault>
-      </activation>
-      <build>
+    <build>
         <plugins>
-          <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>
-          </plugin>
+            <plugin>
+                <groupId>org.apache.geronimo.plugins</groupId>
+                <artifactId>testsuite-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>generate-surefire-xml</id>
+                        <phase>install</phase>
+                        <goals>
+                            <goal>generate-surefire-xml</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
         </plugins>
-      </build>
-    </profile>
-    <profile>
-      <id>child</id>
-    </profile>
-  </profiles>
+    </build>
+
+    <profiles>
+        <profile>
+            <id>child</id>
+            <modules>
+                <module>test-war</module>
+                <module>test-ejb</module>
+            </modules>
+        </profile>
+    </profiles>
 
 </project>

Modified: geronimo/server/trunk/testsuite/webservices-testsuite/stax/test-ejb/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/webservices-testsuite/stax/test-ejb/pom.xml?view=diff&rev=494509&r1=494091&r2=494509
==============================================================================
--- geronimo/server/trunk/testsuite/webservices-testsuite/stax/test-ejb/pom.xml (original)
+++ geronimo/server/trunk/testsuite/webservices-testsuite/stax/test-ejb/pom.xml Tue Jan  9 10:25:52 2007
@@ -17,99 +17,116 @@
     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>stax-testsuite</artifactId>
+        <artifactId>stax-tests</artifactId>
         <version>2.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>test-ejb</artifactId>
-    <name>Geronimo TestSuite, JEE5 Test Suite, StAX :: Test EJB</name>
+    <name>Geronimo TestSuite :: WebServices TestSuite :: StAX EJB</name>
     <packaging>jar</packaging>
 
     <description>This project executes testcases for your testsuite</description>
 
     <dependencies>
-      <dependency>
-           <groupId>org.apache.geronimo.specs</groupId>
-           <artifactId>geronimo-ejb_2.1_spec</artifactId>
-       </dependency>
-
-       <dependency>
-           <groupId>org.apache.openejb</groupId>
-           <artifactId>openejb-core</artifactId>
-       </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-ejb_2.1_spec</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.openejb</groupId>
+            <artifactId>openejb-core</artifactId>
+        </dependency>
 
-       <dependency>
+        <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-kernel</artifactId>
             <version>${version}</version>
-       </dependency>
+        </dependency>
 
-       <dependency>
+        <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-security</artifactId>
             <version>${version}</version>
-       </dependency>
+        </dependency>
 
-       <dependency>
+        <dependency>
             <groupId>stax</groupId>
             <artifactId>stax-api</artifactId>
             <scope>provided</scope>
-       </dependency>
-   </dependencies>
+        </dependency>
+    </dependencies>
+
 
-   <profiles>
-        <profile>
-            <id>child</id>
-            <build>
-                <plugins>
-
-                  <plugin>
-                    <groupId>org.apache.geronimo.genesis.plugins</groupId>
-                    <artifactId>tools-maven-plugin</artifactId>
-                    <extensions>true</extensions>
-                  </plugin>
-
-                    <plugin>
-                        <groupId>org.apache.geronimo.plugins</groupId>
-                        <artifactId>geronimo-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>deploy-ejb</id>
-                                <phase>pre-integration-test</phase>
-                                <goals>
-                                    <goal>deploy-module</goal>
-                                </goals>
-                                <configuration>
-                                  <moduleArchive>${project.build.directory}/${artifactId}-${version}.jar</moduleArchive>
-                                </configuration>
-                            </execution>
-                            
-                            <execution>
-                                <id>undeploy-ejb-as-moduleId</id>
-                                <phase>post-integration-test</phase>
-                                <goals>
-                                    <goal>undeploy-module</goal>
-                                </goals>
-                                <configuration>
-                                    <moduleId>JEE5/StaxEJB/1.1/car</moduleId>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.geronimo.plugins</groupId>
+                <artifactId>testsuite-maven-plugin</artifactId>
+                <version>${version}</version>
+                <executions>
+                    <execution>
+                        <id>generate-surefire-xml</id>
+                        <phase>install</phase>
+                        <goals>
+                            <goal>generate-surefire-xml</goal>
+                        </goals>
+                        <!-- 
+                        Merging the configuration of this plugin with the one it inherits.
+                        Updating the reports in the grandparent directly as we'd have missed the boat for the parent's install phase.
+                        This plugin executes twice in Maven 2.0.4 (http://jira.codehaus.org/browse/MNG-2221)
+                        Maven.2.0.5 will fix it soon.
+                        -->
+                        <configuration>
+                            <grandParent>true</grandParent>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+
+            <plugin>
+                <groupId>org.apache.geronimo.genesis.plugins</groupId>
+                <artifactId>tools-maven-plugin</artifactId>
+                <extensions>true</extensions>
+            </plugin>
+
+            <plugin>
+                <groupId>org.apache.geronimo.plugins</groupId>
+                <artifactId>geronimo-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>deploy-ejb</id>
+                        <phase>pre-integration-test</phase>
+                        <goals>
+                            <goal>deploy-module</goal>
+                        </goals>
+                        <configuration>
+                            <moduleArchive>${project.build.directory}/${artifactId}-${version}.jar</moduleArchive>
+                        </configuration>
+                    </execution>
+
+                    <execution>
+                        <id>undeploy-ejb-as-moduleId</id>
+                        <phase>post-integration-test</phase>
+                        <goals>
+                            <goal>undeploy-module</goal>
+                        </goals>
+                        <configuration>
+                            <moduleId>JEE5/StaxEJB/1.1/car</moduleId>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
 
 </project>
 

Modified: geronimo/server/trunk/testsuite/webservices-testsuite/stax/test-war/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/webservices-testsuite/stax/test-war/pom.xml?view=diff&rev=494509&r1=494091&r2=494509
==============================================================================
--- geronimo/server/trunk/testsuite/webservices-testsuite/stax/test-war/pom.xml (original)
+++ geronimo/server/trunk/testsuite/webservices-testsuite/stax/test-war/pom.xml Tue Jan  9 10:25:52 2007
@@ -17,106 +17,122 @@
     specific language governing permissions and limitations
     under the License.
 -->
-
 <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>stax-testsuite</artifactId>
+        <artifactId>stax-tests</artifactId>
         <version>2.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>test-war</artifactId>
-    <name>Geronimo TestSuite, JEE5 Test Suite, StAX :: Test WAR</name>
+    <name>Geronimo TestSuite :: WebServices TestSuite :: StAX WAR</name>
     <packaging>war</packaging>
 
     <description>This project executes testcases for your testsuite</description>
 
-  <dependencies>
+    <dependencies>
 
-     <dependency>
+        <dependency>
             <groupId>stax</groupId>
             <artifactId>stax-api</artifactId>
             <scope>provided</scope>
-     </dependency>
+        </dependency>
 
-     <dependency>
+        <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-servlet_2.5_spec</artifactId> 
+            <artifactId>geronimo-servlet_2.5_spec</artifactId>
             <scope>provided</scope>
-     </dependency>
-
-  </dependencies>
+        </dependency>
 
+    </dependencies>
 
-   <profiles>
-        <profile>
-            <id>child</id>
-            <build>
-                <plugins>
-
-                  <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-surefire-plugin</artifactId>
-                    <configuration>
-                       <systemProperties>
-                          <property>
-                             <name>webAppName</name>
-                             <value>${artifactId}-${version}</value>
-                          </property>
-                       </systemProperties>
-                    </configuration>
-                  </plugin>
-
-                  <plugin>
-                    <groupId>org.apache.geronimo.genesis.plugins</groupId>
-                    <artifactId>tools-maven-plugin</artifactId>
-                    <extensions>true</extensions>
-                  </plugin>
-
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-war-plugin</artifactId>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.geronimo.plugins</groupId>
+                <artifactId>testsuite-maven-plugin</artifactId>
+                <version>${version}</version>
+                <executions>
+                    <execution>
+                        <id>generate-surefire-xml</id>
+                        <phase>install</phase>
+                        <goals>
+                            <goal>generate-surefire-xml</goal>
+                        </goals>
+                        <!-- 
+                        Merging the configuration of this plugin with the one it inherits.
+                        Updating the reports in the grandparent directly as we'd have missed the boat for the parent's install phase.
+                        This plugin executes twice in Maven 2.0.4 (http://jira.codehaus.org/browse/MNG-2221)
+                        Maven.2.0.5 will fix it soon.
+                        -->
+                        <configuration>
+                            <grandParent>true</grandParent>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <configuration>
+                    <systemProperties>
+                        <property>
+                            <name>webAppName</name>
+                            <value>${artifactId}-${version}</value>
+                        </property>
+                    </systemProperties>
+                </configuration>
+            </plugin>
+
+            <plugin>
+                <groupId>org.apache.geronimo.genesis.plugins</groupId>
+                <artifactId>tools-maven-plugin</artifactId>
+                <extensions>true</extensions>
+            </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-war-plugin</artifactId>
+                <configuration>
+                    <webXml>${pom.basedir}/src/main/webapp/WEB-INF/web.xml</webXml>
+                    <warSourceIncludes>WEB-INF/lib/${artifactId}-${version}.jar, **/*.jsp, **/*.xml, **/*.class</warSourceIncludes>
+                </configuration>
+            </plugin>
+
+            <plugin>
+                <groupId>org.apache.geronimo.plugins</groupId>
+                <artifactId>geronimo-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>deploy-wars</id>
+                        <phase>pre-integration-test</phase>
+                        <goals>
+                            <goal>deploy-module</goal>
+                        </goals>
                         <configuration>
-                            <webXml>${pom.basedir}/src/main/webapp/WEB-INF/web.xml</webXml>
-                            <warSourceIncludes>WEB-INF/lib/${artifactId}-${version}.jar, **/*.jsp, **/*.xml, **/*.class</warSourceIncludes>
+                            <moduleArchive>${project.build.directory}/${artifactId}-${version}.war</moduleArchive>
                         </configuration>
-                    </plugin>
+                    </execution>
 
-                    <plugin>
-                        <groupId>org.apache.geronimo.plugins</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>JEE5/StaxServlet/1.1/car</moduleId>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
+                    <execution>
+                        <id>undeploy-war-as-moduleId</id>
+                        <phase>post-integration-test</phase>
+                        <goals>
+                            <goal>undeploy-module</goal>
+                        </goals>
+                        <configuration>
+                            <moduleId>JEE5/StaxServlet/1.1/car</moduleId>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
 
 </project>
 



Mime
View raw message