Author: olamy Date: Fri Apr 1 11:28:18 2016 New Revision: 1737348 URL: http://svn.apache.org/viewvc?rev=1737348&view=rev Log: executable war: Bind Tomcat to an address via command-line option #15
Merged pr https://github.com/apache/tomcat-maven-plugin/pull/15 Signed-off-by: olivier lamy <ol...@apache.org> Modified: tomcat/maven-plugin/trunk/tomcat7-war-runner/src/main/java/org/apache/tomcat/maven/runner/Tomcat7Runner.java tomcat/maven-plugin/trunk/tomcat7-war-runner/src/main/java/org/apache/tomcat/maven/runner/Tomcat7RunnerCli.java Modified: tomcat/maven-plugin/trunk/tomcat7-war-runner/src/main/java/org/apache/tomcat/maven/runner/Tomcat7Runner.java URL: http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat7-war-runner/src/main/java/org/apache/tomcat/maven/runner/Tomcat7Runner.java?rev=1737348&r1=1737347&r2=1737348&view=diff ============================================================================== --- tomcat/maven-plugin/trunk/tomcat7-war-runner/src/main/java/org/apache/tomcat/maven/runner/Tomcat7Runner.java (original) +++ tomcat/maven-plugin/trunk/tomcat7-war-runner/src/main/java/org/apache/tomcat/maven/runner/Tomcat7Runner.java Fri Apr 1 11:28:18 2016 @@ -87,6 +87,8 @@ public class Tomcat7Runner public static final String HTTP_PORT_KEY = "httpPort"; + public String httpAddress; + public int httpPort; public int httpsPort; @@ -305,15 +307,24 @@ public class Tomcat7Runner debugMessage( "use connectorHttpProtocol:" + connectorHttpProtocol ); - if ( httpPort > 0 ) + if ( httpPort > 0 || httpAddress != null) { Connector connector = new Connector( connectorHttpProtocol ); - connector.setPort( httpPort ); connector.setMaxPostSize( maxPostSize ); - if ( httpsPort > 0 ) + if(httpPort > 0) + { + connector.setPort( httpPort ); + + if ( httpsPort > 0 ) + { + connector.setRedirectPort( httpsPort ); + } + } + + if( httpAddress != null) { - connector.setRedirectPort( httpsPort ); + connector.setProperty("address", httpAddress); } connector.setURIEncoding( uriEncoding ); Modified: tomcat/maven-plugin/trunk/tomcat7-war-runner/src/main/java/org/apache/tomcat/maven/runner/Tomcat7RunnerCli.java URL: http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat7-war-runner/src/main/java/org/apache/tomcat/maven/runner/Tomcat7RunnerCli.java?rev=1737348&r1=1737347&r2=1737348&view=diff ============================================================================== --- tomcat/maven-plugin/trunk/tomcat7-war-runner/src/main/java/org/apache/tomcat/maven/runner/Tomcat7RunnerCli.java (original) +++ tomcat/maven-plugin/trunk/tomcat7-war-runner/src/main/java/org/apache/tomcat/maven/runner/Tomcat7RunnerCli.java Fri Apr 1 11:28:18 2016 @@ -42,6 +42,9 @@ public class Tomcat7RunnerCli public static final String STAND_ALONE_PROPERTIES_FILENAME = "tomcat.standalone.properties"; + static Option httpAddress = + OptionBuilder.withArgName( "httpAddress" ).hasArg().withDescription( "http address to use" ).create( "httpAddress" ); + static Option httpPort = OptionBuilder.withArgName( "httpPort" ).hasArg().withDescription( "http port to use" ).create( "httpPort" ); @@ -102,7 +105,8 @@ public class Tomcat7RunnerCli static { - options.addOption( httpPort ) // + options.addOption( httpAddress ) // + .addOption( httpPort ) // .addOption( httpsPort ) // .addOption( ajpPort ) // .addOption( serverXmlPath ) // @@ -160,6 +164,11 @@ public class Tomcat7RunnerCli tomcat7Runner.serverXmlPath = line.getOptionValue( serverXmlPath.getOpt() ); } + if ( line.hasOption( httpAddress.getOpt() ) ) + { + tomcat7Runner.httpAddress = line.getOptionValue( httpAddress.getOpt() ); + } + String port = tomcat7Runner.runtimeProperties.getProperty( Tomcat7Runner.HTTP_PORT_KEY ); if ( port != null ) { --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
