You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by Konstantin Kolinko <kn...@gmail.com> on 2012/03/13 01:25:14 UTC
Re: svn commit: r1299689 - in /tomcat/maven-plugin/trunk: (...)
2012/3/12 <ol...@apache.org>:
> Author: olamy
> Date: Mon Mar 12 14:36:22 2012
> New Revision: 1299689
>
> URL: http://svn.apache.org/viewvc?rev=1299689&view=rev
> Log:
> [MTOMCAT-126] Add support for keystoreType
> Submitted by Cédric Couralet.
>
> Modified:
> tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/AbstractRunMojo.java
> tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/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=1299689&r1=1299688&r2=1299689&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 Mon Mar 12 14:36:22 2012
> @@ -71,7 +71,7 @@ import java.util.Set;
> *
> * @author Jurgen Lust
> * @author Mark Hobson <ma...@gmail.com>
> - * @version $Id: AbstractRunMojo.java 14033 2011-05-04 17:51:15Z bimargulies $
> + * @version $Id$
> */
> public abstract class AbstractRunMojo
> extends AbstractI18NTomcat6Mojo
> @@ -253,6 +253,14 @@ public abstract class AbstractRunMojo
> * @since 1.1
> */
> private String keystorePass;
> +
> + /**
> + * Override the default keystoreType for the HTTPS connector (if enabled)
> + *
> + * @parameter
No "@parameter default-value=" here?
Your code for Tomcat 7 below has "default-value".
It is @since 2.0.1, not 1.1 as written below?
> + * @since 1.1
> + */
> + private String keystoreType;
>
> /**
> * <p>
> @@ -767,6 +775,10 @@ public abstract class AbstractRunMojo
> {
> httpsConnector.setAttribute( "keystorePass", keystorePass );
> }
> + if ( keystoreType != null )
> + {
> + httpsConnector.setAttribute( "keystoreType", keystoreType );
> + }
> container.addConnector( httpsConnector );
>
> }
>
> 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=1299689&r1=1299688&r2=1299689&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 Mon Mar 12 14:36:22 2012
> @@ -254,7 +254,13 @@ public abstract class AbstractRunMojo
> * @since 1.1
> */
> private String keystorePass;
> -
> +
> + /**
> + * Override the type of keystore file to be used for the server certificate. If not specified, the default value is "JKS".
> + * @parameter default-value="JKS"
> + */
> + private String keystoreType;
> +
> /**
> * <p>
> * Enables or disables naming support for the embedded Tomcat server.
> @@ -752,6 +758,10 @@ public abstract class AbstractRunMojo
> {
> httpsConnector.setAttribute( "keystorePass", keystorePass );
> }
> + if ( keystoreType != null )
> + {
> + httpsConnector.setAttribute( "keystoreType", keystoreType);
> + }
> embeddedTomcat.getEngine().getService().addConnector( httpsConnector );
>
> }
>
>
Best regards,
Konstantin Kolinko
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
Re: svn commit: r1299689 - in /tomcat/maven-plugin/trunk: (...)
Posted by Olivier Lamy <ol...@apache.org>.
2012/3/13 Konstantin Kolinko <kn...@gmail.com>:
> 2012/3/12 <ol...@apache.org>:
>> Author: olamy
>> Date: Mon Mar 12 14:36:22 2012
>> New Revision: 1299689
>>
>> URL: http://svn.apache.org/viewvc?rev=1299689&view=rev
>> Log:
>> [MTOMCAT-126] Add support for keystoreType
>> Submitted by Cédric Couralet.
>>
>> Modified:
>> tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/AbstractRunMojo.java
>> tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/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=1299689&r1=1299688&r2=1299689&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 Mon Mar 12 14:36:22 2012
>> @@ -71,7 +71,7 @@ import java.util.Set;
>> *
>> * @author Jurgen Lust
>> * @author Mark Hobson <ma...@gmail.com>
>> - * @version $Id: AbstractRunMojo.java 14033 2011-05-04 17:51:15Z bimargulies $
>> + * @version $Id$
>> */
>> public abstract class AbstractRunMojo
>> extends AbstractI18NTomcat6Mojo
>> @@ -253,6 +253,14 @@ public abstract class AbstractRunMojo
>> * @since 1.1
>> */
>> private String keystorePass;
>> +
>> + /**
>> + * Override the default keystoreType for the HTTPS connector (if enabled)
>> + *
>> + * @parameter
>
> No "@parameter default-value=" here?
> Your code for Tomcat 7 below has "default-value".
Good catch. Just fixed that.
Thanks for the review.
>
> It is @since 2.0.1, not 1.1 as written below?
>
>> + * @since 1.1
>> + */
>> + private String keystoreType;
>>
>> /**
>> * <p>
>> @@ -767,6 +775,10 @@ public abstract class AbstractRunMojo
>> {
>> httpsConnector.setAttribute( "keystorePass", keystorePass );
>> }
>> + if ( keystoreType != null )
>> + {
>> + httpsConnector.setAttribute( "keystoreType", keystoreType );
>> + }
>> container.addConnector( httpsConnector );
>>
>> }
>>
>> 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=1299689&r1=1299688&r2=1299689&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 Mon Mar 12 14:36:22 2012
>> @@ -254,7 +254,13 @@ public abstract class AbstractRunMojo
>> * @since 1.1
>> */
>> private String keystorePass;
>> -
>> +
>> + /**
>> + * Override the type of keystore file to be used for the server certificate. If not specified, the default value is "JKS".
>> + * @parameter default-value="JKS"
>> + */
>> + private String keystoreType;
>> +
>> /**
>> * <p>
>> * Enables or disables naming support for the embedded Tomcat server.
>> @@ -752,6 +758,10 @@ public abstract class AbstractRunMojo
>> {
>> httpsConnector.setAttribute( "keystorePass", keystorePass );
>> }
>> + if ( keystoreType != null )
>> + {
>> + httpsConnector.setAttribute( "keystoreType", keystoreType);
>> + }
>> embeddedTomcat.getEngine().getService().addConnector( httpsConnector );
>>
>> }
>>
>>
>
> Best regards,
> Konstantin Kolinko
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
> For additional commands, e-mail: dev-help@tomcat.apache.org
>
--
Olivier Lamy
Talend: http://coders.talend.com
http://twitter.com/olamy | http://linkedin.com/in/olamy
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org