geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ga...@apache.org
Subject svn commit: r1030825 - in /geronimo/server/trunk/testsuite/javaee6-testsuite: di1.0-test/pom.xml di1.0-test/src/main/resources/ webbean1.0-test/conversation-test/pom.xml webbean1.0-test/webbean-ejb-test/pom.xml webbean1.0-test/webbean-servlet-test/pom.xml
Date Thu, 04 Nov 2010 03:48:31 GMT
Author: gawor
Date: Thu Nov  4 03:48:30 2010
New Revision: 1030825

URL: http://svn.apache.org/viewvc?rev=1030825&view=rev
Log:
clean up tests a bit more

Removed:
    geronimo/server/trunk/testsuite/javaee6-testsuite/di1.0-test/src/main/resources/
Modified:
    geronimo/server/trunk/testsuite/javaee6-testsuite/di1.0-test/pom.xml
    geronimo/server/trunk/testsuite/javaee6-testsuite/webbean1.0-test/conversation-test/pom.xml
    geronimo/server/trunk/testsuite/javaee6-testsuite/webbean1.0-test/webbean-ejb-test/pom.xml
    geronimo/server/trunk/testsuite/javaee6-testsuite/webbean1.0-test/webbean-servlet-test/pom.xml

Modified: geronimo/server/trunk/testsuite/javaee6-testsuite/di1.0-test/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/javaee6-testsuite/di1.0-test/pom.xml?rev=1030825&r1=1030824&r2=1030825&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/javaee6-testsuite/di1.0-test/pom.xml (original)
+++ geronimo/server/trunk/testsuite/javaee6-testsuite/di1.0-test/pom.xml Thu Nov  4 03:48:30
2010
@@ -31,12 +31,23 @@
     <name>Geronimo TestSuite :: Java EE 6 Testsuite :: Dependency Injection for Java
1.0-test</name>
     <packaging>war</packaging>
 
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.apache.geronimo.plugins</groupId>
+                <artifactId>myfaces</artifactId>
+                <version>${geronimoVersion}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
     <dependencies>
         <!-- MyFaces API -->
         <dependency>
             <groupId>org.apache.myfaces.core</groupId>
             <artifactId>myfaces-api</artifactId>
-            <version>2.0.0</version>
             <scope>provided</scope>
         </dependency>
         <!-- JSR-299 API -->

Modified: geronimo/server/trunk/testsuite/javaee6-testsuite/webbean1.0-test/conversation-test/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/javaee6-testsuite/webbean1.0-test/conversation-test/pom.xml?rev=1030825&r1=1030824&r2=1030825&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/javaee6-testsuite/webbean1.0-test/conversation-test/pom.xml
(original)
+++ geronimo/server/trunk/testsuite/javaee6-testsuite/webbean1.0-test/conversation-test/pom.xml
Thu Nov  4 03:48:30 2010
@@ -17,9 +17,7 @@
     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>
@@ -33,8 +31,9 @@
     <artifactId>conversation-test</artifactId>
     <name>Geronimo TestSuite :: Java EE 6 Testsuite :: Web Bean :: conversation-test</name>
     <packaging>war</packaging>
+
     <dependencyManagement>
-        <dependencies>            
+        <dependencies>
             <dependency>
                 <groupId>org.apache.geronimo.plugins</groupId>
                 <artifactId>myfaces</artifactId>
@@ -45,43 +44,28 @@
         </dependencies>
     </dependencyManagement>
 
-
-	<dependencies>
+    <dependencies>
         <!-- JSR-314 API - JSF 2.0 -->
         <dependency>
             <groupId>org.apache.myfaces.core</groupId>
             <artifactId>myfaces-api</artifactId>
             <scope>provided</scope>
-        </dependency>        
-
+        </dependency>
         <!-- JSR-299 API - Web Beans 1.0-->
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-jcdi_1.0_spec</artifactId>
-			<scope>provided</scope>
+            <scope>provided</scope>
         </dependency>
