geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ga...@apache.org
Subject svn commit: r936153 - in /geronimo/server/trunk: ./ testsuite/ testsuite/commands-testsuite/ testsuite/commands-testsuite/deploy/ testsuite/commands-testsuite/gshell/ testsuite/commands-testsuite/jaxws/ testsuite/commands-testsuite/shutdown/ testsuite/...
Date Wed, 21 Apr 2010 04:11:43 GMT
Author: gawor
Date: Wed Apr 21 04:11:42 2010
New Revision: 936153

URL: http://svn.apache.org/viewvc?rev=936153&view=rev
Log:
GERONIMO-5262: Updated testsuites to use maven-failsafe plugin and enabled some tests to run

Removed:
    geronimo/server/trunk/testsuite/commands-testsuite/deploy/goals.txt
    geronimo/server/trunk/testsuite/commands-testsuite/gshell/goals.txt
    geronimo/server/trunk/testsuite/commands-testsuite/jaxws/goals.txt
    geronimo/server/trunk/testsuite/commands-testsuite/shutdown/goals.txt
    geronimo/server/trunk/testsuite/web-testsuite/test-2.1-jsps/goals.txt
    geronimo/server/trunk/testsuite/web-testsuite/test-2.5-servlets/goals.txt
    geronimo/server/trunk/testsuite/web-testsuite/test-jetty/goals.txt
    geronimo/server/trunk/testsuite/web-testsuite/test-myfaces/goals.txt
    geronimo/server/trunk/testsuite/web-testsuite/test-tld/goals.txt
    geronimo/server/trunk/testsuite/web-testsuite/test-tomcat/goals.txt
    geronimo/server/trunk/testsuite/web-testsuite/test-web-forward/goals.txt
    geronimo/server/trunk/testsuite/web-testsuite/test-web-references/goals.txt
    geronimo/server/trunk/testsuite/webservices-testsuite/jaxb-tests/goals.txt
    geronimo/server/trunk/testsuite/webservices-testsuite/stax-tests/goals.txt
Modified:
    geronimo/server/trunk/pom.xml
    geronimo/server/trunk/testsuite/commands-testsuite/pom.xml
    geronimo/server/trunk/testsuite/pom.xml
    geronimo/server/trunk/testsuite/web-testsuite/pom.xml
    geronimo/server/trunk/testsuite/web-testsuite/test-2.1-jsps/pom.xml
    geronimo/server/trunk/testsuite/web-testsuite/test-2.1-jsps/src/main/webapp/WEB-INF/geronimo-web.xml
    geronimo/server/trunk/testsuite/web-testsuite/test-2.5-servlets/pom.xml
    geronimo/server/trunk/testsuite/web-testsuite/test-2.5-servlets/src/main/webapp/WEB-INF/geronimo-web.xml
    geronimo/server/trunk/testsuite/web-testsuite/test-tld/test-tld-war/pom.xml
    geronimo/server/trunk/testsuite/web-testsuite/test-tld/test-tld-war/src/test/java/org/apache/geronimo/testsuite/tld/TestTLD.java
    geronimo/server/trunk/testsuite/webservices-testsuite/jaxb-tests/jaxb-client/pom.xml
    geronimo/server/trunk/testsuite/webservices-testsuite/jaxb-tests/jaxb-client/src/main/resources/META-INF/geronimo-application-client.xml
    geronimo/server/trunk/testsuite/webservices-testsuite/jaxb-tests/jaxb-ejb/pom.xml
    geronimo/server/trunk/testsuite/webservices-testsuite/jaxb-tests/jaxb-ejb/src/main/resources/META-INF/openejb-jar.xml
    geronimo/server/trunk/testsuite/webservices-testsuite/jaxb-tests/jaxb-war/pom.xml
    geronimo/server/trunk/testsuite/webservices-testsuite/jaxb-tests/jaxb-war/src/main/webapp/WEB-INF/geronimo-web.xml
    geronimo/server/trunk/testsuite/webservices-testsuite/pom.xml
    geronimo/server/trunk/testsuite/webservices-testsuite/stax-tests/stax-client/pom.xml
    geronimo/server/trunk/testsuite/webservices-testsuite/stax-tests/stax-client/src/main/resources/META-INF/geronimo-application-client.xml
    geronimo/server/trunk/testsuite/webservices-testsuite/stax-tests/stax-ejb/pom.xml
    geronimo/server/trunk/testsuite/webservices-testsuite/stax-tests/stax-ejb/src/main/resources/META-INF/openejb-jar.xml
    geronimo/server/trunk/testsuite/webservices-testsuite/stax-tests/stax-war/pom.xml
    geronimo/server/trunk/testsuite/webservices-testsuite/stax-tests/stax-war/src/main/webapp/WEB-INF/geronimo-web.xml
    geronimo/server/trunk/testsupport/testsupport-commands/src/main/java/org/apache/geronimo/testsupport/commands/CommandTestSupport.java

Modified: geronimo/server/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/pom.xml?rev=936153&r1=936152&r2=936153&view=diff
==============================================================================
--- geronimo/server/trunk/pom.xml (original)
+++ geronimo/server/trunk/pom.xml Wed Apr 21 04:11:42 2010
@@ -53,6 +53,7 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 
         <!-- This property is required by the car:package mojo -->
         <geronimoVersion>${version}</geronimoVersion>

Modified: geronimo/server/trunk/testsuite/commands-testsuite/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/commands-testsuite/pom.xml?rev=936153&r1=936152&r2=936153&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/commands-testsuite/pom.xml (original)
+++ geronimo/server/trunk/testsuite/commands-testsuite/pom.xml Wed Apr 21 04:11:42 2010
@@ -43,39 +43,41 @@
             <version>${version}</version>
         </dependency>
     </dependencies> 
