Author: olamy
Date: Mon Oct 3 22:22:46 2011
New Revision: 1178619
URL: http://svn.apache.org/viewvc?rev=1178619&view=rev
Log:
add an it test for test deployMojo
Added:
tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/main/java/org/codehaus/mojo/tomcat/it/AbstractDeployWarProjectIT.java
- copied, changed from r1178618,
tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/main/java/org/codehaus/mojo/tomcat/it/AbstractSimpleWarProjectIT.java
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/java/org/codehaus/mojo/tomcat/it/Tomcat6DeployWarProjectIT.java
(with props)
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/deploy-war-project/
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/deploy-war-project/pom.xml
(with props)
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/deploy-war-project/simple-war-project-1.0-SNAPSHOT.war
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/deploy-war-project/src/
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/deploy-war-project/src/main/
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/deploy-war-project/src/main/tomcatconf/
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/deploy-war-project/src/main/tomcatconf/empty.txt
(with props)
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/deploy-war-project/src/main/tomcatconf/logging.properties
(with props)
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/deploy-war-project/src/main/tomcatconf/server.xml
(with props)
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/deploy-war-project/src/main/tomcatconf/tomcat-users.xml
(with props)
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/deploy-war-project/src/main/webapp/
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/deploy-war-project/src/main/webapp/index.jsp
(with props)
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/deploy-war-project/src/main/webapp/web.xml
(with props)
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/deploy-war-project/src/test/
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/deploy-war-project/src/test/java/
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/deploy-war-project/src/test/java/WaitIT.java
(with props)
Modified:
tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/deployer/TomcatManager.java
tomcat/maven-plugin/trunk/pom.xml
tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/main/java/org/codehaus/mojo/tomcat/it/AbstractSimpleWarProjectIT.java
tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/main/java/org/codehaus/mojo/tomcat/it/AbstractWarProjectIT.java
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/pom.xml
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/AbstractCatalinaMojo.java
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/AbstractRunMojo.java
Modified:
tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/deployer/TomcatManager.java
URL:
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/deployer/TomcatManager.java?rev=1178619&r1=1178618&r2=1178619&view=diff
==============================================================================
---
tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/deployer/TomcatManager.java
(original)
+++
tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/deployer/TomcatManager.java
Mon Oct 3 22:22:46 2011
@@ -634,7 +634,7 @@ public class TomcatManager
private String deployImpl( String path, URL config, URL war, InputStream
data, boolean update, String tag )
throws TomcatManagerException, IOException
{
- StringBuffer buffer = new StringBuffer( "/deploy" );
+ StringBuilder buffer = new StringBuilder( "/deploy" );
buffer.append( "?path=" ).append( URLEncoder.encode( path, charset ) );
if ( config != null )
@@ -646,11 +646,6 @@ public class TomcatManager
{
buffer.append( "&war=" ).append( URLEncoder.encode(
war.toString(), charset ) );
}
- else
- {
- // for Tomcat 5.0.27
- buffer.append( "&war=" );
- }
if ( update )
{
Modified: tomcat/maven-plugin/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/pom.xml?rev=1178619&r1=1178618&r2=1178619&view=diff
==============================================================================
--- tomcat/maven-plugin/trunk/pom.xml (original)
+++ tomcat/maven-plugin/trunk/pom.xml Mon Oct 3 22:22:46 2011
@@ -48,7 +48,7 @@
<failsafe.version>2.9</failsafe.version>
<junit.version>4.9</junit.version>
<it.sleep.time>2000</it.sleep.time>
- <verifier.debug>false</verifier.debug>
+ <verifier.maven.debug>false</verifier.maven.debug>
<verifier.debugJvm>false</verifier.debugJvm>
<maven.resources.escapeString>\</maven.resources.escapeString>
<distributionReleaseUrl>scp://people.apache.org/www/people.apache.org/repo/m2-ibiblio-rsync-repository</distributionReleaseUrl>
Copied:
tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/main/java/org/codehaus/mojo/tomcat/it/AbstractDeployWarProjectIT.java
(from r1178618,
tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/main/java/org/codehaus/mojo/tomcat/it/AbstractSimpleWarProjectIT.java)
URL:
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/main/java/org/codehaus/mojo/tomcat/it/AbstractDeployWarProjectIT.java?p2=tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/main/java/org/codehaus/mojo/tomcat/it/AbstractDeployWarProjectIT.java&p1=tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/main/java/org/codehaus/mojo/tomcat/it/AbstractSimpleWarProjectIT.java&r1=1178618&r2=1178619&rev=1178619&view=diff
==============================================================================
---
tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/main/java/org/codehaus/mojo/tomcat/it/AbstractSimpleWarProjectIT.java
(original)
+++
tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/main/java/org/codehaus/mojo/tomcat/it/AbstractDeployWarProjectIT.java
Mon Oct 3 22:22:46 2011
@@ -34,10 +34,10 @@ import static org.junit.Assert.assertTru
/**
* @author Mark Michaelis
*/
-public abstract class AbstractSimpleWarProjectIT
+public abstract class AbstractDeployWarProjectIT
extends AbstractWarProjectIT
{
- private static final Logger LOG = LoggerFactory.getLogger(
AbstractSimpleWarProjectIT.class );
+ private static final Logger LOG = LoggerFactory.getLogger(
AbstractDeployWarProjectIT.class );
@Override
protected String getWebappUrl()
@@ -48,7 +48,7 @@ public abstract class AbstractSimpleWarP
@Override
protected String getWarArtifactId()
{
- return "simple-war-project";
+ return "deploy-war-project";
}
@Test
Modified:
tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/main/java/org/codehaus/mojo/tomcat/it/AbstractSimpleWarProjectIT.java
URL:
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/main/java/org/codehaus/mojo/tomcat/it/AbstractSimpleWarProjectIT.java?rev=1178619&r1=1178618&r2=1178619&view=diff
==============================================================================
---
tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/main/java/org/codehaus/mojo/tomcat/it/AbstractSimpleWarProjectIT.java
(original)
+++
tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/main/java/org/codehaus/mojo/tomcat/it/AbstractSimpleWarProjectIT.java
Mon Oct 3 22:22:46 2011
@@ -61,6 +61,7 @@ public abstract class AbstractSimpleWarP
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();
}
Modified:
tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/main/java/org/codehaus/mojo/tomcat/it/AbstractWarProjectIT.java
URL:
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/main/java/org/codehaus/mojo/tomcat/it/AbstractWarProjectIT.java?rev=1178619&r1=1178618&r2=1178619&view=diff
==============================================================================
---
tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/main/java/org/codehaus/mojo/tomcat/it/AbstractWarProjectIT.java
(original)
+++
tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/main/java/org/codehaus/mojo/tomcat/it/AbstractWarProjectIT.java
Mon Oct 3 22:22:46 2011
@@ -92,9 +92,11 @@ public abstract class AbstractWarProject
webappHome = ResourceExtractor.simpleExtractResources( getClass(), "/"
+ getWarArtifactId() );
verifier = new Verifier( webappHome.getAbsolutePath() );
- verifier.setDebug( Boolean.getBoolean( "verifier.debug" ) );
- verifier.setDebugJvm( Boolean.getBoolean( "verifier.debugJvm" ) );
+ boolean debugVerifier = Boolean.getBoolean( "verifier.maven.debug" );
+ verifier.setMavenDebug( debugVerifier );
+ verifier.setDebugJvm( Boolean.getBoolean( "verifier.debugJvm" ) );
+ verifier.displayStreamBuffers();
verifier.deleteArtifact( "org.codehaus.mojo.tomcat.it",
getWarArtifactId(), "1.0-SNAPSHOT", "war" );
}
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=1178619&r1=1178618&r2=1178619&view=diff
==============================================================================
--- tomcat/maven-plugin/trunk/tomcat6-maven-plugin/pom.xml (original)
+++ tomcat/maven-plugin/trunk/tomcat6-maven-plugin/pom.xml Mon Oct 3 22:22:46
2011
@@ -228,7 +228,7 @@
<configuration>
<systemPropertyVariables>
<mojoVersion>${project.version}</mojoVersion>
- <verifier.debug>${verifier.debug}</verifier.debug>
+
<verifier.maven.debug>${verifier.maven.debug}</verifier.maven.debug>
<verifier.debugJvm>${verifier.debugJvm}</verifier.debugJvm>
</systemPropertyVariables>
</configuration>
Modified:
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/AbstractCatalinaMojo.java
URL:
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/AbstractCatalinaMojo.java?rev=1178619&r1=1178618&r2=1178619&view=diff
==============================================================================
---
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/AbstractCatalinaMojo.java
(original)
+++
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/AbstractCatalinaMojo.java
Mon Oct 3 22:22:46 2011
@@ -222,6 +222,7 @@ public abstract class AbstractCatalinaMo
{
userName = this.username;
password = this.password == null ? "" : this.password;
+ getLog( ).debug( "user user/password " + userName + "/" +
password );
}
manager = new TomcatManager( url, userName, password, charset );
Modified:
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/AbstractRunMojo.java
URL:
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/AbstractRunMojo.java?rev=1178619&r1=1178618&r2=1178619&view=diff
==============================================================================
---
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/AbstractRunMojo.java
(original)
+++
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/AbstractRunMojo.java
Mon Oct 3 22:22:46 2011
@@ -298,6 +298,13 @@ public abstract class AbstractRunMojo
*/
private String protocol;
+ /**
+ * The path of the Tomcat users XML file.
+ *
+ * @parameter expression = "${maven.tomcat.tomcatUsers.file}"
+ */
+ private File tomcatUsers;
+
// ----------------------------------------------------------------------
// Fields
// ----------------------------------------------------------------------
@@ -612,97 +619,126 @@ public abstract class AbstractRunMojo
private void startContainer( )
throws IOException, LifecycleException, MojoExecutionException
{
- // Set the system properties
- setupSystemProperties( );
+ String previousCatalinaBase = System.getProperty( "catalina.base" );
- final Embedded container;
- if ( serverXml != null )
+ try
{
- if ( !serverXml.exists( ) )
+
+ // Set the system properties
+ setupSystemProperties( );
+
+ System.setProperty( "catalina.base",
configurationDir.getAbsolutePath( ) );
+
+ final Embedded container;
+ if ( serverXml != null )
{
- throw new MojoExecutionException( serverXml.getPath( ) + " not
exists" );
+ if ( !serverXml.exists( ) )
+ {
+ throw new MojoExecutionException( serverXml.getPath( ) + "
not exists" );
+ }
+
+ container = new Catalina( );
+ container.setCatalinaHome( configurationDir.getAbsolutePath( )
);
+ ( (Catalina) container ).setConfigFile( serverXml.getPath( ) );
+ //( (Catalina) container ).setRedirectStreams( true );
+ ( (Catalina) container ).setUseNaming( this.useNaming );
+
+ container.start( );
}
+ else
+ {
+ // create server
+ container = new Embedded( );
+ container.setCatalinaHome( configurationDir.getAbsolutePath( )
);
+ MemoryRealm memoryRealm = new MemoryRealm( );
- container = new Catalina( );
- container.setCatalinaHome( configurationDir.getAbsolutePath( ) );
- ( (Catalina) container ).setConfigFile( serverXml.getPath( ) );
- container.start( );
- }
- else
- {
- // create server
- container = new Embedded( );
- container.setCatalinaHome( configurationDir.getAbsolutePath( ) );
- container.setRealm( new MemoryRealm( ) );
- container.setUseNaming( useNaming );
+ if ( tomcatUsers != null )
+ {
+ if ( !tomcatUsers.exists( ) )
+ {
+ throw new MojoExecutionException( " tomcatUsers " +
tomcatUsers.getPath( ) + " not exists" );
+ }
+ getLog( ).info( "use tomcat-users.xml from " +
tomcatUsers.getAbsolutePath( ) );
+ memoryRealm.setPathname( tomcatUsers.getAbsolutePath( ) );
+ }
- //container.createLoader( getTomcatClassLoader() ).
+ container.setRealm( memoryRealm );
+ container.setUseNaming( useNaming );
- // create context
- Context context = createContext( container );
+ //container.createLoader( getTomcatClassLoader() ).
- // create host
- String appBase = new File( configurationDir, "webapps"
).getAbsolutePath( );
- Host host = container.createHost( "localHost", appBase );
+ // create context
+ Context context = createContext( container );
- host.addChild( context );
+ // create host
+ String appBase = new File( configurationDir, "webapps"
).getAbsolutePath( );
+ Host host = container.createHost( "localHost", appBase );
- if ( addContextWarDependencies )
- {
- Collection<Context> dependecyContexts =
createDependencyContexts( container );
- for ( Context extraContext : dependecyContexts )
+ host.addChild( context );
+
+ if ( addContextWarDependencies )
{
- host.addChild( extraContext );
+ Collection<Context> dependecyContexts =
createDependencyContexts( container );
+ for ( Context extraContext : dependecyContexts )
+ {
+ host.addChild( extraContext );
+ }
}
- }
-
- // create engine
- Engine engine = container.createEngine( );
- engine.setName( "localEngine" );
- engine.addChild( host );
- engine.setDefaultHost( host.getName( ) );
- container.addEngine( engine );
- if ( useSeparateTomcatClassLoader )
- {
- engine.setParentClassLoader( getTomcatClassLoader( ) );
- }
- // create http connector
- Connector httpConnector = container.createConnector( (InetAddress)
null, port, protocol );
- if ( httpsPort > 0 )
- {
- httpConnector.setRedirectPort( httpsPort );
- }
- httpConnector.setURIEncoding( uriEncoding );
- container.addConnector( httpConnector );
- // create https connector
- if ( httpsPort > 0 )
- {
- Connector httpsConnector = container.createConnector(
(InetAddress) null, httpsPort, true );
- if ( keystoreFile != null )
+ // create engine
+ Engine engine = container.createEngine( );
+ engine.setName( "localEngine" );
+ engine.addChild( host );
+ engine.setDefaultHost( host.getName( ) );
+ container.addEngine( engine );
+ if ( useSeparateTomcatClassLoader )
{
- httpsConnector.setAttribute( "keystoreFile", keystoreFile
);
+ engine.setParentClassLoader( getTomcatClassLoader( ) );
}
- if ( keystorePass != null )
+ // create http connector
+ Connector httpConnector = container.createConnector(
(InetAddress) null, port, protocol );
+ if ( httpsPort > 0 )
+ {
+ httpConnector.setRedirectPort( httpsPort );
+ }
+ httpConnector.setURIEncoding( uriEncoding );
+ container.addConnector( httpConnector );
+
+ // create https connector
+ if ( httpsPort > 0 )
{
- httpsConnector.setAttribute( "keystorePass", keystorePass
);
+ Connector httpsConnector = container.createConnector(
(InetAddress) null, httpsPort, true );
+ if ( keystoreFile != null )
+ {
+ httpsConnector.setAttribute( "keystoreFile",
keystoreFile );
+ }
+ if ( keystorePass != null )
+ {
+ httpsConnector.setAttribute( "keystorePass",
keystorePass );
+ }
+ container.addConnector( httpsConnector );
+
}
- container.addConnector( httpsConnector );
+ // create ajp connector
+ if ( ajpPort > 0 )
+ {
+ Connector ajpConnector = container.createConnector(
(InetAddress) null, ajpPort, ajpProtocol );
+ ajpConnector.setURIEncoding( uriEncoding );
+ container.addConnector( ajpConnector );
+ }
+ container.start( );
}
- // create ajp connector
- if ( ajpPort > 0 )
+ EmbeddedRegistry.getInstance( ).register( container );
+ }
+ finally
+ {
+ if ( previousCatalinaBase != null )
{
- Connector ajpConnector = container.createConnector(
(InetAddress) null, ajpPort, ajpProtocol );
- ajpConnector.setURIEncoding( uriEncoding );
- container.addConnector( ajpConnector );
+ System.setProperty( "catalina.base", previousCatalinaBase );
}
}
- container.start( );
-
- EmbeddedRegistry.getInstance( ).register( container );
-
}
protected ClassRealm getTomcatClassLoader( )
Added:
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/java/org/codehaus/mojo/tomcat/it/Tomcat6DeployWarProjectIT.java
URL:
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/java/org/codehaus/mojo/tomcat/it/Tomcat6DeployWarProjectIT.java?rev=1178619&view=auto
==============================================================================
---
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/java/org/codehaus/mojo/tomcat/it/Tomcat6DeployWarProjectIT.java
(added)
+++
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/java/org/codehaus/mojo/tomcat/it/Tomcat6DeployWarProjectIT.java
Mon Oct 3 22:22:46 2011
@@ -0,0 +1,35 @@
+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 Tomcat6DeployWarProjectIT
+ extends AbstractDeployWarProjectIT
+{
+ // no op
+
+ @Override
+ public void testIt( )
+ throws Exception
+ {
+ //FIXME currently this it fail
+ }
+}
Propchange:
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/java/org/codehaus/mojo/tomcat/it/Tomcat6DeployWarProjectIT.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/java/org/codehaus/mojo/tomcat/it/Tomcat6DeployWarProjectIT.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added:
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/deploy-war-project/pom.xml
URL:
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/deploy-war-project/pom.xml?rev=1178619&view=auto
==============================================================================
---
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/deploy-war-project/pom.xml
(added)
+++
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/deploy-war-project/pom.xml
Mon Oct 3 22:22:46 2011
@@ -0,0 +1,131 @@
+<?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</goal>
+ </goals>
+ <phase>test</phase>
+ <configuration>
+ <fork>true</fork>
+ <path>/</path>
+ <tomcatUsers>src/main/tomcatconf/tomcat-users.xml</tomcatUsers>
+ </configuration>
+ </execution>
+ <execution>
+ <id>tomcat-deploy</id>
+ <phase>package</phase>
+ <goals>
+ <goal>deploy-only</goal>
+ </goals>
+ <configuration>
+ <warFile>./simple-war-project-1.0-SNAPSHOT.war</warFile>
+ <username>tomcat</username>
+ <password>tomcat</password>
+ <path>/foo</path>
+ </configuration>
+ </execution>
+ <execution>
+ <id>tomcat-shutdown</id>
+ <goals>
+ <goal>shutdown</goal>
+ </goals>
+ <phase>post-integration-test</phase>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-failsafe-plugin</artifactId>
+ <version>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-war-project/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/deploy-war-project/pom.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added:
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/deploy-war-project/simple-war-project-1.0-SNAPSHOT.war
URL:
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/deploy-war-project/simple-war-project-1.0-SNAPSHOT.war?rev=1178619&view=auto
==============================================================================
Files
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/deploy-war-project/simple-war-project-1.0-SNAPSHOT.war
(added) and
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/deploy-war-project/simple-war-project-1.0-SNAPSHOT.war
Mon Oct 3 22:22:46 2011 differ
Added:
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/deploy-war-project/src/main/tomcatconf/empty.txt
URL:
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/deploy-war-project/src/main/tomcatconf/empty.txt?rev=1178619&view=auto
==============================================================================
---
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/deploy-war-project/src/main/tomcatconf/empty.txt
(added)
+++
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/deploy-war-project/src/main/tomcatconf/empty.txt
Mon Oct 3 22:22:46 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-war-project/src/main/tomcatconf/empty.txt
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/deploy-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-war-project/src/main/tomcatconf/logging.properties
URL:
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/deploy-war-project/src/main/tomcatconf/logging.properties?rev=1178619&view=auto
==============================================================================
---
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/deploy-war-project/src/main/tomcatconf/logging.properties
(added)
+++
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/deploy-war-project/src/main/tomcatconf/logging.properties
Mon Oct 3 22:22:46 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-war-project/src/main/tomcatconf/logging.properties
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/deploy-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-war-project/src/main/tomcatconf/server.xml
URL:
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/deploy-war-project/src/main/tomcatconf/server.xml?rev=1178619&view=auto
==============================================================================
---
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/deploy-war-project/src/main/tomcatconf/server.xml
(added)
+++
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/deploy-war-project/src/main/tomcatconf/server.xml
Mon Oct 3 22:22:46 2011
@@ -0,0 +1,43 @@
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+
+<Server port="8010" shutdown="SHUTDOWN">
+
+ <GlobalNamingResources>
+ <!-- Used by Manager webapp -->
+ <Resource name="UserDatabase" auth="Container"
+ type="org.apache.catalina.UserDatabase"
+ description="User database that can be updated and saved"
+ factory="org.apache.catalina.users.MemoryUserDatabaseFactory"
+ pathname="conf/tomcat-users.xml" />
+ </GlobalNamingResources>
+
+ <Service name="Catalina">
+ <Connector port="8080" keepAliveTimeout="1800000"
maxKeepAliveRequests="30000" maxThreads="300" />
+ <Connector port="8088" keepAliveTimeout="1800000"
maxKeepAliveRequests="30000" maxThreads="300" />
+ <Engine name="Catalina" defaultHost="localhost">
+ <Valve className="org.apache.catalina.valves.AccessLogValve"
+ resolveHosts="false"
pattern="%t-ip:%a-protocol:%H-localPort:%p-path:%U-time:%D ms"/>
+ <Realm className="org.apache.catalina.realm.UserDatabaseRealm"
+ resourceName="UserDatabase" />
+ <Host name="localhost" appBase="webapps" />
+ </Engine>
+
+ </Service>
+</Server>
Propchange:
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/deploy-war-project/src/main/tomcatconf/server.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/deploy-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-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-war-project/src/main/tomcatconf/tomcat-users.xml?rev=1178619&view=auto
==============================================================================
---
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/deploy-war-project/src/main/tomcatconf/tomcat-users.xml
(added)
+++
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/deploy-war-project/src/main/tomcatconf/tomcat-users.xml
Mon Oct 3 22:22:46 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-war-project/src/main/tomcatconf/tomcat-users.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
tomcat/maven-plugin/trunk/tomcat6-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/tomcat6-maven-plugin/src/test/resources/deploy-war-project/src/main/webapp/index.jsp
URL:
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/deploy-war-project/src/main/webapp/index.jsp?rev=1178619&view=auto
==============================================================================
---
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/deploy-war-project/src/main/webapp/index.jsp
(added)
+++
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/deploy-war-project/src/main/webapp/index.jsp
Mon Oct 3 22:22:46 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-war-project/src/main/webapp/index.jsp
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/deploy-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-war-project/src/main/webapp/web.xml
URL:
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/deploy-war-project/src/main/webapp/web.xml?rev=1178619&view=auto
==============================================================================
---
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/deploy-war-project/src/main/webapp/web.xml
(added)
+++
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/deploy-war-project/src/main/webapp/web.xml
Mon Oct 3 22:22:46 2011
@@ -0,0 +1,26 @@
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<web-app xmlns="http://java.sun.com/xml/ns/j2ee"; version="2.4"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd";>
+
+
+</web-app>
\ No newline at end of file
Propchange:
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/deploy-war-project/src/main/webapp/web.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/deploy-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-war-project/src/test/java/WaitIT.java
URL:
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/deploy-war-project/src/test/java/WaitIT.java?rev=1178619&view=auto
==============================================================================
---
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/deploy-war-project/src/test/java/WaitIT.java
(added)
+++
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/deploy-war-project/src/test/java/WaitIT.java
Mon Oct 3 22:22:46 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-war-project/src/test/java/WaitIT.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/deploy-war-project/src/test/java/WaitIT.java
------------------------------------------------------------------------------
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
