svn commit: r1756441 [6/7] - in /tomcat/maven-plugin/trunk: ./ tomcat-maven-archetype/src/main/resources/archetype-resources/ tomcat-maven-archetype/src/main/resources/archetype-resources/__rootArtifactId__-webapp/ tomcat8-maven-plugin/ tomcat8-maven-p...

[olamy]

Propchange: 
tomcat/maven-plugin/trunk/tomcat8-maven-plugin/src/main/resources/conf/web.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: 
tomcat/maven-plugin/trunk/tomcat8-maven-plugin/src/main/resources/conf/web.xml
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Added: 
tomcat/maven-plugin/trunk/tomcat8-maven-plugin/src/site/apt/adjust-embedded-tomcat-version.apt.vm
URL: 
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat8-maven-plugin/src/site/apt/adjust-embedded-tomcat-version.apt.vm?rev=1756441&view=auto
==============================================================================
--- 
tomcat/maven-plugin/trunk/tomcat8-maven-plugin/src/site/apt/adjust-embedded-tomcat-version.apt.vm
 (added)
+++ 
tomcat/maven-plugin/trunk/tomcat8-maven-plugin/src/site/apt/adjust-embedded-tomcat-version.apt.vm
 Tue Aug 16 01:03:14 2016
@@ -0,0 +1,162 @@
+ ---
+ Adjust Tomcat Version
+ ---
+ Olivier Lamy
+ ---
+ 2012-04-11
+ ---
+
+ ~~ 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
+
+Adjust Tomcat Version
+
+ In case you need to adjust the version of the embedded tomcat to run you can 
do so by changing
+ the runtime-dependencies:
+
++--
+<project>
+   [...]
+  <properties>
+   <tomcat.version>7.0.50</tomcat.version>
+   [...]
+  </properties>
+   [...]
+  <build>
+    <pluginManagement>
+      <plugins>
+        <plugin>
+          <groupId>org.apache.tomcat.maven</groupId>
+          <artifactId>tomcat7-maven-plugin</artifactId>
+          <version>${project.version}</version>
+          <dependencies>
+          <dependency>
+            <groupId>org.apache.tomcat.embed</groupId>
+            <artifactId>tomcat-embed-core</artifactId>
+            <version>${tomcat.version}</version>
+          </dependency>
+          <dependency>
+            <groupId>org.apache.tomcat</groupId>
+            <artifactId>tomcat-util</artifactId>
+            <version>${tomcat.version}</version>
+          </dependency>
+          <dependency>
+            <groupId>org.apache.tomcat</groupId>
+            <artifactId>tomcat-coyote</artifactId>
+            <version>${tomcat.version}</version>
+          </dependency>
+          <dependency>
+            <groupId>org.apache.tomcat</groupId>
+            <artifactId>tomcat-api</artifactId>
+            <version>${tomcat.version}</version>
+          </dependency>
+
+          <dependency>
+            <groupId>org.apache.tomcat</groupId>
+            <artifactId>tomcat-jdbc</artifactId>
+            <version>${tomcat.version}</version>
+          </dependency>
+
+          <dependency>
+            <groupId>org.apache.tomcat</groupId>
+            <artifactId>tomcat-dbcp</artifactId>
+            <version>${tomcat.version}</version>
+          </dependency>
+
+          <dependency>
+            <groupId>org.apache.tomcat</groupId>
+            <artifactId>tomcat-servlet-api</artifactId>
+            <version>${tomcat.version}</version>
+          </dependency>
+
+          <dependency>
+            <groupId>org.apache.tomcat</groupId>
+            <artifactId>tomcat-jsp-api</artifactId>
+            <version>${tomcat.version}</version>
+          </dependency>
+
+          <dependency>
+            <groupId>org.apache.tomcat</groupId>
+            <artifactId>tomcat-jasper</artifactId>
+            <version>${tomcat.version}</version>
+          </dependency>
+
+          <dependency>
+            <groupId>org.apache.tomcat</groupId>
+            <artifactId>tomcat-jasper-el</artifactId>
+            <version>${tomcat.version}</version>
+          </dependency>
+
+          <dependency>
+            <groupId>org.apache.tomcat</groupId>
+            <artifactId>tomcat-el-api</artifactId>
+            <version>${tomcat.version}</version>
+          </dependency>
+
+          <dependency>
+            <groupId>org.apache.tomcat</groupId>
+            <artifactId>tomcat-catalina</artifactId>
+            <version>${tomcat.version}</version>
+          </dependency>
+
+          <dependency>
+            <groupId>org.apache.tomcat</groupId>
+            <artifactId>tomcat-tribes</artifactId>
+            <version>${tomcat.version}</version>
+          </dependency>
+
+          <dependency>
+            <groupId>org.apache.tomcat</groupId>
+            <artifactId>tomcat-catalina-ha</artifactId>
+            <version>${tomcat.version}</version>
+          </dependency>
+
+          <dependency>
+            <groupId>org.apache.tomcat</groupId>
+            <artifactId>tomcat-annotations-api</artifactId>
+            <version>${tomcat.version}</version>
+          </dependency>
+
+          <dependency>
+            <groupId>org.apache.tomcat</groupId>
+            <artifactId>tomcat-juli</artifactId>
+            <version>${tomcat.version}</version>
+          </dependency>
+
+          <dependency>
+            <groupId>org.apache.tomcat.embed</groupId>
+            <artifactId>tomcat-embed-logging-juli</artifactId>
+            <version>${tomcat.version}</version>
+          </dependency>
+          <dependency>
+            <groupId>org.apache.tomcat.embed</groupId>
+            <artifactId>tomcat-embed-logging-log4j</artifactId>
+            <version>${tomcat.version}</version>
+          </dependency>
+          </dependencies>
+        </plugin>
+        [...]
+      </plugins>
+    </pluginManagement>
+    [...]
+  </build>
+  [...]
+</project>
++--

