tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ol...@apache.org
Subject svn commit: r1176544 - in /tomcat/maven-plugin/trunk: ./ tomcat-maven-plugin-it/ tomcat-maven-plugin-it/src/main/java/org/codehaus/mojo/tomcat/it/ tomcat-maven-plugin-it/src/main/resources/ tomcat6-maven-plugin/ tomcat6-maven-plugin/src/test/ tomcat6-m...
Date Tue, 27 Sep 2011 19:23:36 GMT
Author: olamy
Date: Tue Sep 27 19:23:35 2011
New Revision: 1176544

URL: http://svn.apache.org/viewvc?rev=1176544&view=rev
Log:
add some integration tests

Added:
    tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/
    tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/java/
    tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/java/org/
    tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/java/org/codehaus/
    tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/java/org/codehaus/mojo/
    tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/java/org/codehaus/mojo/tomcat/
    tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/java/org/codehaus/mojo/tomcat/it/
    tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/java/org/codehaus/mojo/tomcat/it/Tomcat6RunMultiConfigIT.java
    tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/java/org/codehaus/mojo/tomcat/it/Tomcat6SimpleWarProjectIT.java
    tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/java/org/codehaus/mojo/tomcat/it/Tomcat6UsageContextpathIT.java
    tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/
    tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/logback-test.xml
      - copied, changed from r1176539, tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/main/resources/logback-test.xml
    tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/simple-war-project/
    tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/simple-war-project/pom.xml
    tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/simple-war-project/src/
    tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/simple-war-project/src/main/
    tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/simple-war-project/src/main/tomcatconf/
    tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/simple-war-project/src/main/tomcatconf/empty.txt
    tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/simple-war-project/src/main/tomcatconf/server.xml
    tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/simple-war-project/src/main/webapp/
    tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/simple-war-project/src/main/webapp/index.jsp
    tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/simple-war-project/src/main/webapp/web.xml
    tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/simple-war-project/src/test/
    tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/simple-war-project/src/test/java/
    tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/simple-war-project/src/test/java/WaitIT.java
    tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/tomcat-run-multi-config/
    tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/tomcat-run-multi-config/pom.xml
    tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/tomcat-run-multi-config/src/
    tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/tomcat-run-multi-config/src/main/
    tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/tomcat-run-multi-config/src/main/tcconf/
    tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/tomcat-run-multi-config/src/main/tcconf/empty.txt
    tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/tomcat-run-multi-config/src/main/webapp/
    tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/tomcat-run-multi-config/src/main/webapp/index.jsp
    tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/tomcat-run-multi-config/src/main/webapp/web.xml
      - copied, changed from r1176539, tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/main/resources/logback-test.xml
    tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/tomcat-run-multi-config/src/test/
    tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/tomcat-run-multi-config/src/test/java/
    tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/tomcat-run-multi-config/src/test/java/WaitIT.java
    tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/usage-contextpath/
    tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/usage-contextpath/pom.xml
    tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/usage-contextpath/src/
    tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/usage-contextpath/src/main/
    tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/usage-contextpath/src/main/webapp/
    tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/usage-contextpath/src/main/webapp/index.html
      - copied, changed from r1176539, tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/main/resources/logback-test.xml
    tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/usage-contextpath/src/test/
    tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/usage-contextpath/src/test/java/
    tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/usage-contextpath/src/test/java/WaitIT.java
Removed:
    tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/main/java/org/codehaus/mojo/tomcat/it/UsageContextpathIT.java
    tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/main/resources/logback-test.xml
Modified:
    tomcat/maven-plugin/trunk/pom.xml
    tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/pom.xml
    tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/main/java/org/codehaus/mojo/tomcat/it/AbstractTomcatRunMultiConfigIT.java
    tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/main/java/org/codehaus/mojo/tomcat/it/AbstractUsageContextpathIT.java
    tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/main/java/org/codehaus/mojo/tomcat/it/AbstractWarProjectIT.java
    tomcat/maven-plugin/trunk/tomcat6-maven-plugin/pom.xml

Modified: tomcat/maven-plugin/trunk/pom.xml
URL: http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/pom.xml?rev=1176544&r1=1176543&r2=1176544&view=diff
==============================================================================
--- tomcat/maven-plugin/trunk/pom.xml (original)
+++ tomcat/maven-plugin/trunk/pom.xml Tue Sep 27 19:23:35 2011
@@ -49,6 +49,8 @@
     <maven.test.redirectTestOutputToFile>false</maven.test.redirectTestOutputToFile>
     <failsafe.version>2.9</failsafe.version>
     <junit.version>4.9</junit.version>
