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 2013/11/01 06:08:03 UTC

svn commit: r1537821 - /tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractRunMojo.java

Author: olamy
Date: Fri Nov  1 05:08:03 2013
New Revision: 1537821

URL: http://svn.apache.org/r1537821
Log:
[MTOMCAT-207] Allow truststoreFile in plugin configuration
for tomcat7 plugin

Modified:
    tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractRunMojo.java

Modified: tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractRunMojo.java
URL: http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractRunMojo.java?rev=1537821&r1=1537820&r2=1537821&view=diff
==============================================================================
--- tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractRunMojo.java (original)
+++ tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractRunMojo.java Fri Nov  1 05:08:03 2013
@@ -490,6 +490,20 @@ public abstract class AbstractRunMojo
     @Parameter( property = "maven.tomcat.useBodyEncodingForURI", defaultValue = "false" )
     protected boolean useBodyEncodingForURI;
 
+    protected String trustManagerClassName;
+
+    protected String trustMaxCertLength;
+
+    protected String truststoreAlgorithm;
+
+    protected String truststoreFile;
+
+    protected String  truststorePass;
+
+    protected String truststoreProvider;
+
+    protected String truststoreType;
+
     // ----------------------------------------------------------------------
     // Fields
     // ----------------------------------------------------------------------
@@ -1096,6 +1110,42 @@ public abstract class AbstractRunMojo
                         httpsConnector.setAttribute( "keystoreType", keystoreType );
                     }
 
+                    if( trustManagerClassName != null )
+                    {
+                        httpsConnector.setAttribute( "trustManagerClassName", trustManagerClassName );
+                    }
+
+                    if( trustMaxCertLength != null )
+                    {
+                        httpsConnector.setAttribute( "trustMaxCertLength", trustMaxCertLength );
+                    }
+
+                    if( truststoreAlgorithm != null )
+                    {
+                        httpsConnector.setAttribute( "truststoreAlgorithm", truststoreAlgorithm );
+                    }
+
+                    if( truststoreFile != null )
+                    {
+                        httpsConnector.setAttribute( "truststoreFile", truststoreFile );
+                    }
+
+                    if( truststorePass != null )
+                    {
+                        httpsConnector.setAttribute( "truststorePass", truststorePass );
+                    }
+
+                    if( truststoreProvider != null )
+                    {
+                        httpsConnector.setAttribute( "truststoreProvider", truststoreProvider );
+                    }
+
+
+                    if( truststoreType != null )
+                    {
+                        httpsConnector.setAttribute( "truststoreType", truststoreType );
+                    }
+
                     httpsConnector.setAttribute( "clientAuth", clientAuth );
 
                     httpsConnector.setUseBodyEncodingForURI( this.useBodyEncodingForURI );



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org