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

https://issues.apache.org/jira/browse/AMQ-5943 - rename resources so that they don't match the surefire *Test* filter which will try to execute them as tests

This commit is contained in:
gtully 2015-08-27 11:09:20 +01:00
parent 547476d1bc
commit 1ea289736b
6 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
activemq-unit-tests/src/test/java/org/apache/activemq/security/JaasDualAuthenticationNetworkBridgeTest.java
View File

@ -50,7 +50,7 @@ import org.slf4j.LoggerFactory;
* - ssl-domain-JaasDualAuthenticationNetworkBridgeTest.properties
*/
public class JaasDualAuthenticationNetworkBridgeTest {
protected final static String CONFIG_FILE="org/apache/activemq/security/JaasDualAuthenticationNetworkBridgeTest.xml";
protected final static String CONFIG_FILE="org/apache/activemq/security/JaasDualAuthenticationNetworkBridge.xml";
protected static Logger LOG = LoggerFactory.getLogger(JaasDualAuthenticationNetworkBridgeTest.class);
private BrokerService broker1 = null;
private BrokerService broker2 = null;
@ -62,7 +62,7 @@ public class JaasDualAuthenticationNetworkBridgeTest {
public void setUp() throws Exception {
LOG.info("Starting up");
String path = null;
URL resource = JaasDualAuthenticationNetworkBridgeTest.class.getClassLoader().getResource("login-JaasDualAuthenticationNetworkBridgeTest.config");
URL resource = JaasDualAuthenticationNetworkBridgeTest.class.getClassLoader().getResource("login-JaasDualAuthenticationNetworkBridge.config");
if (resource != null) {
path = resource.getFile();
System.setProperty("java.security.auth.login.config", path);

0
activemq-unit-tests/src/test/resources/groups-JaasDualAuthenticationNetworkBridgeTest.properties → activemq-unit-tests/src/test/resources/groups-JaasDualAuthenticationNetworkBridge.properties
View File

8
activemq-unit-tests/src/test/resources/login-JaasDualAuthenticationNetworkBridgeTest.config → activemq-unit-tests/src/test/resources/login-JaasDualAuthenticationNetworkBridge.config
View File

@ -20,13 +20,13 @@ activemq-domain {
org.apache.activemq.jaas.PropertiesLoginModule requisite
debug=true
org.apache.activemq.jaas.properties.user="users-JaasDualAuthenticationNetworkBridgeTest.properties"
org.apache.activemq.jaas.properties.group="groups-JaasDualAuthenticationNetworkBridgeTest.properties";
org.apache.activemq.jaas.properties.user="users-JaasDualAuthenticationNetworkBridge.properties"
org.apache.activemq.jaas.properties.group="groups-JaasDualAuthenticationNetworkBridge.properties";
};
activemq-ssl-domain {
org.apache.activemq.jaas.TextFileCertificateLoginModule required
debug=true
org.apache.activemq.jaas.textfiledn.user="ssl-domain-JaasDualAuthenticationNetworkBridgeTest.properties"
org.apache.activemq.jaas.textfiledn.group="groups-JaasDualAuthenticationNetworkBridgeTest.properties";
org.apache.activemq.jaas.textfiledn.user="ssl-domain-JaasDualAuthenticationNetworkBridge.properties"
org.apache.activemq.jaas.textfiledn.group="groups-JaasDualAuthenticationNetworkBridge.properties";
};

0
activemq-unit-tests/src/test/resources/org/apache/activemq/security/JaasDualAuthenticationNetworkBridgeTest.xml → activemq-unit-tests/src/test/resources/org/apache/activemq/security/JaasDualAuthenticationNetworkBridge.xml
View File

0
activemq-unit-tests/src/test/resources/ssl-domain-JaasDualAuthenticationNetworkBridgeTest.properties → activemq-unit-tests/src/test/resources/ssl-domain-JaasDualAuthenticationNetworkBridge.properties
View File

0
activemq-unit-tests/src/test/resources/users-JaasDualAuthenticationNetworkBridgeTest.properties → activemq-unit-tests/src/test/resources/users-JaasDualAuthenticationNetworkBridge.properties
View File