Apache
/
activemq
mirror of https://github.com/apache/activemq.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix for: https://issues.apache.org/jira/browse/AMQ-4388 

fix for: https://issues.apache.org/jira/browse/AMQ-4387

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1458015 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Timothy A. Bish 2013-03-18 21:29:30 +00:00
parent 1d9b347157
commit 84eab9b5bb
2 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ3625Test.java
View File

@ -49,7 +49,6 @@ public class AMQ3625Test {
protected String base = "src/test/resources/org/apache/activemq/bugs/amq3625";
protected String conf = "conf";
protected String keys = "keys";
protected String sep = File.separator;
protected String JaasStompSSLBroker1_xml = "JaasStompSSLBroker1.xml";
protected String JaasStompSSLBroker2_xml = "JaasStompSSLBroker2.xml";
@ -60,9 +59,9 @@ public class AMQ3625Test {
if (System.getProperty(java_security_auth_login_config) != null) {
oldLoginConf = System.getProperty(java_security_auth_login_config);
}
System.setProperty(java_security_auth_login_config, base + sep + conf + sep + "login.config");
broker1 = BrokerFactory.createBroker(xbean + base + sep + conf + sep + JaasStompSSLBroker1_xml);
broker2 = BrokerFactory.createBroker(xbean + base + sep + conf + sep + JaasStompSSLBroker2_xml);
System.setProperty(java_security_auth_login_config, base + "/" + conf + "/" + "login.config");
broker1 = BrokerFactory.createBroker(xbean + base + "/" + conf + "/" + JaasStompSSLBroker1_xml);
broker2 = BrokerFactory.createBroker(xbean + base + "/" + conf + "/" + JaasStompSSLBroker2_xml);
broker1.start();
broker1.waitUntilStarted();

13
activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ4126Test.java
View File

@ -47,7 +47,6 @@ public class AMQ4126Test {
protected String xbean = "xbean:";
protected String confBase = "src/test/resources/org/apache/activemq/bugs/amq4126";
protected String certBase = "src/test/resources/org/apache/activemq/security";
protected String sep = File.separator;
protected String JaasStompSSLBroker_xml = "JaasStompSSLBroker.xml";
protected StompConnection stompConnection = new StompConnection();
@ -58,8 +57,8 @@ public class AMQ4126Test {
if (System.getProperty(java_security_auth_login_config) != null) {
oldLoginConf = System.getProperty(java_security_auth_login_config);
}
System.setProperty(java_security_auth_login_config, confBase + sep + "login.config");
broker = BrokerFactory.createBroker(xbean + confBase + sep + JaasStompSSLBroker_xml);
System.setProperty(java_security_auth_login_config, confBase + "/login.config");
broker = BrokerFactory.createBroker(xbean + confBase + "/" + JaasStompSSLBroker_xml);
broker.start();
broker.waitUntilStarted();
@ -75,10 +74,10 @@ public class AMQ4126Test {
}
public Socket createSocket(String host, int port) throws Exception {
System.setProperty("javax.net.ssl.trustStore", certBase + sep + "broker1.ks");
System.setProperty("javax.net.ssl.trustStore", certBase + "/broker1.ks");
System.setProperty("javax.net.ssl.trustStorePassword", "password");
System.setProperty("javax.net.ssl.trustStoreType", "jks");
System.setProperty("javax.net.ssl.keyStore", certBase + sep + "client.ks");
System.setProperty("javax.net.ssl.keyStore", certBase + "/client.ks");
System.setProperty("javax.net.ssl.keyStorePassword", "password");
System.setProperty("javax.net.ssl.keyStoreType", "jks");
@ -122,9 +121,9 @@ public class AMQ4126Test {
URI brokerURI = broker.getConnectorByName(connectorName).getConnectUri();
String uri = "ssl://" + brokerURI.getHost() + ":" + brokerURI.getPort();
ActiveMQSslConnectionFactory cf = new ActiveMQSslConnectionFactory(uri);
cf.setTrustStore("org/apache/activemq/security" + sep + "broker1.ks");
cf.setTrustStore("org/apache/activemq/security/broker1.ks");
cf.setTrustStorePassword("password");
cf.setKeyStore("org/apache/activemq/security" + sep + "client.ks");
cf.setKeyStore("org/apache/activemq/security/client.ks");
cf.setKeyStorePassword("password");
ActiveMQConnection connection = null;
if (username != null || password != null) {