Return-Path: X-Original-To: apmail-tomcat-dev-archive@www.apache.org Delivered-To: apmail-tomcat-dev-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id C02439376 for ; Wed, 11 Jan 2012 13:41:50 +0000 (UTC) Received: (qmail 25615 invoked by uid 500); 11 Jan 2012 13:41:49 -0000 Delivered-To: apmail-tomcat-dev-archive@tomcat.apache.org Received: (qmail 25495 invoked by uid 500); 11 Jan 2012 13:41:42 -0000 Mailing-List: contact dev-help@tomcat.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: "Tomcat Developers List" Delivered-To: mailing list dev@tomcat.apache.org Received: (qmail 25484 invoked by uid 99); 11 Jan 2012 13:41:40 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 11 Jan 2012 13:41:40 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 11 Jan 2012 13:41:38 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 2E75F23888D2 for ; Wed, 11 Jan 2012 13:41:18 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit 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 -0000 To: dev@tomcat.apache.org From: olamy@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120111134118.2E75F23888D2@eris.apache.org> 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 @@ org.apache.maven.plugins + maven-resources-plugin + 2.5 + + + org.apache.maven.plugins maven-site-plugin 3.0 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 @@ basic-webapp + + basic-webapp-it + @@ -108,5 +111,21 @@ + + + + src/test/ + + **/*.java + + + + src/test/ + + **/*.xml + + + + 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 @@ 4.0.0 - ${groupId} + \${groupId} ${rootArtifactId} - ${version} + \${version} pom @@ -60,14 +60,20 @@ - ${groupId} + \${groupId} ${artifactId-api} - ${project.version} + \${project.version} - ${groupId} + \${groupId} ${artifactId-api-impl} - ${project.version} + \${project.version} + + + \${groupId} + ${artifactId-webapp} + \${project.version} + war org.springframework 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 @@ 4.0.0 - ${groupId} + \${groupId} ${rootArtifactId} - ${version} + \${version} ${artifactId-api-impl} @@ -32,7 +32,7 @@ - ${groupId} + \${groupId} ${artifactId-api} 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 @@ 4.0.0 - ${groupId} + \${groupId} ${rootArtifactId} - ${version} + \${version} ${artifactId-api} 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 @@ 4.0.0 - ${groupId} + \${groupId} ${rootArtifactId} - ${version} + \${version} - ${artifactId-webapp} - war + ${artifactId-webapp-it} + pom 2.2-SNAPSHOT @@ -42,22 +42,6 @@ - org.apache.tomcat.maven - tomcat6-maven-plugin - - 9090 - / - - - - org.apache.tomcat.maven - tomcat7-maven-plugin - - 9090 - / - - - org.codehaus.mojo selenium-maven-plugin ${seleniumPluginVersion} @@ -86,13 +70,34 @@ org.apache.maven.plugins + maven-dependency-plugin + 2.4 + + + unzip-webapp + compile + + unpack + + + + + \${project.groupId} + ${artifactId-webapp} + \${project.version} + war + + + \${project.build.directory}/webapp + true + + + + + + org.apache.maven.plugins maven-surefire-plugin 2.11 - - - Foo - - integration-tests @@ -127,8 +132,10 @@ / ${tomcat.port} UTF-8 - target/${artifactId-webapp}-${project.version} + \${project.build.directory}/webapp/ true + true + src/test/context.xml @@ -162,60 +169,9 @@ - ${groupId} - ${artifactId-api} - ${project.version} - - - ${groupId} - ${artifactId-api} - ${project.version} - - - javax.ws.rs - jsr311-api - - - org.apache.cxf - cxf-bundle-jaxrs - - - org.eclipse.jetty - jetty-server - - - org.eclipse.jetty - jetty-continuation - - - org.eclipse.jetty - jetty-http - - - org.eclipse.jetty - jetty-io - - - org.eclipse.jetty - jetty-util - - - org.eclipse.jetty - jetty-security - - - org.apache.geronimo.specs - geronimo-servlet_3.0_spec - - - org.apache.geronimo.specs - geronimo-javamail_1.4_spec - - - org.apache.geronimo.specs - geronimo-servlet_2.5_spec - - + \${groupId} + \${artifactId-webapp} + war log4j 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 = '\' ) + - - - - - - - - - - - - - - - - - - - - - + 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