This closes #122 openwire fix
This commit is contained in:
commit
21b068a7a9
|
@ -79,6 +79,8 @@ public class BrokerService implements Service {
|
||||||
public String TRUSTSTORE_PASSWORD;
|
public String TRUSTSTORE_PASSWORD;
|
||||||
public String storeType;
|
public String storeType;
|
||||||
|
|
||||||
|
private SslContext sslContext;
|
||||||
|
|
||||||
private static final Logger LOG = LoggerFactory.getLogger(BrokerService.class);
|
private static final Logger LOG = LoggerFactory.getLogger(BrokerService.class);
|
||||||
|
|
||||||
@SuppressWarnings("unused")
|
@SuppressWarnings("unused")
|
||||||
|
@ -91,7 +93,7 @@ public class BrokerService implements Service {
|
||||||
private boolean startAsync = false;
|
private boolean startAsync = false;
|
||||||
public Set<Integer> extraConnectors = new HashSet<Integer>();
|
public Set<Integer> extraConnectors = new HashSet<Integer>();
|
||||||
|
|
||||||
private final List<TransportConnector> transportConnectors = new ArrayList<TransportConnector>();
|
private List<TransportConnector> transportConnectors = new ArrayList<TransportConnector>();
|
||||||
private File dataDirectoryFile;
|
private File dataDirectoryFile;
|
||||||
|
|
||||||
private PolicyMap destinationPolicy;
|
private PolicyMap destinationPolicy;
|
||||||
|
@ -368,7 +370,7 @@ public class BrokerService implements Service {
|
||||||
}
|
}
|
||||||
|
|
||||||
public SslContext getSslContext() {
|
public SslContext getSslContext() {
|
||||||
return null;
|
return this.sslContext;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setDataDirectory(String dataDirectory) {
|
public void setDataDirectory(String dataDirectory) {
|
||||||
|
@ -465,6 +467,7 @@ public class BrokerService implements Service {
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setTransportConnectors(List<TransportConnector> transportConnectors) throws Exception {
|
public void setTransportConnectors(List<TransportConnector> transportConnectors) throws Exception {
|
||||||
|
this.transportConnectors = transportConnectors;
|
||||||
}
|
}
|
||||||
|
|
||||||
public NetworkConnector addNetworkConnector(NetworkConnector connector) throws Exception {
|
public NetworkConnector addNetworkConnector(NetworkConnector connector) throws Exception {
|
||||||
|
@ -603,6 +606,7 @@ public class BrokerService implements Service {
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setSslContext(SslContext sslContext) {
|
public void setSslContext(SslContext sslContext) {
|
||||||
|
this.sslContext = sslContext;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setPersistenceFactory(PersistenceAdapterFactory persistenceFactory) {
|
public void setPersistenceFactory(PersistenceAdapterFactory persistenceFactory) {
|
||||||
|
|
|
@ -0,0 +1,44 @@
|
||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<!--
|
||||||
|
Licensed to the Apache Software Foundation (ASF) under one or more
|
||||||
|
contributor license agreements. See the NOTICE file distributed with
|
||||||
|
this work for additional information regarding copyright ownership.
|
||||||
|
The ASF licenses this file to You under the Apache License, Version 2.0
|
||||||
|
(the "License"); you may not use this file except in compliance with
|
||||||
|
the License. You may obtain a copy of the License at
|
||||||
|
|
||||||
|
http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
|
||||||
|
Unless required by applicable law or agreed to in writing, software
|
||||||
|
distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
See the License for the specific language governing permissions and
|
||||||
|
limitations under the License.
|
||||||
|
-->
|
||||||
|
|
||||||
|
<!-- START SNIPPET: spring -->
|
||||||
|
<beans
|
||||||
|
xmlns="http://www.springframework.org/schema/beans"
|
||||||
|
xmlns:amq="http://activemq.apache.org/schema/core"
|
||||||
|
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||||
|
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
|
||||||
|
http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd">
|
||||||
|
|
||||||
|
<!-- lets create an embedded ActiveMQ Broker -->
|
||||||
|
<amq:broker useJmx="false" persistent="false">
|
||||||
|
|
||||||
|
<amq:sslContext>
|
||||||
|
<amq:sslContext
|
||||||
|
keyStore="server.keystore" keyStorePassword="password"
|
||||||
|
trustStore="client.keystore" trustStorePassword="password"/>
|
||||||
|
</amq:sslContext>
|
||||||
|
|
||||||
|
<amq:transportConnectors>
|
||||||
|
<amq:transportConnector uri="ssl://localhost:61616" />
|
||||||
|
</amq:transportConnectors>
|
||||||
|
|
||||||
|
</amq:broker>
|
||||||
|
|
||||||
|
</beans>
|
||||||
|
|
||||||
|
<!-- END SNIPPET: spring -->
|
Loading…
Reference in New Issue