diff --git a/tests/activemq5-unit-tests/src/main/java/org/apache/activemq/broker/BrokerService.java b/tests/activemq5-unit-tests/src/main/java/org/apache/activemq/broker/BrokerService.java index a3dce7f7ba..e50fdf8483 100644 --- a/tests/activemq5-unit-tests/src/main/java/org/apache/activemq/broker/BrokerService.java +++ b/tests/activemq5-unit-tests/src/main/java/org/apache/activemq/broker/BrokerService.java @@ -79,6 +79,8 @@ public class BrokerService implements Service { public String TRUSTSTORE_PASSWORD; public String storeType; + private SslContext sslContext; + private static final Logger LOG = LoggerFactory.getLogger(BrokerService.class); @SuppressWarnings("unused") @@ -91,7 +93,7 @@ public class BrokerService implements Service { private boolean startAsync = false; public Set extraConnectors = new HashSet(); - private final List transportConnectors = new ArrayList(); + private List transportConnectors = new ArrayList(); private File dataDirectoryFile; private PolicyMap destinationPolicy; @@ -368,7 +370,7 @@ public class BrokerService implements Service { } public SslContext getSslContext() { - return null; + return this.sslContext; } public void setDataDirectory(String dataDirectory) { @@ -465,6 +467,7 @@ public class BrokerService implements Service { } public void setTransportConnectors(List transportConnectors) throws Exception { + this.transportConnectors = transportConnectors; } public NetworkConnector addNetworkConnector(NetworkConnector connector) throws Exception { @@ -603,6 +606,7 @@ public class BrokerService implements Service { } public void setSslContext(SslContext sslContext) { + this.sslContext = sslContext; } public void setPersistenceFactory(PersistenceAdapterFactory persistenceFactory) { diff --git a/tests/activemq5-unit-tests/src/test/resources/org/apache/activemq/transport/tcp/activemq-ssl.xml b/tests/activemq5-unit-tests/src/test/resources/org/apache/activemq/transport/tcp/activemq-ssl.xml new file mode 100755 index 0000000000..1fe92a9df7 --- /dev/null +++ b/tests/activemq5-unit-tests/src/test/resources/org/apache/activemq/transport/tcp/activemq-ssl.xml @@ -0,0 +1,44 @@ + + + + + + + + + + + + + + + + + + + + + +