-
         <!-- JSR-330 API - Dependency Injection for Java 1.0-->
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-atinject_1.0_spec</artifactId>
-			<scope>provided</scope>
+            <scope>provided</scope>
         </dependency>
+    </dependencies>
 
-      </dependencies>
-	  <build>
-		<plugins>
-			<plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-war-plugin</artifactId>
-                    <configuration>
-                        <archiveClasses>false</archiveClasses>
-                    </configuration>
-                </plugin>
-			</plugins>
-	  </build>
-     
-       <profiles>
+    <profiles>
         <profile>
             <id>it</id>
             <activation>
@@ -121,21 +105,20 @@
                             </execution>
                         </executions>
                     </plugin>
-					<plugin>
+                    <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-failsafe-plugin</artifactId>      
                     
-                        <configuration>                                
+                        <artifactId>maven-failsafe-plugin</artifactId>
+                        <configuration>
                             <suiteXmlFiles>
                                 <suiteXmlFile>${project.build.testOutputDirectory}/testng.xml</suiteXmlFile>
                             </suiteXmlFiles>
-							<testFailureIgnore>true</testFailureIgnore>
                             <systemPropertyVariables>
                                 <appContext>${project.artifactId}</appContext>
                             </systemPropertyVariables>
-                        </configuration>                            
+                        </configuration>
                     </plugin>
                 </plugins>
             </build>
-	    </profile>
-       </profiles>
+        </profile>
+    </profiles>
 </project>

Modified: geronimo/server/trunk/testsuite/javaee6-testsuite/webbean1.0-test/webbean-ejb-test/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/javaee6-testsuite/webbean1.0-test/webbean-ejb-test/pom.xml?rev=1030825&r1=1030824&r2=1030825&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/javaee6-testsuite/webbean1.0-test/webbean-ejb-test/pom.xml
(original)
+++ geronimo/server/trunk/testsuite/javaee6-testsuite/webbean1.0-test/webbean-ejb-test/pom.xml
Thu Nov  4 03:48:30 2010
@@ -17,9 +17,7 @@
     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>
@@ -30,12 +28,12 @@
         <version>3.0-SNAPSHOT</version>
     </parent>
 
-
     <artifactId>webbean-ejb-test</artifactId>
     <name>Geronimo TestSuite :: Java EE 6 Testsuite :: Web Bean :: webbean-ejb-test</name>
     <packaging>war</packaging>
+
     <dependencyManagement>
-        <dependencies>            
+        <dependencies>
             <dependency>
                 <groupId>org.apache.geronimo.plugins</groupId>
                 <artifactId>myfaces</artifactId>
@@ -46,57 +44,40 @@
         </dependencies>
     </dependencyManagement>
 
-
-	<dependencies>
+    <dependencies>
         <!-- JSR-314 API - JSF 2.0 -->
         <dependency>
             <groupId>org.apache.myfaces.core</groupId>
             <artifactId>myfaces-api</artifactId>
             <scope>provided</scope>
-        </dependency>        
-
+        </dependency>
         <!-- JSR-299 API - Web Beans 1.0-->
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-jcdi_1.0_spec</artifactId>
-			<scope>provided</scope>
+            <scope>provided</scope>
         </dependency>
-
         <!-- JSR-330 API - Dependency Injection for Java 1.0-->
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-atinject_1.0_spec</artifactId>
-			<scope>provided</scope>
+            <scope>provided</scope>
         </dependency>
-		
-		 <!-- EJB API -->
+        <!-- EJB API -->
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-ejb_3.1_spec</artifactId>
             <scope>provided</scope>
         </dependency>
-
         <!-- JPA API -->
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-jpa_2.0_spec</artifactId>
             <scope>provided</scope>
         </dependency>
+    </dependencies>
 
