tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ol...@apache.org
Subject svn commit: r1230031 - in /tomcat/maven-plugin/trunk: ./ tomcat-maven-archetype/src/main/resources/META-INF/maven/ tomcat-maven-archetype/src/main/resources/archetype-resources/ tomcat-maven-archetype/src/main/resources/archetype-resources/test-api-imp...
Date Wed, 11 Jan 2012 13:41:17 GMT
Author: olamy
Date: Wed Jan 11 13:41:16 2012
New Revision: 1230031

URL: http://svn.apache.org/viewvc?rev=1230031&view=rev
Log:
[MTOMCAT-114] add a module to run selenium tests on the produce war.

Added:
    tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/test-webapp-it/
    tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/test-webapp-it/pom.xml
      - copied, changed from r1230030, tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/test-webapp/pom.xml
    tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/test-webapp-it/src/
    tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/test-webapp-it/src/test/
    tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/test-webapp-it/src/test/context.xml
  (contents, props changed)
      - copied, changed from r1230030, tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/test-webapp/src/main/webapp/META-INF/context.xml
    tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/test-webapp-it/src/test/java/
    tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/test-webapp-it/src/test/java/webapp/
    tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/test-webapp-it/src/test/java/webapp/test/
    tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/test-webapp-it/src/test/java/webapp/test/SimpleTest.java
  (contents, props changed)
      - copied, changed from r1230030, tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/test-webapp/src/test/java/webapp/test/SimpleTest.java
    tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/test-webapp/src/main/webapp/WEB-INF/applicationContext.xml
      - copied, changed from r1230030, tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/test-webapp/src/main/resources/log4j.xml
Removed:
    tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/test-webapp/src/main/webapp/META-INF/context.xml
    tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/test-webapp/src/test/java/webapp/test/SimpleTest.java
Modified:
    tomcat/maven-plugin/trunk/pom.xml
    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/pom.xml
    tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/test-api-impl/pom.xml
    tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/test-api/pom.xml
    tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/test-webapp/pom.xml
    tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/test-webapp/src/main/resources/log4j.xml
    tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/test/resources/projects/basic/archetype.properties

Modified: tomcat/maven-plugin/trunk/pom.xml
URL: http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/pom.xml?rev=1230031&r1=1230030&r2=1230031&view=diff
==============================================================================
--- tomcat/maven-plugin/trunk/pom.xml (original)
+++ tomcat/maven-plugin/trunk/pom.xml Wed Jan 11 13:41:16 2012
@@ -547,6 +547,11 @@
         </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-resources-plugin</artifactId>
+          <version>2.5</version>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-site-plugin</artifactId>
           <version>3.0</version>
           <dependencies>

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=1230031&r1=1230030&r2=1230031&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:16 2012
@@ -42,6 +42,9 @@
     <requiredProperty key="artifactId-webapp">
       <defaultValue>basic-webapp</defaultValue>
     </requiredProperty>
+    <requiredProperty key="artifactId-webapp-it">
+      <defaultValue>basic-webapp-it</defaultValue>
+    </requiredProperty>
   </requiredProperties>
   <fileSets>
     <fileSet encoding="UTF-8">
@@ -108,5 +111,21 @@
         </fileSet>
       </fileSets>
     </module>
+    <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>
+          <includes>
+            <include>**/*.java</include>
+          </includes>
+        </fileSet>
+        <fileSet filtered="false" packaged="false" encoding="UTF-8">
+          <directory>src/test/</directory>
+          <includes>
+            <include>**/*.xml</include>
+          </includes>
+        </fileSet>
+      </fileSets>
+    </module>
   </modules>
 </archetype-descriptor>

Modified: tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/pom.xml?rev=1230031&r1=1230030&r2=1230031&view=diff
==============================================================================
--- tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/pom.xml
(original)
+++ tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/pom.xml
Wed Jan 11 13:41:16 2012
@@ -21,9 +21,9 @@
 <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/xsd/maven-4.0.0.xsd">
 
   <modelVersion>4.0.0</modelVersion>
-  <groupId>${groupId}</groupId>
+  <groupId>\${groupId}</groupId>
   <artifactId>${rootArtifactId}</artifactId>
-  <version>${version}</version>
+  <version>\${version}</version>
   <packaging>pom</packaging>
 
   <properties>
@@ -60,14 +60,20 @@
   <dependencyManagement>
     <dependencies>
       <dependency>
-        <groupId>${groupId}</groupId>
+        <groupId>\${groupId}</groupId>
         <artifactId>${artifactId-api}</artifactId>