+    <it.sleep.time>2000</it.sleep.time>
+    <maven.resources.escapeString>\</maven.resources.escapeString>
     <distributionReleaseUrl>scp://people.apache.org/www/people.apache.org/repo/m2-ibiblio-rsync-repository</distributionReleaseUrl>
     <distributionSnapshotsUrl>scp://people.apache.org/www/people.apache.org/repo/m2-snapshot-repository</distributionSnapshotsUrl>
     <distributionSiteUrl>scp://people.apache.org/www/tomcat.apache.org/maven-plugin-${project.version}</distributionSiteUrl>
@@ -282,12 +284,12 @@
       <dependency>
         <groupId>ch.qos.logback</groupId>
         <artifactId>logback-core</artifactId>
-        <version>0.9.24</version>
+        <version>0.9.30</version>
       </dependency>
       <dependency>
         <groupId>ch.qos.logback</groupId>
         <artifactId>logback-classic</artifactId>
-        <version>0.9.24</version>
+        <version>0.9.30</version>
       </dependency>
       <dependency>
         <groupId>org.apache.tomcat.maven</groupId>

Modified: tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/pom.xml
URL: http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/pom.xml?rev=1176544&r1=1176543&r2=1176544&view=diff
==============================================================================
--- tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/pom.xml (original)
+++ tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/pom.xml Tue Sep 27 19:23:35 2011
@@ -30,7 +30,7 @@
 
   <artifactId>tomcat-maven-plugin-it</artifactId>
   <packaging>jar</packaging>
-  <name>Tomcat Maven Plugin Integration Tests</name>
+  <name>Tomcat Maven Plugin :: Integration Tests</name>
 
   <properties>
     <!-- The time to wait between startup and shutdown of tomcat. Realized by a test which waits for the specified

Modified: tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/main/java/org/codehaus/mojo/tomcat/it/AbstractTomcatRunMultiConfigIT.java
URL: http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/main/java/org/codehaus/mojo/tomcat/it/AbstractTomcatRunMultiConfigIT.java?rev=1176544&r1=1176543&r2=1176544&view=diff
==============================================================================
--- tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/main/java/org/codehaus/mojo/tomcat/it/AbstractTomcatRunMultiConfigIT.java (original)
+++ tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/main/java/org/codehaus/mojo/tomcat/it/AbstractTomcatRunMultiConfigIT.java Tue Sep 27 19:23:35 2011
@@ -37,7 +37,7 @@ import static org.junit.Assert.assertTru
  *
  * @author Mark Michaelis
  */
-public final class AbstractTomcatRunMultiConfigIT
+public class AbstractTomcatRunMultiConfigIT
     extends AbstractWarProjectIT
 {
     private static final Logger LOG = LoggerFactory.getLogger( AbstractTomcatRunMultiConfigIT.class );
@@ -81,8 +81,8 @@ public final class AbstractTomcatRunMult
         final File emptyLocation = new File( tomcatFolder, "conf/empty.txt" );
 
         assertTrue(
-            "Tomcat folder \"" + tomcatFolder.getAbsolutePath() + "\" should exist in target folder of project at " +
-                webappHome, tomcatFolder.exists() );
+            "Tomcat folder \"" + tomcatFolder.getAbsolutePath() + "\" should exist in target folder of project at "
+                + webappHome, tomcatFolder.exists() );
         assertTrue(
             "File \"" + emptyLocation.getAbsolutePath() + "\" should have been copied from tcconf to tomcat/conf",
             emptyLocation.exists() );

Modified: tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/main/java/org/codehaus/mojo/tomcat/it/AbstractUsageContextpathIT.java
URL: http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/main/java/org/codehaus/mojo/tomcat/it/AbstractUsageContextpathIT.java?rev=1176544&r1=1176543&r2=1176544&view=diff
==============================================================================
--- tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/main/java/org/codehaus/mojo/tomcat/it/AbstractUsageContextpathIT.java (original)
+++ tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/main/java/org/codehaus/mojo/tomcat/it/AbstractUsageContextpathIT.java Tue Sep 27 19:23:35 2011
@@ -32,7 +32,7 @@ import static org.junit.Assert.assertNot
  *
  * @author Mark Michaelis
  */
