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

[olamy]

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-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org