Propchange: 
tomcat/maven-plugin/trunk/tomcat8-maven-plugin/src/site/apt/adjust-embedded-tomcat-version.apt.vm
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: 
tomcat/maven-plugin/trunk/tomcat8-maven-plugin/src/site/apt/adjust-embedded-tomcat-version.apt.vm
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Added: tomcat/maven-plugin/trunk/tomcat8-maven-plugin/src/site/apt/index.apt
URL: 
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat8-maven-plugin/src/site/apt/index.apt?rev=1756441&view=auto
==============================================================================
--- tomcat/maven-plugin/trunk/tomcat8-maven-plugin/src/site/apt/index.apt 
(added)
+++ tomcat/maven-plugin/trunk/tomcat8-maven-plugin/src/site/apt/index.apt Tue 
Aug 16 01:03:14 2016
@@ -0,0 +1,39 @@
+ ---
+ Introduction
+ ---
+ Olivier Lamy
+ ---
+ 2012-02-03
+ ---
+
+ ~~ 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
+
+Tomcat Maven Plugin
+
+ The Tomcat7 Maven Plugin provides goals to manipulate WAR projects within the 
{{{http://tomcat.apache.org/}Tomcat}} servlet container version 7.x
+
+* Goals Overview
+
+  The goals for this plugin are available here {{{./plugin-info.html}goals 
page}}.
+
+* Usage
+
+  Instructions on how to use the Tomcat Maven Plugin can be found on the 
{{{./usage.html}usage page}}.

Propchange: 
tomcat/maven-plugin/trunk/tomcat8-maven-plugin/src/site/apt/index.apt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: 
tomcat/maven-plugin/trunk/tomcat8-maven-plugin/src/site/apt/index.apt
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Added: tomcat/maven-plugin/trunk/tomcat8-maven-plugin/src/site/apt/usage.apt.vm
URL: 
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat8-maven-plugin/src/site/apt/usage.apt.vm?rev=1756441&view=auto
==============================================================================
--- tomcat/maven-plugin/trunk/tomcat8-maven-plugin/src/site/apt/usage.apt.vm 
(added)
+++ tomcat/maven-plugin/trunk/tomcat8-maven-plugin/src/site/apt/usage.apt.vm 
Tue Aug 16 01:03:14 2016
@@ -0,0 +1,182 @@
+ ---
+ Usage
+ ---
+ Olivier Lamy
+ ---
+ 2012-02-03
+ ---
+
+ ~~ 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
+
+Usage
+
+ If no explicit configuration is provided then the Tomcat7 Maven Plugin 
defaults to
+ the following:
+
+ * Tomcat manager URL of <<<http://localhost:8080/manager>>>
+
+ * Authentication details of username <<<admin>>> and no password
+
+ * Context path of <<</$\{project.artifactId\}>>>
+
+ []
+
+ These can be overridden as described below.
+
+* Using a different Tomcat manager URL
+
+ To configure the plugin for a different Tomcat instance, add a plugin
+ configuration block to your <<<pom.xml>>> as follows:
+
++--
+<project>
+  ...
+  <build>
+    ...
+    <plugins>
+      ...
+      <plugin>
+        <groupId>org.apache.tomcat.maven</groupId>
+        <artifactId>tomcat7-maven-plugin</artifactId>
+        <version>${project.version}</version>
+        <configuration>
+          <url>http://www.mydomain.com:1234/mymanager</url>
+        </configuration>
+      </plugin>
+      ...
+    </plugins>
+    ...
+  </build>
+  ...
+</project>
++--
+
+  The default Tomcat manager URL is <<<http://localhost:8080/manager/text>>>.
+
+* Using different Tomcat manager authentication details
+
+ To specify a different username and password to use when authenticating with
+ Tomcat manager:
+
+ [[1]] Add a plugin configuration block to your <<<pom.xml>>>:
+
++--
+<project>
+  ...
+  <build>
+    ...
+    <plugins>
+      ...
+      <plugin>
+        <groupId>org.apache.tomcat.maven</groupId>
+        <artifactId>tomcat7-maven-plugin</artifactId>
+        <version>${project.version}</version>
+        <configuration>
+          <server>myserver</server>
+        </configuration>
+      </plugin>
+      ...
+    </plugins>
+    ...
+  </build>
+  ...
+</project>
++--
+
+ [[2]] Add a corresponding <<<server>>> block to your <<<settings.xml>>>:
+
++--
+<settings>
+  ...
+  <servers>
+    ...
+    <server>
+      <id>myserver</id>
+      <username>myusername</username>
+      <password>mypassword</password>
+    </server>
+    ...
+  </servers>
+  ...
+</settings>
++--
+
+ []
+
+ The default authentication details are username <<<admin>>> and no password.
+
+* Using a different context path
+
+ The default context path is <<</$\{project.artifactId\}>>>.
+
+ To change the context path to <<</mycontext>>> configure the plugin like this:
+
++--
+<project>
+  ...
+  <build>
+    ...
+    <plugins>
+      ...
+      <plugin>
+        <groupId>org.apache.tomcat.maven</groupId>
+        <artifactId>tomcat7-maven-plugin</artifactId>
+        <version>${project.version}</version>
+        <configuration>
+          <path>/mycontext</path>
+        </configuration>
+      </plugin>
+      ...
+    </plugins>
+    ...
+  </build>
+  ...
+</project>
++--
+
+ If you are using <<<project.build.finalName>>> to change the name of your WAR
+ file, you can use that value when you configure the context path as well. To 
do
+ that add the following configuration block to your <<<pom.xml>>>:
+
++--
+<project>
+  ...
+  <build>
+    ...
+    <finalName>mycontext</finalName>
+    ...
+    <plugins>
+      ...
+      <plugin>
+        <groupId>org.apache.tomcat.maven</groupId>
+        <artifactId>tomcat7-maven-plugin</artifactId>
+        <version>${project.version}</version>
+        <configuration>
+          <path>/\${project.build.finalName}</path>
+        </configuration>
+      </plugin>
+      ...
+    </plugins>
+    ...
+  </build>
+  ...
+</project>
++--

Propchange: 
tomcat/maven-plugin/trunk/tomcat8-maven-plugin/src/site/apt/usage.apt.vm
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: 
tomcat/maven-plugin/trunk/tomcat8-maven-plugin/src/site/apt/usage.apt.vm
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Added: tomcat/maven-plugin/trunk/tomcat8-maven-plugin/src/site/site.xml
URL: 
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat8-maven-plugin/src/site/site.xml?rev=1756441&view=auto
==============================================================================
--- tomcat/maven-plugin/trunk/tomcat8-maven-plugin/src/site/site.xml (added)
+++ tomcat/maven-plugin/trunk/tomcat8-maven-plugin/src/site/site.xml Tue Aug 16 
01:03:14 2016
@@ -0,0 +1,39 @@
+<?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
+  ~ 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/DECORATION/1.0.0"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xsi:schemaLocation="http://maven.apache.org/DECORATION/1.0.0 
http://maven.apache.org/xsd/decoration-1.0.0.xsd";>
+  <body>
+    <menu name="Overview">
+      <item name="Introduction"          href="index.html"/>
+      <item name="Goals"                 href="plugin-info.html"/>
+      <item name="Adjust Tomcat Version" 
href="adjust-embedded-tomcat-version.html"/>
+    </menu>
+
+    <menu ref="reports"/>
+
+    <menu name="ASF">
+      <item name="How Apache Works"  
href="http://www.apache.org/foundation/how-it-works.html"/>
+      <item name="Foundation"        href="http://www.apache.org/foundation/"/>
+      <item name="Sponsoring Apache" 
href="http://www.apache.org/foundation/sponsorship.html"/>
+      <item name="Thanks"            
href="http://www.apache.org/foundation/thanks.html"/>
+    </menu>
+
+  </body>
+</project>

Propchange: tomcat/maven-plugin/trunk/tomcat8-maven-plugin/src/site/site.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: tomcat/maven-plugin/trunk/tomcat8-maven-plugin/src/site/site.xml
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Added: 
tomcat/maven-plugin/trunk/tomcat8-maven-plugin/src/test/java/org/apache/tomcat/maven/it/Tomcat7DeployWarOnlyProjectIT.java
URL: 
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat8-maven-plugin/src/test/java/org/apache/tomcat/maven/it/Tomcat7DeployWarOnlyProjectIT.java?rev=1756441&view=auto
==============================================================================
--- 
tomcat/maven-plugin/trunk/tomcat8-maven-plugin/src/test/java/org/apache/tomcat/maven/it/Tomcat7DeployWarOnlyProjectIT.java
 (added)
+++ 
tomcat/maven-plugin/trunk/tomcat8-maven-plugin/src/test/java/org/apache/tomcat/maven/it/Tomcat7DeployWarOnlyProjectIT.java
 Tue Aug 16 01:03:14 2016
@@ -0,0 +1,31 @@
+package org.apache.tomcat.maven.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.
+ */
+
+import org.apache.tomcat.maven.it.AbstractDeployWarOnlyProjectIT;
+
+/**
+ * @author Olivier Lamy
+ */
+public class Tomcat7DeployWarOnlyProjectIT
+    extends AbstractDeployWarOnlyProjectIT
+{
+    // no op
+
+}

Propchange: 
tomcat/maven-plugin/trunk/tomcat8-maven-plugin/src/test/java/org/apache/tomcat/maven/it/Tomcat7DeployWarOnlyProjectIT.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: 
tomcat/maven-plugin/trunk/tomcat8-maven-plugin/src/test/java/org/apache/tomcat/maven/it/Tomcat7DeployWarOnlyProjectIT.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Added: 
tomcat/maven-plugin/trunk/tomcat8-maven-plugin/src/test/java/org/apache/tomcat/maven/it/Tomcat7DeployWarProjectIT.java
URL: 
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat8-maven-plugin/src/test/java/org/apache/tomcat/maven/it/Tomcat7DeployWarProjectIT.java?rev=1756441&view=auto
==============================================================================
--- 
tomcat/maven-plugin/trunk/tomcat8-maven-plugin/src/test/java/org/apache/tomcat/maven/it/Tomcat7DeployWarProjectIT.java
 (added)
+++ 
tomcat/maven-plugin/trunk/tomcat8-maven-plugin/src/test/java/org/apache/tomcat/maven/it/Tomcat7DeployWarProjectIT.java
 Tue Aug 16 01:03:14 2016
@@ -0,0 +1,30 @@
+package org.apache.tomcat.maven.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.
+ */
+
+import org.apache.tomcat.maven.it.AbstractDeployWarProjectIT;
+
+/**
+ * @author Olivier Lamy
+ */
+public class Tomcat7DeployWarProjectIT
+    extends AbstractDeployWarProjectIT
+{
+    // no op
+}

Propchange: 
tomcat/maven-plugin/trunk/tomcat8-maven-plugin/src/test/java/org/apache/tomcat/maven/it/Tomcat7DeployWarProjectIT.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: 
tomcat/maven-plugin/trunk/tomcat8-maven-plugin/src/test/java/org/apache/tomcat/maven/it/Tomcat7DeployWarProjectIT.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Added: 
tomcat/maven-plugin/trunk/tomcat8-maven-plugin/src/test/java/org/apache/tomcat/maven/it/Tomcat7RunMultiConfigIT.java
URL: 
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat8-maven-plugin/src/test/java/org/apache/tomcat/maven/it/Tomcat7RunMultiConfigIT.java?rev=1756441&view=auto
==============================================================================
--- 
tomcat/maven-plugin/trunk/tomcat8-maven-plugin/src/test/java/org/apache/tomcat/maven/it/Tomcat7RunMultiConfigIT.java
 (added)
+++ 
tomcat/maven-plugin/trunk/tomcat8-maven-plugin/src/test/java/org/apache/tomcat/maven/it/Tomcat7RunMultiConfigIT.java
 Tue Aug 16 01:03:14 2016
@@ -0,0 +1,38 @@
+package org.apache.tomcat.maven.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.
+ */
+
+import org.apache.maven.it.VerificationException;
+import org.apache.tomcat.maven.it.AbstractTomcatRunMultiConfigIT;
+
+/**
+ * @author Olivier Lamy
+ */
+public class Tomcat7RunMultiConfigIT
+    extends AbstractTomcatRunMultiConfigIT
+{
+    @Override
+    protected void verifyConnectorsStarted()
+        throws VerificationException
+    {
+        verifier.verifyTextInLog("INFO: Starting ProtocolHandler [\"http-bio-" 
+ getHttpItPort() + "\"]");
+        verifier.verifyTextInLog("INFO: Starting ProtocolHandler [\"http-bio-" 
+ getHttpsItPort() + "\"]");
+        verifier.verifyTextInLog("INFO: Starting ProtocolHandler [\"ajp-bio-" 
+ getAjpItPort() + "\"]");
+    }
+}

Propchange: 
tomcat/maven-plugin/trunk/tomcat8-maven-plugin/src/test/java/org/apache/tomcat/maven/it/Tomcat7RunMultiConfigIT.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: 
tomcat/maven-plugin/trunk/tomcat8-maven-plugin/src/test/java/org/apache/tomcat/maven/it/Tomcat7RunMultiConfigIT.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Added: 
tomcat/maven-plugin/trunk/tomcat8-maven-plugin/src/test/java/org/apache/tomcat/maven/it/Tomcat7SimpleWarProjectIT.java
URL: 
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat8-maven-plugin/src/test/java/org/apache/tomcat/maven/it/Tomcat7SimpleWarProjectIT.java?rev=1756441&view=auto
==============================================================================
--- 
tomcat/maven-plugin/trunk/tomcat8-maven-plugin/src/test/java/org/apache/tomcat/maven/it/Tomcat7SimpleWarProjectIT.java
 (added)
+++ 
tomcat/maven-plugin/trunk/tomcat8-maven-plugin/src/test/java/org/apache/tomcat/maven/it/Tomcat7SimpleWarProjectIT.java
 Tue Aug 16 01:03:14 2016
@@ -0,0 +1,43 @@
+package org.apache.tomcat.maven.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.
+ */
+
+import org.apache.maven.it.VerificationException;
+import org.apache.tomcat.maven.it.AbstractSimpleWarProjectIT;
+
+/**
+ * @author Olivier Lamy
+ */
+public class Tomcat7SimpleWarProjectIT
+    extends AbstractSimpleWarProjectIT
+{
+    protected int getTimeout()
+    {
+        return 20000;
+    }
+
+    @Override
+    protected void verifyConnectorsStarted()
+        throws VerificationException
+    {
+        verifier.verifyTextInLog("INFO: Starting ProtocolHandler [\"http-bio-" 
+ getHttpItPort() + "\"]");
+
+        verifier.verifyTextInLog( "INFO: Starting ProtocolHandler 
[\"ajp-bio-"+ getAjpItPort() +"\"]" );
+    }
+}

Propchange: 
tomcat/maven-plugin/trunk/tomcat8-maven-plugin/src/test/java/org/apache/tomcat/maven/it/Tomcat7SimpleWarProjectIT.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: 
tomcat/maven-plugin/trunk/tomcat8-maven-plugin/src/test/java/org/apache/tomcat/maven/it/Tomcat7SimpleWarProjectIT.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Added: tomcat/maven-plugin/trunk/tomcat8-maven-plugin/src/test/keystore
URL: 
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat8-maven-plugin/src/test/keystore?rev=1756441&view=auto
==============================================================================
Binary files tomcat/maven-plugin/trunk/tomcat8-maven-plugin/src/test/keystore 
(added) and tomcat/maven-plugin/trunk/tomcat8-maven-plugin/src/test/keystore 
Tue Aug 16 01:03:14 2016 differ

Added: tomcat/maven-plugin/trunk/tomcat8-maven-plugin/src/test/manager.war
URL: 
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat8-maven-plugin/src/test/manager.war?rev=1756441&view=auto
==============================================================================
Binary files 
tomcat/maven-plugin/trunk/tomcat8-maven-plugin/src/test/manager.war (added) and 
tomcat/maven-plugin/trunk/tomcat8-maven-plugin/src/test/manager.war Tue Aug 16 
01:03:14 2016 differ

Added: 
tomcat/maven-plugin/trunk/tomcat8-maven-plugin/src/test/resources/deploy-only-war-project/pom.xml
URL: 
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat8-maven-plugin/src/test/resources/deploy-only-war-project/pom.xml?rev=1756441&view=auto
==============================================================================
--- 
tomcat/maven-plugin/trunk/tomcat8-maven-plugin/src/test/resources/deploy-only-war-project/pom.xml
 (added)
+++ 
tomcat/maven-plugin/trunk/tomcat8-maven-plugin/src/test/resources/deploy-only-war-project/pom.xml
 Tue Aug 16 01:03:14 2016
@@ -0,0 +1,137 @@
+<?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.apache.tomcat.maven.it</groupId>
+  <artifactId>simple-war-project</artifactId>
+  <version>1.0-SNAPSHOT</version>
+  <packaging>war</packaging>
+
+  <properties>
+    
<project.build.sourceEncoding>${project.build.sourceEncoding}</project.build.sourceEncoding>
+  </properties>
+
+  <build>
+    <pluginManagement>
+      <plugins>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-war-plugin</artifactId>
+          <version>2.1-alpha-2</version>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-compiler-plugin</artifactId>
+          <version>2.3.2</version>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.tomcat.maven</groupId>
+          <artifactId>tomcat7-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>tomcat7-maven-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>tomcat-run</id>
+            <goals>
+              <goal>run-war-only</goal>
+            </goals>
+            <phase>pre-integration-test</phase>
+            <configuration>
+              <fork>true</fork>
+              <path>/foo</path>
+              <serverXml>src/main/tomcatconf/server.xml</serverXml>
+              <tomcatUsers>src/main/tomcatconf/tomcat-users.xml</tomcatUsers>
+            </configuration>
+          </execution>
+          <execution>
+            <id>tomcat-deploy</id>
+            <phase>integration-test</phase>
+            <goals>
+              <goal>deploy-only</goal>
+            </goals>
+            <configuration>
+              <url>http://localhost:${its.http.port}/manager</url>
+              <path>/bar</path>
+              <warFile>${warTestPath}</warFile>
+              <username>tomcat</username>
+              <password>tomcat</password>
+              <tag>test</tag>
+            </configuration>
+          </execution>
+          <execution>
+            <id>tomcat-shutdown</id>
+            <phase>post-integration-test</phase>
+            <goals>
+              <goal>shutdown</goal>
+            </goals>
+          </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>4.9</version>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+
+</project>

Propchange: 
tomcat/maven-plugin/trunk/tomcat8-maven-plugin/src/test/resources/deploy-only-war-project/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: 
tomcat/maven-plugin/trunk/tomcat8-maven-plugin/src/test/resources/deploy-only-war-project/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Added: 
tomcat/maven-plugin/trunk/tomcat8-maven-plugin/src/test/resources/deploy-only-war-project/src/main/tomcatconf/empty.txt
URL: 
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat8-maven-plugin/src/test/resources/deploy-only-war-project/src/main/tomcatconf/empty.txt?rev=1756441&view=auto
==============================================================================
--- 
tomcat/maven-plugin/trunk/tomcat8-maven-plugin/src/test/resources/deploy-only-war-project/src/main/tomcatconf/empty.txt
 (added)
+++ 
tomcat/maven-plugin/trunk/tomcat8-maven-plugin/src/test/resources/deploy-only-war-project/src/main/tomcatconf/empty.txt
 Tue Aug 16 01:03:14 2016
@@ -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

Propchange: 
tomcat/maven-plugin/trunk/tomcat8-maven-plugin/src/test/resources/deploy-only-war-project/src/main/tomcatconf/empty.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: 
tomcat/maven-plugin/trunk/tomcat8-maven-plugin/src/test/resources/deploy-only-war-project/src/main/tomcatconf/empty.txt
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Added: 
tomcat/maven-plugin/trunk/tomcat8-maven-plugin/src/test/resources/deploy-only-war-project/src/main/tomcatconf/logging.properties
URL: 
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat8-maven-plugin/src/test/resources/deploy-only-war-project/src/main/tomcatconf/logging.properties?rev=1756441&view=auto
==============================================================================
--- 
tomcat/maven-plugin/trunk/tomcat8-maven-plugin/src/test/resources/deploy-only-war-project/src/main/tomcatconf/logging.properties
 (added)
+++ 
tomcat/maven-plugin/trunk/tomcat8-maven-plugin/src/test/resources/deploy-only-war-project/src/main/tomcatconf/logging.properties
 Tue Aug 16 01:03:14 2016
@@ -0,0 +1,66 @@
+# 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.
+
+handlers = 1catalina.org.apache.juli.FileHandler, 
2localhost.org.apache.juli.FileHandler, 3manager.org.apache.juli.FileHandler, 
4host-manager.org.apache.juli.FileHandler, java.util.logging.ConsoleHandler
+
+.handlers = 1catalina.org.apache.juli.FileHandler, 
java.util.logging.ConsoleHandler
+
+############################################################
+# Handler specific properties.
+# Describes specific configuration info for Handlers.
+############################################################
+
+1catalina.org.apache.juli.FileHandler.level = FINE
+1catalina.org.apache.juli.FileHandler.directory = ${catalina.base}/logs
+1catalina.org.apache.juli.FileHandler.prefix = catalina.
+
+2localhost.org.apache.juli.FileHandler.level = FINE
+2localhost.org.apache.juli.FileHandler.directory = ${catalina.base}/logs
+2localhost.org.apache.juli.FileHandler.prefix = localhost.
+
+3manager.org.apache.juli.FileHandler.level = FINE
+3manager.org.apache.juli.FileHandler.directory = ${catalina.base}/logs
+3manager.org.apache.juli.FileHandler.prefix = manager.
+
+4host-manager.org.apache.juli.FileHandler.level = FINE
+4host-manager.org.apache.juli.FileHandler.directory = ${catalina.base}/logs
+4host-manager.org.apache.juli.FileHandler.prefix = host-manager.
+
+java.util.logging.ConsoleHandler.level = FINE
+java.util.logging.ConsoleHandler.formatter = java.util.logging.SimpleFormatter
+
+
+############################################################
+# Facility specific properties.
+# Provides extra control for each logger.
+############################################################
+
+org.apache.catalina.core.ContainerBase.[Catalina].[localhost].level = INFO
+org.apache.catalina.core.ContainerBase.[Catalina].[localhost].handlers = 
2localhost.org.apache.juli.FileHandler
+
+org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/manager].level 
= INFO
+org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/manager].handlers
 = 3manager.org.apache.juli.FileHandler
+
+org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/host-manager].level
 = INFO
+org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/host-manager].handlers
 = 4host-manager.org.apache.juli.FileHandler