-public final class AbstractUsageContextpathIT
+public class AbstractUsageContextpathIT
     extends AbstractWarProjectIT
 {
     private static final Logger LOG = LoggerFactory.getLogger( AbstractUsageContextpathIT.class );

Modified: tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/main/java/org/codehaus/mojo/tomcat/it/AbstractWarProjectIT.java
URL: http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/main/java/org/codehaus/mojo/tomcat/it/AbstractWarProjectIT.java?rev=1176544&r1=1176543&r2=1176544&view=diff
==============================================================================
--- tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/main/java/org/codehaus/mojo/tomcat/it/AbstractWarProjectIT.java (original)
+++ tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/main/java/org/codehaus/mojo/tomcat/it/AbstractWarProjectIT.java Tue Sep 27 19:23:35 2011
@@ -20,10 +20,6 @@ package org.codehaus.mojo.tomcat.it;
  */
 
 
-
-import java.io.File;
-import java.io.IOException;
-
 import org.apache.http.HttpResponse;
 import org.apache.http.client.ResponseHandler;
 import org.apache.http.client.methods.HttpGet;
@@ -40,6 +36,11 @@ import org.junit.Before;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.io.File;
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
+
 /**
  * Base class for all tests which have a war-project using the tomcat-maven-plugin below project-resources.
  *
@@ -105,12 +106,13 @@ public abstract class AbstractWarProject
 
     /**
      * Executes mvn verify and retrieves the response from the web application.
+     *
      * @return the response given
      * @throws VerificationException if the verifier failed to execute the goal
-     * @throws InterruptedException if the execution got interrupted in some way
+     * @throws InterruptedException  if the execution got interrupted in some way
      */
     protected final String executeVerifyWithGet()
-        throws VerificationException, InterruptedException
+        throws VerificationException, InterruptedException, IOException
     {
         final String[] responseBodies = new String[]{ null };
 
@@ -126,6 +128,11 @@ public abstract class AbstractWarProject
         thread.start();
 
         LOG.info( "Executing verify on " + webappHome.getAbsolutePath() );
+        Map<String, String> map = new HashMap<String, String>();
+        map.put( "@project.version@", System.getProperty( "mojoVersion" ) );
+        System.out.println( " webappHome: " + webappHome );
+        verifier.filterFile( "pom.xml", "pom.xml", "UTF-8", map );
+        verifier.displayStreamBuffers();
         verifier.executeGoal( "verify" );
 
         thread.join();

Modified: tomcat/maven-plugin/trunk/tomcat6-maven-plugin/pom.xml
URL: http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat6-maven-plugin/pom.xml?rev=1176544&r1=1176543&r2=1176544&view=diff
==============================================================================
--- tomcat/maven-plugin/trunk/tomcat6-maven-plugin/pom.xml (original)
+++ tomcat/maven-plugin/trunk/tomcat6-maven-plugin/pom.xml Tue Sep 27 19:23:35 2011
@@ -41,6 +41,8 @@
   </prerequisites>
   <inceptionYear>2005</inceptionYear>
 
+
+
   <dependencies>
     <dependency>
       <groupId>org.apache.maven</groupId>
@@ -161,6 +163,12 @@
   </dependencies>
 
   <build>
+    <testResources>
+      <testResource>
+        <directory>src/test/resources</directory>
+        <filtering>true</filtering>
+      </testResource>
+    </testResources>
     <plugins>
       <plugin>
         <groupId>org.codehaus.plexus</groupId>
@@ -207,6 +215,29 @@
               </execution>
             </executions>
           </plugin>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-failsafe-plugin</artifactId>
+            <executions>
+              <execution>
+                <id>integration-test</id>
+                <goals>
+                  <goal>integration-test</goal>
+                </goals>
+                <configuration>
+                  <systemPropertyVariables>
+                    <mojoVersion>${project.version}</mojoVersion>
+                  </systemPropertyVariables>
+                </configuration>
+              </execution>
+              <execution>
+                <id>verify</id>
+                <goals>
+                  <goal>verify</goal>
+                </goals>
+              </execution>
+            </executions>
+          </plugin>
         </plugins>
       </build>
     </profile>

Added: tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/java/org/codehaus/mojo/tomcat/it/Tomcat6RunMultiConfigIT.java
URL: http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/java/org/codehaus/mojo/tomcat/it/Tomcat6RunMultiConfigIT.java?rev=1176544&view=auto
==============================================================================
--- tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/java/org/codehaus/mojo/tomcat/it/Tomcat6RunMultiConfigIT.java (added)
+++ tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/java/org/codehaus/mojo/tomcat/it/Tomcat6RunMultiConfigIT.java Tue Sep 27 19:23:35 2011
@@ -0,0 +1,28 @@
+package org.codehaus.mojo.tomcat.it;
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "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
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+/**
+ * @author Olivier Lamy
+ */
+public class Tomcat6RunMultiConfigIT
+    extends AbstractTomcatRunMultiConfigIT
+{
+    // no op
+}

Added: tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/java/org/codehaus/mojo/tomcat/it/Tomcat6SimpleWarProjectIT.java
URL: http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/java/org/codehaus/mojo/tomcat/it/Tomcat6SimpleWarProjectIT.java?rev=1176544&view=auto
==============================================================================
--- tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/java/org/codehaus/mojo/tomcat/it/Tomcat6SimpleWarProjectIT.java (added)
+++ tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/java/org/codehaus/mojo/tomcat/it/Tomcat6SimpleWarProjectIT.java Tue Sep 27 19:23:35 2011
@@ -0,0 +1,28 @@
+package org.codehaus.mojo.tomcat.it;
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "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
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+/**
+ * @author Olivier Lamy
+ */
+public class Tomcat6SimpleWarProjectIT
+    extends AbstractSimpleWarProjectIT
+{
+    // no op
+}

Added: tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/java/org/codehaus/mojo/tomcat/it/Tomcat6UsageContextpathIT.java
URL: http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/java/org/codehaus/mojo/tomcat/it/Tomcat6UsageContextpathIT.java?rev=1176544&view=auto
==============================================================================
--- tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/java/org/codehaus/mojo/tomcat/it/Tomcat6UsageContextpathIT.java (added)
+++ tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/java/org/codehaus/mojo/tomcat/it/Tomcat6UsageContextpathIT.java Tue Sep 27 19:23:35 2011
@@ -0,0 +1,28 @@
+package org.codehaus.mojo.tomcat.it;
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "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
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+/**
+ * @author Olivier Lamy
+ */
+public class Tomcat6UsageContextpathIT
+    extends AbstractUsageContextpathIT
+{
+    // no op
+}

Copied: tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/logback-test.xml (from r1176539, tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/main/resources/logback-test.xml)
URL: http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/logback-test.xml?p2=tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/logback-test.xml&p1=tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/main/resources/logback-test.xml&r1=1176539&r2=1176544&rev=1176544&view=diff
==============================================================================
    (empty)

Added: tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/simple-war-project/pom.xml
URL: http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/simple-war-project/pom.xml?rev=1176544&view=auto
==============================================================================
--- tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/simple-war-project/pom.xml (added)
+++ tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/simple-war-project/pom.xml Tue Sep 27 19:23:35 2011
@@ -0,0 +1,114 @@
+<?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
+  distributed with this work for additional information
+  regarding copyright ownership.  The ASF licenses this file
+  to you under the Apache License, Version 2.0 (the
+  "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
+
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  KIND, either express or implied.  See the License for the
+  specific language governing permissions and limitations
+  under the License.
+-->
+<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>
+  <groupId>org.codehaus.mojo.tomcat.it</groupId>
+  <artifactId>simple-war-project</artifactId>
+  <version>1.0-SNAPSHOT</version>
+  <packaging>war</packaging>
+
+
+  <build>
+    <pluginManagement>
+      <plugins>
+        <plugin>
+          <artifactId>maven-war-plugin</artifactId>
+          <version>2.1-alpha-2</version>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.tomcat.maven</groupId>
+          <artifactId>tomcat6-maven-plugin</artifactId>
+          <version>${project.version}</version>
+        </plugin>
+      </plugins>
+    </pluginManagement>
+
+    <plugins>
+      <plugin>
+        <artifactId>maven-war-plugin</artifactId>
+        <configuration>
+          <webXml>src/main/webapp/web.xml</webXml>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.tomcat.maven</groupId>
+        <artifactId>tomcat6-maven-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>tomcat-run</id>
+            <goals>
+              <goal>run</goal>
+            </goals>
+            <phase>pre-integration-test</phase>
+            <configuration>
+              <fork>true</fork>
+              <path>/</path>
+              <systemProperties>
+                <com.sun.management.jmxremote.ssl>false</com.sun.management.jmxremote.ssl>
+              </systemProperties>
+            </configuration>
+          </execution>
+          <execution>
+            <id>tomcat-shutdown</id>
+            <goals>
+              <goal>shutdown</goal>
+            </goals>
+            <phase>post-integration-test</phase>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-failsafe-plugin</artifactId>
+        <version>2.9</version>
+        <executions>
+          <execution>
+            <id>integration-test</id>
+            <goals>
+              <goal>integration-test</goal>
+            </goals>
+          </execution>
+          <execution>
+            <id>verify</id>
+            <goals>
+              <goal>verify</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-context-support</artifactId>
+      <version>2.5.6</version>
+    </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>4.9</version>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+
+</project>

Added: tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/simple-war-project/src/main/tomcatconf/empty.txt
URL: http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/simple-war-project/src/main/tomcatconf/empty.txt?rev=1176544&view=auto
==============================================================================
--- tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/simple-war-project/src/main/tomcatconf/empty.txt (added)
+++ tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/simple-war-project/src/main/tomcatconf/empty.txt Tue Sep 27 19:23:35 2011
@@ -0,0 +1,19 @@
+ ~~ Licensed to the Apache Software Foundation (ASF) under one
+ ~~ or more contributor license agreements.  See the NOTICE file
+ ~~ distributed with this work for additional information
+ ~~ regarding copyright ownership.  The ASF licenses this file
+ ~~ to you under the Apache License, Version 2.0 (the
+ ~~ "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
+ ~~
+ ~~ Unless required by applicable law or agreed to in writing,
+ ~~ software distributed under the License is distributed on an
+ ~~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ ~~ KIND, either express or implied.  See the License for the
+ ~~ specific language governing permissions and limitations
+ ~~ under the License.
+
+ ~~ NOTE: For help with the syntax of this file, see:
+ ~~ http://maven.apache.org/doxia/references/apt-format.html
\ No newline at end of file

Added: tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/simple-war-project/src/main/tomcatconf/server.xml
URL: http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/simple-war-project/src/main/tomcatconf/server.xml?rev=1176544&view=auto
==============================================================================
--- tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/simple-war-project/src/main/tomcatconf/server.xml (added)
+++ tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/simple-war-project/src/main/tomcatconf/server.xml Tue Sep 27 19:23:35 2011
@@ -0,0 +1,43 @@
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements.  See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership.  The ASF licenses this file
+  to you under the Apache License, Version 2.0 (the
+  "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
+
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  KIND, either express or implied.  See the License for the
+  specific language governing permissions and limitations
+  under the License.
+-->
+
+<Server port="8010" shutdown="SHUTDOWN">
+
+  <GlobalNamingResources>
+    <!-- Used by Manager webapp -->
+    <Resource name="UserDatabase" auth="Container"
+              type="org.apache.catalina.UserDatabase"
+       description="User database that can be updated and saved"
+           factory="org.apache.catalina.users.MemoryUserDatabaseFactory"
+          pathname="conf/tomcat-users.xml" />
+  </GlobalNamingResources>
+
+  <Service name="Catalina">
+    <Connector port="8080" keepAliveTimeout="1800000" maxKeepAliveRequests="30000" maxThreads="300" />
+    <Connector port="8088" keepAliveTimeout="1800000" maxKeepAliveRequests="30000" maxThreads="300" />
+    <Engine name="Catalina" defaultHost="localhost">
+      <Valve className="org.apache.catalina.valves.AccessLogValve" 
+             resolveHosts="false" pattern="%t-ip:%a-protocol:%H-localPort:%p-path:%U-time:%D ms"/> 
+      <Realm className="org.apache.catalina.realm.UserDatabaseRealm"
+             resourceName="UserDatabase" />
+      <Host name="localhost" appBase="webapps" />
+    </Engine>
+    
+  </Service>
+</Server>

Added: tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/simple-war-project/src/main/webapp/index.jsp
URL: http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/simple-war-project/src/main/webapp/index.jsp?rev=1176544&view=auto
==============================================================================
--- tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/simple-war-project/src/main/webapp/index.jsp (added)
+++ tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/simple-war-project/src/main/webapp/index.jsp Tue Sep 27 19:23:35 2011
@@ -0,0 +1,17 @@
+<%--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "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
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+--%>
+It works !!
\ No newline at end of file

Added: tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/simple-war-project/src/main/webapp/web.xml
URL: http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/simple-war-project/src/main/webapp/web.xml?rev=1176544&view=auto
==============================================================================
--- tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/simple-war-project/src/main/webapp/web.xml (added)
+++ tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/simple-war-project/src/main/webapp/web.xml Tue Sep 27 19:23:35 2011
@@ -0,0 +1,26 @@
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements.  See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership.  The ASF licenses this file
+  to you under the Apache License, Version 2.0 (the
+  "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
+
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  KIND, either express or implied.  See the License for the
+  specific language governing permissions and limitations
+  under the License.
+-->
+
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<web-app xmlns="http://java.sun.com/xml/ns/j2ee" version="2.4" 
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+         xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
+    
+    
+</web-app>
\ No newline at end of file

Added: tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/simple-war-project/src/test/java/WaitIT.java
URL: http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/simple-war-project/src/test/java/WaitIT.java?rev=1176544&view=auto
==============================================================================
--- tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/simple-war-project/src/test/java/WaitIT.java (added)
+++ tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/simple-war-project/src/test/java/WaitIT.java Tue Sep 27 19:23:35 2011
@@ -0,0 +1,30 @@
+import org.junit.Test;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "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
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
+@SuppressWarnings({"WrongPackageStatement"})
+public final class WaitIT {
+  @Test
+  public void testWait() throws Exception {
+    System.out.println("Just wait a while...");
+    Thread.sleep(${it.sleep.time});
+  }
+}

Added: tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/tomcat-run-multi-config/pom.xml
URL: http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/tomcat-run-multi-config/pom.xml?rev=1176544&view=auto
==============================================================================
--- tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/tomcat-run-multi-config/pom.xml (added)
+++ tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/tomcat-run-multi-config/pom.xml Tue Sep 27 19:23:35 2011
@@ -0,0 +1,132 @@
+<?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
+  distributed with this work for additional information
+  regarding copyright ownership.  The ASF licenses this file
+  to you under the Apache License, Version 2.0 (the
+  "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
+
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  KIND, either express or implied.  See the License for the
+  specific language governing permissions and limitations
+  under the License.
+-->
+<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>
+  <groupId>org.codehaus.mojo.tomcat.it</groupId>
+  <artifactId>tomcat-run-multi-config</artifactId>
+  <version>1.0-SNAPSHOT</version>
+  <packaging>war</packaging>
+
+  <properties>
+    <!-- Set to false if you want to debug the tomcat -->
+    <maven.tomcat.fork>true</maven.tomcat.fork>
+    <pluginVersion>${project.version}</pluginVersion>
+    <maven.compiler.source>${maven.compiler.source}</maven.compiler.source>
+    <maven.compiler.target>${maven.compiler.target}</maven.compiler.target>
+    <project.build.sourceEncoding>${project.build.sourceEncoding}</project.build.sourceEncoding>
+    <failOnMissingWebXml>false</failOnMissingWebXml>
+  </properties>
+
+  <build>
+    <pluginManagement>
+      <plugins>
+        <plugin>
+          <groupId>org.apache.tomcat.maven</groupId>
+          <artifactId>tomcat6-maven-plugin</artifactId>
+          <version>${project.version}</version>
+        </plugin>
+      </plugins>
+    </pluginManagement>
+
+    <plugins>
+      <plugin>
+        <artifactId>maven-war-plugin</artifactId>
+        <configuration>
+          <webXml>src/main/webapp/web.xml</webXml>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.tomcat.maven</groupId>
+        <artifactId>tomcat6-maven-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>tomcat-run</id>
+            <goals>
+              <goal>run</goal>
+            </goals>
+            <phase>pre-integration-test</phase>
+            <configuration>
+              <additionalConfigFilesDir>\${basedir}/src/main/tcconf</additionalConfigFilesDir>
+              <configurationDir>\${project.build.directory}/tc</configurationDir>
+              <path>/multi-config</path>
+              <port>8001</port>
+              <uriEncoding>UTF-8</uriEncoding>
+              <systemProperties>
+                <com.sun.management.jmxremote.ssl>false</com.sun.management.jmxremote.ssl>
+              </systemProperties>
+            </configuration>
+          </execution>
+          <execution>
+            <id>tomcat-shutdown</id>
+            <goals>
+              <goal>shutdown</goal>
+            </goals>
+            <phase>post-integration-test</phase>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-failsafe-plugin</artifactId>
+        <version>${failsafe.version}</version>
+        <executions>
+          <execution>
+            <id>integration-test</id>
+            <goals>
+              <goal>integration-test</goal>
+            </goals>
+          </execution>
+          <execution>
+            <id>verify</id>
+            <goals>
+              <goal>verify</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-context-support</artifactId>
+      <version>2.5.6</version>
+    </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>${junit.version}</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>jstl</groupId>
+      <artifactId>jstl</artifactId>
+      <version>1.1.2</version>
+    </dependency>
+    <dependency>
+      <groupId>taglibs</groupId>
+      <artifactId>standard</artifactId>
+      <version>1.1.2</version>
+    </dependency>
+  </dependencies>
+
+</project>

Added: tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/tomcat-run-multi-config/src/main/tcconf/empty.txt
URL: http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/tomcat-run-multi-config/src/main/tcconf/empty.txt?rev=1176544&view=auto
==============================================================================
--- tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/tomcat-run-multi-config/src/main/tcconf/empty.txt (added)
+++ tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/tomcat-run-multi-config/src/main/tcconf/empty.txt Tue Sep 27 19:23:35 2011
@@ -0,0 +1,19 @@
+ ~~ Licensed to the Apache Software Foundation (ASF) under one
+ ~~ or more contributor license agreements.  See the NOTICE file
+ ~~ distributed with this work for additional information
+ ~~ regarding copyright ownership.  The ASF licenses this file
+ ~~ to you under the Apache License, Version 2.0 (the
+ ~~ "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
+ ~~
+ ~~ Unless required by applicable law or agreed to in writing,
+ ~~ software distributed under the License is distributed on an
+ ~~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ ~~ KIND, either express or implied.  See the License for the
+ ~~ specific language governing permissions and limitations
+ ~~ under the License.
+
+ ~~ NOTE: For help with the syntax of this file, see:
+ ~~ http://maven.apache.org/doxia/references/apt-format.html
\ No newline at end of file

Added: tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/tomcat-run-multi-config/src/main/webapp/index.jsp
URL: http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/tomcat-run-multi-config/src/main/webapp/index.jsp?rev=1176544&view=auto
==============================================================================
--- tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/tomcat-run-multi-config/src/main/webapp/index.jsp (added)
+++ tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/tomcat-run-multi-config/src/main/webapp/index.jsp Tue Sep 27 19:23:35 2011
@@ -0,0 +1,40 @@
+<%@ page language="java" contentType="text/html;charset=UTF-8" pageEncoding="UTF-8"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "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
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+--%>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<head>
+<title>Example</title>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+</head>
+<body>
+<p>
+<c:choose>
+    <c:when test="${empty param.string}">
+        Not set.
+    </c:when>
+    <c:otherwise>
+        String: <b><c:out value="${param.string}" /></b>!
+    </c:otherwise>
+</c:choose>
+</p>
+</body>
+</html>
+
+
+

Copied: tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/tomcat-run-multi-config/src/main/webapp/web.xml (from r1176539, tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/main/resources/logback-test.xml)
URL: http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/tomcat-run-multi-config/src/main/webapp/web.xml?p2=tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/tomcat-run-multi-config/src/main/webapp/web.xml&p1=tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/main/resources/logback-test.xml&r1=1176539&r2=1176544&rev=1176544&view=diff
==============================================================================
--- tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/main/resources/logback-test.xml (original)
+++ tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/tomcat-run-multi-config/src/main/webapp/web.xml Tue Sep 27 19:23:35 2011
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
 <!--
   ~ Licensed to the Apache Software Foundation (ASF) under one
   ~ or more contributor license agreements.  See the NOTICE file
@@ -17,18 +18,21 @@
   ~ under the License.
   -->
 
-<configuration>
+<web-app xmlns="http://java.sun.com/xml/ns/j2ee" version="2.4"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
 
-  <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
-    <!-- encoders are assigned the type
-         ch.qos.logback.classic.encoder.PatternLayoutEncoder by default -->
-    <encoder>
-      <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
-    </encoder>
-  </appender>
+<jsp-config>
+        <taglib>
+                <taglib-uri>http://java.sun.com/jsp/jstl/core</taglib-uri>
+                <taglib-location>/WEB-INF/tld/c.tld</taglib-location>
+        </taglib>
+</jsp-config>
+  <!--
+  <taglib>
+    <taglib-uri>http://java.sun.com/jstl/core</taglib-uri>
+    <taglib-location>/WEB-INF/c.tld</taglib-location>
+  </taglib>
+-->
 
-  <root level="debug">
-    <appender-ref ref="STDOUT"/>
-  </root>
-  
-</configuration>
+</web-app>

Added: tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/tomcat-run-multi-config/src/test/java/WaitIT.java
URL: http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/tomcat-run-multi-config/src/test/java/WaitIT.java?rev=1176544&view=auto
==============================================================================
--- tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/tomcat-run-multi-config/src/test/java/WaitIT.java (added)
+++ tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/tomcat-run-multi-config/src/test/java/WaitIT.java Tue Sep 27 19:23:35 2011
@@ -0,0 +1,30 @@
+import org.junit.Test;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "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
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
+@SuppressWarnings({"WrongPackageStatement"})
+public final class WaitIT {
+  @Test
+  public void testWait() throws Exception {
+    System.out.println("Just wait a while...");
+    Thread.sleep(${it.sleep.time});
+  }
+}

Added: tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/usage-contextpath/pom.xml
URL: http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/usage-contextpath/pom.xml?rev=1176544&view=auto
==============================================================================
--- tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/usage-contextpath/pom.xml (added)
+++ tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/usage-contextpath/pom.xml Tue Sep 27 19:23:35 2011
@@ -0,0 +1,107 @@
+<?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
+  ~ distributed with this work for additional information
+  ~ regarding copyright ownership.  The ASF licenses this file
+  ~ to you under the Apache License, Version 2.0 (the
+  ~ "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
+  ~
+  ~ Unless required by applicable law or agreed to in writing,
+  ~ software distributed under the License is distributed on an
+  ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  ~ KIND, either express or implied.  See the License for the
+  ~ specific language governing permissions and limitations
+  ~ under the License.
+  -->
+<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>
+  <groupId>org.codehaus.mojo.tomcat.it</groupId>
+  <artifactId>usage-contextpath</artifactId>
+  <version>1.0-SNAPSHOT</version>
+  <packaging>war</packaging>
+  <properties>
+    <pluginVersion>${project.version}</pluginVersion>
+    <maven.compiler.source>${maven.compiler.source}</maven.compiler.source>
+    <maven.compiler.target>${maven.compiler.target}</maven.compiler.target>
+    <project.build.sourceEncoding>${project.build.sourceEncoding}</project.build.sourceEncoding>
+    <failOnMissingWebXml>false</failOnMissingWebXml>
+  </properties>
+
+  <build>
+    <pluginManagement>
+      <plugins>
+        <plugin>
+          <groupId>org.apache.tomcat.maven</groupId>
+          <artifactId>tomcat6-maven-plugin</artifactId>
+          <version>${project.version}</version>
+        </plugin>
+      </plugins>
+    </pluginManagement>
+
+    <plugins>
+      <plugin>
+        <groupId>org.apache.tomcat.maven</groupId>
+        <artifactId>tomcat6-maven-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>tomcat-run</id>
+            <goals>
+              <goal>run</goal>
+            </goals>
+            <phase>pre-integration-test</phase>
+            <configuration>
+              <fork>true</fork>
+              <path>/lorem</path>
+            </configuration>
+          </execution>
+          <execution>
+            <id>tomcat-shutdown</id>
+            <goals>
+              <goal>shutdown</goal>
+            </goals>
+            <phase>post-integration-test</phase>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-failsafe-plugin</artifactId>
+        <version>${failsafe.version}</version>
+        <executions>
+          <execution>
+            <id>integration-test</id>
+            <goals>
+              <goal>integration-test</goal>
+            </goals>
+          </execution>
+          <execution>
+            <id>verify</id>
+            <goals>
+              <goal>verify</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-context-support</artifactId>
+      <version>2.5.6</version>
+    </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>${junit.version}</version>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+
+</project>

Copied: tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/usage-contextpath/src/main/webapp/index.html (from r1176539, tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/main/resources/logback-test.xml)
URL: http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/usage-contextpath/src/main/webapp/index.html?p2=tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/usage-contextpath/src/main/webapp/index.html&p1=tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/main/resources/logback-test.xml&r1=1176539&r2=1176544&rev=1176544&view=diff
==============================================================================
--- tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/main/resources/logback-test.xml (original)
+++ tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/usage-contextpath/src/main/webapp/index.html Tue Sep 27 19:23:35 2011
@@ -17,18 +17,13 @@
   ~ under the License.
   -->
 
-<configuration>
-
-  <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
-    <!-- encoders are assigned the type
-         ch.qos.logback.classic.encoder.PatternLayoutEncoder by default -->
-    <encoder>
-      <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
-    </encoder>
-  </appender>
-
-  <root level="debug">
-    <appender-ref ref="STDOUT"/>
-  </root>
-  
-</configuration>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
+        "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+    <title>Usage-Example: Contextpath</title>
+</head>
+<body>
+Success!
+</body>
+</html>

Added: tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/usage-contextpath/src/test/java/WaitIT.java
URL: http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/usage-contextpath/src/test/java/WaitIT.java?rev=1176544&view=auto
==============================================================================
--- tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/usage-contextpath/src/test/java/WaitIT.java (added)
+++ tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/usage-contextpath/src/test/java/WaitIT.java Tue Sep 27 19:23:35 2011
@@ -0,0 +1,31 @@
+import org.junit.Test;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "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
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
+
+@SuppressWarnings({"WrongPackageStatement"})
+public final class WaitIT {
+  @Test
+  public void testWait() throws Exception {
+    System.out.println("Just wait a while...");
+    Thread.sleep(${it.sleep.time});
+  }
+}



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


Mime
View raw message