Author: olamy Date: Wed Aug 13 00:17:06 2014 New Revision: 1617630 URL: http://svn.apache.org/r1617630 Log: basic support for tomcat 8
Added: tomcat/maven-plugin/branches/tc8.x/tomcat8-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat8/AbstractTomcat8Mojo.java (contents, props changed) - copied, changed from r1612479, tomcat/maven-plugin/branches/tc8.x/tomcat8-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat8/AbstractTomcat7Mojo.java tomcat/maven-plugin/branches/tc8.x/tomcat8-maven-plugin/src/test/java/org/apache/tomcat/maven/it/Tomcat8DeployWarOnlyProjectIT.java (contents, props changed) - copied, changed from r1612479, tomcat/maven-plugin/branches/tc8.x/tomcat8-maven-plugin/src/test/java/org/apache/tomcat/maven/it/Tomcat7DeployWarOnlyProjectIT.java tomcat/maven-plugin/branches/tc8.x/tomcat8-maven-plugin/src/test/java/org/apache/tomcat/maven/it/Tomcat8DeployWarProjectIT.java (contents, props changed) - copied, changed from r1612479, tomcat/maven-plugin/branches/tc8.x/tomcat8-maven-plugin/src/test/java/org/apache/tomcat/maven/it/Tomcat7DeployWarProjectIT.java tomcat/maven-plugin/branches/tc8.x/tomcat8-maven-plugin/src/test/java/org/apache/tomcat/maven/it/Tomcat8RunMultiConfigIT.java (contents, props changed) - copied, changed from r1612479, tomcat/maven-plugin/branches/tc8.x/tomcat8-maven-plugin/src/test/java/org/apache/tomcat/maven/it/Tomcat7RunMultiConfigIT.java tomcat/maven-plugin/branches/tc8.x/tomcat8-maven-plugin/src/test/java/org/apache/tomcat/maven/it/Tomcat8SimpleWarProjectIT.java (contents, props changed) - copied, changed from r1612479, tomcat/maven-plugin/branches/tc8.x/tomcat8-maven-plugin/src/test/java/org/apache/tomcat/maven/it/Tomcat7SimpleWarProjectIT.java tomcat/maven-plugin/branches/tc8.x/tomcat8-war-runner/ tomcat/maven-plugin/branches/tc8.x/tomcat8-war-runner/NOTES.TXT tomcat/maven-plugin/branches/tc8.x/tomcat8-war-runner/pom.xml (with props) tomcat/maven-plugin/branches/tc8.x/tomcat8-war-runner/src/ tomcat/maven-plugin/branches/tc8.x/tomcat8-war-runner/src/main/ tomcat/maven-plugin/branches/tc8.x/tomcat8-war-runner/src/main/java/ tomcat/maven-plugin/branches/tc8.x/tomcat8-war-runner/src/main/java/org/ tomcat/maven-plugin/branches/tc8.x/tomcat8-war-runner/src/main/java/org/apache/ tomcat/maven-plugin/branches/tc8.x/tomcat8-war-runner/src/main/java/org/apache/tomcat/ tomcat/maven-plugin/branches/tc8.x/tomcat8-war-runner/src/main/java/org/apache/tomcat/maven/ tomcat/maven-plugin/branches/tc8.x/tomcat8-war-runner/src/main/java/org/apache/tomcat/maven/runner/ tomcat/maven-plugin/branches/tc8.x/tomcat8-war-runner/src/main/java/org/apache/tomcat/maven/runner/PasswordUtil.java (with props) tomcat/maven-plugin/branches/tc8.x/tomcat8-war-runner/src/main/java/org/apache/tomcat/maven/runner/Tomcat8Runner.java (with props) tomcat/maven-plugin/branches/tc8.x/tomcat8-war-runner/src/main/java/org/apache/tomcat/maven/runner/Tomcat8RunnerCli.java (with props) Removed: tomcat/maven-plugin/branches/tc8.x/tomcat8-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat8/AbstractTomcat7Mojo.java tomcat/maven-plugin/branches/tc8.x/tomcat8-maven-plugin/src/test/java/org/apache/tomcat/maven/it/Tomcat7DeployWarOnlyProjectIT.java tomcat/maven-plugin/branches/tc8.x/tomcat8-maven-plugin/src/test/java/org/apache/tomcat/maven/it/Tomcat7DeployWarProjectIT.java tomcat/maven-plugin/branches/tc8.x/tomcat8-maven-plugin/src/test/java/org/apache/tomcat/maven/it/Tomcat7RunMultiConfigIT.java tomcat/maven-plugin/branches/tc8.x/tomcat8-maven-plugin/src/test/java/org/apache/tomcat/maven/it/Tomcat7SimpleWarProjectIT.java Modified: tomcat/maven-plugin/branches/tc8.x/pom.xml tomcat/maven-plugin/branches/tc8.x/tomcat8-maven-plugin/pom.xml tomcat/maven-plugin/branches/tc8.x/tomcat8-maven-plugin/src/it/simple-war-exec-project/pom.xml tomcat/maven-plugin/branches/tc8.x/tomcat8-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat8/AbstractCatalinaMojo.java tomcat/maven-plugin/branches/tc8.x/tomcat8-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat8/run/AbstractExecWarMojo.java tomcat/maven-plugin/branches/tc8.x/tomcat8-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat8/run/AbstractRunMojo.java tomcat/maven-plugin/branches/tc8.x/tomcat8-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat8/run/AbstractStandaloneWarMojo.java tomcat/maven-plugin/branches/tc8.x/tomcat8-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat8/run/ShutdownMojo.java tomcat/maven-plugin/branches/tc8.x/tomcat8-maven-plugin/src/main/resources/conf/logging.properties tomcat/maven-plugin/branches/tc8.x/tomcat8-maven-plugin/src/main/resources/conf/tomcat-users.xml tomcat/maven-plugin/branches/tc8.x/tomcat8-maven-plugin/src/main/resources/conf/web.xml tomcat/maven-plugin/branches/tc8.x/tomcat8-maven-plugin/src/site/apt/adjust-embedded-tomcat-version.apt.vm tomcat/maven-plugin/branches/tc8.x/tomcat8-maven-plugin/src/site/apt/index.apt tomcat/maven-plugin/branches/tc8.x/tomcat8-maven-plugin/src/site/apt/usage.apt.vm tomcat/maven-plugin/branches/tc8.x/tomcat8-maven-plugin/src/test/resources/deploy-only-war-project/pom.xml tomcat/maven-plugin/branches/tc8.x/tomcat8-maven-plugin/src/test/resources/deploy-war-project/pom.xml tomcat/maven-plugin/branches/tc8.x/tomcat8-maven-plugin/src/test/resources/simple-war-project/pom.xml tomcat/maven-plugin/branches/tc8.x/tomcat8-maven-plugin/src/test/resources/tomcat-run-multi-config/pom.xml Modified: tomcat/maven-plugin/branches/tc8.x/pom.xml URL: http://svn.apache.org/viewvc/tomcat/maven-plugin/branches/tc8.x/pom.xml?rev=1617630&r1=1617629&r2=1617630&view=diff ============================================================================== --- tomcat/maven-plugin/branches/tc8.x/pom.xml (original) +++ tomcat/maven-plugin/branches/tc8.x/pom.xml Wed Aug 13 00:17:06 2014 @@ -302,6 +302,7 @@ <module>tomcat6-maven-plugin</module> <module>tomcat7-war-runner</module> <module>tomcat7-maven-plugin</module> + <module>tomcat8-war-runner</module> <module>tomcat8-maven-plugin</module> <module>tomcat-maven-archetype</module> </modules> @@ -445,6 +446,12 @@ <artifactId>tomcat7-war-runner</artifactId> <version>${project.version}</version> </dependency> + + <dependency> + <groupId>org.apache.tomcat.maven</groupId> + <artifactId>tomcat8-war-runner</artifactId> + <version>${project.version}</version> + </dependency> <dependency> <groupId>org.apache.maven.plugin-tools</groupId> Modified: tomcat/maven-plugin/branches/tc8.x/tomcat8-maven-plugin/pom.xml URL: http://svn.apache.org/viewvc/tomcat/maven-plugin/branches/tc8.x/tomcat8-maven-plugin/pom.xml?rev=1617630&r1=1617629&r2=1617630&view=diff ============================================================================== --- tomcat/maven-plugin/branches/tc8.x/tomcat8-maven-plugin/pom.xml (original) +++ tomcat/maven-plugin/branches/tc8.x/tomcat8-maven-plugin/pom.xml Wed Aug 13 00:17:06 2014 @@ -159,7 +159,7 @@ </dependency> <dependency> <groupId>org.apache.tomcat.maven</groupId> - <artifactId>tomcat7-war-runner</artifactId> + <artifactId>tomcat8-war-runner</artifactId> </dependency> <dependency> <groupId>org.apache.maven</groupId> Modified: tomcat/maven-plugin/branches/tc8.x/tomcat8-maven-plugin/src/it/simple-war-exec-project/pom.xml URL: http://svn.apache.org/viewvc/tomcat/maven-plugin/branches/tc8.x/tomcat8-maven-plugin/src/it/simple-war-exec-project/pom.xml?rev=1617630&r1=1617629&r2=1617630&view=diff ============================================================================== --- tomcat/maven-plugin/branches/tc8.x/tomcat8-maven-plugin/src/it/simple-war-exec-project/pom.xml (original) +++ tomcat/maven-plugin/branches/tc8.x/tomcat8-maven-plugin/src/it/simple-war-exec-project/pom.xml Wed Aug 13 00:17:06 2014 @@ -41,7 +41,7 @@ </plugin> <plugin> <groupId>org.apache.tomcat.maven</groupId> - <artifactId>tomcat7-maven-plugin</artifactId> + <artifactId>tomcat8-maven-plugin</artifactId> <version>@pom.version@</version> </plugin> </plugins> @@ -56,7 +56,7 @@ </plugin> <plugin> <groupId>org.apache.tomcat.maven</groupId> - <artifactId>tomcat7-maven-plugin</artifactId> + <artifactId>tomcat8-maven-plugin</artifactId> <executions> <execution> <id>tomcat-run</id> Modified: tomcat/maven-plugin/branches/tc8.x/tomcat8-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat8/AbstractCatalinaMojo.java URL: http://svn.apache.org/viewvc/tomcat/maven-plugin/branches/tc8.x/tomcat8-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat8/AbstractCatalinaMojo.java?rev=1617630&r1=1617629&r2=1617630&view=diff ============================================================================== --- tomcat/maven-plugin/branches/tc8.x/tomcat8-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat8/AbstractCatalinaMojo.java (original) +++ tomcat/maven-plugin/branches/tc8.x/tomcat8-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat8/AbstractCatalinaMojo.java Wed Aug 13 00:17:06 2014 @@ -26,7 +26,7 @@ import org.apache.maven.plugins.annotati import org.apache.maven.wagon.authentication.AuthenticationInfo; import org.apache.tomcat.maven.common.deployer.TomcatManager; import org.apache.tomcat.maven.common.deployer.TomcatManagerException; -import org.apache.tomcat.maven.plugin.tomcat8.AbstractTomcat7Mojo; +import org.apache.tomcat.maven.plugin.tomcat8.AbstractTomcat8Mojo; import org.codehaus.plexus.util.StringUtils; import java.io.IOException; @@ -40,7 +40,7 @@ import java.util.StringTokenizer; * @author Mark Hobson <markhob...@gmail.com> */ public abstract class AbstractCatalinaMojo - extends AbstractTomcat7Mojo + extends AbstractTomcat8Mojo { // ---------------------------------------------------------------------- // Constants Copied: tomcat/maven-plugin/branches/tc8.x/tomcat8-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat8/AbstractTomcat8Mojo.java (from r1612479, tomcat/maven-plugin/branches/tc8.x/tomcat8-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat8/AbstractTomcat7Mojo.java) URL: http://svn.apache.org/viewvc/tomcat/maven-plugin/branches/tc8.x/tomcat8-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat8/AbstractTomcat8Mojo.java?p2=tomcat/maven-plugin/branches/tc8.x/tomcat8-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat8/AbstractTomcat8Mojo.java&p1=tomcat/maven-plugin/branches/tc8.x/tomcat8-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat8/AbstractTomcat7Mojo.java&r1=1612479&r2=1617630&rev=1617630&view=diff ============================================================================== --- tomcat/maven-plugin/branches/tc8.x/tomcat8-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat8/AbstractTomcat7Mojo.java (original) +++ tomcat/maven-plugin/branches/tc8.x/tomcat8-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat8/AbstractTomcat8Mojo.java Wed Aug 13 00:17:06 2014 @@ -30,7 +30,7 @@ import org.apache.tomcat.maven.common.me * @author Olivier Lamy * @since 2.0 */ -public abstract class AbstractTomcat7Mojo +public abstract class AbstractTomcat8Mojo extends AbstractMojo { @Component Propchange: tomcat/maven-plugin/branches/tc8.x/tomcat8-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat8/AbstractTomcat8Mojo.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: tomcat/maven-plugin/branches/tc8.x/tomcat8-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat8/AbstractTomcat8Mojo.java ------------------------------------------------------------------------------ svn:keywords = Author Date Id Revision Modified: tomcat/maven-plugin/branches/tc8.x/tomcat8-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat8/run/AbstractExecWarMojo.java URL: http://svn.apache.org/viewvc/tomcat/maven-plugin/branches/tc8.x/tomcat8-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat8/run/AbstractExecWarMojo.java?rev=1617630&r1=1617629&r2=1617630&view=diff ============================================================================== --- tomcat/maven-plugin/branches/tc8.x/tomcat8-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat8/run/AbstractExecWarMojo.java (original) +++ tomcat/maven-plugin/branches/tc8.x/tomcat8-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat8/run/AbstractExecWarMojo.java Wed Aug 13 00:17:06 2014 @@ -38,9 +38,9 @@ import org.apache.maven.plugins.annotati import org.apache.maven.plugins.annotations.Parameter; import org.apache.maven.project.MavenProject; import org.apache.maven.project.MavenProjectHelper; -import org.apache.tomcat.maven.plugin.tomcat8.AbstractTomcat7Mojo; -import org.apache.tomcat.maven.runner.Tomcat7Runner; -import org.apache.tomcat.maven.runner.Tomcat7RunnerCli; +import org.apache.tomcat.maven.plugin.tomcat8.AbstractTomcat8Mojo; +import org.apache.tomcat.maven.runner.Tomcat8Runner; +import org.apache.tomcat.maven.runner.Tomcat8RunnerCli; import org.codehaus.plexus.archiver.jar.Manifest; import org.codehaus.plexus.archiver.jar.ManifestException; import org.codehaus.plexus.util.DirectoryScanner; @@ -65,7 +65,7 @@ import java.util.jar.JarFile; * @since 2.0 */ public abstract class AbstractExecWarMojo - extends AbstractTomcat7Mojo + extends AbstractTomcat8Mojo { @Parameter( defaultValue = "${project.artifact}", required = true, readonly = true ) @@ -86,7 +86,7 @@ public abstract class AbstractExecWarMoj /** * Path under {@link #buildDirectory} where this mojo may do temporary work. */ - @Parameter( defaultValue = "${project.build.directory}/tomcat7-maven-plugin-exec" ) + @Parameter( defaultValue = "${project.build.directory}/tomcat8-maven-plugin-exec" ) private File pluginWorkDirectory; @Parameter( property = "maven.tomcat.exec.war.tomcatConf", defaultValue = "src/main/tomcatconf" ) @@ -195,7 +195,7 @@ public abstract class AbstractExecWarMoj * Main class to use for starting the standalone jar. */ @Parameter( property = "maven.tomcat.exec.war.mainClass", - defaultValue = "org.apache.tomcat.maven.runner.Tomcat7RunnerCli", required = true ) + defaultValue = "org.apache.tomcat.maven.runner.Tomcat8RunnerCli", required = true ) protected String mainClass; /** @@ -280,15 +280,15 @@ public abstract class AbstractExecWarMoj Properties properties = new Properties(); - properties.put( Tomcat7Runner.ARCHIVE_GENERATION_TIMESTAMP_KEY, + properties.put( Tomcat8Runner.ARCHIVE_GENERATION_TIMESTAMP_KEY, Long.toString( System.currentTimeMillis() ) ); - properties.put( Tomcat7Runner.ENABLE_NAMING_KEY, Boolean.toString( enableNaming ) ); - properties.put( Tomcat7Runner.ACCESS_LOG_VALVE_FORMAT_KEY, accessLogValveFormat ); - properties.put( Tomcat7Runner.HTTP_PROTOCOL_KEY, connectorHttpProtocol ); + properties.put( Tomcat8Runner.ENABLE_NAMING_KEY, Boolean.toString( enableNaming ) ); + properties.put( Tomcat8Runner.ACCESS_LOG_VALVE_FORMAT_KEY, accessLogValveFormat ); + properties.put( Tomcat8Runner.HTTP_PROTOCOL_KEY, connectorHttpProtocol ); if ( httpPort != null ) { - properties.put( Tomcat7Runner.HTTP_PORT_KEY, httpPort ); + properties.put( Tomcat8Runner.HTTP_PORT_KEY, httpPort ); } os = new ArchiveStreamFactory().createArchiveOutputStream( ArchiveStreamFactory.JAR, @@ -301,7 +301,7 @@ public abstract class AbstractExecWarMoj IOUtils.copy( new FileInputStream( projectArtifact.getFile() ), os ); os.closeArchiveEntry(); - properties.put( Tomcat7Runner.WARS_KEY, StringUtils.removeStart( path, "/" ) + ".war|" + path ); + properties.put( Tomcat8Runner.WARS_KEY, StringUtils.removeStart( path, "/" ) + ".war|" + path ); } else if ( warRunDependencies != null && !warRunDependencies.isEmpty() ) { @@ -341,17 +341,17 @@ public abstract class AbstractExecWarMoj os.putArchiveEntry( new JarArchiveEntry( warFileName ) ); IOUtils.copy( new FileInputStream( warFileToBundle ), os ); os.closeArchiveEntry(); - String propertyWarValue = properties.getProperty( Tomcat7Runner.WARS_KEY ); + String propertyWarValue = properties.getProperty( Tomcat8Runner.WARS_KEY ); String contextPath = StringUtils.isEmpty( warRunDependency.contextPath ) ? "/" : warRunDependency.contextPath; if ( propertyWarValue != null ) { - properties.put( Tomcat7Runner.WARS_KEY, + properties.put( Tomcat8Runner.WARS_KEY, propertyWarValue + ";" + warFileName + "|" + contextPath ); } else { - properties.put( Tomcat7Runner.WARS_KEY, warFileName + "|" + contextPath ); + properties.put( Tomcat8Runner.WARS_KEY, warFileName + "|" + contextPath ); } } } @@ -362,11 +362,11 @@ public abstract class AbstractExecWarMoj os.putArchiveEntry( new JarArchiveEntry( "conf/server.xml" ) ); IOUtils.copy( new FileInputStream( serverXml ), os ); os.closeArchiveEntry(); - properties.put( Tomcat7Runner.USE_SERVER_XML_KEY, Boolean.TRUE.toString() ); + properties.put( Tomcat8Runner.USE_SERVER_XML_KEY, Boolean.TRUE.toString() ); } else { - properties.put( Tomcat7Runner.USE_SERVER_XML_KEY, Boolean.FALSE.toString() ); + properties.put( Tomcat8Runner.USE_SERVER_XML_KEY, Boolean.FALSE.toString() ); } os.putArchiveEntry( new JarArchiveEntry( "conf/web.xml" ) ); @@ -378,7 +378,7 @@ public abstract class AbstractExecWarMoj tmpPropertiesFileOutputStream.flush(); tmpPropertiesFileOutputStream.close(); - os.putArchiveEntry( new JarArchiveEntry( Tomcat7RunnerCli.STAND_ALONE_PROPERTIES_FILENAME ) ); + os.putArchiveEntry( new JarArchiveEntry( Tomcat8RunnerCli.STAND_ALONE_PROPERTIES_FILENAME ) ); IOUtils.copy( new FileInputStream( tmpPropertiesFile ), os ); os.closeArchiveEntry(); @@ -389,7 +389,7 @@ public abstract class AbstractExecWarMoj "org.apache.tomcat.embed", pluginArtifact.getGroupId() ) || StringUtils.equals( "org.eclipse.jdt.core.compiler", pluginArtifact.getGroupId() ) || StringUtils.equals( "commons-cli", pluginArtifact.getArtifactId() ) - || StringUtils.equals( "tomcat7-war-runner", pluginArtifact.getArtifactId() ) ) + || StringUtils.equals( "tomcat8-war-runner", pluginArtifact.getArtifactId() ) ) { JarFile jarFile = new JarFile( pluginArtifact.getFile() ); extractJarToArchive( jarFile, os, null ); Modified: tomcat/maven-plugin/branches/tc8.x/tomcat8-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat8/run/AbstractRunMojo.java URL: http://svn.apache.org/viewvc/tomcat/maven-plugin/branches/tc8.x/tomcat8-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat8/run/AbstractRunMojo.java?rev=1617630&r1=1617629&r2=1617630&view=diff ============================================================================== --- tomcat/maven-plugin/branches/tc8.x/tomcat8-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat8/run/AbstractRunMojo.java (original) +++ tomcat/maven-plugin/branches/tc8.x/tomcat8-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat8/run/AbstractRunMojo.java Wed Aug 13 00:17:06 2014 @@ -59,7 +59,7 @@ import org.apache.tomcat.JarScanner; import org.apache.tomcat.maven.common.config.AbstractWebapp; import org.apache.tomcat.maven.common.run.EmbeddedRegistry; import org.apache.tomcat.maven.common.run.ExternalRepositoriesReloadableWebappLoader; -import org.apache.tomcat.maven.plugin.tomcat8.AbstractTomcat7Mojo; +import org.apache.tomcat.maven.plugin.tomcat8.AbstractTomcat8Mojo; import org.apache.tomcat.util.scan.StandardJarScanner; import org.codehaus.plexus.archiver.ArchiverException; import org.codehaus.plexus.archiver.UnArchiver; @@ -104,7 +104,7 @@ import java.util.Set; * @since 2.0 */ public abstract class AbstractRunMojo - extends AbstractTomcat7Mojo + extends AbstractTomcat8Mojo { // --------------------------------------------------------------------- // Mojo Components @@ -967,7 +967,7 @@ public abstract class AbstractRunMojo } /** - * FIXME not sure we need all of those files with tomcat7 + * FIXME not sure we need all of those files with tomcat8 * Creates the Tomcat configuration directory with the necessary resources. * * @throws IOException if the Tomcat configuration could not be created Modified: tomcat/maven-plugin/branches/tc8.x/tomcat8-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat8/run/AbstractStandaloneWarMojo.java URL: http://svn.apache.org/viewvc/tomcat/maven-plugin/branches/tc8.x/tomcat8-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat8/run/AbstractStandaloneWarMojo.java?rev=1617630&r1=1617629&r2=1617630&view=diff ============================================================================== --- tomcat/maven-plugin/branches/tc8.x/tomcat8-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat8/run/AbstractStandaloneWarMojo.java (original) +++ tomcat/maven-plugin/branches/tc8.x/tomcat8-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat8/run/AbstractStandaloneWarMojo.java Wed Aug 13 00:17:06 2014 @@ -31,8 +31,8 @@ import org.apache.maven.model.Dependency import org.apache.maven.plugin.MojoExecutionException; import org.apache.maven.plugin.MojoFailureException; import org.apache.maven.plugins.annotations.Parameter; -import org.apache.tomcat.maven.runner.Tomcat7Runner; -import org.apache.tomcat.maven.runner.Tomcat7RunnerCli; +import org.apache.tomcat.maven.runner.Tomcat8Runner; +import org.apache.tomcat.maven.runner.Tomcat8RunnerCli; import org.codehaus.plexus.archiver.jar.Manifest; import org.codehaus.plexus.archiver.jar.ManifestException; import org.codehaus.plexus.util.DirectoryScanner; @@ -135,12 +135,12 @@ public abstract class AbstractStandalone Properties properties = new Properties(); - properties.put( Tomcat7Runner.ARCHIVE_GENERATION_TIMESTAMP_KEY, + properties.put( Tomcat8Runner.ARCHIVE_GENERATION_TIMESTAMP_KEY, Long.toString( System.currentTimeMillis() ) ); - properties.put( Tomcat7Runner.ENABLE_NAMING_KEY, Boolean.toString( enableNaming ) ); - properties.put( Tomcat7Runner.ACCESS_LOG_VALVE_FORMAT_KEY, accessLogValveFormat ); - properties.put( Tomcat7Runner.HTTP_PROTOCOL_KEY, connectorHttpProtocol ); - properties.put( Tomcat7Runner.CODE_SOURCE_CONTEXT_PATH, path ); + properties.put( Tomcat8Runner.ENABLE_NAMING_KEY, Boolean.toString( enableNaming ) ); + properties.put( Tomcat8Runner.ACCESS_LOG_VALVE_FORMAT_KEY, accessLogValveFormat ); + properties.put( Tomcat8Runner.HTTP_PROTOCOL_KEY, connectorHttpProtocol ); + properties.put( Tomcat8Runner.CODE_SOURCE_CONTEXT_PATH, path ); os = new ArchiveStreamFactory().createArchiveOutputStream( ArchiveStreamFactory.JAR, execWarJarOutputStream ); @@ -152,11 +152,11 @@ public abstract class AbstractStandalone os.putArchiveEntry( new JarArchiveEntry( "conf/server.xml" ) ); IOUtils.copy( new FileInputStream( serverXml ), os ); os.closeArchiveEntry(); - properties.put( Tomcat7Runner.USE_SERVER_XML_KEY, Boolean.TRUE.toString() ); + properties.put( Tomcat8Runner.USE_SERVER_XML_KEY, Boolean.TRUE.toString() ); } else { - properties.put( Tomcat7Runner.USE_SERVER_XML_KEY, Boolean.FALSE.toString() ); + properties.put( Tomcat8Runner.USE_SERVER_XML_KEY, Boolean.FALSE.toString() ); } os.putArchiveEntry( new JarArchiveEntry( "conf/web.xml" ) ); @@ -168,7 +168,7 @@ public abstract class AbstractStandalone tmpPropertiesFileOutputStream.flush(); tmpPropertiesFileOutputStream.close(); - os.putArchiveEntry( new JarArchiveEntry( Tomcat7RunnerCli.STAND_ALONE_PROPERTIES_FILENAME ) ); + os.putArchiveEntry( new JarArchiveEntry( Tomcat8RunnerCli.STAND_ALONE_PROPERTIES_FILENAME ) ); IOUtils.copy( new FileInputStream( tmpPropertiesFile ), os ); os.closeArchiveEntry(); @@ -179,7 +179,7 @@ public abstract class AbstractStandalone "org.apache.tomcat.embed", pluginArtifact.getGroupId() ) || StringUtils.equals( "org.eclipse.jdt.core.compiler", pluginArtifact.getGroupId() ) || StringUtils.equals( "commons-cli", pluginArtifact.getArtifactId() ) - || StringUtils.equals( "tomcat7-war-runner", pluginArtifact.getArtifactId() ) ) + || StringUtils.equals( "tomcat8-war-runner", pluginArtifact.getArtifactId() ) ) { JarFile jarFile = new JarFile( pluginArtifact.getFile() ); extractJarToArchive( jarFile, os, null ); Modified: tomcat/maven-plugin/branches/tc8.x/tomcat8-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat8/run/ShutdownMojo.java URL: http://svn.apache.org/viewvc/tomcat/maven-plugin/branches/tc8.x/tomcat8-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat8/run/ShutdownMojo.java?rev=1617630&r1=1617629&r2=1617630&view=diff ============================================================================== --- tomcat/maven-plugin/branches/tc8.x/tomcat8-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat8/run/ShutdownMojo.java (original) +++ tomcat/maven-plugin/branches/tc8.x/tomcat8-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat8/run/ShutdownMojo.java Wed Aug 13 00:17:06 2014 @@ -24,7 +24,7 @@ import org.apache.maven.plugins.annotati import org.apache.maven.plugins.annotations.Parameter; import org.apache.maven.plugins.annotations.ResolutionScope; import org.apache.tomcat.maven.common.run.EmbeddedRegistry; -import org.apache.tomcat.maven.plugin.tomcat8.AbstractTomcat7Mojo; +import org.apache.tomcat.maven.plugin.tomcat8.AbstractTomcat8Mojo; /** @@ -42,7 +42,7 @@ import org.apache.tomcat.maven.plugin.to */ @Mojo( name = "shutdown", requiresDependencyResolution = ResolutionScope.RUNTIME, threadSafe = true ) public class ShutdownMojo - extends AbstractTomcat7Mojo + extends AbstractTomcat8Mojo { /** Modified: tomcat/maven-plugin/branches/tc8.x/tomcat8-maven-plugin/src/main/resources/conf/logging.properties URL: http://svn.apache.org/viewvc/tomcat/maven-plugin/branches/tc8.x/tomcat8-maven-plugin/src/main/resources/conf/logging.properties?rev=1617630&r1=1617629&r2=1617630&view=diff ============================================================================== --- tomcat/maven-plugin/branches/tc8.x/tomcat8-maven-plugin/src/main/resources/conf/logging.properties (original) +++ tomcat/maven-plugin/branches/tc8.x/tomcat8-maven-plugin/src/main/resources/conf/logging.properties Wed Aug 13 00:17:06 2014 @@ -1,64 +1,64 @@ -# 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 +# 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.AsyncFileHandler, 2localhost.org.apache.juli.AsyncFileHandler, 3manager.org.apache.juli.AsyncFileHandler, 4host-manager.org.apache.juli.AsyncFileHandler, java.util.logging.ConsoleHandler + +.handlers = 1catalina.org.apache.juli.AsyncFileHandler, java.util.logging.ConsoleHandler + +############################################################ +# Handler specific properties. +# Describes specific configuration info for Handlers. +############################################################ + +1catalina.org.apache.juli.AsyncFileHandler.level = FINE +1catalina.org.apache.juli.AsyncFileHandler.directory = ${catalina.base}/logs +1catalina.org.apache.juli.AsyncFileHandler.prefix = catalina. + +2localhost.org.apache.juli.AsyncFileHandler.level = FINE +2localhost.org.apache.juli.AsyncFileHandler.directory = ${catalina.base}/logs +2localhost.org.apache.juli.AsyncFileHandler.prefix = localhost. + +3manager.org.apache.juli.AsyncFileHandler.level = FINE +3manager.org.apache.juli.AsyncFileHandler.directory = ${catalina.base}/logs +3manager.org.apache.juli.AsyncFileHandler.prefix = manager. + +4host-manager.org.apache.juli.AsyncFileHandler.level = FINE +4host-manager.org.apache.juli.AsyncFileHandler.directory = ${catalina.base}/logs +4host-manager.org.apache.juli.AsyncFileHandler.prefix = host-manager. + +java.util.logging.ConsoleHandler.level = FINE +java.util.logging.ConsoleHandler.formatter = org.apache.juli.OneLineFormatter + + +############################################################ +# 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.AsyncFileHandler + +org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/manager].level = INFO +org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/manager].handlers = 3manager.org.apache.juli.AsyncFileHandler + +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.AsyncFileHandler + +# 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 Modified: tomcat/maven-plugin/branches/tc8.x/tomcat8-maven-plugin/src/main/resources/conf/tomcat-users.xml URL: http://svn.apache.org/viewvc/tomcat/maven-plugin/branches/tc8.x/tomcat8-maven-plugin/src/main/resources/conf/tomcat-users.xml?rev=1617630&r1=1617629&r2=1617630&view=diff ============================================================================== --- tomcat/maven-plugin/branches/tc8.x/tomcat8-maven-plugin/src/main/resources/conf/tomcat-users.xml (original) +++ tomcat/maven-plugin/branches/tc8.x/tomcat8-maven-plugin/src/main/resources/conf/tomcat-users.xml Wed Aug 13 00:17:06 2014 @@ -1,26 +1,36 @@ -<?xml version='1.0' encoding='utf-8'?> -<!-- - Licensed to the Apache Software Foundation (ASF) under one or more - contributor license agreements. See the NOTICE file distributed with - this work for additional information regarding copyright ownership. - The ASF licenses this file to You under the Apache License, Version 2.0 - (the "License"); you may not use this file except in compliance with - the License. You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. ---> -<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"/> ---> -</tomcat-users> +<?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> +<!-- + NOTE: By default, no user is included in the "manager-gui" role required + to operate the "/manager/html" web application. If you wish to use this app, + you must define such a user - the username and password are arbitrary. +--> +<!-- + NOTE: The sample user and role entries below are wrapped in a comment + and thus are ignored when reading this file. Do not forget to remove + <!.. ..> that surrounds them. +--> +<!-- + <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"/> +--> +</tomcat-users> --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org