-        <version>${project.version}</version>
+        <version>\${project.version}</version>
       </dependency>
       <dependency>
-        <groupId>${groupId}</groupId>
+        <groupId>\${groupId}</groupId>
         <artifactId>${artifactId-api-impl}</artifactId>
-        <version>${project.version}</version>
+        <version>\${project.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>\${groupId}</groupId>
+        <artifactId>${artifactId-webapp}</artifactId>
+        <version>\${project.version}</version>
+        <type>war</type>
       </dependency>
       <dependency>
         <groupId>org.springframework</groupId>

Modified: tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/test-api-impl/pom.xml
URL: http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/test-api-impl/pom.xml?rev=1230031&r1=1230030&r2=1230031&view=diff
==============================================================================
--- tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/test-api-impl/pom.xml
(original)
+++ tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/test-api-impl/pom.xml
Wed Jan 11 13:41:16 2012
@@ -21,9 +21,9 @@
 <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/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>${groupId}</groupId>
+    <groupId>\${groupId}</groupId>
     <artifactId>${rootArtifactId}</artifactId>
-    <version>${version}</version>
+    <version>\${version}</version>
   </parent>
 
   <artifactId>${artifactId-api-impl}</artifactId>
@@ -32,7 +32,7 @@
 
   <dependencies>
     <dependency>
-       <groupId>${groupId}</groupId>
+       <groupId>\${groupId}</groupId>
        <artifactId>${artifactId-api}</artifactId>
      </dependency>
     <dependency>

Modified: tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/test-api/pom.xml
URL: http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/test-api/pom.xml?rev=1230031&r1=1230030&r2=1230031&view=diff
==============================================================================
--- tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/test-api/pom.xml
(original)
+++ tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/test-api/pom.xml
Wed Jan 11 13:41:16 2012
@@ -21,9 +21,9 @@
 <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/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>${groupId}</groupId>
+    <groupId>\${groupId}</groupId>
     <artifactId>${rootArtifactId}</artifactId>
-    <version>${version}</version>
+    <version>\${version}</version>
   </parent>
 
   <artifactId>${artifactId-api}</artifactId>

Copied: tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/test-webapp-it/pom.xml
(from r1230030, tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/test-webapp/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?p2=tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/test-webapp-it/pom.xml&p1=tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/test-webapp/pom.xml&r1=1230030&r2=1230031&rev=1230031&view=diff
==============================================================================
--- tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/test-webapp/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:16 2012
@@ -21,13 +21,13 @@
 <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/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>${groupId}</groupId>
+    <groupId>\${groupId}</groupId>
     <artifactId>${rootArtifactId}</artifactId>
-    <version>${version}</version>
+    <version>\${version}</version>
   </parent>
 
-  <artifactId>${artifactId-webapp}</artifactId>
-  <packaging>war</packaging>
+  <artifactId>${artifactId-webapp-it}</artifactId>
+  <packaging>pom</packaging>
 
   <properties>
     <seleniumPluginVersion>2.2-SNAPSHOT</seleniumPluginVersion>
@@ -42,22 +42,6 @@
     <pluginManagement>
       <plugins>
         <plugin>
-          <groupId>org.apache.tomcat.maven</groupId>
-          <artifactId>tomcat6-maven-plugin</artifactId>
-          <configuration>
-            <port>9090</port>
-            <path>/</path>
-          </configuration>
-        </plugin>
-        <plugin>
-          <groupId>org.apache.tomcat.maven</groupId>
-          <artifactId>tomcat7-maven-plugin</artifactId>
-          <configuration>
-            <port>9090</port>
-            <path>/</path>
-          </configuration>
-        </plugin>
-        <plugin>
           <groupId>org.codehaus.mojo</groupId>
           <artifactId>selenium-maven-plugin</artifactId>
           <version>${seleniumPluginVersion}</version>
@@ -86,13 +70,34 @@
     <plugins>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-dependency-plugin</artifactId>
+        <version>2.4</version>
+        <executions>
+          <execution>
+            <id>unzip-webapp</id>
+            <phase>compile</phase>
+            <goals>
+              <goal>unpack</goal>
+            </goals>
+            <configuration>
+              <artifactItems>
+                <artifactItem>
+                  <groupId>\${project.groupId}</groupId>
+                  <artifactId>${artifactId-webapp}</artifactId>
+                  <version>\${project.version}</version>
+                  <type>war</type>
+                </artifactItem>
+              </artifactItems>
+              <outputDirectory>\${project.build.directory}/webapp</outputDirectory>
+              <overWriteSnapshots>true</overWriteSnapshots>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-plugin</artifactId>
         <version>2.11</version>
-        <configuration>
-          <includes>
-            <include>Foo</include>
-          </includes>
-        </configuration>
         <executions>
           <execution>
             <id>integration-tests</id>
@@ -127,8 +132,10 @@
               <path>/</path>
               <port>${tomcat.port}</port>
               <uriEncoding>UTF-8</uriEncoding>
-              <warDirectory>target/${artifactId-webapp}-${project.version}</warDirectory>
+              <warDirectory>\${project.build.directory}/webapp/</warDirectory>
               <fork>true</fork>
+              <ignorePackaging>true</ignorePackaging>
+              <contextFile>src/test/context.xml</contextFile>
             </configuration>
           </execution>
           <execution>
@@ -162,60 +169,9 @@
 
   <dependencies>
     <dependency>
-       <groupId>${groupId}</groupId>
-       <artifactId>${artifactId-api}</artifactId>
-       <version>${project.version}</version>
-     </dependency>
-    <dependency>
-       <groupId>${groupId}</groupId>
-       <artifactId>${artifactId-api}</artifactId>
-       <version>${project.version}</version>
-     </dependency>
-    <dependency>
-      <groupId>javax.ws.rs</groupId>
-      <artifactId>jsr311-api</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.cxf</groupId>
-      <artifactId>cxf-bundle-jaxrs</artifactId>
-      <exclusions>
-        <exclusion>
-          <groupId>org.eclipse.jetty</groupId>
-          <artifactId>jetty-server</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>org.eclipse.jetty</groupId>
-          <artifactId>jetty-continuation</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>org.eclipse.jetty</groupId>
-          <artifactId>jetty-http</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>org.eclipse.jetty</groupId>
-          <artifactId>jetty-io</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>org.eclipse.jetty</groupId>
-          <artifactId>jetty-util</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>org.eclipse.jetty</groupId>
-          <artifactId>jetty-security</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>org.apache.geronimo.specs</groupId>
-          <artifactId>geronimo-servlet_3.0_spec</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>org.apache.geronimo.specs</groupId>
-          <artifactId>geronimo-javamail_1.4_spec</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>org.apache.geronimo.specs</groupId>
-          <artifactId>geronimo-servlet_2.5_spec</artifactId>
-        </exclusion>
-      </exclusions>
+      <groupId>\${groupId}</groupId>
+      <artifactId>\${artifactId-webapp}</artifactId>
+      <type>war</type>
     </dependency>
     <dependency>
       <groupId>log4j</groupId>

Copied: tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/test-webapp-it/src/test/context.xml
(from r1230030, tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/test-webapp/src/main/webapp/META-INF/context.xml)
URL: http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/test-webapp-it/src/test/context.xml?p2=tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/test-webapp-it/src/test/context.xml&p1=tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/test-webapp/src/main/webapp/META-INF/context.xml&r1=1230030&r2=1230031&rev=1230031&view=diff
==============================================================================
--- tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/test-webapp/src/main/webapp/META-INF/context.xml
(original)
+++ tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/test-webapp-it/src/test/context.xml
Wed Jan 11 13:41:16 2012
@@ -1,6 +1,3 @@
-#set( $symbol_pound = '#' )
-#set( $symbol_dollar = '$' )
-#set( $symbol_escape = '\' )
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
   Licensed to the Apache Software Foundation (ASF) under one

Propchange: tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/test-webapp-it/src/test/context.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/test-webapp-it/src/test/context.xml
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Copied: tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/test-webapp-it/src/test/java/webapp/test/SimpleTest.java
(from r1230030, tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/test-webapp/src/test/java/webapp/test/SimpleTest.java)
URL: http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/test-webapp-it/src/test/java/webapp/test/SimpleTest.java?p2=tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/test-webapp-it/src/test/java/webapp/test/SimpleTest.java&p1=tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/test-webapp/src/test/java/webapp/test/SimpleTest.java&r1=1230030&r2=1230031&rev=1230031&view=diff
==============================================================================
    (empty)

Propchange: tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/test-webapp-it/src/test/java/webapp/test/SimpleTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/test-webapp-it/src/test/java/webapp/test/SimpleTest.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Modified: tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/test-webapp/pom.xml
URL: http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/test-webapp/pom.xml?rev=1230031&r1=1230030&r2=1230031&view=diff
==============================================================================
--- tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/test-webapp/pom.xml
(original)
+++ tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/test-webapp/pom.xml
Wed Jan 11 13:41:16 2012
@@ -21,23 +21,14 @@
 <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/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>${groupId}</groupId>
+    <groupId>\${groupId}</groupId>
     <artifactId>${rootArtifactId}</artifactId>
-    <version>${version}</version>
+    <version>\${version}</version>
   </parent>
 
   <artifactId>${artifactId-webapp}</artifactId>
   <packaging>war</packaging>
 
-  <properties>
-    <seleniumPluginVersion>2.2-SNAPSHOT</seleniumPluginVersion>
-    <selenium-server.version>2.16.0</selenium-server.version>
-    <selenium.port>4444</selenium.port>
-    <tomcat.port>9898</tomcat.port>
-    <serverUrl>http://localhost:${tomcat.port}/</serverUrl>
-    <seleniumBrowser>*firefox</seleniumBrowser>
-  </properties>
-
   <build>
     <pluginManagement>
       <plugins>
@@ -57,119 +48,19 @@
             <path>/</path>
           </configuration>
         </plugin>
-        <plugin>
-          <groupId>org.codehaus.mojo</groupId>
-          <artifactId>selenium-maven-plugin</artifactId>
-          <version>${seleniumPluginVersion}</version>
-          <dependencies>
-            <dependency>
-              <groupId>org.seleniumhq.selenium</groupId>
-              <artifactId>selenium-server</artifactId>
-              <version>${selenium-server.version}</version>
-            </dependency>
-
-            <dependency>
-              <groupId>org.seleniumhq.selenium</groupId>
-              <artifactId>selenium-remote-driver</artifactId>
-              <version>${selenium-server.version}</version>
-            </dependency>
-
-            <dependency>
-              <groupId>org.seleniumhq.selenium</groupId>
-              <artifactId>selenium-api</artifactId>
-              <version>${selenium-server.version}</version>
-            </dependency>
-          </dependencies>
-        </plugin>
+
       </plugins>
     </pluginManagement>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <version>2.11</version>
-        <configuration>
-          <includes>
-            <include>Foo</include>
-          </includes>
-        </configuration>
-        <executions>
-          <execution>
-            <id>integration-tests</id>
-            <phase>integration-test</phase>
-            <goals>
-              <goal>test</goal>
-            </goals>
-            <configuration>
-              <systemPropertyVariables>
-                <selenium.port>${selenium.port}</selenium.port>
-                <serverUrl>${serverUrl}</serverUrl>
-                <seleniumBrowser>${seleniumBrowser}</seleniumBrowser>
-              </systemPropertyVariables>
-              <includes>
-                <include>**/**</include>
-              </includes>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.tomcat.maven</groupId>
-        <artifactId>tomcat7-maven-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>tomcat-run</id>
-            <goals>
-              <goal>run-war-only</goal>
-            </goals>
-            <phase>pre-integration-test</phase>
-            <configuration>
-              <path>/</path>
-              <port>${tomcat.port}</port>
-              <uriEncoding>UTF-8</uriEncoding>
-              <warDirectory>target/${artifactId-webapp}-${project.version}</warDirectory>
-              <fork>true</fork>
-            </configuration>
-          </execution>
-          <execution>
-            <id>tomcat-shutdown</id>
-            <goals>
-              <goal>shutdown</goal>
-            </goals>
-            <phase>post-integration-test</phase>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>selenium-maven-plugin</artifactId>
-        <executions>
-          <execution>
-            <phase>pre-integration-test</phase>
-            <goals>
-              <goal>start-server</goal>
-            </goals>
-            <configuration>
-              <background>true</background>
-              <port>${selenium.port}</port>
-              <logOutput>true</logOutput>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
   </build>
 
   <dependencies>
     <dependency>
-       <groupId>${groupId}</groupId>
+       <groupId>\${groupId}</groupId>
        <artifactId>${artifactId-api}</artifactId>
-       <version>${project.version}</version>
      </dependency>
     <dependency>
-       <groupId>${groupId}</groupId>
-       <artifactId>${artifactId-api}</artifactId>
-       <version>${project.version}</version>
+       <groupId>\${groupId}</groupId>
+       <artifactId>${artifactId-api-impl}</artifactId>
      </dependency>
     <dependency>
       <groupId>javax.ws.rs</groupId>
@@ -227,28 +118,9 @@
       <artifactId>junit</artifactId>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.seleniumhq.selenium.client-drivers</groupId>
-      <artifactId>selenium-java-client-driver</artifactId>
-      <version>1.0.2</version>
-      <scope>test</scope>
-    </dependency>
+
   </dependencies>
 
-  <profiles>
-    <profile>
-      <id>chrome</id>
-      <properties>
-        <seleniumBrowser>*chrome</seleniumBrowser>
-      </properties>
-    </profile>
-    <profile>
-      <id>iexplore</id>
-      <properties>
-        <seleniumBrowser>*iexplore</seleniumBrowser>
-      </properties>
-    </profile>
-  </profiles>
 
 
 </project>

Modified: tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/test-webapp/src/main/resources/log4j.xml
URL: http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/test-webapp/src/main/resources/log4j.xml?rev=1230031&r1=1230030&r2=1230031&view=diff
==============================================================================
--- tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/test-webapp/src/main/resources/log4j.xml
(original)
+++ tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/test-webapp/src/main/resources/log4j.xml
Wed Jan 11 13:41:16 2012
@@ -29,7 +29,7 @@
   </appender>
 
   <logger name="org.springframework">
-    <level value="info"/>
+    <level value="debug"/>
   </logger>
 
 

Copied: tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/test-webapp/src/main/webapp/WEB-INF/applicationContext.xml
(from r1230030, tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/test-webapp/src/main/resources/log4j.xml)
URL: http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/test-webapp/src/main/webapp/WEB-INF/applicationContext.xml?p2=tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/test-webapp/src/main/webapp/WEB-INF/applicationContext.xml&p1=tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/test-webapp/src/main/resources/log4j.xml&r1=1230030&r2=1230031&rev=1230031&view=diff
==============================================================================
--- tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/test-webapp/src/main/resources/log4j.xml
(original)
+++ tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/test-webapp/src/main/webapp/WEB-INF/applicationContext.xml
Wed Jan 11 13:41:16 2012
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" ?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
   ~ Licensed to the Apache Software Foundation (ASF) under one
   ~ or more contributor license agreements.  See the NOTICE file
@@ -8,7 +8,7 @@
   ~ "License"); you may not use this file except in compliance
   ~ with the License.  You may obtain a copy of the License at
   ~
-  ~   http://www.apache.org/licenses/LICENSE-2.0
+  ~  http://www.apache.org/licenses/LICENSE-2.0
   ~
   ~ Unless required by applicable law or agreed to in writing,
   ~ software distributed under the License is distributed on an
@@ -17,25 +17,15 @@
   ~ specific language governing permissions and limitations
   ~ under the License.
   -->
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:context="http://www.springframework.org/schema/context"
+       xmlns:jaxrs="http://cxf.apache.org/jaxrs"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans
+           http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
+           http://www.springframework.org/schema/context
+           http://www.springframework.org/schema/context/spring-context-3.0.xsd
+           http://cxf.apache.org/jaxrs
+           http://cxf.apache.org/schemas/jaxrs.xsd">
 
-<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
-
-<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/">
-
-  <appender name="console" class="org.apache.log4j.ConsoleAppender">
-    <layout class="org.apache.log4j.PatternLayout">
-      <param name="ConversionPattern" value="%d [%t] %-5p %c %x - %m%n"/>
-    </layout>
-  </appender>
-
-  <logger name="org.springframework">
-    <level value="info"/>
-  </logger>
-
-
-  <root>
-    <priority value ="info" />
-    <appender-ref ref="console" />
-  </root>
-
-</log4j:configuration>
+</beans>

Modified: tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/test/resources/projects/basic/archetype.properties
URL: http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/test/resources/projects/basic/archetype.properties?rev=1230031&r1=1230030&r2=1230031&view=diff
==============================================================================
--- tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/test/resources/projects/basic/archetype.properties
(original)
+++ tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/test/resources/projects/basic/archetype.properties
Wed Jan 11 13:41:16 2012
@@ -1,9 +1,10 @@
-package=org.apache.tomcat.maven.archetype.it.pkg
+package=org.apache
 version=0.1-SNAPSHOT
-groupId=org.apache.tomcat.maven.archetype.archetype.it
+groupId=org.apache.tomcat.maven.archetype.it
 artifactId=basic
 artifactId-api=basic-api
 artifactId-api-impl=basic-api-impl
 artifactId-webapp=basic-webapp
+artifactId-webapp-it=basic-webapp-it
 rootArtifactId=basic
 



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


Mime
View raw message