From d5056d5fdcc1f348fe485515796383abd8ff9c76 Mon Sep 17 00:00:00 2001 From: Gary Tully Date: Fri, 1 Feb 2013 12:00:54 +0000 Subject: [PATCH] fix itest git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1441411 13f79535-47bb-0310-9956-ffa450edef68 --- .../org/apache/activemq/karaf/itest/AbstractFeatureTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/activemq-karaf-itest/src/test/java/org/apache/activemq/karaf/itest/AbstractFeatureTest.java b/activemq-karaf-itest/src/test/java/org/apache/activemq/karaf/itest/AbstractFeatureTest.java index 30e3f9f31d..432a8890f9 100644 --- a/activemq-karaf-itest/src/test/java/org/apache/activemq/karaf/itest/AbstractFeatureTest.java +++ b/activemq-karaf-itest/src/test/java/org/apache/activemq/karaf/itest/AbstractFeatureTest.java @@ -237,7 +237,7 @@ public abstract class AbstractFeatureTest { // override the config.properties (to fix pax-exam bug) replaceConfigurationFile("etc/config.properties", new File(basedir+"/src/test/resources/org/apache/activemq/karaf/itest/config.properties")), replaceConfigurationFile("etc/custom.properties", new File(basedir+"/src/test/resources/org/apache/activemq/karaf/itest/custom.properties")), - replaceConfigurationFile("etc/org.apache.activemq.server-default.cfg", new File(basedir+"/src/test/resources/org/apache/activemq/karaf/itest/org.apache.activemq.server-default.cfg")), + replaceConfigurationFile("etc/org.apache.activemq.server-default.cfg", new File(basedir+"/src/test/resources/org/apache/activemq/karaf/itest/org.apache.activemq.server.cfg")), replaceConfigurationFile("etc/activemq.xml", new File(basedir+"/src/test/resources/org/apache/activemq/karaf/itest/activemq.xml")), replaceConfigurationFile("etc/org.ops4j.pax.logging.cfg", new File(basedir+"/src/test/resources/org/apache/activemq/karaf/itest/org.ops4j.pax.logging.cfg")), scanFeatures(getActiveMQKarafFeatureUrl(), f.toArray(new String[f.size()]))};