tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ol...@apache.org
Subject svn commit: r1230033 - in /tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources: META-INF/maven/archetype-metadata.xml archetype-resources/test-webapp-it/pom.xml
Date Wed, 11 Jan 2012 13:41:43 GMT
Author: olamy
Date: Wed Jan 11 13:41:43 2012
New Revision: 1230033

URL: http://svn.apache.org/viewvc?rev=1230033&view=rev
Log:
fix selenium test execution in the webapp-it module

Modified:
    tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
    tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/test-webapp-it/pom.xml

Modified: tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
URL: http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml?rev=1230033&r1=1230032&r2=1230033&view=diff
==============================================================================
--- tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
(original)
+++ tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
Wed Jan 11 13:41:43 2012
@@ -114,7 +114,7 @@
     <module id="test-webapp-it" dir="test-webapp-it" name="test-webapp-it">
       <fileSets>
         <fileSet filtered="true" packaged="true" encoding="UTF-8">
-          <directory>src/test/</directory>
+          <directory>src/test/java</directory>
           <includes>
             <include>**/*.java</include>
           </includes>

Modified: tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/test-webapp-it/pom.xml
URL: http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/test-webapp-it/pom.xml?rev=1230033&r1=1230032&r2=1230033&view=diff
==============================================================================
--- tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/test-webapp-it/pom.xml
(original)
+++ tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/test-webapp-it/pom.xml
Wed Jan 11 13:41:43 2012
@@ -39,6 +39,7 @@
   </properties>
 
   <build>
+    <testSourceDirectory>src/test/java</testSourceDirectory>
     <pluginManagement>
       <plugins>
         <plugin>
@@ -70,6 +71,18 @@
     <plugins>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <executions>
+          <execution>
+            <phase>test-compile</phase>
+            <goals>
+              <goal>testCompile</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-dependency-plugin</artifactId>
         <version>2.4</version>
         <executions>
@@ -100,7 +113,7 @@
         <version>2.11</version>
         <executions>
           <execution>
-            <id>integration-tests</id>
+            <id>selenium-integration-tests</id>
             <phase>integration-test</phase>
             <goals>
               <goal>test</goal>
@@ -111,9 +124,6 @@
                 <serverUrl>${serverUrl}</serverUrl>
                 <seleniumBrowser>${seleniumBrowser}</seleniumBrowser>
               </systemPropertyVariables>
-              <includes>
-                <include>**/**</include>
-              </includes>
             </configuration>
           </execution>
         </executions>



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org


Mime
View raw message