+
+# For example, set the org.apache.catalina.util.LifecycleBase logger to log
+# each component that extends LifecycleBase changing state:
+#org.apache.catalina.util.LifecycleBase.level = FINE
+
+# To see debug messages in TldLocationsCache, uncomment the following line:
+#org.apache.jasper.compiler.TldLocationsCache.level = FINE
+
+org.apache.catalina.realm.MemoryRealm = FINE

Propchange: 
tomcat/maven-plugin/trunk/tomcat8-maven-plugin/src/test/resources/deploy-only-war-project/src/main/tomcatconf/logging.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: 
tomcat/maven-plugin/trunk/tomcat8-maven-plugin/src/test/resources/deploy-only-war-project/src/main/tomcatconf/logging.properties
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Added: 
tomcat/maven-plugin/trunk/tomcat8-maven-plugin/src/test/resources/deploy-only-war-project/src/main/tomcatconf/server.xml
URL: 
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat8-maven-plugin/src/test/resources/deploy-only-war-project/src/main/tomcatconf/server.xml?rev=1756441&view=auto
==============================================================================
--- 
tomcat/maven-plugin/trunk/tomcat8-maven-plugin/src/test/resources/deploy-only-war-project/src/main/tomcatconf/server.xml
 (added)
+++ 
tomcat/maven-plugin/trunk/tomcat8-maven-plugin/src/test/resources/deploy-only-war-project/src/main/tomcatconf/server.xml
 Tue Aug 16 01:03:14 2016
