summaryrefslogtreecommitdiff
path: root/java/broker/src/test
diff options
context:
space:
mode:
Diffstat (limited to 'java/broker/src/test')
-rw-r--r--java/broker/src/test/java/org/apache/qpid/server/logging/LogMessageTest.java4
-rw-r--r--java/broker/src/test/java/org/apache/qpid/server/queue/MockAMQQueue.java7
2 files changed, 5 insertions, 6 deletions
diff --git a/java/broker/src/test/java/org/apache/qpid/server/logging/LogMessageTest.java b/java/broker/src/test/java/org/apache/qpid/server/logging/LogMessageTest.java
index 7a8cabf512..956bb6f8fa 100644
--- a/java/broker/src/test/java/org/apache/qpid/server/logging/LogMessageTest.java
+++ b/java/broker/src/test/java/org/apache/qpid/server/logging/LogMessageTest.java
@@ -38,7 +38,7 @@ public class LogMessageTest extends TestCase
{
Locale usLocal = Locale.US;
Locale.setDefault(usLocal);
- ResourceBundle _messages = ResourceBundle.getBundle("org.apache.qpid.server.logging.messages.LogMessages",
+ ResourceBundle _messages = ResourceBundle.getBundle("org.apache.qpid.server.logging.messages.Broker_logmessages",
usLocal);
assertNotNull("Unable to load ResourceBundle", _messages);
@@ -55,7 +55,7 @@ public class LogMessageTest extends TestCase
Locale.setDefault(japanese);
try
{
- ResourceBundle _messages = ResourceBundle.getBundle("org.apache.qpid.server.logging.messages.LogMessages",
+ ResourceBundle _messages = ResourceBundle.getBundle("org.apache.qpid.server.logging.messages.Broker_logmessages",
japanese);
assertNotNull("Unable to load ResourceBundle", _messages);
diff --git a/java/broker/src/test/java/org/apache/qpid/server/queue/MockAMQQueue.java b/java/broker/src/test/java/org/apache/qpid/server/queue/MockAMQQueue.java
index 70d146437f..51b049787c 100644
--- a/java/broker/src/test/java/org/apache/qpid/server/queue/MockAMQQueue.java
+++ b/java/broker/src/test/java/org/apache/qpid/server/queue/MockAMQQueue.java
@@ -21,8 +21,8 @@
package org.apache.qpid.server.queue;
import org.apache.qpid.framing.AMQShortString;
-import org.apache.qpid.framing.FieldTable;
import org.apache.qpid.server.configuration.*;
+import org.apache.qpid.server.configuration.plugins.ConfigurationPlugin;
import org.apache.qpid.server.exchange.Exchange;
import org.apache.qpid.server.logging.LogSubject;
import org.apache.qpid.server.subscription.Subscription;
@@ -36,7 +36,6 @@ import org.apache.qpid.server.binding.Binding;
import org.apache.qpid.server.txn.ServerTransaction;
import org.apache.qpid.AMQException;
-import javax.swing.*;
import java.util.List;
import java.util.Set;
import java.util.Map;
@@ -520,12 +519,12 @@ public class MockAMQQueue implements AMQQueue
//To change body of implemented methods use File | Settings | File Templates.
}
- public void configure(QueueConfiguration config)
+ public void configure(ConfigurationPlugin config)
{
}
- public QueueConfiguration getConfiguration()
+ public ConfigurationPlugin getConfiguration()
{
return null; //To change body of implemented methods use File | Settings | File Templates.
}