diff options
Diffstat (limited to 'qpid/java/systests/src')
| -rwxr-xr-x | qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java | 22 |
1 files changed, 7 insertions, 15 deletions
diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java index 605296d55c..3828cd8ea0 100755 --- a/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java +++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java @@ -249,20 +249,12 @@ public class QpidBrokerTestCase extends QpidTestCase private void initialiseLogConfigFile() { - try - { - _logger.info("About to initialise log config file from system property: " + LOG4J_CONFIG_FILE_PATH); + _logger.info("About to initialise log config file from system property: " + LOG4J_CONFIG_FILE_PATH); - URI uri = new URI("file", LOG4J_CONFIG_FILE_PATH, null); - _logConfigFile = new File(uri); - if(!_logConfigFile.exists()) - { - throw new RuntimeException("Log config file " + _logConfigFile.getAbsolutePath() + " does not exist"); - } - } - catch (URISyntaxException e) + _logConfigFile = new File(LOG4J_CONFIG_FILE_PATH); + if(!_logConfigFile.exists()) { - throw new RuntimeException("Couldn't create URI from log4.configuration: " + LOG4J_CONFIG_FILE_PATH, e); + throw new RuntimeException("Log config file " + _logConfigFile.getAbsolutePath() + " does not exist"); } } @@ -633,17 +625,17 @@ public class QpidBrokerTestCase extends QpidTestCase public String getTestConfigFile(int port) { - return _output + "/" + getTestQueueName() + "-" + port + "-config"; + return _output + File.separator + getTestQueueName() + "-" + port + "-config"; } public String getTestVirtualhostsFile(int port) { - return _output + "/" + getTestQueueName() + "-" + port + "-virtualhosts.xml"; + return _output + File.separator + getTestQueueName() + "-" + port + "-virtualhosts.xml"; } private String relativeToQpidHome(String file) { - return file.replace(System.getProperty(QPID_HOME,"QPID_HOME") + "/",""); + return file.replace(System.getProperty(QPID_HOME,"QPID_HOME") + File.separator,""); } protected String getPathRelativeToWorkingDirectory(String file) |