@@ -0,0 +1,44 @@
+<!--
+  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="${its.server.port}" 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="${its.http.port}" 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-status:%s-localPort:%p-path:%U-time:%D ms" 
buffered="false"/>
+      <Realm className="org.apache.catalina.realm.UserDatabaseRealm"
+             resourceName="UserDatabase" />
+      <Host name="localhost" 
appBase="${project.build.directory}/test-classes/deploy-only-war-project/target/tomcat/webapps">
+        <Context path="/manager" privileged="true" 
docBase="${managerWebAppPath}/manager"/>
+      </Host>
+    </Engine>
+    
+  </Service>
+</Server>

Propchange: 
tomcat/maven-plugin/trunk/tomcat8-maven-plugin/src/test/resources/deploy-only-war-project/src/main/tomcatconf/server.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: 
tomcat/maven-plugin/trunk/tomcat8-maven-plugin/src/test/resources/deploy-only-war-project/src/main/tomcatconf/server.xml
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Added: 
tomcat/maven-plugin/trunk/tomcat8-maven-plugin/src/test/resources/deploy-only-war-project/src/main/tomcatconf/tomcat-users.xml
URL: 
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat8-maven-plugin/src/test/resources/deploy-only-war-project/src/main/tomcatconf/tomcat-users.xml?rev=1756441&view=auto
==============================================================================
--- 
tomcat/maven-plugin/trunk/tomcat8-maven-plugin/src/test/resources/deploy-only-war-project/src/main/tomcatconf/tomcat-users.xml
 (added)