-    
-    <build>
-        <pluginManagement>
-            <plugins>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-surefire-plugin</artifactId>
-                    <configuration>
-                        <suiteXmlFiles>
-                            <suiteXmlFile>${project.build.testOutputDirectory}/testng.xml</suiteXmlFile>
-                        </suiteXmlFiles>
-                        <systemProperties>
-                            <property>
-                                <name>geronimoVersion</name>
-                                <value>${version}</value>
-                            </property>
-                        </systemProperties>
-                    </configuration>
-                </plugin>
-            </plugins>
-        </pluginManagement>
-    </build>
 
     <profiles>
         <profile>
-            <id>all-subprojects</id>
-            <!-- use for things like versions:set and perhaps release when build has to run on all projects -->
-            <modules>
-                <module>deploy</module>
-                <module>gshell</module>
-                <module>jaxws</module>
-                <module>shutdown</module>
-            </modules>
+            <id>it</id>
+            <build>
+                <pluginManagement>
+                    <plugins>
+                        <plugin>
+                            <groupId>org.apache.maven.plugins</groupId>
+                            <artifactId>maven-failsafe-plugin</artifactId>
+                            <configuration>
+                                <suiteXmlFiles>
+                                    <suiteXmlFile>${project.build.testOutputDirectory}/testng.xml</suiteXmlFile>
+                                </suiteXmlFiles>
+                                <systemProperties>
+                                    <property>
+                                        <name>geronimoVersion</name>
+                                        <value>${version}</value>
+                                    </property>
+                                </systemProperties>
+                            </configuration>
+                        </plugin>
+                    </plugins>
+                </pluginManagement>
+            </build>
         </profile>
     </profiles>
+
+    <modules>
+        <module>deploy</module>
+<!--
+        <module>gshell</module>
+        <module>jaxws</module>
+-->
+        <module>shutdown</module>
+    </modules>
+
 </project>

Modified: geronimo/server/trunk/testsuite/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/pom.xml?rev=936153&r1=936152&r2=936153&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/pom.xml (original)
+++ geronimo/server/trunk/testsuite/pom.xml Wed Apr 21 04:11:42 2010
@@ -70,19 +70,16 @@
             <artifactId>slf4j-gossip</artifactId>
             <scope>test</scope>
         </dependency>
+
+        <dependency>
+            <groupId>org.osgi</groupId>
+            <artifactId>org.osgi.core</artifactId>
+            <scope>test</scope>
+        </dependency>
+
     </dependencies>
 
     <build>
-        <!--
-        <extensions>
-            <extension>
-                <groupId>org.apache.geronimo.testsupport</groupId>
-                <artifactId>testsupport-packaging</artifactId>
-                <version>${version}</version>
-            </extension>
-        </extensions>
-        -->
-
         <pluginManagement>
             <plugins>
                 <plugin>
@@ -119,18 +116,6 @@
                     </configuration>
                 </plugin>
 
-                <plugin>
-                    <groupId>org.apache.geronimo.buildsupport</groupId>
-                    <artifactId>geronimo-maven-plugin</artifactId>
-                    <configuration>
-                        <reporters>
-                            <reporter
-                                    implementation="org.apache.geronimo.mavenplugins.geronimo.reporting.SurefireReporter">
-                                <reportsDirectory>${project.build.directory}/surefire-reports</reportsDirectory>
-                            </reporter>
-                        </reporters>
-                    </configuration>
-                </plugin>
             </plugins>
         </pluginManagement>
 
@@ -161,20 +146,19 @@
         </site>
     </distributionManagement>
 
-    <!--<pluginRepositories>-->
-    <!--<pluginRepository>-->
-    <!--<id>codehaus</id>-->
-    <!--<name>Codehaus Release Repository</name>-->
-    <!--<url>http://repository.codehaus.org</url>-->
-    <!--<layout>default</layout>-->
-    <!--<snapshots>-->
-    <!--<enabled>false</enabled>-->
-    <!--</snapshots>-->
-    <!--<releases>-->
-    <!--<enabled>true</enabled>-->
-    <!--</releases>-->
-    <!--</pluginRepository>-->
-    <!--</pluginRepositories>-->
+    <modules>
+        <module>commands-testsuite</module>
+<!--
+        <module>concurrent-testsuite</module>
+        <module>console-testsuite</module>
+        <module>corba-testsuite</module>
+        <module>deployment-testsuite</module>
+        <module>enterprise-testsuite</module>
+        <module>security-testsuite</module>
+-->
+        <module>web-testsuite</module>
+        <module>webservices-testsuite</module>
+    </modules>
 
     <profiles>
         <profile>
@@ -184,38 +168,11 @@
                     <plugins>
                         <plugin>
                             <groupId>org.codehaus.mojo</groupId>
-                            <artifactId>shitty-maven-plugin</artifactId>
-                            <inherited>false</inherited>
-                            <configuration>
-                                <projects>
-                                    <fileset>
-                                        <directory>${project.basedir}</directory>
-                                        <includes>
-                                            <include>${shittyTestIncludes}</include>
-                                        </includes>
-                                        <excludes>
-                                            <exclude>${shittyTestExcludes}</exclude>
-                                        </excludes>
-                                    </fileset>
-                                </projects>
-                            </configuration>
-                            <executions>
-                                <execution>
-                                    <goals>
-                                        <goal>clean</goal>
-                                        <goal>install</goal>
-                                        <goal>test</goal>
-                                    </goals>
-                                </execution>
-                            </executions>
-                        </plugin>
-                        <plugin>
-                            <groupId>org.codehaus.mojo</groupId>
                             <artifactId>selenium-maven-plugin</artifactId>
                             <inherited>false</inherited>
                             <executions>
                                 <execution>
