You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ol...@apache.org on 2011/10/13 10:46:04 UTC
svn commit: r1182720 - in /tomcat/maven-plugin/trunk:
tomcat-maven-plugin-it/src/main/java/org/codehaus/mojo/tomcat/it/
tomcat6-maven-plugin/ tomcat6-maven-plugin/src/test/
tomcat6-maven-plugin/src/test/java/org/codehaus/mojo/tomcat/it/
tomcat6-maven-p...
Author: olamy
Date: Thu Oct 13 08:46:03 2011
New Revision: 1182720
URL: http://svn.apache.org/viewvc?rev=1182720&view=rev
Log:
add an integration test for deploy-only goal
Added:
tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/main/java/org/codehaus/mojo/tomcat/it/AbstractDeployWarOnlyProjectIT.java (with props)
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/java/org/codehaus/mojo/tomcat/it/Tomcat6DeployWarOnlyProjectIT.java (with props)
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/deploy-only-war-project/
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/deploy-only-war-project/pom.xml (with props)
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/deploy-only-war-project/src/
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/deploy-only-war-project/src/main/
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/deploy-only-war-project/src/main/tomcatconf/
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/deploy-only-war-project/src/main/tomcatconf/empty.txt (with props)
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/deploy-only-war-project/src/main/tomcatconf/logging.properties (with props)
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/deploy-only-war-project/src/main/tomcatconf/server.xml (with props)
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/deploy-only-war-project/src/main/tomcatconf/tomcat-users.xml (with props)
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/deploy-only-war-project/src/main/webapp/
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/deploy-only-war-project/src/main/webapp/index.jsp (with props)
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/deploy-only-war-project/src/main/webapp/web.xml (with props)
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/deploy-only-war-project/src/test/
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/deploy-only-war-project/src/test/java/
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/deploy-only-war-project/src/test/java/WaitIT.java (with props)
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/test/java/org/apache/tomcat/maven/plugin/tomcat7/Tomcat7DeployWarOnlyProjectIT.java (with props)
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/test/resources/deploy-only-war-project/
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/test/resources/deploy-only-war-project/pom.xml (with props)
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/test/resources/deploy-only-war-project/src/
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/test/resources/deploy-only-war-project/src/main/
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/test/resources/deploy-only-war-project/src/main/tomcatconf/
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/test/resources/deploy-only-war-project/src/main/tomcatconf/empty.txt (with props)
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/test/resources/deploy-only-war-project/src/main/tomcatconf/logging.properties (with props)
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/test/resources/deploy-only-war-project/src/main/tomcatconf/server.xml (with props)
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/test/resources/deploy-only-war-project/src/main/tomcatconf/tomcat-users.xml (with props)
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/test/resources/deploy-only-war-project/src/main/webapp/
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/test/resources/deploy-only-war-project/src/main/webapp/index.jsp (with props)
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/test/resources/deploy-only-war-project/src/main/webapp/web.xml (with props)
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/test/resources/deploy-only-war-project/src/test/
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/test/resources/deploy-only-war-project/src/test/java/
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/test/resources/deploy-only-war-project/src/test/java/WaitIT.java (with props)
Modified:
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/pom.xml
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/simple-war-project-1.0-SNAPSHOT.war
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/pom.xml
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/test/simple-war-project-1.0-SNAPSHOT.war
Added: tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/main/java/org/codehaus/mojo/tomcat/it/AbstractDeployWarOnlyProjectIT.java
URL: http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/main/java/org/codehaus/mojo/tomcat/it/AbstractDeployWarOnlyProjectIT.java?rev=1182720&view=auto
==============================================================================
--- tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/main/java/org/codehaus/mojo/tomcat/it/AbstractDeployWarOnlyProjectIT.java (added)
+++ tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/main/java/org/codehaus/mojo/tomcat/it/AbstractDeployWarOnlyProjectIT.java Thu Oct 13 08:46:03 2011
@@ -0,0 +1,73 @@
+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.
+ */
+
+
+
+import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.File;
+
+import static junitx.framework.StringAssert.assertContains;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
+/**
+ * @author Mark Michaelis
+ */
+public abstract class AbstractDeployWarOnlyProjectIT
+ extends AbstractWarProjectIT
+{
+ private static final Logger LOG = LoggerFactory.getLogger( AbstractDeployWarOnlyProjectIT.class );
+
+ @Override
+ protected String getWebappUrl()
+ {
+ return "http://localhost:" + getHttpItPort() + "/bar/";
+ }
+
+ @Override
+ protected String getWarArtifactId()
+ {
+ return "deploy-only-war-project";
+ }
+
+ @Test
+ public void testIt()
+ throws Exception
+ {
+ final String responseBody = executeVerifyWithGet();
+ assertNotNull("Received message body must not be null.", responseBody);
+ assertContains( "Response must match expected content.", "It works !!", responseBody );
+
+ assertTrue( "Tomcat folder should exist in target folder of project at " + webappHome,
+ new File( webappHome, "target/tomcat" ).exists() );
+ LOG.info( "Error Free Log check" );
+ verifier.verifyErrorFreeLog();
+ }
+
+ @Override
+ protected int getTimeout()
+ {
+ return 40000;
+ }
+}
Propchange: tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/main/java/org/codehaus/mojo/tomcat/it/AbstractDeployWarOnlyProjectIT.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/main/java/org/codehaus/mojo/tomcat/it/AbstractDeployWarOnlyProjectIT.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
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=1182720&r1=1182719&r2=1182720&view=diff
==============================================================================
--- tomcat/maven-plugin/trunk/tomcat6-maven-plugin/pom.xml (original)
+++ tomcat/maven-plugin/trunk/tomcat6-maven-plugin/pom.xml Thu Oct 13 08:46:03 2011
@@ -36,6 +36,7 @@
<properties>
<tomcat.version>6.0.33</tomcat.version>
<managerWebAppPath>${basedir}/target/</managerWebAppPath>
+ <warTestPath>${basedir}/src/test/simple-war-project-1.0-SNAPSHOT.war</warTestPath>
</properties>
<prerequisites>
<maven>${mavenVersion}</maven>
Added: tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/java/org/codehaus/mojo/tomcat/it/Tomcat6DeployWarOnlyProjectIT.java
URL: http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/java/org/codehaus/mojo/tomcat/it/Tomcat6DeployWarOnlyProjectIT.java?rev=1182720&view=auto
==============================================================================
--- tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/java/org/codehaus/mojo/tomcat/it/Tomcat6DeployWarOnlyProjectIT.java (added)
+++ tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/java/org/codehaus/mojo/tomcat/it/Tomcat6DeployWarOnlyProjectIT.java Thu Oct 13 08:46:03 2011
@@ -0,0 +1,29 @@
+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 Tomcat6DeployWarOnlyProjectIT
+ extends AbstractDeployWarOnlyProjectIT
+{
+ // no op
+
+}
Propchange: tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/java/org/codehaus/mojo/tomcat/it/Tomcat6DeployWarOnlyProjectIT.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/java/org/codehaus/mojo/tomcat/it/Tomcat6DeployWarOnlyProjectIT.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/deploy-only-war-project/pom.xml
URL: http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/deploy-only-war-project/pom.xml?rev=1182720&view=auto
==============================================================================
--- tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/deploy-only-war-project/pom.xml (added)
+++ tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/deploy-only-war-project/pom.xml Thu Oct 13 08:46:03 2011
@@ -0,0 +1,134 @@
+<?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>
+ <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>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-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>
+ <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>
Propchange: tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/deploy-only-war-project/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/deploy-only-war-project/pom.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/deploy-only-war-project/src/main/tomcatconf/empty.txt
URL: http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/deploy-only-war-project/src/main/tomcatconf/empty.txt?rev=1182720&view=auto
==============================================================================
--- tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/deploy-only-war-project/src/main/tomcatconf/empty.txt (added)
+++ tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/deploy-only-war-project/src/main/tomcatconf/empty.txt Thu Oct 13 08:46:03 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
Propchange: tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/deploy-only-war-project/src/main/tomcatconf/empty.txt
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: tomcat/maven-plugin/trunk/tomcat6-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/tomcat6-maven-plugin/src/test/resources/deploy-only-war-project/src/main/tomcatconf/logging.properties
URL: http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/deploy-only-war-project/src/main/tomcatconf/logging.properties?rev=1182720&view=auto
==============================================================================
--- tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/deploy-only-war-project/src/main/tomcatconf/logging.properties (added)
+++ tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/deploy-only-war-project/src/main/tomcatconf/logging.properties Thu Oct 13 08:46:03 2011
@@ -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/tomcat6-maven-plugin/src/test/resources/deploy-only-war-project/src/main/tomcatconf/logging.properties
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: tomcat/maven-plugin/trunk/tomcat6-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/tomcat6-maven-plugin/src/test/resources/deploy-only-war-project/src/main/tomcatconf/server.xml
URL: http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/deploy-only-war-project/src/main/tomcatconf/server.xml?rev=1182720&view=auto
==============================================================================
--- tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/deploy-only-war-project/src/main/tomcatconf/server.xml (added)
+++ tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/deploy-only-war-project/src/main/tomcatconf/server.xml Thu Oct 13 08:46:03 2011
@@ -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/tomcat6-maven-plugin/src/test/resources/deploy-only-war-project/src/main/tomcatconf/server.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: tomcat/maven-plugin/trunk/tomcat6-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/tomcat6-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/tomcat6-maven-plugin/src/test/resources/deploy-only-war-project/src/main/tomcatconf/tomcat-users.xml?rev=1182720&view=auto
==============================================================================
--- tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/deploy-only-war-project/src/main/tomcatconf/tomcat-users.xml (added)
+++ tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/deploy-only-war-project/src/main/tomcatconf/tomcat-users.xml Thu Oct 13 08:46:03 2011
@@ -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/tomcat6-maven-plugin/src/test/resources/deploy-only-war-project/src/main/tomcatconf/tomcat-users.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: tomcat/maven-plugin/trunk/tomcat6-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/tomcat6-maven-plugin/src/test/resources/deploy-only-war-project/src/main/webapp/index.jsp
URL: http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/deploy-only-war-project/src/main/webapp/index.jsp?rev=1182720&view=auto
==============================================================================
--- tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/deploy-only-war-project/src/main/webapp/index.jsp (added)
+++ tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/deploy-only-war-project/src/main/webapp/index.jsp Thu Oct 13 08:46:03 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
Propchange: tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/deploy-only-war-project/src/main/webapp/index.jsp
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: tomcat/maven-plugin/trunk/tomcat6-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/tomcat6-maven-plugin/src/test/resources/deploy-only-war-project/src/main/webapp/web.xml
URL: http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/deploy-only-war-project/src/main/webapp/web.xml?rev=1182720&view=auto
==============================================================================
--- tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/deploy-only-war-project/src/main/webapp/web.xml (added)
+++ tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/deploy-only-war-project/src/main/webapp/web.xml Thu Oct 13 08:46:03 2011
@@ -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/tomcat6-maven-plugin/src/test/resources/deploy-only-war-project/src/main/webapp/web.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: tomcat/maven-plugin/trunk/tomcat6-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/tomcat6-maven-plugin/src/test/resources/deploy-only-war-project/src/test/java/WaitIT.java
URL: http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/deploy-only-war-project/src/test/java/WaitIT.java?rev=1182720&view=auto
==============================================================================
--- tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/deploy-only-war-project/src/test/java/WaitIT.java (added)
+++ tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/deploy-only-war-project/src/test/java/WaitIT.java Thu Oct 13 08:46:03 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});
+ }
+}
Propchange: tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/deploy-only-war-project/src/test/java/WaitIT.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/deploy-only-war-project/src/test/java/WaitIT.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Modified: tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/simple-war-project-1.0-SNAPSHOT.war
URL: http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/simple-war-project-1.0-SNAPSHOT.war?rev=1182720&r1=1182719&r2=1182720&view=diff
==============================================================================
Files tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/simple-war-project-1.0-SNAPSHOT.war (original) and tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/simple-war-project-1.0-SNAPSHOT.war Thu Oct 13 08:46:03 2011 differ
Modified: tomcat/maven-plugin/trunk/tomcat7-maven-plugin/pom.xml
URL: http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat7-maven-plugin/pom.xml?rev=1182720&r1=1182719&r2=1182720&view=diff
==============================================================================
--- tomcat/maven-plugin/trunk/tomcat7-maven-plugin/pom.xml (original)
+++ tomcat/maven-plugin/trunk/tomcat7-maven-plugin/pom.xml Thu Oct 13 08:46:03 2011
@@ -35,6 +35,7 @@
<properties>
<tomcat.version>7.0.22</tomcat.version>
<managerWebAppPath>${basedir}/target/</managerWebAppPath>
+ <warTestPath>${basedir}/src/test/simple-war-project-1.0-SNAPSHOT.war</warTestPath>
</properties>
<dependencies>
Added: tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/test/java/org/apache/tomcat/maven/plugin/tomcat7/Tomcat7DeployWarOnlyProjectIT.java
URL: http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/test/java/org/apache/tomcat/maven/plugin/tomcat7/Tomcat7DeployWarOnlyProjectIT.java?rev=1182720&view=auto
==============================================================================
--- tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/test/java/org/apache/tomcat/maven/plugin/tomcat7/Tomcat7DeployWarOnlyProjectIT.java (added)
+++ tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/test/java/org/apache/tomcat/maven/plugin/tomcat7/Tomcat7DeployWarOnlyProjectIT.java Thu Oct 13 08:46:03 2011
@@ -0,0 +1,31 @@
+package org.apache.tomcat.maven.plugin.tomcat7;
+/*
+ * 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.codehaus.mojo.tomcat.it.AbstractDeployWarOnlyProjectIT;
+
+/**
+ * @author Olivier Lamy
+ */
+public class Tomcat7DeployWarOnlyProjectIT
+ extends AbstractDeployWarOnlyProjectIT
+{
+ // no op
+
+}
Propchange: tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/test/java/org/apache/tomcat/maven/plugin/tomcat7/Tomcat7DeployWarOnlyProjectIT.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/test/java/org/apache/tomcat/maven/plugin/tomcat7/Tomcat7DeployWarOnlyProjectIT.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/test/resources/deploy-only-war-project/pom.xml
URL: http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/test/resources/deploy-only-war-project/pom.xml?rev=1182720&view=auto
==============================================================================
--- tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/test/resources/deploy-only-war-project/pom.xml (added)
+++ tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/test/resources/deploy-only-war-project/pom.xml Thu Oct 13 08:46:03 2011
@@ -0,0 +1,134 @@
+<?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>
+ <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>
+ <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>
Propchange: tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/test/resources/deploy-only-war-project/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/test/resources/deploy-only-war-project/pom.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/test/resources/deploy-only-war-project/src/main/tomcatconf/empty.txt
URL: http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/test/resources/deploy-only-war-project/src/main/tomcatconf/empty.txt?rev=1182720&view=auto
==============================================================================
--- tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/test/resources/deploy-only-war-project/src/main/tomcatconf/empty.txt (added)
+++ tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/test/resources/deploy-only-war-project/src/main/tomcatconf/empty.txt Thu Oct 13 08:46:03 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
Propchange: tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/test/resources/deploy-only-war-project/src/main/tomcatconf/empty.txt
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: tomcat/maven-plugin/trunk/tomcat7-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/tomcat7-maven-plugin/src/test/resources/deploy-only-war-project/src/main/tomcatconf/logging.properties
URL: http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/test/resources/deploy-only-war-project/src/main/tomcatconf/logging.properties?rev=1182720&view=auto
==============================================================================
--- tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/test/resources/deploy-only-war-project/src/main/tomcatconf/logging.properties (added)
+++ tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/test/resources/deploy-only-war-project/src/main/tomcatconf/logging.properties Thu Oct 13 08:46:03 2011
@@ -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/tomcat7-maven-plugin/src/test/resources/deploy-only-war-project/src/main/tomcatconf/logging.properties
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: tomcat/maven-plugin/trunk/tomcat7-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/tomcat7-maven-plugin/src/test/resources/deploy-only-war-project/src/main/tomcatconf/server.xml
URL: http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/test/resources/deploy-only-war-project/src/main/tomcatconf/server.xml?rev=1182720&view=auto
==============================================================================
--- tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/test/resources/deploy-only-war-project/src/main/tomcatconf/server.xml (added)
+++ tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/test/resources/deploy-only-war-project/src/main/tomcatconf/server.xml Thu Oct 13 08:46:03 2011
@@ -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/tomcat7-maven-plugin/src/test/resources/deploy-only-war-project/src/main/tomcatconf/server.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: tomcat/maven-plugin/trunk/tomcat7-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/tomcat7-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/tomcat7-maven-plugin/src/test/resources/deploy-only-war-project/src/main/tomcatconf/tomcat-users.xml?rev=1182720&view=auto
==============================================================================
--- tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/test/resources/deploy-only-war-project/src/main/tomcatconf/tomcat-users.xml (added)
+++ tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/test/resources/deploy-only-war-project/src/main/tomcatconf/tomcat-users.xml Thu Oct 13 08:46:03 2011
@@ -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/tomcat7-maven-plugin/src/test/resources/deploy-only-war-project/src/main/tomcatconf/tomcat-users.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: tomcat/maven-plugin/trunk/tomcat7-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/tomcat7-maven-plugin/src/test/resources/deploy-only-war-project/src/main/webapp/index.jsp
URL: http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/test/resources/deploy-only-war-project/src/main/webapp/index.jsp?rev=1182720&view=auto
==============================================================================
--- tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/test/resources/deploy-only-war-project/src/main/webapp/index.jsp (added)
+++ tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/test/resources/deploy-only-war-project/src/main/webapp/index.jsp Thu Oct 13 08:46:03 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
Propchange: tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/test/resources/deploy-only-war-project/src/main/webapp/index.jsp
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: tomcat/maven-plugin/trunk/tomcat7-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/tomcat7-maven-plugin/src/test/resources/deploy-only-war-project/src/main/webapp/web.xml
URL: http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/test/resources/deploy-only-war-project/src/main/webapp/web.xml?rev=1182720&view=auto
==============================================================================
--- tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/test/resources/deploy-only-war-project/src/main/webapp/web.xml (added)
+++ tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/test/resources/deploy-only-war-project/src/main/webapp/web.xml Thu Oct 13 08:46:03 2011
@@ -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/tomcat7-maven-plugin/src/test/resources/deploy-only-war-project/src/main/webapp/web.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: tomcat/maven-plugin/trunk/tomcat7-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/tomcat7-maven-plugin/src/test/resources/deploy-only-war-project/src/test/java/WaitIT.java
URL: http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/test/resources/deploy-only-war-project/src/test/java/WaitIT.java?rev=1182720&view=auto
==============================================================================
--- tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/test/resources/deploy-only-war-project/src/test/java/WaitIT.java (added)
+++ tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/test/resources/deploy-only-war-project/src/test/java/WaitIT.java Thu Oct 13 08:46:03 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});
+ }
+}
Propchange: tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/test/resources/deploy-only-war-project/src/test/java/WaitIT.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/test/resources/deploy-only-war-project/src/test/java/WaitIT.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Modified: tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/test/simple-war-project-1.0-SNAPSHOT.war
URL: http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/test/simple-war-project-1.0-SNAPSHOT.war?rev=1182720&r1=1182719&r2=1182720&view=diff
==============================================================================
Files tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/test/simple-war-project-1.0-SNAPSHOT.war (original) and tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/test/simple-war-project-1.0-SNAPSHOT.war Thu Oct 13 08:46:03 2011 differ
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org