+++ 
tomcat/maven-plugin/trunk/tomcat8-maven-plugin/src/test/resources/deploy-only-war-project/src/main/tomcatconf/tomcat-users.xml
 Tue Aug 16 01:03:14 2016
@@ -0,0 +1,31 @@
+<?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.
+-->
+<tomcat-users>
+<!--
+  <role rolename="tomcat"/>
+  <role rolename="role1"/>
+  <user username="tomcat" password="tomcat" roles="tomcat"/>
+  <user username="both" password="tomcat" roles="tomcat,role1"/>
+  <user username="role1" password="tomcat" roles="role1"/>
+-->
+  <role rolename="manager"/>
+  <role rolename="manager-gui"/>
+  <role rolename="manager-script"/>
+  <user username="admin" password="admin123" 
roles="manager,manager-gui,manager-script" />
+  <user username="tomcat" password="tomcat" roles="manager"/>
+</tomcat-users>

Propchange: 
tomcat/maven-plugin/trunk/tomcat8-maven-plugin/src/test/resources/deploy-only-war-project/src/main/tomcatconf/tomcat-users.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: 
tomcat/maven-plugin/trunk/tomcat8-maven-plugin/src/test/resources/deploy-only-war-project/src/main/tomcatconf/tomcat-users.xml
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Added: 
tomcat/maven-plugin/trunk/tomcat8-maven-plugin/src/test/resources/deploy-only-war-project/src/main/webapp/index.jsp
URL: 
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat8-maven-plugin/src/test/resources/deploy-only-war-project/src/main/webapp/index.jsp?rev=1756441&view=auto
==============================================================================
--- 
tomcat/maven-plugin/trunk/tomcat8-maven-plugin/src/test/resources/deploy-only-war-project/src/main/webapp/index.jsp
 (added)
+++ 
tomcat/maven-plugin/trunk/tomcat8-maven-plugin/src/test/resources/deploy-only-war-project/src/main/webapp/index.jsp
 Tue Aug 16 01:03:14 2016
@@ -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

Propchange: 
tomcat/maven-plugin/trunk/tomcat8-maven-plugin/src/test/resources/deploy-only-war-project/src/main/webapp/index.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: 
tomcat/maven-plugin/trunk/tomcat8-maven-plugin/src/test/resources/deploy-only-war-project/src/main/webapp/index.jsp
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Added: 
tomcat/maven-plugin/trunk/tomcat8-maven-plugin/src/test/resources/deploy-only-war-project/src/main/webapp/web.xml
URL: 
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat8-maven-plugin/src/test/resources/deploy-only-war-project/src/main/webapp/web.xml?rev=1756441&view=auto
==============================================================================
--- 
tomcat/maven-plugin/trunk/tomcat8-maven-plugin/src/test/resources/deploy-only-war-project/src/main/webapp/web.xml
 (added)