-                                    <id>start</id>
+                                    <id>start-selenium</id>
                                     <phase>pre-integration-test</phase>
                                     <goals>
                                         <goal>start-server</goal>
@@ -232,7 +189,7 @@
                                     </configuration>
                                 </execution>
                                 <execution>
-                                    <id>stop</id>
+                                    <id>stop-selenium</id>
                                     <phase>post-integration-test</phase>
                                     <goals>
                                         <goal>stop-server</goal>
@@ -241,47 +198,45 @@
                             </executions>
                         </plugin>
 
-                        <!--
-                        NOTE: This horrible looking configuration sets up the surefire plugin to
-                              not run tests durring the 'test' phase, but instead during the
-                              'integration-test' phase.
-                        -->
                         <plugin>
                             <groupId>org.apache.maven.plugins</groupId>
-                            <artifactId>maven-surefire-plugin</artifactId>
+                            <artifactId>maven-failsafe-plugin</artifactId>
+                            <version>2.5</version>
                             <configuration>
-                                <skip>true</skip>
+                                <redirectTestOutputToFile>true</redirectTestOutputToFile>
+                                <forkMode>once</forkMode>
+                                <argLine>-enableassertions</argLine>
+                                <failIfNoTests>false</failIfNoTests>
+                                <workingDirectory>${project.build.directory}</workingDirectory>
+                                <includes>
+                                    <include>**/Test*.java</include>
+                                    <include>**/*Test.java</include>
+                                </includes>
                             </configuration>
                             <executions>
                                 <execution>
-                                    <id>test</id>
-                                    <phase>test</phase>
+                                    <id>integration-test</id>
                                     <goals>
-                                        <goal>test</goal>
+                                        <goal>integration-test</goal>
                                     </goals>
-                                    <configuration>
-                                        <skip>true</skip>
-                                    </configuration>
                                 </execution>
                                 <execution>
-                                    <id>integration</id>
-                                    <phase>integration-test</phase>
+                                    <id>verify</id>
+                                    <phase>install</phase>
                                     <goals>
-                                        <goal>test</goal>
+                                        <goal>verify</goal>
                                     </goals>
-                                    <configuration>
-                                        <skip>false</skip>
-                                    </configuration>
                                 </execution>
                             </executions>
                         </plugin>
+
                         <plugin>
                             <groupId>org.apache.geronimo.buildsupport</groupId>
                             <artifactId>geronimo-maven-plugin</artifactId>
                             <inherited>false</inherited>
                             <executions>
                                 <execution>
-                                    <id>start</id>
+                                    <id>start-geronimo</id>
                                     <phase>pre-integration-test</phase>
                                     <goals>
                                         <goal>start-server</goal>
@@ -302,8 +257,8 @@
                                     </configuration>
                                 </execution>
                                 <execution>
-                                    <id>stop</id>
-                                    <phase>install</phase>
+                                    <id>stop-geronimo</id>
+                                    <phase>verify</phase>
                                     <goals>
                                         <goal>stop-server</goal>
                                     </goals>
@@ -313,6 +268,16 @@
 
                     </plugins>
                 </pluginManagement>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-failsafe-plugin</artifactId>
+                    </plugin>
+                    <plugin>
+                        <groupId>org.apache.geronimo.buildsupport</groupId>
+                        <artifactId>geronimo-maven-plugin</artifactId>
+                    </plugin>
+                </plugins>
             </build>
         </profile>
 
@@ -387,22 +352,6 @@
                 <browser>${browserPath}</browser>
             </properties>
         </profile>
-
-        <profile>
-            <id>all-subprojects</id>
-            <!-- use for things like versions:set and perhaps release when build has to run on all projects -->
-            <modules>
-                <module>commands-testsuite</module>
-                <module>concurrent-testsuite</module>
-                <module>console-testsuite</module>
-                <module>corba-testsuite</module>
-                <module>deployment-testsuite</module>
-                <module>enterprise-testsuite</module>
-                <module>security-testsuite</module>
-                <module>web-testsuite</module>
-                <module>webservices-testsuite</module>
-            </modules>
-        </profile>
     </profiles>
 
 </project>

Modified: geronimo/server/trunk/testsuite/web-testsuite/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/web-testsuite/pom.xml?rev=936153&r1=936152&r2=936153&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/web-testsuite/pom.xml (original)
+++ geronimo/server/trunk/testsuite/web-testsuite/pom.xml Wed Apr 21 04:11:42 2010
@@ -44,21 +44,17 @@
          - JSTL
     </description>
 
-    <profiles>
-        <profile>
-            <id>all-subprojects</id>
-            <!-- use for things like versions:set and perhaps release when build has to run on all projects -->
-            <modules>
-                <module>test-2.1-jsps</module>
-                <module>test-2.5-servlets</module>
-                <module>test-jetty</module>
-                <module>test-myfaces</module>
-                <module>test-tomcat</module>
-                <module>test-web-forward</module>
-                <module>test-web-references</module>
-                <module>test-tld</module>
-            </modules>
-        </profile>
-    </profiles>
+    <modules>
+        <module>test-2.1-jsps</module>
+        <module>test-2.5-servlets</module>
+        <module>test-tld</module>
+<!--
+        <module>test-jetty</module>
+        <module>test-myfaces</module>
+        <module>test-tomcat</module>
+        <module>test-web-forward</module>
+        <module>test-web-references</module>
+-->
+    </modules>
 
 </project>

Modified: geronimo/server/trunk/testsuite/web-testsuite/test-2.1-jsps/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/web-testsuite/test-2.1-jsps/pom.xml?rev=936153&r1=936152&r2=936153&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/web-testsuite/test-2.1-jsps/pom.xml (original)
+++ geronimo/server/trunk/testsuite/web-testsuite/test-2.1-jsps/pom.xml Wed Apr 21 04:11:42 2010
@@ -48,50 +48,59 @@
         </dependency>
     </dependencies>
 
-    <build>
-        <pluginManagement>
-            <plugins>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-surefire-plugin</artifactId>
-                    <configuration>
-                        <suiteXmlFiles>
-                            <suiteXmlFile>${project.build.testOutputDirectory}/testng.xml</suiteXmlFile>
-                        </suiteXmlFiles>
-                    </configuration>
-                </plugin>
-            </plugins>
-        </pluginManagement>
+    <profiles>
+        <profile>
+            <id>it</id>
+            <build>
+                <pluginManagement>
+                    <plugins>
+                        <plugin>
+                            <groupId>org.apache.maven.plugins</groupId>
+                            <artifactId>maven-failsafe-plugin</artifactId>
+                            <configuration>
+                                <suiteXmlFiles>
+                                    <suiteXmlFile>${project.build.testOutputDirectory}/testng.xml</suiteXmlFile>
+                                </suiteXmlFiles>
+                            </configuration>
+                        </plugin>
+                    </plugins>
+                </pluginManagement>
 
-        <plugins>
-            <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>
+                <plugins>
+                    <plugin>
+                        <groupId>org.codehaus.mojo</groupId>
+                        <artifactId>selenium-maven-plugin</artifactId>
+                    </plugin>
 
-                    <execution>
-                        <id>undeploy-war-as-moduleId</id>
-                        <phase>post-integration-test</phase>
-                        <goals>
-                            <goal>undeploy-module</goal>
-                        </goals>
-                        <configuration>
-                            <moduleId>${groupId}/${artifactId}/${version}/car</moduleId>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
+                    <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>
 
 </project>

Modified: geronimo/server/trunk/testsuite/web-testsuite/test-2.1-jsps/src/main/webapp/WEB-INF/geronimo-web.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/web-testsuite/test-2.1-jsps/src/main/webapp/WEB-INF/geronimo-web.xml?rev=936153&r1=936152&r2=936153&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/web-testsuite/test-2.1-jsps/src/main/webapp/WEB-INF/geronimo-web.xml (original)
+++ geronimo/server/trunk/testsuite/web-testsuite/test-2.1-jsps/src/main/webapp/WEB-INF/geronimo-web.xml Wed Apr 21 04:11:42 2010
@@ -21,7 +21,7 @@
       <dep:groupId>${pom.groupId}</dep:groupId>
       <dep:artifactId>${pom.artifactId}</dep:artifactId>
       <dep:version>${version}</dep:version>
-      <dep:type>car</dep:type>
+      <dep:type>war</dep:type>
     </dep:moduleId>
   </dep:environment>
   <context-root>/jsp21</context-root>

Modified: geronimo/server/trunk/testsuite/web-testsuite/test-2.5-servlets/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/web-testsuite/test-2.5-servlets/pom.xml?rev=936153&r1=936152&r2=936153&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/web-testsuite/test-2.5-servlets/pom.xml (original)
+++ geronimo/server/trunk/testsuite/web-testsuite/test-2.5-servlets/pom.xml Wed Apr 21 04:11:42 2010
@@ -42,50 +42,59 @@
         </dependency>
     </dependencies>
 
-    <build>
-        <pluginManagement>
-            <plugins>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-surefire-plugin</artifactId>
-                    <configuration>
-                        <suiteXmlFiles>
-                            <suiteXmlFile>${project.build.testOutputDirectory}/testng.xml</suiteXmlFile>
-                        </suiteXmlFiles>
-                    </configuration>
-                </plugin>
-            </plugins>
-        </pluginManagement>
-        
-        <plugins>
-            <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>
+    <profiles>
+        <profile>
+            <id>it</id>
+            <build>
+                <pluginManagement>
+                    <plugins>
+                        <plugin>
+                            <groupId>org.apache.maven.plugins</groupId>
+                            <artifactId>maven-failsafe-plugin</artifactId>
+                            <configuration>
+                                <suiteXmlFiles>
+                                    <suiteXmlFile>${project.build.testOutputDirectory}/testng.xml</suiteXmlFile>
+                                </suiteXmlFiles>
+                            </configuration>
+                        </plugin>
+                    </plugins>
+                </pluginManagement>
 
-                    <execution>
-                        <id>undeploy-war-as-moduleId</id>
-                        <phase>post-integration-test</phase>
-                        <goals>
-                            <goal>undeploy-module</goal>
-                        </goals>
-                        <configuration>
-                            <moduleId>${groupId}/${artifactId}/${version}/car</moduleId>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.codehaus.mojo</groupId>
+                        <artifactId>selenium-maven-plugin</artifactId>
+                    </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>
 
 </project>

Modified: geronimo/server/trunk/testsuite/web-testsuite/test-2.5-servlets/src/main/webapp/WEB-INF/geronimo-web.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/web-testsuite/test-2.5-servlets/src/main/webapp/WEB-INF/geronimo-web.xml?rev=936153&r1=936152&r2=936153&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/web-testsuite/test-2.5-servlets/src/main/webapp/WEB-INF/geronimo-web.xml (original)
+++ geronimo/server/trunk/testsuite/web-testsuite/test-2.5-servlets/src/main/webapp/WEB-INF/geronimo-web.xml Wed Apr 21 04:11:42 2010
@@ -21,7 +21,7 @@
       <dep:groupId>${pom.groupId}</dep:groupId>
       <dep:artifactId>${pom.artifactId}</dep:artifactId>
       <dep:version>${version}</dep:version>
-      <dep:type>car</dep:type>
+      <dep:type>war</dep:type>
     </dep:moduleId>
   </dep:environment>
   <context-root>/servlet25</context-root>

Modified: geronimo/server/trunk/testsuite/web-testsuite/test-tld/test-tld-war/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/web-testsuite/test-tld/test-tld-war/pom.xml?rev=936153&r1=936152&r2=936153&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/web-testsuite/test-tld/test-tld-war/pom.xml (original)
+++ geronimo/server/trunk/testsuite/web-testsuite/test-tld/test-tld-war/pom.xml Wed Apr 21 04:11:42 2010
@@ -54,50 +54,59 @@
         </dependency>
     </dependencies>
 
-    <build>
-        <pluginManagement>
-            <plugins>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-surefire-plugin</artifactId>
-                    <configuration>
-                        <suiteXmlFiles>
-                            <suiteXmlFile>${project.build.testOutputDirectory}/testng.xml</suiteXmlFile>
-                        </suiteXmlFiles>
-                    </configuration>
-                </plugin>
-            </plugins>
-        </pluginManagement>
+    <profiles>
+        <profile>
+            <id>it</id>
+            <build>
+                <pluginManagement>
+                    <plugins>
+                        <plugin>
+                            <groupId>org.apache.maven.plugins</groupId>
+                            <artifactId>maven-failsafe-plugin</artifactId>
+                            <configuration>
+                                <suiteXmlFiles>
+                                    <suiteXmlFile>${project.build.testOutputDirectory}/testng.xml</suiteXmlFile>
+                                </suiteXmlFiles>
+                            </configuration>
+                        </plugin>
+                    </plugins>
+                </pluginManagement>
 
-        <plugins>
-            <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>
+                <plugins>
+                    <plugin>
+                        <groupId>org.codehaus.mojo</groupId>
+                        <artifactId>selenium-maven-plugin</artifactId>
+                    </plugin>
 
-                    <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>
+                    <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>
 
 </project>

Modified: geronimo/server/trunk/testsuite/web-testsuite/test-tld/test-tld-war/src/test/java/org/apache/geronimo/testsuite/tld/TestTLD.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/web-testsuite/test-tld/test-tld-war/src/test/java/org/apache/geronimo/testsuite/tld/TestTLD.java?rev=936153&r1=936152&r2=936153&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/web-testsuite/test-tld/test-tld-war/src/test/java/org/apache/geronimo/testsuite/tld/TestTLD.java (original)
+++ geronimo/server/trunk/testsuite/web-testsuite/test-tld/test-tld-war/src/test/java/org/apache/geronimo/testsuite/tld/TestTLD.java Wed Apr 21 04:11:42 2010
@@ -28,7 +28,10 @@ public class TestTLD extends SeleniumTes
     public void testTaglibs() throws Exception {
         selenium.open("/tld/testTaglibs.jsp");
         waitForPageLoad();
-        assertEquals("HelloHelloTestTag", selenium.getText("xpath=/html/body"));
+        String text = selenium.getText("xpath=/html/body");
+        assertTrue("'Hello' not found", text.contains("Hello"));
+        assertTrue("'TestTag' not found", text.contains("TestTag"));
+        assertTrue("'Listener initialized' not found", text.contains("Listener initialized: true"));
     }
 
 }

Modified: geronimo/server/trunk/testsuite/webservices-testsuite/jaxb-tests/jaxb-client/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/webservices-testsuite/jaxb-tests/jaxb-client/pom.xml?rev=936153&r1=936152&r2=936153&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/webservices-testsuite/jaxb-tests/jaxb-client/pom.xml (original)
+++ geronimo/server/trunk/testsuite/webservices-testsuite/jaxb-tests/jaxb-client/pom.xml Wed Apr 21 04:11:42 2010
@@ -40,9 +40,6 @@
         <clientLogFile>${basedir}/target/client.log</clientLogFile>
     </properties>
 
-    <dependencies>
-    </dependencies>
-
     <build>
         <plugins>
             <plugin>
@@ -56,17 +53,18 @@
                     </archive>
                 </configuration>
             </plugin>
-
-       </plugins>
+        </plugins>
     </build>
+
     <profiles>
         <profile>
             <id>it</id>
             <build>
                 <plugins>
+
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
+                        <artifactId>maven-failsafe-plugin</artifactId>
                         <configuration>
                             <systemProperties>
                                 <property>
@@ -99,7 +97,7 @@
                                     <goal>run-client</goal>
                                 </goals>
                                 <configuration>
-                                    <moduleId>JEE5/JAXBClient/1.1/car</moduleId>
+                                    <moduleId>JEE5/JAXBClient/1.1/jar</moduleId>
                                     <logOutput>true</logOutput>
                                     <logFile>${clientLogFile}</logFile>
                                 </configuration>
@@ -112,12 +110,11 @@
                                     <goal>undeploy-module</goal>
                                 </goals>
                                 <configuration>
-                                    <moduleId>JEE5/JAXBClientServer/1.1/car</moduleId>
+                                    <moduleId>JEE5/JAXBClientServer/1.1/jar</moduleId>
                                 </configuration>
                             </execution>
                         </executions>
                     </plugin>
-          
                 </plugins>
             </build>
         </profile>

Modified: geronimo/server/trunk/testsuite/webservices-testsuite/jaxb-tests/jaxb-client/src/main/resources/META-INF/geronimo-application-client.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/webservices-testsuite/jaxb-tests/jaxb-client/src/main/resources/META-INF/geronimo-application-client.xml?rev=936153&r1=936152&r2=936153&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/webservices-testsuite/jaxb-tests/jaxb-client/src/main/resources/META-INF/geronimo-application-client.xml (original)
+++ geronimo/server/trunk/testsuite/webservices-testsuite/jaxb-tests/jaxb-client/src/main/resources/META-INF/geronimo-application-client.xml Wed Apr 21 04:11:42 2010
@@ -24,7 +24,7 @@
       <dep:groupId>JEE5</dep:groupId>
       <dep:artifactId>JAXBClient</dep:artifactId>
       <dep:version>1.1</dep:version>
-      <dep:type>car</dep:type>
+      <dep:type>jar</dep:type>
     </dep:moduleId>
    </dep:client-environment>
 
@@ -33,7 +33,7 @@
       <dep:groupId>JEE5</dep:groupId>
       <dep:artifactId>JAXBClientServer</dep:artifactId>
       <dep:version>1.1</dep:version>
-      <dep:type>car</dep:type>
+      <dep:type>jar</dep:type>
     </dep:moduleId>
    </dep:server-environment>
 

Modified: geronimo/server/trunk/testsuite/webservices-testsuite/jaxb-tests/jaxb-ejb/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/webservices-testsuite/jaxb-tests/jaxb-ejb/pom.xml?rev=936153&r1=936152&r2=936153&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/webservices-testsuite/jaxb-tests/jaxb-ejb/pom.xml (original)
+++ geronimo/server/trunk/testsuite/webservices-testsuite/jaxb-tests/jaxb-ejb/pom.xml Wed Apr 21 04:11:42 2010
@@ -61,36 +61,41 @@
         </dependency>
     </dependencies>
 
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.geronimo.buildsupport</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>
+    <profiles>
+        <profile>
+            <id>it</id>
+            <build>
+                <plugins>
+                    <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}.jar</moduleArchive>
+                                </configuration>
+                            </execution>
+                            <execution>
+                                <id>undeploy-war-as-moduleId</id>
+                                <phase>post-integration-test</phase>
+                                <goals>
+                                    <goal>undeploy-module</goal>
+                                </goals>
+                                <configuration>
+                                    <moduleId>JEE5/JAXBEJB/1.1/jar</moduleId>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
 
 </project>
 

Modified: geronimo/server/trunk/testsuite/webservices-testsuite/jaxb-tests/jaxb-ejb/src/main/resources/META-INF/openejb-jar.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/webservices-testsuite/jaxb-tests/jaxb-ejb/src/main/resources/META-INF/openejb-jar.xml?rev=936153&r1=936152&r2=936153&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/webservices-testsuite/jaxb-tests/jaxb-ejb/src/main/resources/META-INF/openejb-jar.xml (original)
+++ geronimo/server/trunk/testsuite/webservices-testsuite/jaxb-tests/jaxb-ejb/src/main/resources/META-INF/openejb-jar.xml Wed Apr 21 04:11:42 2010
@@ -27,7 +27,7 @@
             <groupId>JEE5</groupId>
             <artifactId>JAXBEJB</artifactId>
             <version>1.1</version>
-            <type>car</type>
+            <type>jar</type>
         </moduleId>
    </environment>
 

Modified: geronimo/server/trunk/testsuite/webservices-testsuite/jaxb-tests/jaxb-war/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/webservices-testsuite/jaxb-tests/jaxb-war/pom.xml?rev=936153&r1=936152&r2=936153&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/webservices-testsuite/jaxb-tests/jaxb-war/pom.xml (original)
+++ geronimo/server/trunk/testsuite/webservices-testsuite/jaxb-tests/jaxb-war/pom.xml Wed Apr 21 04:11:42 2010
@@ -37,14 +37,6 @@
     <description>This project executes testcases for your testsuite</description>
 
     <dependencies>
-        <!--
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-jsp_2.2_spec</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        -->
-
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-servlet_3.0_spec</artifactId>
@@ -52,50 +44,58 @@
         </dependency>
     </dependencies>
 
-    <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.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>JEE5/JAXBServlet/1.1/car</moduleId>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
+    <profiles>
+        <profile>
+            <id>it</id>
+            <build>
+                <pluginManagement>
+                    <plugins>
+                        <plugin>
+                            <groupId>org.apache.maven.plugins</groupId>
+                            <artifactId>maven-failsafe-plugin</artifactId>
+                            <configuration>
+                                <systemProperties>
+                                    <property>
+                                        <name>webAppName</name>
+                                        <value>${artifactId}-${version}</value>
+                                    </property>
+                                </systemProperties>
+                            </configuration>
+                        </plugin>
+                    </plugins>
+                </pluginManagement>
+
+                <plugins>
+                    <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>JEE5/JAXBServlet/1.1/war</moduleId>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
 
 </project>
 

Modified: geronimo/server/trunk/testsuite/webservices-testsuite/jaxb-tests/jaxb-war/src/main/webapp/WEB-INF/geronimo-web.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/webservices-testsuite/jaxb-tests/jaxb-war/src/main/webapp/WEB-INF/geronimo-web.xml?rev=936153&r1=936152&r2=936153&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/webservices-testsuite/jaxb-tests/jaxb-war/src/main/webapp/WEB-INF/geronimo-web.xml (original)
+++ geronimo/server/trunk/testsuite/webservices-testsuite/jaxb-tests/jaxb-war/src/main/webapp/WEB-INF/geronimo-web.xml Wed Apr 21 04:11:42 2010
@@ -21,7 +21,7 @@
       <dep:groupId>JEE5</dep:groupId>
       <dep:artifactId>JAXBServlet</dep:artifactId>
       <dep:version>1.1</dep:version>
-      <dep:type>car</dep:type>
+      <dep:type>war</dep:type>
     </dep:moduleId>
   </dep:environment>
 </web-app>

Modified: geronimo/server/trunk/testsuite/webservices-testsuite/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/webservices-testsuite/pom.xml?rev=936153&r1=936152&r2=936153&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/webservices-testsuite/pom.xml (original)
+++ geronimo/server/trunk/testsuite/webservices-testsuite/pom.xml Wed Apr 21 04:11:42 2010
@@ -37,25 +37,22 @@
     <description>
         Tests JEE5 WebServices features.
     </description>
-    <profiles>
-        <profile>
-            <id>all-subprojects</id>
-            <!-- use for things like versions:set and perhaps release when build has to run on all projects -->
-            <modules>
-                <module>jaxb-tests</module>
-                <module>jaxr-tests</module>
-                <module>jaxrpc-jaxws-tests</module>
-                <module>jaxrpc-tests</module>
-                <module>jaxws-catalog-tests</module>
-                <module>jaxws-catalog-tests</module>
-                <module>jaxws-mtom-tests</module>
-                <module>jaxws-provider-tests</module>
-                <module>jaxws-tests</module>
-                <module>jaxws-wsa-tests</module>
-                <module>saaj-tests</module>
-                <module>stax-tests</module>
-            </modules>
-        </profile>
-    </profiles>
+
+    <modules>
+        <module>jaxb-tests</module>
+<!--
+        <module>jaxr-tests</module>
+        <module>jaxrpc-jaxws-tests</module>
+        <module>jaxrpc-tests</module>
+        <module>jaxws-catalog-tests</module>
+        <module>jaxws-catalog-tests</module>
+        <module>jaxws-mtom-tests</module>
+        <module>jaxws-provider-tests</module>
+        <module>jaxws-tests</module>
+        <module>jaxws-wsa-tests</module>
+        <module>saaj-tests</module>
+-->
+        <module>stax-tests</module>
+    </modules>
 
 </project>

Modified: geronimo/server/trunk/testsuite/webservices-testsuite/stax-tests/stax-client/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/webservices-testsuite/stax-tests/stax-client/pom.xml?rev=936153&r1=936152&r2=936153&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/webservices-testsuite/stax-tests/stax-client/pom.xml (original)
+++ geronimo/server/trunk/testsuite/webservices-testsuite/stax-tests/stax-client/pom.xml Wed Apr 21 04:11:42 2010
@@ -63,6 +63,7 @@
             </plugin>
         </plugins>
     </build>
+
     <profiles>
         <profile>
             <id>it</id>
@@ -71,7 +72,7 @@
 
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
+                        <artifactId>maven-failsafe-plugin</artifactId>
                         <configuration>
                             <systemProperties>
                                 <property>
@@ -104,7 +105,7 @@
                                     <goal>run-client</goal>
                                 </goals>
                                 <configuration>
-                                    <moduleId>JEE5/StaxClient/1.1/car</moduleId>
+                                    <moduleId>JEE5/StaxClient/1.1/jar</moduleId>
                                     <logOutput>true</logOutput>
                                     <logFile>${clientLogFile}</logFile>
                                 </configuration>
@@ -117,7 +118,7 @@
                                     <goal>undeploy-module</goal>
                                 </goals>
                                 <configuration>
-                                    <moduleId>JEE5/StaxClientServer/1.1/car</moduleId>
+                                    <moduleId>JEE5/StaxClientServer/1.1/jar</moduleId>
                                 </configuration>
                             </execution>
                         </executions>

Modified: geronimo/server/trunk/testsuite/webservices-testsuite/stax-tests/stax-client/src/main/resources/META-INF/geronimo-application-client.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/webservices-testsuite/stax-tests/stax-client/src/main/resources/META-INF/geronimo-application-client.xml?rev=936153&r1=936152&r2=936153&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/webservices-testsuite/stax-tests/stax-client/src/main/resources/META-INF/geronimo-application-client.xml (original)
+++ geronimo/server/trunk/testsuite/webservices-testsuite/stax-tests/stax-client/src/main/resources/META-INF/geronimo-application-client.xml Wed Apr 21 04:11:42 2010
@@ -24,7 +24,7 @@
       <dep:groupId>JEE5</dep:groupId>
       <dep:artifactId>StaxClient</dep:artifactId>
       <dep:version>1.1</dep:version>
-      <dep:type>car</dep:type>
+      <dep:type>jar</dep:type>
     </dep:moduleId>
    </dep:client-environment>
 
@@ -33,7 +33,7 @@
       <dep:groupId>JEE5</dep:groupId>
       <dep:artifactId>StaxClientServer</dep:artifactId>
       <dep:version>1.1</dep:version>
-      <dep:type>car</dep:type>
+      <dep:type>jar</dep:type>
     </dep:moduleId>
    </dep:server-environment>
 

Modified: geronimo/server/trunk/testsuite/webservices-testsuite/stax-tests/stax-ejb/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/webservices-testsuite/stax-tests/stax-ejb/pom.xml?rev=936153&r1=936152&r2=936153&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/webservices-testsuite/stax-tests/stax-ejb/pom.xml (original)
+++ geronimo/server/trunk/testsuite/webservices-testsuite/stax-tests/stax-ejb/pom.xml Wed Apr 21 04:11:42 2010
@@ -60,44 +60,48 @@
             <version>${version}</version>
         </dependency>
 
-	    <dependency>
-	        <groupId>org.apache.geronimo.specs</groupId>
-	        <artifactId>geronimo-stax-api_1.2_spec</artifactId>
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-stax-api_1.2_spec</artifactId>
             <scope>provided</scope>
         </dependency>
     </dependencies>
 
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.geronimo.buildsupport</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>
+    <profiles>
+        <profile>
+            <id>it</id>
+            <build>
+                <plugins>
+                    <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}.jar</moduleArchive>
+                                </configuration>
+                            </execution>
+                            <execution>
+                                <id>undeploy-war-as-moduleId</id>
+                                <phase>post-integration-test</phase>
+                                <goals>
+                                    <goal>undeploy-module</goal>
+                                </goals>
+                                <configuration>
+                                    <moduleId>JEE5/StaxEJB/1.1/jar</moduleId>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
 
 </project>
 

Modified: geronimo/server/trunk/testsuite/webservices-testsuite/stax-tests/stax-ejb/src/main/resources/META-INF/openejb-jar.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/webservices-testsuite/stax-tests/stax-ejb/src/main/resources/META-INF/openejb-jar.xml?rev=936153&r1=936152&r2=936153&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/webservices-testsuite/stax-tests/stax-ejb/src/main/resources/META-INF/openejb-jar.xml (original)
+++ geronimo/server/trunk/testsuite/webservices-testsuite/stax-tests/stax-ejb/src/main/resources/META-INF/openejb-jar.xml Wed Apr 21 04:11:42 2010
@@ -27,7 +27,7 @@
             <groupId>JEE5</groupId>
             <artifactId>StaxEJB</artifactId>
             <version>1.1</version>
-            <type>car</type>
+            <type>jar</type>
         </moduleId>
    </environment>
 

Modified: geronimo/server/trunk/testsuite/webservices-testsuite/stax-tests/stax-war/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/webservices-testsuite/stax-tests/stax-war/pom.xml?rev=936153&r1=936152&r2=936153&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/webservices-testsuite/stax-tests/stax-war/pom.xml (original)
+++ geronimo/server/trunk/testsuite/webservices-testsuite/stax-tests/stax-war/pom.xml Wed Apr 21 04:11:42 2010
@@ -37,9 +37,9 @@
     <description>This project executes testcases for your testsuite</description>
 
     <dependencies>
-	    <dependency>
-	        <groupId>org.apache.geronimo.specs</groupId>
-	        <artifactId>geronimo-stax-api_1.2_spec</artifactId>
+	<dependency>
+	    <groupId>org.apache.geronimo.specs</groupId>
+	    <artifactId>geronimo-stax-api_1.2_spec</artifactId>
             <scope>provided</scope>
         </dependency>
 
@@ -50,50 +50,58 @@
         </dependency>
     </dependencies>
 
-    <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.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>JEE5/StaxServlet/1.1/car</moduleId>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
+    <profiles>
+        <profile>
+            <id>it</id>
+            <build>
+                <pluginManagement>
+                    <plugins>
+                        <plugin>
+                            <groupId>org.apache.maven.plugins</groupId>
+                            <artifactId>maven-failsafe-plugin</artifactId>
+                            <configuration>
+                                <systemProperties>
+                                    <property>
+                                        <name>webAppName</name>
+                                        <value>${artifactId}-${version}</value>
+                                    </property>
+                                </systemProperties>
+                            </configuration>
+                        </plugin>
+                    </plugins>
+                </pluginManagement>
+
+                <plugins>
+                    <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>JEE5/StaxServlet/1.1/war</moduleId>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
 
 </project>
 

Modified: geronimo/server/trunk/testsuite/webservices-testsuite/stax-tests/stax-war/src/main/webapp/WEB-INF/geronimo-web.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/webservices-testsuite/stax-tests/stax-war/src/main/webapp/WEB-INF/geronimo-web.xml?rev=936153&r1=936152&r2=936153&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/webservices-testsuite/stax-tests/stax-war/src/main/webapp/WEB-INF/geronimo-web.xml (original)
+++ geronimo/server/trunk/testsuite/webservices-testsuite/stax-tests/stax-war/src/main/webapp/WEB-INF/geronimo-web.xml Wed Apr 21 04:11:42 2010
@@ -21,7 +21,7 @@
       <dep:groupId>JEE5</dep:groupId>
       <dep:artifactId>StaxServlet</dep:artifactId>
       <dep:version>1.1</dep:version>
-      <dep:type>car</dep:type>
+      <dep:type>war</dep:type>
     </dep:moduleId>
   </dep:environment>
 </web-app>

Modified: geronimo/server/trunk/testsupport/testsupport-commands/src/main/java/org/apache/geronimo/testsupport/commands/CommandTestSupport.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsupport/testsupport-commands/src/main/java/org/apache/geronimo/testsupport/commands/CommandTestSupport.java?rev=936153&r1=936152&r2=936153&view=diff
==============================================================================
--- geronimo/server/trunk/testsupport/testsupport-commands/src/main/java/org/apache/geronimo/testsupport/commands/CommandTestSupport.java (original)
+++ geronimo/server/trunk/testsupport/testsupport-commands/src/main/java/org/apache/geronimo/testsupport/commands/CommandTestSupport.java Wed Apr 21 04:11:42 2010
@@ -117,11 +117,7 @@ public class CommandTestSupport {
         if (isWindows()) {
             return geronimoHome + "/bin/" + command + ".bat";            
         } else {
-            if (GSH.equals(command)) {
-                return geronimoHome + "/bin/" + command;
-            } else {
-                return geronimoHome + "/bin/" + command + ".sh";
-            }
+            return geronimoHome + "/bin/" + command;
         }     
     }
         



Mime
View raw message