Return-Path: X-Original-To: apmail-tomcat-dev-archive@www.apache.org Delivered-To: apmail-tomcat-dev-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 8D7C810085 for ; Tue, 5 Nov 2013 23:18:53 +0000 (UTC) Received: (qmail 25482 invoked by uid 500); 5 Nov 2013 23:18:52 -0000 Delivered-To: apmail-tomcat-dev-archive@tomcat.apache.org Received: (qmail 25424 invoked by uid 500); 5 Nov 2013 23:18:52 -0000 Mailing-List: contact dev-help@tomcat.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: "Tomcat Developers List" Delivered-To: mailing list dev@tomcat.apache.org Received: (qmail 25410 invoked by uid 99); 5 Nov 2013 23:18:52 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 05 Nov 2013 23:18:52 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 05 Nov 2013 23:18:49 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 8966D23889BB for ; Tue, 5 Nov 2013 23:18:27 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1539186 - in /tomcat/maven-plugin/trunk: tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/AbstractRunMojo.java tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractRunMojo.java Date: Tue, 05 Nov 2013 23:18:27 -0000 To: dev@tomcat.apache.org From: olamy@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20131105231827.8966D23889BB@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: olamy Date: Tue Nov 5 23:18:27 2013 New Revision: 1539186 URL: http://svn.apache.org/r1539186 Log: [MTOMCAT-92] setup for https and ajp connectors too 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=1539186&r1=1539185&r2=1539186&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 Tue Nov 5 23:18:27 2013 @@ -920,9 +920,8 @@ public abstract class AbstractRunMojo httpConnector.setURIEncoding( uriEncoding ); httpConnector.setUseBodyEncodingForURI( this.useBodyEncodingForURI ); - if ( address !=null) + if ( address != null) { - //ici httpConnector.setAttribute( "address", address ); } @@ -971,6 +970,11 @@ public abstract class AbstractRunMojo httpsConnector.setUseBodyEncodingForURI( this.useBodyEncodingForURI ); + if ( address != null) + { + httpsConnector.setAttribute( "address", address ); + } + container.addConnector( httpsConnector ); } @@ -981,6 +985,10 @@ public abstract class AbstractRunMojo Connector ajpConnector = container.createConnector( (InetAddress) null, ajpPort, ajpProtocol ); ajpConnector.setURIEncoding( uriEncoding ); ajpConnector.setUseBodyEncodingForURI( this.useBodyEncodingForURI ); + if ( address != null) + { + ajpConnector.setAttribute( "address", address ); + } container.addConnector( ajpConnector ); } if ( useSeparateTomcatClassLoader ) 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=1539186&r1=1539185&r2=1539186&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 Tue Nov 5 23:18:27 2013 @@ -1121,7 +1121,7 @@ public abstract class AbstractRunMojo connector.setRedirectPort( httpsPort ); } - if ( address !=null) + if ( address != null) { connector.setAttribute( "address", address ); } @@ -1202,6 +1202,11 @@ public abstract class AbstractRunMojo httpsConnector.setUseBodyEncodingForURI( this.useBodyEncodingForURI ); + if ( address != null) + { + httpsConnector.setAttribute( "address", address ); + } + embeddedTomcat.getEngine().getService().addConnector( httpsConnector ); } @@ -1214,6 +1219,10 @@ public abstract class AbstractRunMojo ajpConnector.setPort( ajpPort ); ajpConnector.setURIEncoding( uriEncoding ); ajpConnector.setUseBodyEncodingForURI( this.useBodyEncodingForURI ); + if ( address != null) + { + ajpConnector.setAttribute( "address", address ); + } embeddedTomcat.getEngine().getService().addConnector( ajpConnector ); } --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org For additional commands, e-mail: dev-help@tomcat.apache.org