+++ 
tomcat/maven-plugin/trunk/tomcat8-maven-plugin/src/test/resources/deploy-only-war-project/src/main/webapp/web.xml
 Tue Aug 16 01:03:14 2016
@@ -0,0 +1,26 @@
+<?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.
+-->
+
+<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

Propchange: 
tomcat/maven-plugin/trunk/tomcat8-maven-plugin/src/test/resources/deploy-only-war-project/src/main/webapp/web.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: 
tomcat/maven-plugin/trunk/tomcat8-maven-plugin/src/test/resources/deploy-only-war-project/src/main/webapp/web.xml
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Added: 
tomcat/maven-plugin/trunk/tomcat8-maven-plugin/src/test/resources/deploy-only-war-project/src/test/java/WaitIT.java
URL: 
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat8-maven-plugin/src/test/resources/deploy-only-war-project/src/test/java/WaitIT.java?rev=1756441&view=auto
==============================================================================
--- 
tomcat/maven-plugin/trunk/tomcat8-maven-plugin/src/test/resources/deploy-only-war-project/src/test/java/WaitIT.java
 (added)
+++ 
tomcat/maven-plugin/trunk/tomcat8-maven-plugin/src/test/resources/deploy-only-war-project/src/test/java/WaitIT.java
 Tue Aug 16 01:03:14 2016
@@ -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});
+  }
+}

Propchange: 
tomcat/maven-plugin/trunk/tomcat8-maven-plugin/src/test/resources/deploy-only-war-project/src/test/java/WaitIT.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: 
tomcat/maven-plugin/trunk/tomcat8-maven-plugin/src/test/resources/deploy-only-war-project/src/test/java/WaitIT.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Added: 
tomcat/maven-plugin/trunk/tomcat8-maven-plugin/src/test/resources/deploy-war-project/pom.xml
URL: 
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat8-maven-plugin/src/test/resources/deploy-war-project/pom.xml?rev=1756441&view=auto
==============================================================================
--- 
tomcat/maven-plugin/trunk/tomcat8-maven-plugin/src/test/resources/deploy-war-project/pom.xml
 (added)
+++ 
tomcat/maven-plugin/trunk/tomcat8-maven-plugin/src/test/resources/deploy-war-project/pom.xml
 Tue Aug 16 01:03:14 2016
@@ -0,0 +1,135 @@
+<?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.apache.tomcat.maven.it</groupId>
+  <artifactId>simple-war-project</artifactId>
+  <version>1.0-SNAPSHOT</version>
+  <packaging>war</packaging>
+
+  <properties>
+    
<project.build.sourceEncoding>${project.build.sourceEncoding}</project.build.sourceEncoding>
+  </properties>
+
+  <build>
+    <pluginManagement>
+      <plugins>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-war-plugin</artifactId>
+          <version>2.1-alpha-2</version>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-compiler-plugin</artifactId>
+          <version>2.3.2</version>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.tomcat.maven</groupId>
+          <artifactId>tomcat7-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>tomcat7-maven-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>tomcat-run</id>
+            <goals>
+              <goal>run-war-only</goal>
+            </goals>
+            <phase>pre-integration-test</phase>
+            <configuration>
+              <fork>true</fork>
+              <path>/foo</path>
+              <serverXml>src/main/tomcatconf/server.xml</serverXml>
+              <tomcatUsers>src/main/tomcatconf/tomcat-users.xml</tomcatUsers>
+            </configuration>
+          </execution>
+          <execution>
+            <id>tomcat-deploy</id>
+            <phase>integration-test</phase>
+            <goals>
+              <goal>deploy</goal>
+            </goals>
+            <configuration>
+              <url>http://localhost:${its.http.port}/manager</url>
+              <username>tomcat</username>
+              <password>tomcat</password>
+              <path>/foo</path>
+            </configuration>
+          </execution>
+          <execution>
+            <id>tomcat-shutdown</id>
+            <phase>post-integration-test</phase>
+            <goals>
+              <goal>shutdown</goal>
+            </goals>
+          </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>4.9</version>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+
+</project>

Propchange: 
tomcat/maven-plugin/trunk/tomcat8-maven-plugin/src/test/resources/deploy-war-project/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: 
tomcat/maven-plugin/trunk/tomcat8-maven-plugin/src/test/resources/deploy-war-project/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Added: 
tomcat/maven-plugin/trunk/tomcat8-maven-plugin/src/test/resources/deploy-war-project/src/main/tomcatconf/empty.txt
URL: 
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat8-maven-plugin/src/test/resources/deploy-war-project/src/main/tomcatconf/empty.txt?rev=1756441&view=auto
==============================================================================
--- 
tomcat/maven-plugin/trunk/tomcat8-maven-plugin/src/test/resources/deploy-war-project/src/main/tomcatconf/empty.txt
 (added)
+++ 
tomcat/maven-plugin/trunk/tomcat8-maven-plugin/src/test/resources/deploy-war-project/src/main/tomcatconf/empty.txt
 Tue Aug 16 01:03:14 2016
@@ -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

Propchange: 
tomcat/maven-plugin/trunk/tomcat8-maven-plugin/src/test/resources/deploy-war-project/src/main/tomcatconf/empty.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: 
tomcat/maven-plugin/trunk/tomcat8-maven-plugin/src/test/resources/deploy-war-project/src/main/tomcatconf/empty.txt
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Added: 
tomcat/maven-plugin/trunk/tomcat8-maven-plugin/src/test/resources/deploy-war-project/src/main/tomcatconf/logging.properties
URL: 
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat8-maven-plugin/src/test/resources/deploy-war-project/src/main/tomcatconf/logging.properties?rev=1756441&view=auto
==============================================================================
--- 
tomcat/maven-plugin/trunk/tomcat8-maven-plugin/src/test/resources/deploy-war-project/src/main/tomcatconf/logging.properties
 (added)
+++ 
tomcat/maven-plugin/trunk/tomcat8-maven-plugin/src/test/resources/deploy-war-project/src/main/tomcatconf/logging.properties
 Tue Aug 16 01:03:14 2016
