diff options
Diffstat (limited to 'qpid/java/broker/src/main')
2 files changed, 3 insertions, 15 deletions
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ServerConfiguration.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ServerConfiguration.java index 0621b87f0a..95c02c60a7 100644 --- a/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ServerConfiguration.java +++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ServerConfiguration.java @@ -60,7 +60,7 @@ public class ServerConfiguration extends ConfigurationPlugin implements SignalHa public static final int DEFAULT_FRAME_SIZE = 65536; public static final int DEFAULT_PORT = 5672; - public static final int DEFAULT_SSL_PORT = 8672; + public static final int DEFAULT_SSL_PORT = 5671; public static final long DEFAULT_HOUSEKEEPING_PERIOD = 30000L; public static final int DEFAULT_JMXPORT = 8999; @@ -688,12 +688,12 @@ public class ServerConfiguration extends ConfigurationPlugin implements SignalHa public String getKeystorePath() { - return getStringValue("connector.ssl.keystorePath", "none"); + return getStringValue("connector.ssl.keystorePath"); } public String getKeystorePassword() { - return getStringValue("connector.ssl.keystorePassword", "none"); + return getStringValue("connector.ssl.keystorePassword"); } public String getCertType() diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/MultiVersionProtocolEngineFactory.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/MultiVersionProtocolEngineFactory.java index 460ea93509..8a7159bdc2 100755 --- a/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/MultiVersionProtocolEngineFactory.java +++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/MultiVersionProtocolEngineFactory.java @@ -20,7 +20,6 @@ */ package org.apache.qpid.server.protocol; -import java.util.EnumSet; import java.util.Set; import java.util.concurrent.atomic.AtomicLong; @@ -32,23 +31,12 @@ import org.apache.qpid.transport.network.NetworkConnection; public class MultiVersionProtocolEngineFactory implements ProtocolEngineFactory { - private static final Set<AmqpProtocolVersion> ALL_VERSIONS = EnumSet.allOf(AmqpProtocolVersion.class); private static final AtomicLong ID_GENERATOR = new AtomicLong(0); private final IApplicationRegistry _appRegistry; private final String _fqdn; private final Set<AmqpProtocolVersion> _supported; - public MultiVersionProtocolEngineFactory() - { - this("localhost", ALL_VERSIONS); - } - - public MultiVersionProtocolEngineFactory(String fqdn) - { - this(fqdn, ALL_VERSIONS); - } - public MultiVersionProtocolEngineFactory(String fqdn, Set<AmqpProtocolVersion> supportedVersions) { _appRegistry = ApplicationRegistry.getInstance(); |