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/17 16:03:07 UTC
svn commit: r1185177 - in /tomcat/maven-plugin/trunk:
tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/
tomcat7-war-runner/
tomcat7-war-runner/src/main/java/org/apache/tomcat/maven/runner/
Author: olamy
Date: Mon Oct 17 14:03:06 2011
New Revision: 1185177
URL: http://svn.apache.org/viewvc?rev=1185177&view=rev
Log:
[MTOMCAT-102] acces log valve format used configurable
Modified:
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractExecWarMojo.java
tomcat/maven-plugin/trunk/tomcat7-war-runner/NOTES.TXT
tomcat/maven-plugin/trunk/tomcat7-war-runner/src/main/java/org/apache/tomcat/maven/runner/Tomcat7Runner.java
Modified: tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractExecWarMojo.java
URL: http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractExecWarMojo.java?rev=1185177&r1=1185176&r2=1185177&view=diff
==============================================================================
--- tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractExecWarMojo.java (original)
+++ tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractExecWarMojo.java Mon Oct 17 14:03:06 2011
@@ -200,6 +200,14 @@ public abstract class AbstractExecWarMoj
* @required
*/
private boolean enableNaming;
+
+ /**
+ * see http://tomcat.apache.org/tomcat-7.0-doc/config/valve.html
+ *
+ * @parameter expression="${maven.tomcat.exec.war.accessLogValveFormat}" default-value="%h %l %u %t "%r" %s %b %I %D"
+ * @required
+ */
+ private String accessLogValveFormat;
public void execute()
throws MojoExecutionException, MojoFailureException
@@ -251,11 +259,15 @@ public abstract class AbstractExecWarMoj
// * useServerXml=true/false to use directly the one provided
// * enableNaming=true/false
// * wars=foo.war|contextpath;bar.war ( |contextpath is optionnal if empty use the war name )
+ // * accessLogValveFormat=
//* optionnal: conf/ with usual tomcat configuration files
//* MANIFEST with Main-Class
Properties properties = new Properties( );
+ properties.put( Tomcat7Runner.ENABLE_NAMING_KEY, Boolean.toString( enableNaming ) );
+ properties.put( Tomcat7Runner.ACCESS_LOG_VALVE_FORMAT_KEY, accessLogValveFormat );
+
os =
new ArchiveStreamFactory().createArchiveOutputStream(ArchiveStreamFactory.JAR, execWarJarOutputStream);
@@ -267,7 +279,7 @@ public abstract class AbstractExecWarMoj
properties.put( Tomcat7Runner.WARS_KEY , path + ".war|" + path );
}
- properties.put( Tomcat7Runner.ENABLE_NAMING_KEY, Boolean.toString( enableNaming ) );
+
if ( "pom".equals( project.getPackaging() ) && ( warRunDependencies != null && !warRunDependencies.isEmpty() ) )
{
Modified: tomcat/maven-plugin/trunk/tomcat7-war-runner/NOTES.TXT
URL: http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat7-war-runner/NOTES.TXT?rev=1185177&r1=1185176&r2=1185177&view=diff
==============================================================================
--- tomcat/maven-plugin/trunk/tomcat7-war-runner/NOTES.TXT (original)
+++ tomcat/maven-plugin/trunk/tomcat7-war-runner/NOTES.TXT Mon Oct 17 14:03:06 2011
@@ -23,6 +23,7 @@ The generated standalone jar will contai
in the maven plugin configuration
* wars=foo.war|contextpath;bar.war ( |contextpath is optionnal if empty use the war name)
* enableNaming=true/false
+ * accessLogValveFormat=
* optionnal: conf/ with usual tomcat configuration files
Modified: tomcat/maven-plugin/trunk/tomcat7-war-runner/src/main/java/org/apache/tomcat/maven/runner/Tomcat7Runner.java
URL: http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat7-war-runner/src/main/java/org/apache/tomcat/maven/runner/Tomcat7Runner.java?rev=1185177&r1=1185176&r2=1185177&view=diff
==============================================================================
--- tomcat/maven-plugin/trunk/tomcat7-war-runner/src/main/java/org/apache/tomcat/maven/runner/Tomcat7Runner.java (original)
+++ tomcat/maven-plugin/trunk/tomcat7-war-runner/src/main/java/org/apache/tomcat/maven/runner/Tomcat7Runner.java Mon Oct 17 14:03:06 2011
@@ -50,6 +50,8 @@ public class Tomcat7Runner
public static final String ENABLE_NAMING_KEY = "enableNaming";
+ public static final String ACCESS_LOG_VALVE_FORMAT_KEY = "accessLogValveFormat";
+
public int httpPort;
@@ -134,7 +136,7 @@ public class Tomcat7Runner
// add a default acces log valve
AccessLogValve alv = new AccessLogValve();
alv.setDirectory(new File(extractDirectory, "logs").getAbsolutePath());
- alv.setPattern("%h %l %u %t \"%r\" %s %b %I %D");
+ alv.setPattern( runtimeProperties.getProperty( Tomcat7Runner.ACCESS_LOG_VALVE_FORMAT_KEY ) );
tomcat.getHost().getPipeline().addValve(alv);
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org