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/12/19 11:01:22 UTC
svn commit: r1220674 - 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 Dec 19 10:01:21 2011
New Revision: 1220674
URL: http://svn.apache.org/viewvc?rev=1220674&view=rev
Log:
[MTOMCAT-109] nio protocol is impossible to use with tomcat exec mojo.
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=1220674&r1=1220673&r2=1220674&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 Dec 19 10:01:21 2011
@@ -219,6 +219,13 @@ public abstract class AbstractExecWarMoj
*/
private String mainClass;
+ /**
+ * which connector protocol to use HTTP/1.1 or org.apache.coyote.http11.Http11NioProtocol
+ * @parameter expression="${maven.tomcat.exec.war.connectorHttpProtocol}" default-value="HTTP/1.1"
+ * @required
+ */
+ private String connectorHttpProtocol;
+
public void execute()
throws MojoExecutionException, MojoFailureException
{
@@ -269,6 +276,7 @@ public abstract class AbstractExecWarMoj
// * enableNaming=true/false
// * wars=foo.war|contextpath;bar.war ( |contextpath is optionnal if empty use the war name )
// * accessLogValveFormat=
+ // * connectorhttpProtocol: HTTP/1.1 or org.apache.coyote.http11.Http11NioProtocol
//* optionnal: conf/ with usual tomcat configuration files
//* MANIFEST with Main-Class
@@ -276,6 +284,7 @@ public abstract class AbstractExecWarMoj
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 );
os = new ArchiveStreamFactory().createArchiveOutputStream( ArchiveStreamFactory.JAR,
execWarJarOutputStream );
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=1220674&r1=1220673&r2=1220674&view=diff
==============================================================================
--- tomcat/maven-plugin/trunk/tomcat7-war-runner/NOTES.TXT (original)
+++ tomcat/maven-plugin/trunk/tomcat7-war-runner/NOTES.TXT Mon Dec 19 10:01:21 2011
@@ -24,6 +24,7 @@ The generated standalone jar will contai
* wars=foo.war|contextpath;bar.war ( |contextpath is optionnal if empty use the war name)
* enableNaming=true/false
* accessLogValveFormat=
+ * connectorhttpProtocol: HTTP/1.1 or org.apache.coyote.http11.Http11NioProtocol
* 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=1220674&r1=1220673&r2=1220674&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 Dec 19 10:01:21 2011
@@ -57,6 +57,11 @@ public class Tomcat7Runner
public static final String ACCESS_LOG_VALVE_FORMAT_KEY = "accessLogValveFormat";
+ /**
+ * key of the property which contains http protocol : HTTP/1.1 or org.apache.coyote.http11.Http11NioProtocol
+ */
+ public static final String HTTP_PROTOCOL_KEY = "connectorhttpProtocol";
+
public int httpPort;
@@ -143,7 +148,11 @@ public class Tomcat7Runner
tomcat.getHost().setAppBase( new File( extractDirectory, "webapps" ).getAbsolutePath() );
- Connector connector = new Connector( "HTTP/1.1" );
+ String connectorHttpProtocol = runtimeProperties.getProperty( HTTP_PROTOCOL_KEY );
+
+ debugMessage( "use connectorHttpProtocol:" + connectorHttpProtocol );
+
+ Connector connector = new Connector( connectorHttpProtocol );
connector.setPort( httpPort );
if ( httpsPort > 0 )
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org