@@ -0,0 +1,66 @@
+# 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.
+
+handlers = 1catalina.org.apache.juli.FileHandler, 
2localhost.org.apache.juli.FileHandler, 3manager.org.apache.juli.FileHandler, 
4host-manager.org.apache.juli.FileHandler, java.util.logging.ConsoleHandler
+
+.handlers = 1catalina.org.apache.juli.FileHandler, 
java.util.logging.ConsoleHandler
+
+############################################################
+# Handler specific properties.
+# Describes specific configuration info for Handlers.
+############################################################
+
+1catalina.org.apache.juli.FileHandler.level = FINE
+1catalina.org.apache.juli.FileHandler.directory = ${catalina.base}/logs
+1catalina.org.apache.juli.FileHandler.prefix = catalina.
+
+2localhost.org.apache.juli.FileHandler.level = FINE
+2localhost.org.apache.juli.FileHandler.directory = ${catalina.base}/logs
+2localhost.org.apache.juli.FileHandler.prefix = localhost.
+
+3manager.org.apache.juli.FileHandler.level = FINE
+3manager.org.apache.juli.FileHandler.directory = ${catalina.base}/logs
+3manager.org.apache.juli.FileHandler.prefix = manager.
+
+4host-manager.org.apache.juli.FileHandler.level = FINE
+4host-manager.org.apache.juli.FileHandler.directory = ${catalina.base}/logs
+4host-manager.org.apache.juli.FileHandler.prefix = host-manager.
+
+java.util.logging.ConsoleHandler.level = FINE
+java.util.logging.ConsoleHandler.formatter = java.util.logging.SimpleFormatter
+
+
+############################################################
+# Facility specific properties.
+# Provides extra control for each logger.
+############################################################
+
+org.apache.catalina.core.ContainerBase.[Catalina].[localhost].level = INFO
+org.apache.catalina.core.ContainerBase.[Catalina].[localhost].handlers = 
2localhost.org.apache.juli.FileHandler
+
+org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/manager].level 
= INFO
+org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/manager].handlers
 = 3manager.org.apache.juli.FileHandler
+
+org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/host-manager].level
 = INFO
+org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/host-manager].handlers
 = 4host-manager.org.apache.juli.FileHandler
+
+# For example, set the org.apache.catalina.util.LifecycleBase logger to log
+# each component that extends LifecycleBase changing state:
+#org.apache.catalina.util.LifecycleBase.level = FINE
+
+# To see debug messages in TldLocationsCache, uncomment the following line:
+#org.apache.jasper.compiler.TldLocationsCache.level = FINE
+
+org.apache.catalina.realm.MemoryRealm = FINE

Propchange: 
tomcat/maven-plugin/trunk/tomcat8-maven-plugin/src/test/resources/deploy-war-project/src/main/tomcatconf/logging.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: 
tomcat/maven-plugin/trunk/tomcat8-maven-plugin/src/test/resources/deploy-war-project/src/main/tomcatconf/logging.properties
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Added: 
tomcat/maven-plugin/trunk/tomcat8-maven-plugin/src/test/resources/deploy-war-project/src/main/tomcatconf/server.xml
URL: 
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat8-maven-plugin/src/test/resources/deploy-war-project/src/main/tomcatconf/server.xml?rev=1756441&view=auto
==============================================================================
--- 
tomcat/maven-plugin/trunk/tomcat8-maven-plugin/src/test/resources/deploy-war-project/src/main/tomcatconf/server.xml
 (added)
+++ 
tomcat/maven-plugin/trunk/tomcat8-maven-plugin/src/test/resources/deploy-war-project/src/main/tomcatconf/server.xml
 Tue Aug 16 01:03:14 2016
@@ -0,0 +1,44 @@
+<!--
+  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="${its.server.port}" 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="${its.http.port}" 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-status:%s-localPort:%p-path:%U-time:%D ms" 
buffered="false"/>
+      <Realm className="org.apache.catalina.realm.UserDatabaseRealm"
+             resourceName="UserDatabase" />
+      <Host name="localhost" 
appBase="${project.build.directory}/test-classes/deploy-war-project/target/tomcat/webapps">
+        <Context path="/manager" privileged="true" 
docBase="${managerWebAppPath}/manager"/>
+      </Host>
+    </Engine>
+    
+  </Service>
+</Server>

Propchange: 
tomcat/maven-plugin/trunk/tomcat8-maven-plugin/src/test/resources/deploy-war-project/src/main/tomcatconf/server.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: 
tomcat/maven-plugin/trunk/tomcat8-maven-plugin/src/test/resources/deploy-war-project/src/main/tomcatconf/server.xml
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Added: 
tomcat/maven-plugin/trunk/tomcat8-maven-plugin/src/test/resources/deploy-war-project/src/main/tomcatconf/tomcat-users.xml
URL: 
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat8-maven-plugin/src/test/resources/deploy-war-project/src/main/tomcatconf/tomcat-users.xml?rev=1756441&view=auto
==============================================================================
--- 
tomcat/maven-plugin/trunk/tomcat8-maven-plugin/src/test/resources/deploy-war-project/src/main/tomcatconf/tomcat-users.xml
 (added)
+++ 
tomcat/maven-plugin/trunk/tomcat8-maven-plugin/src/test/resources/deploy-war-project/src/main/tomcatconf/tomcat-users.xml
 Tue Aug 16 01:03:14 2016
@@ -0,0 +1,31 @@
+<?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.
+-->
+<tomcat-users>
+<!--
+  <role rolename="tomcat"/>
+  <role rolename="role1"/>
+  <user username="tomcat" password="tomcat" roles="tomcat"/>
+  <user username="both" password="tomcat" roles="tomcat,role1"/>
+  <user username="role1" password="tomcat" roles="role1"/>
+-->
+  <role rolename="manager"/>
+  <role rolename="manager-gui"/>
+  <role rolename="manager-script"/>
+  <user username="admin" password="admin123" 
roles="manager,manager-gui,manager-script" />
+  <user username="tomcat" password="tomcat" roles="manager"/>
+</tomcat-users>

Propchange: 
tomcat/maven-plugin/trunk/tomcat8-maven-plugin/src/test/resources/deploy-war-project/src/main/tomcatconf/tomcat-users.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: 
tomcat/maven-plugin/trunk/tomcat8-maven-plugin/src/test/resources/deploy-war-project/src/main/tomcatconf/tomcat-users.xml
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Added: 
tomcat/maven-plugin/trunk/tomcat8-maven-plugin/src/test/resources/deploy-war-project/src/main/webapp/index.jsp
URL: 
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat8-maven-plugin/src/test/resources/deploy-war-project/src/main/webapp/index.jsp?rev=1756441&view=auto
==============================================================================
--- 
tomcat/maven-plugin/trunk/tomcat8-maven-plugin/src/test/resources/deploy-war-project/src/main/webapp/index.jsp
 (added)
+++ 
tomcat/maven-plugin/trunk/tomcat8-maven-plugin/src/test/resources/deploy-war-project/src/main/webapp/index.jsp
 Tue Aug 16 01:03:14 2016
@@ -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

