QPID-3324: make the SSL port configurable from the comand line

Applied patch from Danushka Menikkumbura


git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1141467 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 21 insertions, 3 deletions

diff --git a/java/broker/src/main/java/org/apache/qpid/server/Main.java b/java/broker/src/main/java/org/apache/qpid/server/Main.java
index 9d3c4dd2e8..08e6a24153 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/Main.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/Main.java
@@ -172,6 +172,11 @@ public class Main
                         .withDescription("monitor the log file configuration file for changes. Units are seconds. "
                                          + "Zero means do not check for changes.").withLongOpt("logwatch").create("w");
 
+        Option sslport =
+                OptionBuilder.withArgName("sslport").hasArg()
+                        .withDescription("SSL port. Overrides any value in the config file")
+                        .withLongOpt("sslport").create("s");
+
         options.addOption(help);
         options.addOption(version);
         options.addOption(configFile);
@@ -184,6 +189,7 @@ public class Main
         options.addOption(exclude0_8);
         options.addOption(mport);
         options.addOption(bind);
+        options.addOption(sslport);
     }
 
     protected void execute()
@@ -428,11 +434,23 @@ public class Main
             {
                 sslFactory = new SSLContextFactory(keystorePath, keystorePassword, certType);
                 NetworkDriver driver = new MINANetworkDriver();
-                driver.bind(serverConfig.getSSLPort(), new InetAddress[]{bindAddress},
+
+                String sslPort = commandLine.getOptionValue("s");
+                int port = 0;
+                if (null != sslPort)
+                {
+                    port = Integer.parseInt(sslPort);
+                }
+                else
+                {
+                    port = serverConfig.getSSLPort();
+                }
+
+                driver.bind(port, new InetAddress[]{bindAddress},
                             new AMQProtocolEngineFactory(), serverConfig.getNetworkConfiguration(), sslFactory);
-                ApplicationRegistry.getInstance().addAcceptor(new InetSocketAddress(bindAddress, serverConfig.getSSLPort()),
+                ApplicationRegistry.getInstance().addAcceptor(new InetSocketAddress(bindAddress, port),
                         new QpidAcceptor(driver,"TCP"));
-                CurrentActor.get().message(BrokerMessages.LISTENING("TCP/SSL", serverConfig.getSSLPort()));
+                CurrentActor.get().message(BrokerMessages.LISTENING("TCP/SSL", port));
             }
 
             CurrentActor.get().message(BrokerMessages.READY());