Author: olamy
Date: Fri Nov 1 02:49:52 2013
New Revision: 1537807
URL: http://svn.apache.org/r1537807
Log:
[MTOMCAT-245] Missing useBodyEncodingForURI parameter on connector
Submitted by Cédric Dutoit
for tomcat6 plugin too
Modified:
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/AbstractRunMojo.java
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=1537807&r1=1537806&r2=1537807&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
Fri Nov 1 02:49:52 2013
@@ -423,6 +423,13 @@ public abstract class AbstractRunMojo
@Parameter
protected String classLoaderClass;
+ /**
+ *
+ * @since 2.2
+ */
+ @Parameter( property = "maven.tomcat.useBodyEncodingForURI", defaultValue
= "false" )
+ protected boolean useBodyEncodingForURI;
+
@Parameter( defaultValue = "${session}", readonly = true, required = true )
protected MavenSession session;
@@ -868,6 +875,7 @@ public abstract class AbstractRunMojo
httpConnector.setRedirectPort( httpsPort );
}
httpConnector.setURIEncoding( uriEncoding );
+ httpConnector.setUseBodyEncodingForURI(
this.useBodyEncodingForURI );
container.addConnector( httpConnector );
// create https connector
@@ -890,6 +898,9 @@ public abstract class AbstractRunMojo
{
httpsConnector.setAttribute( "keystoreType",
keystoreType );
}
+
+ httpsConnector.setUseBodyEncodingForURI(
this.useBodyEncodingForURI );
+
container.addConnector( httpsConnector );
}
@@ -899,6 +910,7 @@ public abstract class AbstractRunMojo
{
Connector ajpConnector = container.createConnector(
(InetAddress) null, ajpPort, ajpProtocol );
ajpConnector.setURIEncoding( uriEncoding );
+ ajpConnector.setUseBodyEncodingForURI(
this.useBodyEncodingForURI );
container.addConnector( ajpConnector );
}
if ( useSeparateTomcatClassLoader )
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]