Propchange: 
tomcat/maven-plugin/trunk/tomcat8-maven-plugin/src/test/resources/deploy-war-project/src/main/webapp/index.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: 
tomcat/maven-plugin/trunk/tomcat8-maven-plugin/src/test/resources/deploy-war-project/src/main/webapp/index.jsp
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Added: 
tomcat/maven-plugin/trunk/tomcat8-maven-plugin/src/test/resources/deploy-war-project/src/main/webapp/web.xml
URL: 
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat8-maven-plugin/src/test/resources/deploy-war-project/src/main/webapp/web.xml?rev=1756441&view=auto
==============================================================================
--- 
tomcat/maven-plugin/trunk/tomcat8-maven-plugin/src/test/resources/deploy-war-project/src/main/webapp/web.xml
 (added)
+++ 
tomcat/maven-plugin/trunk/tomcat8-maven-plugin/src/test/resources/deploy-war-project/src/main/webapp/web.xml
 Tue Aug 16 01:03:14 2016
@@ -0,0 +1,26 @@
+<?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.
+-->
+
+<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

Propchange: 
tomcat/maven-plugin/trunk/tomcat8-maven-plugin/src/test/resources/deploy-war-project/src/main/webapp/web.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: 
tomcat/maven-plugin/trunk/tomcat8-maven-plugin/src/test/resources/deploy-war-project/src/main/webapp/web.xml
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Added: 
tomcat/maven-plugin/trunk/tomcat8-maven-plugin/src/test/resources/deploy-war-project/src/test/java/WaitIT.java
URL: 
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat8-maven-plugin/src/test/resources/deploy-war-project/src/test/java/WaitIT.java?rev=1756441&view=auto
==============================================================================
--- 
tomcat/maven-plugin/trunk/tomcat8-maven-plugin/src/test/resources/deploy-war-project/src/test/java/WaitIT.java
 (added)
+++ 
tomcat/maven-plugin/trunk/tomcat8-maven-plugin/src/test/resources/deploy-war-project/src/test/java/WaitIT.java
 Tue Aug 16 01:03:14 2016
@@ -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});
+  }
+}

Propchange: 
tomcat/maven-plugin/trunk/tomcat8-maven-plugin/src/test/resources/deploy-war-project/src/test/java/WaitIT.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: 
tomcat/maven-plugin/trunk/tomcat8-maven-plugin/src/test/resources/deploy-war-project/src/test/java/WaitIT.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Added: 
tomcat/maven-plugin/trunk/tomcat8-maven-plugin/src/test/resources/log4j2-test.xml
URL: 
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat8-maven-plugin/src/test/resources/log4j2-test.xml?rev=1756441&view=auto
==============================================================================
--- 
tomcat/maven-plugin/trunk/tomcat8-maven-plugin/src/test/resources/log4j2-test.xml
 (added)
+++ 
tomcat/maven-plugin/trunk/tomcat8-maven-plugin/src/test/resources/log4j2-test.xml
 Tue Aug 16 01:03:14 2016
@@ -0,0 +1,36 @@
+<?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.
+  -->
+
+
+<configuration>
+  <appenders>
+    <Console name="console" target="SYSTEM_OUT">
+      <PatternLayout pattern="%d{HH:mm:ss.SSS} [%t] %-5level %logger{36} - 
%msg%n"/>
+    </Console>
+  </appenders>
+  <loggers>
+
+    <root level="info">
+      <appender-ref ref="console"/>
+    </root>
+  </loggers>
+</configuration>
+
+

Propchange: 
tomcat/maven-plugin/trunk/tomcat8-maven-plugin/src/test/resources/log4j2-test.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: 
tomcat/maven-plugin/trunk/tomcat8-maven-plugin/src/test/resources/log4j2-test.xml
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Added: 
tomcat/maven-plugin/trunk/tomcat8-maven-plugin/src/test/resources/simple-war-project/pom.xml
URL: 
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat8-maven-plugin/src/test/resources/simple-war-project/pom.xml?rev=1756441&view=auto
==============================================================================
--- 
tomcat/maven-plugin/trunk/tomcat8-maven-plugin/src/test/resources/simple-war-project/pom.xml
 (added)
+++ 
tomcat/maven-plugin/trunk/tomcat8-maven-plugin/src/test/resources/simple-war-project/pom.xml
 Tue Aug 16 01:03:14 2016
@@ -0,0 +1,126 @@
+<?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.apache.tomcat.maven.it</groupId>
+  <artifactId>simple-war-project</artifactId>
+  <version>1.0-SNAPSHOT</version>
+  <packaging>war</packaging>
+  <properties>
+    
<project.build.sourceEncoding>${project.build.sourceEncoding}</project.build.sourceEncoding>
+  </properties>
+
+
+  <build>
+    <pluginManagement>
+      <plugins>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-war-plugin</artifactId>
+          <version>2.1-alpha-2</version>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-compiler-plugin</artifactId>
+          <version>2.3.2</version>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.tomcat.maven</groupId>
+          <artifactId>tomcat7-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>tomcat7-maven-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>tomcat-run</id>
+            <goals>
+              <goal>run</goal>
+            </goals>
+            <phase>pre-integration-test</phase>
+            <configuration>
+              <fork>true</fork>
+              <port>${its.http.port}</port>
+              <ajpPort>${its.ajp.port}</ajpPort>
+              <path>/</path>
+              <systemProperties>
+                
<com.sun.management.jmxremote.ssl>false</com.sun.management.jmxremote.ssl>
+              </systemProperties>
+              
<tomcatLoggingFile>src/main/tomcatconf/logging.properties</tomcatLoggingFile>
+            </configuration>
+          </execution>
+          <execution>
+            <id>tomcat-shutdown</id>
+            <phase>post-integration-test</phase>
+            <goals>
+              <goal>shutdown</goal>
+            </goals>
+          </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>4.9</version>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+
+</project>

Propchange: 
tomcat/maven-plugin/trunk/tomcat8-maven-plugin/src/test/resources/simple-war-project/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: 
tomcat/maven-plugin/trunk/tomcat8-maven-plugin/src/test/resources/simple-war-project/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Added: 
tomcat/maven-plugin/trunk/tomcat8-maven-plugin/src/test/resources/simple-war-project/src/main/tomcatconf/empty.txt
URL: 
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat8-maven-plugin/src/test/resources/simple-war-project/src/main/tomcatconf/empty.txt?rev=1756441&view=auto
==============================================================================
--- 
tomcat/maven-plugin/trunk/tomcat8-maven-plugin/src/test/resources/simple-war-project/src/main/tomcatconf/empty.txt
 (added)
+++ 
tomcat/maven-plugin/trunk/tomcat8-maven-plugin/src/test/resources/simple-war-project/src/main/tomcatconf/empty.txt
 Tue Aug 16 01:03:14 2016
@@ -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

Propchange: 
tomcat/maven-plugin/trunk/tomcat8-maven-plugin/src/test/resources/simple-war-project/src/main/tomcatconf/empty.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: 
tomcat/maven-plugin/trunk/tomcat8-maven-plugin/src/test/resources/simple-war-project/src/main/tomcatconf/empty.txt
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision



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