-      </dependencies>
-	  <build>
-		<plugins>
-			<plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-war-plugin</artifactId>
-                    <configuration>
-                        <archiveClasses>false</archiveClasses>
-                    </configuration>
-                </plugin>
-			</plugins>
-	  </build>
-     
-       <profiles>
+    <profiles>
         <profile>
             <id>it</id>
             <activation>
@@ -136,21 +117,20 @@
                             </execution>
                         </executions>
                     </plugin>
-					<plugin>
+                    <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-failsafe-plugin</artifactId>      
                     
-                        <configuration>                                
+                        <artifactId>maven-failsafe-plugin</artifactId>
+                        <configuration>
                             <suiteXmlFiles>
                                 <suiteXmlFile>${project.build.testOutputDirectory}/testng.xml</suiteXmlFile>
                             </suiteXmlFiles>
-							<testFailureIgnore>true</testFailureIgnore>
                             <systemPropertyVariables>
                                 <appContext>${project.artifactId}</appContext>
                             </systemPropertyVariables>
-                        </configuration>                            
+                        </configuration>
                     </plugin>
                 </plugins>
             </build>
-	    </profile>
-       </profiles>
+        </profile>
+    </profiles>
 </project>

Modified: geronimo/server/trunk/testsuite/javaee6-testsuite/webbean1.0-test/webbean-servlet-test/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/javaee6-testsuite/webbean1.0-test/webbean-servlet-test/pom.xml?rev=1030825&r1=1030824&r2=1030825&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/javaee6-testsuite/webbean1.0-test/webbean-servlet-test/pom.xml
(original)
+++ geronimo/server/trunk/testsuite/javaee6-testsuite/webbean1.0-test/webbean-servlet-test/pom.xml
Thu Nov  4 03:48:30 2010
@@ -17,59 +17,41 @@
     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>webbean1.0-test</artifactId>
         <version>3.0-SNAPSHOT</version>
     </parent>
 
-
     <artifactId>webbean-servlet-test</artifactId>
     <name>Geronimo TestSuite :: Java EE 6 Testsuite :: Web Bean :: webbean-servlet-test</name>
     <packaging>war</packaging>
-	<dependencies>       
 
+    <dependencies>
         <!-- JSR-299 API - Web Beans 1.0-->
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-jcdi_1.0_spec</artifactId>
-			<scope>provided</scope>
+            <scope>provided</scope>
         </dependency>
-
         <!-- JSR-330 API - Dependency Injection for Java 1.0-->
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-atinject_1.0_spec</artifactId>
-			<scope>provided</scope>
+            <scope>provided</scope>
         </dependency>
-		
-		<dependency>
+        <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-servlet_3.0_spec</artifactId>
             <scope>provided</scope>
         </dependency>
-      </dependencies>
+    </dependencies>
 
-	  <build>
-		<plugins>
-			<plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-war-plugin</artifactId>
-                    <configuration>
-                        <archiveClasses>false</archiveClasses>
-                    </configuration>
-                </plugin>
-			</plugins>
-	  </build>
-     
-       <profiles>
+    <profiles>
         <profile>
             <id>it</id>
             <activation>
@@ -109,21 +91,20 @@
                             </execution>
                         </executions>
                     </plugin>
-					<plugin>
+                    <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-failsafe-plugin</artifactId>      
                     
-                        <configuration>                                
+                        <artifactId>maven-failsafe-plugin</artifactId>
+                        <configuration>
                             <suiteXmlFiles>
                                 <suiteXmlFile>${project.build.testOutputDirectory}/testng.xml</suiteXmlFile>
                             </suiteXmlFiles>
-							<testFailureIgnore>true</testFailureIgnore>
                             <systemPropertyVariables>
                                 <appContext>${project.artifactId}</appContext>
                             </systemPropertyVariables>
-                        </configuration>                            
+                        </configuration>
                     </plugin>
                 </plugins>
             </build>
-	    </profile>
-       </profiles>
+        </profile>
+    </profiles>
 </project>



Mime
View raw message